diff --git a/common/ChangeLog b/common/ChangeLog
index e577363c3..8dc830894 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -2,7 +2,7 @@
 
 	* exechelp.c (gnupg_wait_process): Add arg EXITCODE.  Changed all
 	callers.
-
+	(gnupg_create_inbound_pipe): New.
 	* util.h (GNUPG_MODULE_NAME_GPGSM, GNUPG_MODULE_NAME_GPG): New.
 	* homedir.c (gnupg_module_name): Add them
 	
diff --git a/common/exechelp.c b/common/exechelp.c
index 4ec481f99..7da7dbd50 100644
--- a/common/exechelp.c
+++ b/common/exechelp.c
@@ -270,6 +270,50 @@ do_exec (const char *pgmname, const char *argv[],
 #endif /*!HAVE_W32_SYSTEM*/
 
 
+/* Portable function to create a pipe.  Under Windows the write end is
+   inheritable.  */
+gpg_error_t
+gnupg_create_inbound_pipe (int filedes[2])
+{
+  gpg_error_t err = 0;
+#if HAVE_W32_SYSTEM
+  int fds[2];
+
+  filedes[0] = filedes[1] = -1;
+  err = gpg_error (GPG_ERR_GENERAL);
+  if (!create_inheritable_pipe (fds))
+    {
+      filedes[0] = _open_osfhandle (fds[0], 0);
+      if (filedes[0] == -1)
+        {
+          log_error ("failed to translate osfhandle %p\n", (void*)fds[0]);
+          CloseHandle (fd_to_handle (fds[1]));
+        }
+      else 
+        {
+          filedes[1] = _open_osfhandle (fds[1], 1);
+          if (filedes[1] == -1)
+            {
+              log_error ("failed to translate osfhandle %p\n", (void*)fds[1]);
+              close (filedes[0]);
+              filedes[0] = -1;
+              CloseHandle (fd_to_handle (fds[1]));
+            }
+          else
+            err = 0;
+        }
+    }
+#else
+  if (pipe (filedes) == -1)
+    {
+      err = gpg_error_from_syserror ();
+      filedes[0] = filedes[1] = -1;
+    }
+#endif
+  return err;
+}
+
+
 /* Fork and exec the PGMNAME, connect the file descriptor of INFILE to
    stdin, write the output to OUTFILE, return a new stream in
    STATUSFILE for stderr and the pid of the process in PID. The
diff --git a/common/exechelp.h b/common/exechelp.h
index 7abc03708..5dd7df4cf 100644
--- a/common/exechelp.h
+++ b/common/exechelp.h
@@ -21,6 +21,10 @@
 #define GNUPG_COMMON_EXECHELP_H
 
 
+/* Portable function to create a pipe.  Under Windows the write end is
+   inheritable.  */
+gpg_error_t gnupg_create_inbound_pipe (int filedes[2]);
+
 
 /* Fork and exec the PGMNAME, connect the file descriptor of INFILE to
    stdin, write the output to OUTFILE, return a new stream in
diff --git a/doc/tools.texi b/doc/tools.texi
index 47263311c..21db4c716 100644
--- a/doc/tools.texi
+++ b/doc/tools.texi
@@ -461,13 +461,15 @@ of the program.
 The command argument @code{--check-programs} lists all available
 programs, one per line.  The format of each line is:
 
-@code{@var{name}:@var{description}:@var{program name}:@var{available}:@var{config okay}:}
+@code{@var{name}:@var{description}:@var{pgmname}:@var{avail}:@var{okay}:@var{cfgfile}:@var{line}:@var{error}:}
 
 @table @var
 @item name
 This field contains a name tag of the program which is identical to the
 name of the component.  The name tag is to be used @emph{verbatim}.  It
-is thus not in any escaped format.
+is thus not in any escaped format.  This field may be empty to indicate
+a continuation of error descriptions for the last name.  The description
+and pgmname fields are then also empty.
 
 @item description
 The @emph{string} in this field contains a human-readable description
@@ -475,19 +477,34 @@ of the component.  It can be displayed to the user of the GUI for
 informational purposes.  It is @emph{percent-escaped} and
 @emph{localized}.
 
-@item program name
+@item pgmname
 The @emph{string} in this field contains the absolute name of the
 program's file.  It can be used to unambiguously invoke that program.
 It is @emph{percent-escaped}.
 
-@item available
+@item avail
 The @emph{boolean value} in this field indicates whether the program is
 installed and runnable.
 
-@item config okay
+@item okay
 The @emph{boolean value} in this field indicates whether the program's
 config file is syntactically okay.
 
+@item cfgfile
+If an error occured in the configuraion file (as indicated by a false
+value in the field @code{okay}), this field has the name of the failing
+configuration file.  It is @emph{percent-escaped}.
+
+@item line
+If an error occured in the configuration file, this field has the line
+number of the failing statement in the configuration file.  
+It is an @emph{unsigned number}.
+
+@item error
+If an error occured in the configuration file, this field has the error
+text of the failing statement in the configuration file.  It is
+@emph{percent-escaped} and @emph{localized}.
+
 @end table
 
 @noindent
diff --git a/jnlib/ChangeLog b/jnlib/ChangeLog
index 1d0adec0e..42750dc3b 100644
--- a/jnlib/ChangeLog
+++ b/jnlib/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-29  Werner Koch  <wk@g10code.com>
+
+	* argparse.c (initialize): Make strings translatable and remove
+	extra LF.
+
 2007-08-24  Werner Koch  <wk@g10code.com>
 
 	* mischelp.c (same_file_p): New.
diff --git a/jnlib/argparse.c b/jnlib/argparse.c
index 2d46884f0..3104db40e 100644
--- a/jnlib/argparse.c
+++ b/jnlib/argparse.c
@@ -149,65 +149,71 @@ static void show_version(void);
 static void
 initialize( ARGPARSE_ARGS *arg, const char *filename, unsigned *lineno )
 {
-    if( !(arg->flags & (1<<15)) ) { /* initialize this instance */
-	arg->internal.idx = 0;
-	arg->internal.last = NULL;
-	arg->internal.inarg = 0;
-	arg->internal.stopped = 0;
-	arg->internal.aliases = NULL;
-	arg->internal.cur_alias = NULL;
-	arg->err = 0;
-	arg->flags |= 1<<15; /* mark initialized */
-	if( *arg->argc < 0 )
-	    jnlib_log_bug("Invalid argument for ArgParse\n");
+  if( !(arg->flags & (1<<15)) ) 
+    { 
+      /* Initialize this instance. */
+      arg->internal.idx = 0;
+      arg->internal.last = NULL;
+      arg->internal.inarg = 0;
+      arg->internal.stopped = 0;
+      arg->internal.aliases = NULL;
+      arg->internal.cur_alias = NULL;
+      arg->err = 0;
+      arg->flags |= 1<<15; /* Mark as initialized.  */
+      if ( *arg->argc < 0 )
+        jnlib_log_bug ("invalid argument for arg_parsee\n");
     }
-
-
-    if( arg->err ) { /* last option was erroneous */
-	const char *s;
-
-	if( filename ) {
-	    if( arg->r_opt == -6 )
-		s = "argument not expected\n";
-	    else if( arg->r_opt == -5 )
-		s = "read error\n";
-	    else if( arg->r_opt == -4 )
-		s = "keyword too long\n";
-	    else if( arg->r_opt == -3 )
-		s = "missing argument\n";
-	    else if( arg->r_opt == -7 )
-		s = "invalid command\n";
-	    else if( arg->r_opt == -10 )
-		s = "invalid alias definition\n";
-	    else
-		s = "invalid option\n";
-	    jnlib_log_error("%s:%u: %s\n", filename, *lineno, s);
+  
+  
+  if (arg->err)
+    {
+      /* Last option was erroneous.  */
+      const char *s;
+      
+      if (filename)
+        {
+          if ( arg->r_opt == -6 )
+            s = _("argument not expected");
+          else if ( arg->r_opt == -5 )
+            s = _("read error");
+          else if ( arg->r_opt == -4 )
+            s = _("keyword too long");
+          else if ( arg->r_opt == -3 )
+            s = _("missing argument");
+          else if ( arg->r_opt == -7 )
+            s = _("invalid command");
+          else if ( arg->r_opt == -10 )
+            s = _("invalid alias definition");
+          else
+            s = _("invalid option");
+          jnlib_log_error ("%s:%u: %s\n", filename, *lineno, s);
 	}
-	else {
-            s = arg->internal.last? arg->internal.last:"[??]";
+      else 
+        {
+          s = arg->internal.last? arg->internal.last:"[??]";
             
-	    if( arg->r_opt == -3 )
-              jnlib_log_error ("Missing argument for option \"%.50s\"\n", s);
-	    else if( arg->r_opt == -6 )
-              jnlib_log_error ("Option \"%.50s\" does not expect an argument\n",
-                               s );
-	    else if( arg->r_opt == -7 )
-              jnlib_log_error ("Invalid command \"%.50s\"\n", s);
-	    else if( arg->r_opt == -8 )
-              jnlib_log_error ("Option \"%.50s\" is ambiguous\n", s);
-	    else if( arg->r_opt == -9 )
-              jnlib_log_error ("Command \"%.50s\" is ambiguous\n",s );
-	    else
-              jnlib_log_error ("Invalid option \"%.50s\"\n", s);
+          if ( arg->r_opt == -3 )
+            jnlib_log_error (_("missing argument for option \"%.50s\"\n"), s);
+          else if ( arg->r_opt == -6 )
+            jnlib_log_error (_("option \"%.50s\" does not expect an "
+                               "argument\n"), s );
+          else if ( arg->r_opt == -7 )
+            jnlib_log_error (_("invalid command \"%.50s\"\n"), s);
+          else if ( arg->r_opt == -8 )
+            jnlib_log_error (_("option \"%.50s\" is ambiguous\n"), s);
+          else if ( arg->r_opt == -9 )
+            jnlib_log_error (_("command \"%.50s\" is ambiguous\n"),s );
+          else
+            jnlib_log_error (_("invalid option \"%.50s\"\n"), s);
 	}
-	if( arg->err != 1 )
-	    exit(2);
-	arg->err = 0;
+      if ( arg->err != 1 )
+        exit (2);
+      arg->err = 0;
     }
 
-    /* clearout the return value union */
-    arg->r.ret_str = NULL;
-    arg->r.ret_long= 0;
+  /* Zero out the return value union.  */
+  arg->r.ret_str = NULL;
+  arg->r.ret_long = 0;
 }
 
 
diff --git a/po/ChangeLog b/po/ChangeLog
index c620d54b4..5ddcf07c5 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-29  Werner Koch  <wk@g10code.com>
+
+	* de.po: Translated the argparse.c strings.
+
 2007-08-28  Werner Koch  <wk@g10code.com>
 
 	* de.po: Updated.
diff --git a/po/be.po b/po/be.po
index 5b543771f..6506765f9 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-08-28 19:28+0200\n"
+"POT-Creation-Date: 2007-08-29 18:43+0200\n"
 "PO-Revision-Date: 2003-10-30 16:35+0200\n"
 "Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -270,7 +270,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
 #: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:67 tools/symcryptrun.c:164
+#: tools/gpgconf.c:69 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "шматслоўнасьць"
 
@@ -356,7 +356,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
 #: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:89 tools/symcryptrun.c:204
+#: tools/gpgconf.c:91 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Калі ласка, паведамляйце пра памылкі на <gnupg-bugs@gnu.org>.\n"
@@ -664,42 +664,42 @@ msgstr "дрэнны пароль"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:327 common/exechelp.c:415
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: common/exechelp.c:391 common/exechelp.c:448
+#: common/exechelp.c:435 common/exechelp.c:492
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
+#: common/exechelp.c:471 common/exechelp.c:599 common/exechelp.c:834
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: common/exechelp.c:596 common/exechelp.c:640
+#: common/exechelp.c:645 common/exechelp.c:698
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:604
+#: common/exechelp.c:653
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: common/exechelp.c:610 common/exechelp.c:651
+#: common/exechelp.c:659 common/exechelp.c:709
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: common/exechelp.c:646
+#: common/exechelp.c:704
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:657
+#: common/exechelp.c:717
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
@@ -1507,7 +1507,7 @@ msgstr "%s: немагчыма стварыць тэчку: %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
 
-#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
 msgid ""
 "@Commands:\n"
 " "
@@ -1641,7 +1641,7 @@ msgid "run in server mode"
 msgstr ""
 
 #: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1671,11 +1671,11 @@ msgstr ""
 msgid "use canonical text mode"
 msgstr ""
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
 msgid "use as output file"
 msgstr "выкарыстоўваць у якасьці файла вываду"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
 msgid "do not make any changes"
 msgstr "не рабіць ніякіх зьменаў"
 
@@ -6184,6 +6184,70 @@ msgstr ""
 msgid "can't open fd %d: %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
+#: jnlib/argparse.c:176
+#, fuzzy
+msgid "argument not expected"
+msgstr "сакрэтны ключ недаступны"
+
+#: jnlib/argparse.c:178
+#, fuzzy
+msgid "read error"
+msgstr "памылка чытаньня файла"
+
+#: jnlib/argparse.c:180
+#, fuzzy
+msgid "keyword too long"
+msgstr "пароль занадта доўгі\n"
+
+#: jnlib/argparse.c:182
+msgid "missing argument"
+msgstr ""
+
+#: jnlib/argparse.c:184
+#, fuzzy
+msgid "invalid command"
+msgstr "несумяшчальныя загады\n"
+
+#: jnlib/argparse.c:186
+#, fuzzy
+msgid "invalid alias definition"
+msgstr "недапушчальныя выбары імпартаваньня\n"
+
+#: jnlib/argparse.c:188
+#, fuzzy
+msgid "invalid option"
+msgstr "недапушчальныя выбары імпартаваньня\n"
+
+#: jnlib/argparse.c:196
+#, c-format
+msgid "missing argument for option \"%.50s\"\n"
+msgstr ""
+
+#: jnlib/argparse.c:198
+#, c-format
+msgid "option \"%.50s\" does not expect an argument\n"
+msgstr ""
+
+#: jnlib/argparse.c:201
+#, fuzzy, c-format
+msgid "invalid command \"%.50s\"\n"
+msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
+
+#: jnlib/argparse.c:203
+#, c-format
+msgid "option \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:205
+#, c-format
+msgid "command \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:207
+#, fuzzy, c-format
+msgid "invalid option \"%.50s\"\n"
+msgstr "недапушчальныя выбары імпартаваньня\n"
+
 #: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -7055,7 +7119,7 @@ msgstr "выдаліць ключы са зьвязку грамадскіх к
 msgid "add this secret keyring to the list"
 msgstr ""
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
 msgid "|NAME|use NAME as default secret key"
 msgstr "|НАЗВА|     задаць назву дапомнага сакрэтнага ключа"
 
@@ -7288,7 +7352,7 @@ msgstr ""
 msgid "This is a qualified signature\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "quit [выйсьці]"
@@ -7368,174 +7432,178 @@ msgstr "памылка стварэньня \"%s\": %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
-#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
+#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
+#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
-#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
+#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
+#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
+#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
+#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:504
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:508
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500
+#: tools/gpgconf-comp.c:512
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:526
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:517
+#: tools/gpgconf-comp.c:529
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:521
+#: tools/gpgconf-comp.c:533
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:525
+#: tools/gpgconf-comp.c:537
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:541
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:545
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr ""
 "Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
 "\n"
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:549
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "Паўтарыце пароль\n"
 
-#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|ІМЯ|   зашыфраваць для вылучанай асобы"
 
-#: tools/gpgconf-comp.c:659
+#: tools/gpgconf-comp.c:671
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:664
+#: tools/gpgconf-comp.c:676
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:709
+#: tools/gpgconf-comp.c:721
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:732
+#: tools/gpgconf-comp.c:744
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:776
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:812
+#: tools/gpgconf-comp.c:824
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:822
+#: tools/gpgconf-comp.c:834
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:833
+#: tools/gpgconf-comp.c:845
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:838
+#: tools/gpgconf-comp.c:850
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:875
+#: tools/gpgconf-comp.c:887
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2706
+#: tools/gpgconf-comp.c:2955
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:56
+#: tools/gpgconf.c:57
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
+msgid "check all programs"
+msgstr ""
+
+#: tools/gpgconf.c:59
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:64
 #, fuzzy
 msgid "check global configuration file"
 msgstr "невядомая вэрсыя"
 
-#: tools/gpgconf.c:70
+#: tools/gpgconf.c:72
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:92
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:97
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:168 tools/gpgconf.c:201
+#: tools/gpgconf.c:176 tools/gpgconf.c:209
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "Выкарыстаньне: gpg [выбары] "
 
-#: tools/gpgconf.c:170
+#: tools/gpgconf.c:178
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:179
+#: tools/gpgconf.c:187
 #, fuzzy
 msgid "Component not found"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: tools/gpgconf.c:203
+#: tools/gpgconf.c:211
 #, fuzzy
 msgid "No argument allowed"
 msgstr "сакрэтны ключ недаступны"
@@ -7768,9 +7836,6 @@ msgstr "непадтрымліваецца"
 #~ msgid "bad key"
 #~ msgstr "дрэнны ключ"
 
-#~ msgid "file read error"
-#~ msgstr "памылка чытаньня файла"
-
 #~ msgid "file write error"
 #~ msgstr "памылка запісу файла"
 
diff --git a/po/ca.po b/po/ca.po
index a80a38074..5764796b2 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-08-28 19:28+0200\n"
+"POT-Creation-Date: 2007-08-29 18:43+0200\n"
 "PO-Revision-Date: 2005-02-04 02:04+0100\n"
 "Last-Translator: Jordi Mallach <jordi@gnu.org>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -296,7 +296,7 @@ msgstr ""
 # Un dels dos és en la llista d'opcions amb --help. Urgh. jm
 #: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
 #: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:67 tools/symcryptrun.c:164
+#: tools/gpgconf.c:69 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "detall"
 
@@ -386,7 +386,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
 #: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:89 tools/symcryptrun.c:204
+#: tools/gpgconf.c:91 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Si us plau, informeu sobre els errors a <gnupg-bugs@gnu.org>.\n"
@@ -700,42 +700,42 @@ msgstr "canvia la contrasenya"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:327 common/exechelp.c:415
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: common/exechelp.c:391 common/exechelp.c:448
+#: common/exechelp.c:435 common/exechelp.c:492
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "no es pot obrir el fitxer: %s\n"
 
-#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
+#: common/exechelp.c:471 common/exechelp.c:599 common/exechelp.c:834
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: common/exechelp.c:596 common/exechelp.c:640
+#: common/exechelp.c:645 common/exechelp.c:698
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:604
+#: common/exechelp.c:653
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
 
-#: common/exechelp.c:610 common/exechelp.c:651
+#: common/exechelp.c:659 common/exechelp.c:709
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: common/exechelp.c:646
+#: common/exechelp.c:704
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:657
+#: common/exechelp.c:717
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "error en la lectura de «%s»: %s\n"
@@ -1597,7 +1597,7 @@ msgstr "s'usarà la clau secundària %08lX en lloc de la primària %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "clau %08lX: clau secreta sense clau pública - es descarta\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
 msgid ""
 "@Commands:\n"
 " "
@@ -1733,7 +1733,7 @@ msgid "run in server mode"
 msgstr ""
 
 #: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1763,11 +1763,11 @@ msgstr "|N|nivell de compressió N (0 no comprimeix)"
 msgid "use canonical text mode"
 msgstr "usa el mode de text canònic"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
 msgid "use as output file"
 msgstr "fitxer d'eixida"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
 msgid "do not make any changes"
 msgstr "no fa cap canvi"
 
@@ -6743,6 +6743,70 @@ msgstr "la línia d'entrada %u és massa llarga o hi falta un fí de línia\n"
 msgid "can't open fd %d: %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
 
+#: jnlib/argparse.c:176
+msgid "argument not expected"
+msgstr ""
+
+#: jnlib/argparse.c:178
+#, fuzzy
+msgid "read error"
+msgstr "error de lectura"
+
+#: jnlib/argparse.c:180
+#, fuzzy
+msgid "keyword too long"
+msgstr "la línia és massa llarga\n"
+
+#: jnlib/argparse.c:182
+#, fuzzy
+msgid "missing argument"
+msgstr "l'argument és invàlid"
+
+#: jnlib/argparse.c:184
+#, fuzzy
+msgid "invalid command"
+msgstr "les ordres entren en conflicte\n"
+
+#: jnlib/argparse.c:186
+#, fuzzy
+msgid "invalid alias definition"
+msgstr "opcions d'importació no vàlides\n"
+
+#: jnlib/argparse.c:188
+#, fuzzy
+msgid "invalid option"
+msgstr "opcions d'importació no vàlides\n"
+
+#: jnlib/argparse.c:196
+#, c-format
+msgid "missing argument for option \"%.50s\"\n"
+msgstr ""
+
+#: jnlib/argparse.c:198
+#, c-format
+msgid "option \"%.50s\" does not expect an argument\n"
+msgstr ""
+
+#: jnlib/argparse.c:201
+#, fuzzy, c-format
+msgid "invalid command \"%.50s\"\n"
+msgstr "L'ordre no és vàlida (proveu «help»)\n"
+
+#: jnlib/argparse.c:203
+#, c-format
+msgid "option \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:205
+#, c-format
+msgid "command \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:207
+#, fuzzy, c-format
+msgid "invalid option \"%.50s\"\n"
+msgstr "opcions d'importació no vàlides\n"
+
 #: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -7643,7 +7707,7 @@ msgstr "afegeix aquest anell a la llista"
 msgid "add this secret keyring to the list"
 msgstr "afegeix aquest anell secret a la llista"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOM|usa NOM com a clau secreta predeterminada"
 
@@ -7878,7 +7942,7 @@ msgstr ""
 "\n"
 "Açò serà una autosignatura.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "ix"
@@ -7958,173 +8022,177 @@ msgstr "error mentre s'enviava a «%s»: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
-#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
+#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
+#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
-#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
+#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
+#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
+#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
+#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:504
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:508
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500
+#: tools/gpgconf-comp.c:512
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:526
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:517
+#: tools/gpgconf-comp.c:529
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:521
+#: tools/gpgconf-comp.c:533
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:525
+#: tools/gpgconf-comp.c:537
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:541
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:545
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|usa el mode de contrasenya especificat"
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:549
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOM|xifra per a NOM"
 
-#: tools/gpgconf-comp.c:659
+#: tools/gpgconf-comp.c:671
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:664
+#: tools/gpgconf-comp.c:676
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:709
+#: tools/gpgconf-comp.c:721
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NOM|usa l'algoritme de xifratge NOM per a les contrasenyes"
 
-#: tools/gpgconf-comp.c:732
+#: tools/gpgconf-comp.c:744
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:776
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:812
+#: tools/gpgconf-comp.c:824
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:822
+#: tools/gpgconf-comp.c:834
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:833
+#: tools/gpgconf-comp.c:845
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:838
+#: tools/gpgconf-comp.c:850
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:875
+#: tools/gpgconf-comp.c:887
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2706
+#: tools/gpgconf-comp.c:2955
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:56
+#: tools/gpgconf.c:57
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
+msgid "check all programs"
+msgstr ""
+
+#: tools/gpgconf.c:59
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:64
 #, fuzzy
 msgid "check global configuration file"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: tools/gpgconf.c:70
+#: tools/gpgconf.c:72
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:92
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:97
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:168 tools/gpgconf.c:201
+#: tools/gpgconf.c:176 tools/gpgconf.c:209
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: tools/gpgconf.c:170
+#: tools/gpgconf.c:178
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:179
+#: tools/gpgconf.c:187
 #, fuzzy
 msgid "Component not found"
 msgstr "no s'ha trobat la clau pública"
 
-#: tools/gpgconf.c:203
+#: tools/gpgconf.c:211
 msgid "No argument allowed"
 msgstr ""
 
@@ -8505,9 +8573,6 @@ msgstr "l'algoritme de protecció %d%s no està suportat\n"
 #~ msgid "bad key"
 #~ msgstr "la clau és incorrecta"
 
-#~ msgid "file read error"
-#~ msgstr "error de lectura"
-
 #~ msgid "file write error"
 #~ msgstr "error d'escriptura"
 
@@ -8573,9 +8638,6 @@ msgstr "l'algoritme de protecció %d%s no està suportat\n"
 #~ msgid "weak key"
 #~ msgstr "clau feble"
 
-#~ msgid "invalid argument"
-#~ msgstr "l'argument és invàlid"
-
 # La «U» és masculina o femenina?  ivb
 #~ msgid "bad URI"
 #~ msgstr "l'URI és errònia"
diff --git a/po/cs.po b/po/cs.po
index 0a60c9281..b2b6ac6a3 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.3.92\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-08-28 19:28+0200\n"
+"POT-Creation-Date: 2007-08-29 18:43+0200\n"
 "PO-Revision-Date: 2004-11-26 09:12+0200\n"
 "Last-Translator: Roman Pavlik <rp@tns.cz>\n"
 "Language-Team: Czech <translations.cs@gnupg.cz>\n"
@@ -272,7 +272,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
 #: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:67 tools/symcryptrun.c:164
+#: tools/gpgconf.c:69 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "s dodate�n�mi informacemi"
 
@@ -361,7 +361,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
 #: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:89 tools/symcryptrun.c:204
+#: tools/gpgconf.c:91 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr ""
@@ -676,42 +676,42 @@ msgstr "zm
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:327 common/exechelp.c:415
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
 
-#: common/exechelp.c:391 common/exechelp.c:448
+#: common/exechelp.c:435 common/exechelp.c:492
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "nemohu otev��t podepsan� data '%s'\n"
 
-#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
+#: common/exechelp.c:471 common/exechelp.c:599 common/exechelp.c:834
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: common/exechelp.c:596 common/exechelp.c:640
+#: common/exechelp.c:645 common/exechelp.c:698
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:604
+#: common/exechelp.c:653
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "chyba p�i z�sk�n� informac� o aktu�ln�m kl��i: %s\n"
 
-#: common/exechelp.c:610 common/exechelp.c:651
+#: common/exechelp.c:659 common/exechelp.c:709
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: common/exechelp.c:646
+#: common/exechelp.c:704
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:657
+#: common/exechelp.c:717
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
@@ -1515,7 +1515,7 @@ msgstr "pou
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "kl�� %s: tajn� kl�� bez kl��e ve�ejn�ho - p�esko�eno\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
 msgid ""
 "@Commands:\n"
 " "
@@ -1648,7 +1648,7 @@ msgid "run in server mode"
 msgstr ""
 
 #: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1682,11 +1682,11 @@ msgstr ""
 msgid "use canonical text mode"
 msgstr "pou��t kanonick� textov� m�d"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
 msgid "use as output file"
 msgstr "pou��t jako v�stupn� soubor"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
 msgid "do not make any changes"
 msgstr "neprov�d�t ��dn� zm�ny"
 
@@ -6445,6 +6445,71 @@ msgstr "vstupn
 msgid "can't open fd %d: %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
 
+#: jnlib/argparse.c:176
+#, fuzzy
+msgid "argument not expected"
+msgstr "administr�torsk� p��kazy nejsou povoleny\n"
+
+#: jnlib/argparse.c:178
+#, fuzzy
+msgid "read error"
+msgstr "chyba p�i �ten� souboru"
+
+#: jnlib/argparse.c:180
+#, fuzzy
+msgid "keyword too long"
+msgstr "��dek je p��li� dlouh�"
+
+#: jnlib/argparse.c:182
+#, fuzzy
+msgid "missing argument"
+msgstr "neplatn� argument"
+
+#: jnlib/argparse.c:184
+#, fuzzy
+msgid "invalid command"
+msgstr "pouze administr�torsk� p��kazy\n"
+
+#: jnlib/argparse.c:186
+#, fuzzy
+msgid "invalid alias definition"
+msgstr "neplatn� parametr pro v�pis\n"
+
+#: jnlib/argparse.c:188
+#, fuzzy
+msgid "invalid option"
+msgstr "neplatn� parametr pro v�pis\n"
+
+#: jnlib/argparse.c:196
+#, c-format
+msgid "missing argument for option \"%.50s\"\n"
+msgstr ""
+
+#: jnlib/argparse.c:198
+#, c-format
+msgid "option \"%.50s\" does not expect an argument\n"
+msgstr ""
+
+#: jnlib/argparse.c:201
+#, fuzzy, c-format
+msgid "invalid command \"%.50s\"\n"
+msgstr "Neplatn� p��kaz (zkuste \"help\")\n"
+
+#: jnlib/argparse.c:203
+#, c-format
+msgid "option \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:205
+#, c-format
+msgid "command \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:207
+#, fuzzy, c-format
+msgid "invalid option \"%.50s\"\n"
+msgstr "neplatn� parametr pro v�pis\n"
+
 #: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -7323,7 +7388,7 @@ msgstr "ber kl
 msgid "add this secret keyring to the list"
 msgstr "Pro proveden� t�to operace je pot�eba tajn� kl��.\n"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
@@ -7559,7 +7624,7 @@ msgstr "                alias \"%s\""
 msgid "This is a qualified signature\n"
 msgstr "Jedn� se o podpis kl��e j�m sam�m.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "ukon�it"
@@ -7639,173 +7704,177 @@ msgstr "chyba p
 msgid "error sending standard options: %s\n"
 msgstr "chyba p�i hled�n� z�znamu d�v�ryhodnosti v `%s': %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
-#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
+#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
+#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
-#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
+#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
+#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
+#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
+#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:504
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:508
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500
+#: tools/gpgconf-comp.c:512
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:526
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:517
+#: tools/gpgconf-comp.c:529
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:521
+#: tools/gpgconf-comp.c:533
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:525
+#: tools/gpgconf-comp.c:537
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:541
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:545
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "revokovat kl�� nebo vybran� podkl��e"
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:549
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
 
-#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|JM�NO|�ifrovat pro JM�NO"
 
-#: tools/gpgconf-comp.c:659
+#: tools/gpgconf-comp.c:671
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:664
+#: tools/gpgconf-comp.c:676
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:709
+#: tools/gpgconf-comp.c:721
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:732
+#: tools/gpgconf-comp.c:744
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:776
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:812
+#: tools/gpgconf-comp.c:824
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:822
+#: tools/gpgconf-comp.c:834
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:833
+#: tools/gpgconf-comp.c:845
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:838
+#: tools/gpgconf-comp.c:850
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:875
+#: tools/gpgconf-comp.c:887
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2706
+#: tools/gpgconf-comp.c:2955
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:56
+#: tools/gpgconf.c:57
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
+msgid "check all programs"
+msgstr ""
+
+#: tools/gpgconf.c:59
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
 msgid "apply global default values"
 msgstr ""
 
 # c-format
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:64
 #, fuzzy
 msgid "check global configuration file"
 msgstr "nezn�m� konfigura�n� polo�ka \"%s\"\n"
 
-#: tools/gpgconf.c:70
+#: tools/gpgconf.c:72
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:92
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:97
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:168 tools/gpgconf.c:201
+#: tools/gpgconf.c:176 tools/gpgconf.c:209
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: tools/gpgconf.c:170
+#: tools/gpgconf.c:178
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:179
+#: tools/gpgconf.c:187
 #, fuzzy
 msgid "Component not found"
 msgstr "ve�ejn� kl�� nenalezen"
 
-#: tools/gpgconf.c:203
+#: tools/gpgconf.c:211
 #, fuzzy
 msgid "No argument allowed"
 msgstr "administr�torsk� p��kazy nejsou povoleny\n"
@@ -8190,9 +8259,6 @@ msgstr "ochrann
 #~ msgid "bad key"
 #~ msgstr "�patn� kl��"
 
-#~ msgid "file read error"
-#~ msgstr "chyba p�i �ten� souboru"
-
 #~ msgid "file write error"
 #~ msgstr "chyba p�i z�pisu souboru"
 
@@ -8250,9 +8316,6 @@ msgstr "ochrann
 #~ msgid "weak key"
 #~ msgstr "slab� kl��"
 
-#~ msgid "invalid argument"
-#~ msgstr "neplatn� argument"
-
 #~ msgid "bad URI"
 #~ msgstr "�patn� URI"
 
diff --git a/po/da.po b/po/da.po
index 3acafa02b..04c720f98 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-08-28 19:28+0200\n"
+"POT-Creation-Date: 2007-08-29 18:43+0200\n"
 "PO-Revision-Date: 2003-12-03 16:11+0100\n"
 "Last-Translator: Birger Langkjer <birger.langkjer@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -273,7 +273,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
 #: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:67 tools/symcryptrun.c:164
+#: tools/gpgconf.c:69 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "meddelsom"
 
@@ -362,7 +362,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
 #: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:89 tools/symcryptrun.c:204
+#: tools/gpgconf.c:91 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Rapport�r venligst fejl til <gnupg-bugs@gnu.org>.\n"
@@ -669,42 +669,42 @@ msgstr "
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:327 common/exechelp.c:415
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: common/exechelp.c:391 common/exechelp.c:448
+#: common/exechelp.c:435 common/exechelp.c:492
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
+#: common/exechelp.c:471 common/exechelp.c:599 common/exechelp.c:834
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: common/exechelp.c:596 common/exechelp.c:640
+#: common/exechelp.c:645 common/exechelp.c:698
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:604
+#: common/exechelp.c:653
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: common/exechelp.c:610 common/exechelp.c:651
+#: common/exechelp.c:659 common/exechelp.c:709
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: common/exechelp.c:646
+#: common/exechelp.c:704
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:657
+#: common/exechelp.c:717
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
@@ -1525,7 +1525,7 @@ msgstr "bruger sekund
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
 msgid ""
 "@Commands:\n"
 " "
@@ -1663,7 +1663,7 @@ msgid "run in server mode"
 msgstr ""
 
 #: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1693,11 +1693,11 @@ msgstr "|N|s
 msgid "use canonical text mode"
 msgstr "brug kanonisk tekstmodus"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
 msgid "use as output file"
 msgstr "brug som uddatafil"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
 msgid "do not make any changes"
 msgstr "lav ingen �ndringer"
 
@@ -6330,6 +6330,70 @@ msgstr ""
 msgid "can't open fd %d: %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
+#: jnlib/argparse.c:176
+#, fuzzy
+msgid "argument not expected"
+msgstr "skriver hemmeligt certifikat til '%s'\n"
+
+#: jnlib/argparse.c:178
+#, fuzzy
+msgid "read error"
+msgstr "fill�sningsfejl"
+
+#: jnlib/argparse.c:180
+msgid "keyword too long"
+msgstr ""
+
+#: jnlib/argparse.c:182
+#, fuzzy
+msgid "missing argument"
+msgstr "ugyldigt argument"
+
+#: jnlib/argparse.c:184
+#, fuzzy
+msgid "invalid command"
+msgstr "konfliktende kommandoer\n"
+
+#: jnlib/argparse.c:186
+#, fuzzy
+msgid "invalid alias definition"
+msgstr "ugyldig rustning"
+
+#: jnlib/argparse.c:188
+#, fuzzy
+msgid "invalid option"
+msgstr "ugyldig rustning"
+
+#: jnlib/argparse.c:196
+#, c-format
+msgid "missing argument for option \"%.50s\"\n"
+msgstr ""
+
+#: jnlib/argparse.c:198
+#, c-format
+msgid "option \"%.50s\" does not expect an argument\n"
+msgstr ""
+
+#: jnlib/argparse.c:201
+#, c-format
+msgid "invalid command \"%.50s\"\n"
+msgstr ""
+
+#: jnlib/argparse.c:203
+#, c-format
+msgid "option \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:205
+#, c-format
+msgid "command \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:207
+#, fuzzy, c-format
+msgid "invalid option \"%.50s\"\n"
+msgstr "ugyldig rustning"
+
 #: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -7208,7 +7272,7 @@ msgstr "tilf
 msgid "add this secret keyring to the list"
 msgstr "tilf�j denne hemmeligen�glering til listen"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|brug NAME som standard hemmelign�gle"
 
@@ -7443,7 +7507,7 @@ msgstr "              alias \""
 msgid "This is a qualified signature\n"
 msgstr "skriver selvsignatur\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "afslut"
@@ -7523,174 +7587,178 @@ msgstr "fejl ved l
 msgid "error sending standard options: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
-#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
+#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
+#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
-#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
+#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
 #, fuzzy
 msgid "Options useful for debugging"
 msgstr "sl� fuld fejltjekning til"
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
+#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
+#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
+#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:504
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:508
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500
+#: tools/gpgconf-comp.c:512
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:526
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:517
+#: tools/gpgconf-comp.c:529
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:521
+#: tools/gpgconf-comp.c:533
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:525
+#: tools/gpgconf-comp.c:537
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:541
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:545
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|brug pasfrasemodus N"
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:549
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAME|krypt�r for NAME"
 
-#: tools/gpgconf-comp.c:659
+#: tools/gpgconf-comp.c:671
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:664
+#: tools/gpgconf-comp.c:676
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:709
+#: tools/gpgconf-comp.c:721
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAME|brug cifrealgoritme NAME for pasfrase"
 
-#: tools/gpgconf-comp.c:732
+#: tools/gpgconf-comp.c:744
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:776
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:812
+#: tools/gpgconf-comp.c:824
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:822
+#: tools/gpgconf-comp.c:834
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:833
+#: tools/gpgconf-comp.c:845
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:838
+#: tools/gpgconf-comp.c:850
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:875
+#: tools/gpgconf-comp.c:887
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2706
+#: tools/gpgconf-comp.c:2955
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:56
+#: tools/gpgconf.c:57
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
+msgid "check all programs"
+msgstr ""
+
+#: tools/gpgconf.c:59
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:64
 #, fuzzy
 msgid "check global configuration file"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: tools/gpgconf.c:70
+#: tools/gpgconf.c:72
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:92
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:97
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:168 tools/gpgconf.c:201
+#: tools/gpgconf.c:176 tools/gpgconf.c:209
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "brug: gpg [flag] "
 
-#: tools/gpgconf.c:170
+#: tools/gpgconf.c:178
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:179
+#: tools/gpgconf.c:187
 #, fuzzy
 msgid "Component not found"
 msgstr "offentlig n�gle ikke fundet"
 
-#: tools/gpgconf.c:203
+#: tools/gpgconf.c:211
 #, fuzzy
 msgid "No argument allowed"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
@@ -8013,9 +8081,6 @@ msgstr "valgte cifferalgoritme %d er ugyldig\n"
 #~ msgid "bad key"
 #~ msgstr "d�rlig n�gle"
 
-#~ msgid "file read error"
-#~ msgstr "fill�sningsfejl"
-
 #~ msgid "file write error"
 #~ msgstr "filskrivningsfejl"
 
@@ -8076,9 +8141,6 @@ msgstr "valgte cifferalgoritme %d er ugyldig\n"
 #~ msgid "weak key"
 #~ msgstr "svag n�gle"
 
-#~ msgid "invalid argument"
-#~ msgstr "ugyldigt argument"
-
 #~ msgid "bad URI"
 #~ msgstr "ugyldig URI"
 
diff --git a/po/de.po b/po/de.po
index 9a03e5daf..6fabd11c2 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-2.0.6\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-08-28 19:28+0200\n"
-"PO-Revision-Date: 2007-08-28 19:41+0200\n"
+"POT-Creation-Date: 2007-08-29 18:43+0200\n"
+"PO-Revision-Date: 2007-08-29 18:51+0200\n"
 "Last-Translator: Walter Koch <koch@u32.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -204,21 +204,32 @@ msgid ""
 msgid_plural ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
 "passphrase should%%0Acontain at least %u digits or special characters."
-msgstr[0] "WARNUNG:  Sie haben eine offensichtlich unsichere%%0APassphrase eingegeben.  Eine Passphrase sollte%%0Amindestens %u Sonderzeichen oder eine Ziffer enthalten."
-msgstr[1] "WARNUNG:  Sie haben eine offensichtlich unsichere%%0APassphrase eingegeben.  Eine Passphrase sollte%%0A mindestens %u Sonderzeichen oder Ziffern enthalten."
+msgstr[0] ""
+"WARNUNG:  Sie haben eine offensichtlich unsichere%%0APassphrase eingegeben.  "
+"Eine Passphrase sollte%%0Amindestens %u Sonderzeichen oder eine Ziffer "
+"enthalten."
+msgstr[1] ""
+"WARNUNG:  Sie haben eine offensichtlich unsichere%%0APassphrase eingegeben.  "
+"Eine Passphrase sollte%%0A mindestens %u Sonderzeichen oder Ziffern "
+"enthalten."
 
 #: agent/genkey.c:225
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%0Ais obviously not secure.  A "
 "passphrase may not%0Abe a known term or match certain pattern."
-msgstr "WARNUNG:  Sie haben eine offensichtlich unsichere%0APassphrase eingegeben.  Eine Passphrase sollte kein%0Abekanntes Wort sein oder nach bekannten Regeln aufgebaut sein."
+msgstr ""
+"WARNUNG:  Sie haben eine offensichtlich unsichere%0APassphrase eingegeben.  "
+"Eine Passphrase sollte kein%0Abekanntes Wort sein oder nach bekannten Regeln "
+"aufgebaut sein."
 
 #: agent/genkey.c:238
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
-msgstr "Sie haben keine Passphrase eingegeben!%0AEine leere Passphrase ist nicht erlaubt."
+msgstr ""
+"Sie haben keine Passphrase eingegeben!%0AEine leere Passphrase ist nicht "
+"erlaubt."
 
 #: agent/genkey.c:240
 #, c-format
@@ -271,7 +282,7 @@ msgstr "Im Daemon Modus ausführen"
 
 #: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
 #: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:67 tools/symcryptrun.c:164
+#: tools/gpgconf.c:69 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
@@ -355,7 +366,7 @@ msgstr "|DATEI|Schreibe die Umgebungsvariabeln auf DATEI"
 
 #: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
 #: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:89 tools/symcryptrun.c:204
+#: tools/gpgconf.c:91 tools/symcryptrun.c:204
 msgid "Please report bugs to <"
 msgstr "Fehlerberichte bitte an <"
 
@@ -656,7 +667,9 @@ msgstr "Nein"
 #: agent/findkey.c:158
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
-msgstr "Hinweis: Diese Passphrase wurde noch nie geändert/%0ABitte ändern Sie sie jetzt."
+msgstr ""
+"Hinweis: Diese Passphrase wurde noch nie geändert/%0ABitte ändern Sie sie "
+"jetzt."
 
 #: agent/findkey.c:174
 #, c-format
@@ -675,42 +688,42 @@ msgstr "Die Passphrase ändern"
 msgid "I'll change it later"
 msgstr "Ich werde sie später ändern"
 
-#: common/exechelp.c:327 common/exechelp.c:415
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "Fehler beim Erzeugen einer \"Pipe\": %s\n"
 
-#: common/exechelp.c:391 common/exechelp.c:448
+#: common/exechelp.c:435 common/exechelp.c:492
 #, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "Pipe kann nicht zum Lesen \"fdopen\"t werden: %s\n"
 
-#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
+#: common/exechelp.c:471 common/exechelp.c:599 common/exechelp.c:834
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "Fehler beim \"Forken\" des Prozess: %s\n"
 
-#: common/exechelp.c:596 common/exechelp.c:640
+#: common/exechelp.c:645 common/exechelp.c:698
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "Das Warten auf die Beendigung des Prozesses %d schlug fehl: %s\n"
 
-#: common/exechelp.c:604
+#: common/exechelp.c:653
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "Fehler beim Holen des Exitwerte des Prozesses %d: %s\n"
 
-#: common/exechelp.c:610 common/exechelp.c:651
+#: common/exechelp.c:659 common/exechelp.c:709
 #, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "Fehler bei Ausführung von `%s': Endestatus %d\n"
 
-#: common/exechelp.c:646
+#: common/exechelp.c:704
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr "Feler bei Ausführung von `%s': wahrscheinlich nicht installiert\n"
 
-#: common/exechelp.c:657
+#: common/exechelp.c:717
 #, c-format
 msgid "error running `%s': terminated\n"
 msgstr "Fehler bei Ausführung von `%s': beendet\n"
@@ -1524,7 +1537,7 @@ msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
 "Schlüssel %s: geheimer Schlüssel ohne öffentlichen Schlüssel - übersprungen\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
 msgid ""
 "@Commands:\n"
 " "
@@ -1657,7 +1670,7 @@ msgid "run in server mode"
 msgstr "Im Server Modus ausführen"
 
 #: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1687,11 +1700,11 @@ msgstr "Kompressionsstufe auf N setzen (0=keine)"
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
 msgid "use as output file"
 msgstr "Als Ausgabedatei benutzen"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
 msgid "do not make any changes"
 msgstr "Keine wirklichen Änderungen durchführen"
 
@@ -6553,6 +6566,64 @@ msgstr "Eingabezeile %u ist zu lang oder es fehlt ein LF\n"
 msgid "can't open fd %d: %s\n"
 msgstr "fd=%d kann nicht geöffnet werden: %s\n"
 
+#: jnlib/argparse.c:176
+msgid "argument not expected"
+msgstr "Argument nicht erwartet"
+
+#: jnlib/argparse.c:178
+msgid "read error"
+msgstr "Lesefehler"
+
+#: jnlib/argparse.c:180
+msgid "keyword too long"
+msgstr "Schlüsselwort ist zu lang"
+
+#: jnlib/argparse.c:182
+msgid "missing argument"
+msgstr "Fehlendes Argument"
+
+#: jnlib/argparse.c:184
+msgid "invalid command"
+msgstr "Ungültige Befehl"
+
+#: jnlib/argparse.c:186
+msgid "invalid alias definition"
+msgstr "Ungültige Alias-Definition"
+
+#: jnlib/argparse.c:188
+msgid "invalid option"
+msgstr "Ungültige Option"
+
+#: jnlib/argparse.c:196
+#, c-format
+msgid "missing argument for option \"%.50s\"\n"
+msgstr "Fehlendes Argument für Option \"%.50s\"\n"
+
+#: jnlib/argparse.c:198
+#, c-format
+msgid "option \"%.50s\" does not expect an argument\n"
+msgstr "Option \"%.50s\" erwartet kein Argument\n"
+
+#: jnlib/argparse.c:201
+#, c-format
+msgid "invalid command \"%.50s\"\n"
+msgstr "Ungültiger Befehl \"%.50s\"\n"
+
+#: jnlib/argparse.c:203
+#, c-format
+msgid "option \"%.50s\" is ambiguous\n"
+msgstr "Option \"%.50s\" ist mehrdeutig\n"
+
+#: jnlib/argparse.c:205
+#, c-format
+msgid "command \"%.50s\" is ambiguous\n"
+msgstr "Befehl \"%.50s\" ist mehrdeutig\n"
+
+#: jnlib/argparse.c:207
+#, c-format
+msgid "invalid option \"%.50s\"\n"
+msgstr "Ungültige Option \"%.50s\"\n"
+
 #: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -7414,7 +7485,7 @@ msgstr "Als öffentlichen Schlüsselbund mitbenutzen"
 msgid "add this secret keyring to the list"
 msgstr "Als geheimen Schlüsselbund mitbenutzen"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|NAME als voreingestellten Schlüssel benutzen"
 
@@ -7649,7 +7720,7 @@ msgstr "                alias"
 msgid "This is a qualified signature\n"
 msgstr "Dies ist eine qualifizierte Unterschrift.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
 msgid "quiet"
 msgstr "Weniger Ausgaben"
 
@@ -7693,7 +7764,7 @@ msgstr "Option \"%s\" erfordert ein Programm und evtl. Argumente\n"
 #: tools/gpg-connect-agent.c:323
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
-msgstr "Optuin \"%s\" wird wegen \"%s\" nicht beachtet\n"
+msgstr "Option \"%s\" wird wegen \"%s\" nicht beachtet\n"
 
 #: tools/gpg-connect-agent.c:381
 msgid "line too long - skipped\n"
@@ -7728,147 +7799,151 @@ msgstr "Fehler beim Senden des %s-Befehls: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "Fehler beim Senden der Standardoptionen: %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
-#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
 msgid "Options controlling the diagnostic output"
 msgstr "Optionen zur Einstellung Diagnoseausgaben"
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
+#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
+#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
 msgid "Options controlling the configuration"
 msgstr "Optionen zur Einstellung der Konfiguration"
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
-#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
+#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
 msgid "Options useful for debugging"
 msgstr "Nützliche Optionen zum Debuggen"
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
+#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
+#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
+#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
 msgid "Options controlling the security"
 msgstr "Optionen zur Einstellung der Sicherheit"
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:504
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|lasse SSH Schlüssel im Cache nach N Sekunden verfallen"
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:508
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|setze die maximale Lebensdauer von PINs im Cache auf N Sekunden"
 
-#: tools/gpgconf-comp.c:500
+#: tools/gpgconf-comp.c:512
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|setze die maximale Lebenszeit von SSH Schlüsseln auf N Sekunden"
 
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:526
 msgid "Options enforcing a passphrase policy"
 msgstr "Optionen für eien Passphrase-Policy"
 
-#: tools/gpgconf-comp.c:517
+#: tools/gpgconf-comp.c:529
 msgid "do not allow to bypass the passphrase policy"
 msgstr "Einhaltung der Passphrase-Policy erzwingen"
 
-#: tools/gpgconf-comp.c:521
+#: tools/gpgconf-comp.c:533
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|setze die kleinste erlaubte Länge von Passphrasen auf N"
 
-#: tools/gpgconf-comp.c:525
+#: tools/gpgconf-comp.c:537
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|Verlange mindestens N Nicht-Buchstaben für eine neue Passphrase"
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:541
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|DATEI|Prüfe neue Passphrases gegen die Regelen in DATEI"
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:545
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|Lasse die Passphrase nach N Tagen verfallen"
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:549
 msgid "do not allow the reuse of old passphrases"
 msgstr "Verbiete die Wiedernutzung alter Passphrases."
 
-#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAME|Auf an NAME verschlüsseln"
 
-#: tools/gpgconf-comp.c:659
+#: tools/gpgconf-comp.c:671
 msgid "Configuration for Keyservers"
 msgstr "Konfiguration der Schlüsselserver"
 
-#: tools/gpgconf-comp.c:664
+#: tools/gpgconf-comp.c:676
 msgid "allow PKA lookups (DNS requests)"
 msgstr "Erlaube PKA Zugriffe (DNS Anfragen)"
 
-#: tools/gpgconf-comp.c:709
+#: tools/gpgconf-comp.c:721
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAME|Benutze die Kodierung NAME für PKCS#12 Passphrasen"
 
-#: tools/gpgconf-comp.c:732
+#: tools/gpgconf-comp.c:744
 msgid "do not check CRLs for root certificates"
 msgstr "CRL bei Wurzelzertifikaten nicht überprüfen"
 
-#: tools/gpgconf-comp.c:776
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the format of the output"
 msgstr "Optionen zum Einstellen der Ausgabeformate"
 
-#: tools/gpgconf-comp.c:812
+#: tools/gpgconf-comp.c:824
 msgid "Options controlling the interactivity and enforcement"
 msgstr "Optionen zur Einstellung der Interaktivität und Geltendmachung"
 
-#: tools/gpgconf-comp.c:822
+#: tools/gpgconf-comp.c:834
 msgid "Configuration for HTTP servers"
 msgstr "Konfiguration für HTTP Server"
 
-#: tools/gpgconf-comp.c:833
+#: tools/gpgconf-comp.c:845
 msgid "use system's HTTP proxy setting"
 msgstr "Einstellungen des System HTTP-Proxy benutzen"
 
-#: tools/gpgconf-comp.c:838
+#: tools/gpgconf-comp.c:850
 msgid "Configuration of LDAP servers to use"
 msgstr "Konfiguration der zu nutzenden LDAP-Server"
 
-#: tools/gpgconf-comp.c:875
+#: tools/gpgconf-comp.c:887
 msgid "Configuration for OCSP"
 msgstr "Konfiguration zu OCSP"
 
-#: tools/gpgconf-comp.c:2706
+#: tools/gpgconf-comp.c:2955
 msgid "Note that group specifications are ignored\n"
 msgstr "Beachten Sie, daß Gruppenspezifiaktionen ignoriert werden\n"
 
-#: tools/gpgconf.c:56
+#: tools/gpgconf.c:57
 msgid "list all components"
 msgstr "Liste aller Komponenten"
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
+msgid "check all programs"
+msgstr "Prüfe alle Programme"
+
+#: tools/gpgconf.c:59
 msgid "|COMPONENT|list options"
 msgstr "|KOMPONENTE|Zeige die Optionen an"
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|change options"
 msgstr "|KOMPONENTE|Ändere die Optionen"
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
 msgid "apply global default values"
 msgstr "Wende die gobalen Voreinstellungen an"
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:64
 msgid "check global configuration file"
 msgstr "Prüfe die globale Konfigurationsdatei"
 
-#: tools/gpgconf.c:70
+#: tools/gpgconf.c:72
 msgid "activate changes at runtime, if possible"
 msgstr "Aktiviere Änderungen zur Laufzeit; falls möglich"
 
-#: tools/gpgconf.c:92
+#: tools/gpgconf.c:94
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Aufruf: gpgconf [Optionen] (-h für Hilfe)"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:97
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
@@ -7876,19 +7951,19 @@ msgstr ""
 "Syntax: gpgconf {Optionen]\n"
 "Verwalte Konfigurationsoptionen für Programme des GnuPG Systems\n"
 
-#: tools/gpgconf.c:168 tools/gpgconf.c:201
+#: tools/gpgconf.c:176 tools/gpgconf.c:209
 msgid "usage: gpgconf [options] "
 msgstr "Aufruf: gpgconf [Optionen] "
 
-#: tools/gpgconf.c:170
+#: tools/gpgconf.c:178
 msgid "Need one component argument"
 msgstr "Benötige ein Komponentenargument"
 
-#: tools/gpgconf.c:179
+#: tools/gpgconf.c:187
 msgid "Component not found"
 msgstr "Komponente nicht gefunden"
 
-#: tools/gpgconf.c:203
+#: tools/gpgconf.c:211
 msgid "No argument allowed"
 msgstr "Argumente sind nicht erlaubt"
 
diff --git a/po/el.po b/po/el.po
index 44bb564b1..b31a25654 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.1.92\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-08-28 19:28+0200\n"
+"POT-Creation-Date: 2007-08-29 18:43+0200\n"
 "PO-Revision-Date: 2003-06-27 12:00+0200\n"
 "Last-Translator: Dokianakis Theofanis <madf@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -271,7 +271,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
 #: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:67 tools/symcryptrun.c:164
+#: tools/gpgconf.c:69 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "���������"
 
@@ -361,7 +361,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
 #: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:89 tools/symcryptrun.c:204
+#: tools/gpgconf.c:91 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "��������� �� ���������� ��� <gnupg-bugs@gnu.org>\n"
@@ -674,42 +674,42 @@ msgstr "
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:327 common/exechelp.c:415
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: common/exechelp.c:391 common/exechelp.c:448
+#: common/exechelp.c:435 common/exechelp.c:492
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "�������� ��������� ��� �������: %s\n"
 
-#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
+#: common/exechelp.c:471 common/exechelp.c:599 common/exechelp.c:834
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: common/exechelp.c:596 common/exechelp.c:640
+#: common/exechelp.c:645 common/exechelp.c:698
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:604
+#: common/exechelp.c:653
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: common/exechelp.c:610 common/exechelp.c:651
+#: common/exechelp.c:659 common/exechelp.c:709
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: common/exechelp.c:646
+#: common/exechelp.c:704
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:657
+#: common/exechelp.c:717
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
@@ -1560,7 +1560,7 @@ msgstr "
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "������ %08lX: ������� ������ ����� ������� - ������������\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
 msgid ""
 "@Commands:\n"
 " "
@@ -1694,7 +1694,7 @@ msgid "run in server mode"
 msgstr ""
 
 #: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1724,11 +1724,11 @@ msgstr "|N|
 msgid "use canonical text mode"
 msgstr "����� ��������� ���������� ��������"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
 msgid "use as output file"
 msgstr "����� �� ������� ������"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
 msgid "do not make any changes"
 msgstr "�� �� ����� ������ ������"
 
@@ -6620,6 +6620,71 @@ msgstr "
 msgid "can't open fd %d: %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
 
+#: jnlib/argparse.c:176
+#, fuzzy
+msgid "argument not expected"
+msgstr "������� ��� �������� �������� ��� `%s'\n"
+
+#: jnlib/argparse.c:178
+#, fuzzy
+msgid "read error"
+msgstr "������ ��������� �������"
+
+#: jnlib/argparse.c:180
+#, fuzzy
+msgid "keyword too long"
+msgstr "� ������ ����� ���� ������\n"
+
+#: jnlib/argparse.c:182
+#, fuzzy
+msgid "missing argument"
+msgstr "�� ������ ������"
+
+#: jnlib/argparse.c:184
+#, fuzzy
+msgid "invalid command"
+msgstr "������������� �������\n"
+
+#: jnlib/argparse.c:186
+#, fuzzy
+msgid "invalid alias definition"
+msgstr "�� ������� �������� ���������\n"
+
+#: jnlib/argparse.c:188
+#, fuzzy
+msgid "invalid option"
+msgstr "�� ������� �������� ���������\n"
+
+#: jnlib/argparse.c:196
+#, c-format
+msgid "missing argument for option \"%.50s\"\n"
+msgstr ""
+
+#: jnlib/argparse.c:198
+#, c-format
+msgid "option \"%.50s\" does not expect an argument\n"
+msgstr ""
+
+#: jnlib/argparse.c:201
+#, fuzzy, c-format
+msgid "invalid command \"%.50s\"\n"
+msgstr "�� ������ ������  (��������� \"help\")\n"
+
+#: jnlib/argparse.c:203
+#, c-format
+msgid "option \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:205
+#, c-format
+msgid "command \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:207
+#, fuzzy, c-format
+msgid "invalid option \"%.50s\"\n"
+msgstr "�� ������� �������� ���������\n"
+
 #: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -7497,7 +7562,7 @@ msgstr "
 msgid "add this secret keyring to the list"
 msgstr "�������� ����� ��� �������� ����������� ��� �����"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
 msgid "|NAME|use NAME as default secret key"
 msgstr "|�����|����� �������� ��� �������������� ������� ������"
 
@@ -7731,7 +7796,7 @@ msgstr ""
 "\n"
 "���� �� ����� ��� ����-��������.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "�����������"
@@ -7811,173 +7876,177 @@ msgstr "
 msgid "error sending standard options: %s\n"
 msgstr "������ ��� �������� ���� �� `%s': %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
-#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
+#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
+#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
-#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
+#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
+#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
+#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
+#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:504
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:508
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500
+#: tools/gpgconf-comp.c:512
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:526
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:517
+#: tools/gpgconf-comp.c:529
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:521
+#: tools/gpgconf-comp.c:533
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:525
+#: tools/gpgconf-comp.c:537
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:541
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:545
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|����� ��� ���������� ������ ������ N"
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:549
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|�����|������������� ��� �����"
 
-#: tools/gpgconf-comp.c:659
+#: tools/gpgconf-comp.c:671
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:664
+#: tools/gpgconf-comp.c:676
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:709
+#: tools/gpgconf-comp.c:721
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|�����|����� ���������� �������������� ����� ��� ������� �������"
 
-#: tools/gpgconf-comp.c:732
+#: tools/gpgconf-comp.c:744
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:776
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:812
+#: tools/gpgconf-comp.c:824
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:822
+#: tools/gpgconf-comp.c:834
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:833
+#: tools/gpgconf-comp.c:845
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:838
+#: tools/gpgconf-comp.c:850
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:875
+#: tools/gpgconf-comp.c:887
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2706
+#: tools/gpgconf-comp.c:2955
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:56
+#: tools/gpgconf.c:57
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
+msgid "check all programs"
+msgstr ""
+
+#: tools/gpgconf.c:59
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:64
 #, fuzzy
 msgid "check global configuration file"
 msgstr "������� ����������� ��������� \"%s\"\n"
 
-#: tools/gpgconf.c:70
+#: tools/gpgconf.c:72
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:92
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:97
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:168 tools/gpgconf.c:201
+#: tools/gpgconf.c:176 tools/gpgconf.c:209
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "�����: gpg [��������] "
 
-#: tools/gpgconf.c:170
+#: tools/gpgconf.c:178
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:179
+#: tools/gpgconf.c:187
 #, fuzzy
 msgid "Component not found"
 msgstr "��� ������� �� ������� ������"
 
-#: tools/gpgconf.c:203
+#: tools/gpgconf.c:211
 #, fuzzy
 msgid "No argument allowed"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
@@ -8347,9 +8416,6 @@ msgstr "
 #~ msgid "bad key"
 #~ msgstr "���� ������"
 
-#~ msgid "file read error"
-#~ msgstr "������ ��������� �������"
-
 #~ msgid "file write error"
 #~ msgstr "������ �������� �������"
 
@@ -8410,9 +8476,6 @@ msgstr "
 #~ msgid "weak key"
 #~ msgstr "������� ������"
 
-#~ msgid "invalid argument"
-#~ msgstr "�� ������ ������"
-
 #~ msgid "bad URI"
 #~ msgstr "���� URI"
 
diff --git a/po/eo.po b/po/eo.po
index 8a80a5ab4..ddb76b8c9 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-08-28 19:28+0200\n"
+"POT-Creation-Date: 2007-08-29 18:43+0200\n"
 "PO-Revision-Date: 2002-04-14 14:33+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -272,7 +272,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
 #: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:67 tools/symcryptrun.c:164
+#: tools/gpgconf.c:69 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "detala eligo"
 
@@ -361,7 +361,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
 #: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:89 tools/symcryptrun.c:204
+#: tools/gpgconf.c:91 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Bonvolu raporti cimojn al <gnupg-bugs@gnu.org>.\n"
@@ -674,42 +674,42 @@ msgstr "
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:327 common/exechelp.c:415
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: common/exechelp.c:391 common/exechelp.c:448
+#: common/exechelp.c:435 common/exechelp.c:492
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
+#: common/exechelp.c:471 common/exechelp.c:599 common/exechelp.c:834
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: common/exechelp.c:596 common/exechelp.c:640
+#: common/exechelp.c:645 common/exechelp.c:698
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:604
+#: common/exechelp.c:653
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: common/exechelp.c:610 common/exechelp.c:651
+#: common/exechelp.c:659 common/exechelp.c:709
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: common/exechelp.c:646
+#: common/exechelp.c:704
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:657
+#: common/exechelp.c:717
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "eraro dum legado de '%s': %s\n"
@@ -1544,7 +1544,7 @@ msgstr "uzas flankan 
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
 msgid ""
 "@Commands:\n"
 " "
@@ -1678,7 +1678,7 @@ msgid "run in server mode"
 msgstr ""
 
 #: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1708,11 +1708,11 @@ msgstr "|N|difini densig-nivelon N (0=nenia)"
 msgid "use canonical text mode"
 msgstr "uzi tekstan re�imon"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
 msgid "use as output file"
 msgstr "uzi dosieron por eligo"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
 msgid "do not make any changes"
 msgstr "fari neniajn �an�ojn"
 
@@ -6557,6 +6557,71 @@ msgstr "enigata linio %u tro longa, a
 msgid "can't open fd %d: %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
+#: jnlib/argparse.c:176
+#, fuzzy
+msgid "argument not expected"
+msgstr "skribas sekretan �losilon al '%s'\n"
+
+#: jnlib/argparse.c:178
+#, fuzzy
+msgid "read error"
+msgstr "legeraro �e dosiero"
+
+#: jnlib/argparse.c:180
+#, fuzzy
+msgid "keyword too long"
+msgstr "pasfrazo estas tro longa\n"
+
+#: jnlib/argparse.c:182
+#, fuzzy
+msgid "missing argument"
+msgstr "nevalida argumento"
+
+#: jnlib/argparse.c:184
+#, fuzzy
+msgid "invalid command"
+msgstr "malkongruaj komandoj\n"
+
+#: jnlib/argparse.c:186
+#, fuzzy
+msgid "invalid alias definition"
+msgstr "nevalida kiraso"
+
+#: jnlib/argparse.c:188
+#, fuzzy
+msgid "invalid option"
+msgstr "nevalida kiraso"
+
+#: jnlib/argparse.c:196
+#, c-format
+msgid "missing argument for option \"%.50s\"\n"
+msgstr ""
+
+#: jnlib/argparse.c:198
+#, c-format
+msgid "option \"%.50s\" does not expect an argument\n"
+msgstr ""
+
+#: jnlib/argparse.c:201
+#, fuzzy, c-format
+msgid "invalid command \"%.50s\"\n"
+msgstr "Nevalida komando (provu per \"helpo\")\n"
+
+#: jnlib/argparse.c:203
+#, c-format
+msgid "option \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:205
+#, c-format
+msgid "command \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:207
+#, fuzzy, c-format
+msgid "invalid option \"%.50s\"\n"
+msgstr "nevalida kiraso"
+
 #: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -7445,7 +7510,7 @@ msgstr "aldoni 
 msgid "add this secret keyring to the list"
 msgstr "aldoni �i tiun sekretan �losilaron al la listo"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
 
@@ -7677,7 +7742,7 @@ msgstr "            alinome \""
 msgid "This is a qualified signature\n"
 msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "fini"
@@ -7757,173 +7822,177 @@ msgstr "eraro dum sendo al '%s': %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
-#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
+#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
+#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
-#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
+#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
+#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
+#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
+#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:504
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:508
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500
+#: tools/gpgconf-comp.c:512
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:526
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:517
+#: tools/gpgconf-comp.c:529
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:521
+#: tools/gpgconf-comp.c:533
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:525
+#: tools/gpgconf-comp.c:537
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:541
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:545
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|uzi pasfraz-re�imon N"
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:549
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOMO|�ifri por NOMO"
 
-#: tools/gpgconf-comp.c:659
+#: tools/gpgconf-comp.c:671
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:664
+#: tools/gpgconf-comp.c:676
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:709
+#: tools/gpgconf-comp.c:721
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NOMO|uzi �ifrad-metodon NOMO por pasfrazoj"
 
-#: tools/gpgconf-comp.c:732
+#: tools/gpgconf-comp.c:744
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:776
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:812
+#: tools/gpgconf-comp.c:824
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:822
+#: tools/gpgconf-comp.c:834
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:833
+#: tools/gpgconf-comp.c:845
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:838
+#: tools/gpgconf-comp.c:850
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:875
+#: tools/gpgconf-comp.c:887
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2706
+#: tools/gpgconf-comp.c:2955
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:56
+#: tools/gpgconf.c:57
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
+msgid "check all programs"
+msgstr ""
+
+#: tools/gpgconf.c:59
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:64
 #, fuzzy
 msgid "check global configuration file"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: tools/gpgconf.c:70
+#: tools/gpgconf.c:72
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:92
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:97
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:168 tools/gpgconf.c:201
+#: tools/gpgconf.c:176 tools/gpgconf.c:209
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: tools/gpgconf.c:170
+#: tools/gpgconf.c:178
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:179
+#: tools/gpgconf.c:187
 #, fuzzy
 msgid "Component not found"
 msgstr "publika �losilo ne trovita"
 
-#: tools/gpgconf.c:203
+#: tools/gpgconf.c:211
 #, fuzzy
 msgid "No argument allowed"
 msgstr "skribas sekretan �losilon al '%s'\n"
@@ -8271,9 +8340,6 @@ msgstr "protekto-metodo %d%s ne estas realigita\n"
 #~ msgid "bad key"
 #~ msgstr "malbona �losilo"
 
-#~ msgid "file read error"
-#~ msgstr "legeraro �e dosiero"
-
 #~ msgid "file write error"
 #~ msgstr "skriberaro �e dosiero"
 
@@ -8337,9 +8403,6 @@ msgstr "protekto-metodo %d%s ne estas realigita\n"
 #~ msgid "weak key"
 #~ msgstr "malforta �losilo"
 
-#~ msgid "invalid argument"
-#~ msgstr "nevalida argumento"
-
 #~ msgid "bad URI"
 #~ msgstr "malbona URI"
 
diff --git a/po/es.po b/po/es.po
index 8cc571ffe..e5e8c6c8a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.1\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-08-28 19:28+0200\n"
+"POT-Creation-Date: 2007-08-29 18:43+0200\n"
 "PO-Revision-Date: 2007-08-16 11:35+0200\n"
 "Last-Translator: Jaime Su�rez <jsuarez@ono.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -293,7 +293,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
 #: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:67 tools/symcryptrun.c:164
+#: tools/gpgconf.c:69 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "prolijo"
 
@@ -382,7 +382,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
 #: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:89 tools/symcryptrun.c:204
+#: tools/gpgconf.c:91 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Por favor, informe de posibles \"bugs\" a <gnupg-bugs@gnu.org>.\n"
@@ -705,42 +705,42 @@ msgstr "cambia la frase contrase
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:327 common/exechelp.c:415
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "error creando frase contrase�a: %s\n"
 
-#: common/exechelp.c:391 common/exechelp.c:448
+#: common/exechelp.c:435 common/exechelp.c:492
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "no puede abrirse el fichero: %s\n"
 
-#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
+#: common/exechelp.c:471 common/exechelp.c:599 common/exechelp.c:834
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: common/exechelp.c:596 common/exechelp.c:640
+#: common/exechelp.c:645 common/exechelp.c:698
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:604
+#: common/exechelp.c:653
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "error obteniendo la informaci�n actual de la clave: %s\n"
 
-#: common/exechelp.c:610 common/exechelp.c:651
+#: common/exechelp.c:659 common/exechelp.c:709
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: common/exechelp.c:646
+#: common/exechelp.c:704
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:657
+#: common/exechelp.c:717
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "error leyendo `%s': %s\n"
@@ -1553,7 +1553,7 @@ msgstr "clave %s: clave secreta sin clave p
 # S�, este no he podido ser yo :-) Por cierto, �por qu� la O no se
 # puede acentuar? �demasiado alta?
 # �Qui�n dice que no se puede? :-)
-#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
 msgid ""
 "@Commands:\n"
 " "
@@ -1686,7 +1686,7 @@ msgid "run in server mode"
 msgstr ""
 
 #: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1716,11 +1716,11 @@ msgstr "|N|nivel de compresi
 msgid "use canonical text mode"
 msgstr "usa modo de texto can�nico"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
 msgid "do not make any changes"
 msgstr "no hace ning�n cambio"
 
@@ -6479,6 +6479,71 @@ msgstr "la l
 msgid "can't open fd %d: %s\n"
 msgstr "no se puede abrir `%s': %s\n"
 
+#: jnlib/argparse.c:176
+#, fuzzy
+msgid "argument not expected"
+msgstr "No se permiten �rdenes de administrador\n"
+
+#: jnlib/argparse.c:178
+#, fuzzy
+msgid "read error"
+msgstr "error de lectura"
+
+#: jnlib/argparse.c:180
+#, fuzzy
+msgid "keyword too long"
+msgstr "l�nea demasiado larga"
+
+#: jnlib/argparse.c:182
+#, fuzzy
+msgid "missing argument"
+msgstr "argumento inv�lido"
+
+#: jnlib/argparse.c:184
+#, fuzzy
+msgid "invalid command"
+msgstr "�rdenes s�lo de administrador\n"
+
+#: jnlib/argparse.c:186
+#, fuzzy
+msgid "invalid alias definition"
+msgstr "lista de opciones inv�lida\n"
+
+#: jnlib/argparse.c:188
+#, fuzzy
+msgid "invalid option"
+msgstr "lista de opciones inv�lida\n"
+
+#: jnlib/argparse.c:196
+#, c-format
+msgid "missing argument for option \"%.50s\"\n"
+msgstr ""
+
+#: jnlib/argparse.c:198
+#, c-format
+msgid "option \"%.50s\" does not expect an argument\n"
+msgstr ""
+
+#: jnlib/argparse.c:201
+#, fuzzy, c-format
+msgid "invalid command \"%.50s\"\n"
+msgstr "Orden inv�lida (pruebe \"help\")\n"
+
+#: jnlib/argparse.c:203
+#, c-format
+msgid "option \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:205
+#, c-format
+msgid "command \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:207
+#, fuzzy, c-format
+msgid "invalid option \"%.50s\"\n"
+msgstr "lista de opciones inv�lida\n"
+
 #: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -7372,7 +7437,7 @@ msgstr "a
 msgid "add this secret keyring to the list"
 msgstr "a�ade este anillo secreto a la lista"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
 
@@ -7604,7 +7669,7 @@ msgstr "                alias \"%s\""
 msgid "This is a qualified signature\n"
 msgstr "Esto ser� una autofirma.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "fin"
@@ -7684,174 +7749,178 @@ msgstr "error enviando a `%s': %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "error enviando a `%s': %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
-#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
+#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
+#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
-#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
+#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
 #, fuzzy
 msgid "Options useful for debugging"
 msgstr "habilita depuraci�n completa"
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
+#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
+#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
+#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:504
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:508
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500
+#: tools/gpgconf-comp.c:512
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:526
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:517
+#: tools/gpgconf-comp.c:529
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:521
+#: tools/gpgconf-comp.c:533
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:525
+#: tools/gpgconf-comp.c:537
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:541
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:545
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|usa modo de contrase�a N"
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:549
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "error creando frase contrase�a: %s\n"
 
-#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: tools/gpgconf-comp.c:659
+#: tools/gpgconf-comp.c:671
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:664
+#: tools/gpgconf-comp.c:676
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:709
+#: tools/gpgconf-comp.c:721
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE para las contrase�as"
 
-#: tools/gpgconf-comp.c:732
+#: tools/gpgconf-comp.c:744
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:776
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:812
+#: tools/gpgconf-comp.c:824
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:822
+#: tools/gpgconf-comp.c:834
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:833
+#: tools/gpgconf-comp.c:845
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:838
+#: tools/gpgconf-comp.c:850
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:875
+#: tools/gpgconf-comp.c:887
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2706
+#: tools/gpgconf-comp.c:2955
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:56
+#: tools/gpgconf.c:57
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
+msgid "check all programs"
+msgstr ""
+
+#: tools/gpgconf.c:59
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:64
 #, fuzzy
 msgid "check global configuration file"
 msgstr "art�culo de configuraci�n desconocido `%s'\n"
 
-#: tools/gpgconf.c:70
+#: tools/gpgconf.c:72
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:92
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:97
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:168 tools/gpgconf.c:201
+#: tools/gpgconf.c:176 tools/gpgconf.c:209
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "uso: gpg [opciones] "
 
-#: tools/gpgconf.c:170
+#: tools/gpgconf.c:178
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:179
+#: tools/gpgconf.c:187
 #, fuzzy
 msgid "Component not found"
 msgstr "Clave p�blica no encontrada"
 
-#: tools/gpgconf.c:203
+#: tools/gpgconf.c:211
 #, fuzzy
 msgid "No argument allowed"
 msgstr "No se permiten �rdenes de administrador\n"
@@ -8261,9 +8330,6 @@ msgstr "el resumen protector %d no puede ser utilizado\n"
 #~ msgid "bad key"
 #~ msgstr "clave incorrecta"
 
-#~ msgid "file read error"
-#~ msgstr "error de lectura"
-
 #~ msgid "file write error"
 #~ msgstr "error de escritura"
 
@@ -8331,9 +8397,6 @@ msgstr "el resumen protector %d no puede ser utilizado\n"
 #~ msgid "weak key"
 #~ msgstr "clave d�bil"
 
-#~ msgid "invalid argument"
-#~ msgstr "argumento inv�lido"
-
 #~ msgid "bad URI"
 #~ msgstr "URI incorrecto"
 
diff --git a/po/et.po b/po/et.po
index 0e209e003..4cf42dc4b 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-08-28 19:28+0200\n"
+"POT-Creation-Date: 2007-08-29 18:43+0200\n"
 "PO-Revision-Date: 2004-06-17 11:04+0300\n"
 "Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -271,7 +271,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
 #: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:67 tools/symcryptrun.c:164
+#: tools/gpgconf.c:69 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "ole jutukas"
 
@@ -360,7 +360,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
 #: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:89 tools/symcryptrun.c:204
+#: tools/gpgconf.c:91 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Palun saatke veateated aadressil <gnupg-bugs@gnu.org>.\n"
@@ -673,42 +673,42 @@ msgstr "muuda parooli"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:327 common/exechelp.c:415
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: common/exechelp.c:391 common/exechelp.c:448
+#: common/exechelp.c:435 common/exechelp.c:492
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "faili ei �nnestu avada: %s\n"
 
-#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
+#: common/exechelp.c:471 common/exechelp.c:599 common/exechelp.c:834
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: common/exechelp.c:596 common/exechelp.c:640
+#: common/exechelp.c:645 common/exechelp.c:698
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:604
+#: common/exechelp.c:653
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: common/exechelp.c:610 common/exechelp.c:651
+#: common/exechelp.c:659 common/exechelp.c:709
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: common/exechelp.c:646
+#: common/exechelp.c:704
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:657
+#: common/exechelp.c:717
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "viga `%s' lugemisel: %s\n"
@@ -1551,7 +1551,7 @@ msgstr "kasutan sekundaarset v
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "v�ti %08lX: salajane v�ti avaliku v�tmeta - j�tsin vahele\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
 msgid ""
 "@Commands:\n"
 " "
@@ -1685,7 +1685,7 @@ msgid "run in server mode"
 msgstr ""
 
 #: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1715,11 +1715,11 @@ msgstr "|N|m
 msgid "use canonical text mode"
 msgstr "kasuta kanoonilist tekstimoodi"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
 msgid "use as output file"
 msgstr "kasuta v�ljundfailina"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
 msgid "do not make any changes"
 msgstr "�ra tee mingeid muutusi"
 
@@ -6526,6 +6526,71 @@ msgstr "sisendrida %u on liiga pikk v
 msgid "can't open fd %d: %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
 
+#: jnlib/argparse.c:176
+#, fuzzy
+msgid "argument not expected"
+msgstr "kirjutan salajase v�tme faili `%s'\n"
+
+#: jnlib/argparse.c:178
+#, fuzzy
+msgid "read error"
+msgstr "viga faili lugemisel"
+
+#: jnlib/argparse.c:180
+#, fuzzy
+msgid "keyword too long"
+msgstr "rida on liiga pikk\n"
+
+#: jnlib/argparse.c:182
+#, fuzzy
+msgid "missing argument"
+msgstr "vigane argument"
+
+#: jnlib/argparse.c:184
+#, fuzzy
+msgid "invalid command"
+msgstr "vastuolulised k�sud\n"
+
+#: jnlib/argparse.c:186
+#, fuzzy
+msgid "invalid alias definition"
+msgstr "vigased impordi v�tmed\n"
+
+#: jnlib/argparse.c:188
+#, fuzzy
+msgid "invalid option"
+msgstr "vigased impordi v�tmed\n"
+
+#: jnlib/argparse.c:196
+#, c-format
+msgid "missing argument for option \"%.50s\"\n"
+msgstr ""
+
+#: jnlib/argparse.c:198
+#, c-format
+msgid "option \"%.50s\" does not expect an argument\n"
+msgstr ""
+
+#: jnlib/argparse.c:201
+#, fuzzy, c-format
+msgid "invalid command \"%.50s\"\n"
+msgstr "Vigane k�sklus (proovige \"help\")\n"
+
+#: jnlib/argparse.c:203
+#, c-format
+msgid "option \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:205
+#, c-format
+msgid "command \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:207
+#, fuzzy, c-format
+msgid "invalid option \"%.50s\"\n"
+msgstr "vigased impordi v�tmed\n"
+
 #: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -7402,7 +7467,7 @@ msgstr "lisa see v
 msgid "add this secret keyring to the list"
 msgstr "lisa see salajaste v�tmete hoidla nimekirja"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NIMI|kasuta NIME vaikimisi salajase v�tmena"
 
@@ -7636,7 +7701,7 @@ msgstr ""
 "\n"
 "See saab olema iseenda allkiri.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "v�lju"
@@ -7716,173 +7781,177 @@ msgstr "viga teate saatmisel serverile `%s': %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
-#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
+#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
+#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
-#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
+#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
+#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
+#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
+#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:504
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:508
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500
+#: tools/gpgconf-comp.c:512
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:526
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:517
+#: tools/gpgconf-comp.c:529
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:521
+#: tools/gpgconf-comp.c:533
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:525
+#: tools/gpgconf-comp.c:537
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:541
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:545
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|kasuta parooli moodi N"
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:549
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "viga parooli loomisel: %s\n"
 
-#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NIMI|kr�pti NIMEle"
 
-#: tools/gpgconf-comp.c:659
+#: tools/gpgconf-comp.c:671
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:664
+#: tools/gpgconf-comp.c:676
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:709
+#: tools/gpgconf-comp.c:721
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NIMI|kasuta paroolidega �ifri algoritmi NIMI"
 
-#: tools/gpgconf-comp.c:732
+#: tools/gpgconf-comp.c:744
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:776
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:812
+#: tools/gpgconf-comp.c:824
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:822
+#: tools/gpgconf-comp.c:834
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:833
+#: tools/gpgconf-comp.c:845
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:838
+#: tools/gpgconf-comp.c:850
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:875
+#: tools/gpgconf-comp.c:887
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2706
+#: tools/gpgconf-comp.c:2955
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:56
+#: tools/gpgconf.c:57
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
+msgid "check all programs"
+msgstr ""
+
+#: tools/gpgconf.c:59
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:64
 #, fuzzy
 msgid "check global configuration file"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: tools/gpgconf.c:70
+#: tools/gpgconf.c:72
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:92
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:97
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:168 tools/gpgconf.c:201
+#: tools/gpgconf.c:176 tools/gpgconf.c:209
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: tools/gpgconf.c:170
+#: tools/gpgconf.c:178
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:179
+#: tools/gpgconf.c:187
 #, fuzzy
 msgid "Component not found"
 msgstr "ei leia avalikku v�tit"
 
-#: tools/gpgconf.c:203
+#: tools/gpgconf.c:211
 #, fuzzy
 msgid "No argument allowed"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
@@ -8248,9 +8317,6 @@ msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 #~ msgid "bad key"
 #~ msgstr "halb v�ti"
 
-#~ msgid "file read error"
-#~ msgstr "viga faili lugemisel"
-
 #~ msgid "file write error"
 #~ msgstr "viga faili kirjutamisel"
 
@@ -8311,9 +8377,6 @@ msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 #~ msgid "weak key"
 #~ msgstr "n�rk v�ti"
 
-#~ msgid "invalid argument"
-#~ msgstr "vigane argument"
-
 #~ msgid "bad URI"
 #~ msgstr "halb URI"
 
diff --git a/po/fi.po b/po/fi.po
index 38fe73656..6e8c3fa96 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-08-28 19:28+0200\n"
+"POT-Creation-Date: 2007-08-29 18:43+0200\n"
 "PO-Revision-Date: 2004-06-16 22:40+0300\n"
 "Last-Translator: Tommi Vainikainen <Tommi.Vainikainen@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -287,7 +287,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
 #: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:67 tools/symcryptrun.c:164
+#: tools/gpgconf.c:69 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "monisanainen"
 
@@ -376,7 +376,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
 #: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:89 tools/symcryptrun.c:204
+#: tools/gpgconf.c:91 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr ""
@@ -690,42 +690,42 @@ msgstr "muuta salasanaa"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:327 common/exechelp.c:415
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: common/exechelp.c:391 common/exechelp.c:448
+#: common/exechelp.c:435 common/exechelp.c:492
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "ei voi avata tiedostoa: %s\n"
 
-#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
+#: common/exechelp.c:471 common/exechelp.c:599 common/exechelp.c:834
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: common/exechelp.c:596 common/exechelp.c:640
+#: common/exechelp.c:645 common/exechelp.c:698
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:604
+#: common/exechelp.c:653
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: common/exechelp.c:610 common/exechelp.c:651
+#: common/exechelp.c:659 common/exechelp.c:709
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: common/exechelp.c:646
+#: common/exechelp.c:704
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:657
+#: common/exechelp.c:717
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -1570,7 +1570,7 @@ msgstr ""
 "avain %08lX: salaisella avaimella ei ole vastaavaa \n"
 "julkista avainta - ohitetaan\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
 msgid ""
 "@Commands:\n"
 " "
@@ -1704,7 +1704,7 @@ msgid "run in server mode"
 msgstr ""
 
 #: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1734,11 +1734,11 @@ msgstr "|N|aseta pakkausaste N (0 poistaa käytöstä)"
 msgid "use canonical text mode"
 msgstr "käytä tekstimuotoa"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
 msgid "use as output file"
 msgstr "käytä tulostustiedostona"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
 msgid "do not make any changes"
 msgstr "älä tee muutoksia"
 
@@ -6603,6 +6603,71 @@ msgstr "syöterivi %u on liian pitkä tai rivinvaihto puutuu\n"
 msgid "can't open fd %d: %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
 
+#: jnlib/argparse.c:176
+#, fuzzy
+msgid "argument not expected"
+msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
+
+#: jnlib/argparse.c:178
+#, fuzzy
+msgid "read error"
+msgstr "virhe tiedostoa luettaessa"
+
+#: jnlib/argparse.c:180
+#, fuzzy
+msgid "keyword too long"
+msgstr "rivi on liian pitkä\n"
+
+#: jnlib/argparse.c:182
+#, fuzzy
+msgid "missing argument"
+msgstr "virheellinen argumentti"
+
+#: jnlib/argparse.c:184
+#, fuzzy
+msgid "invalid command"
+msgstr "ristiriitainen komento\n"
+
+#: jnlib/argparse.c:186
+#, fuzzy
+msgid "invalid alias definition"
+msgstr "virheelliset tuontivalitsimet\n"
+
+#: jnlib/argparse.c:188
+#, fuzzy
+msgid "invalid option"
+msgstr "virheelliset tuontivalitsimet\n"
+
+#: jnlib/argparse.c:196
+#, c-format
+msgid "missing argument for option \"%.50s\"\n"
+msgstr ""
+
+#: jnlib/argparse.c:198
+#, c-format
+msgid "option \"%.50s\" does not expect an argument\n"
+msgstr ""
+
+#: jnlib/argparse.c:201
+#, fuzzy, c-format
+msgid "invalid command \"%.50s\"\n"
+msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
+
+#: jnlib/argparse.c:203
+#, c-format
+msgid "option \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:205
+#, c-format
+msgid "command \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:207
+#, fuzzy, c-format
+msgid "invalid option \"%.50s\"\n"
+msgstr "virheelliset tuontivalitsimet\n"
+
 #: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -7481,7 +7546,7 @@ msgstr "lisää tämä avainrengas avainrenkaiden luetteloon"
 msgid "add this secret keyring to the list"
 msgstr "lisää tämä salainen avainrengas luetteloon"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
 
@@ -7715,7 +7780,7 @@ msgstr ""
 "\n"
 "Tämä tulee olemaan oma-allekirjoitus.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "lopeta|sulje"
@@ -7795,173 +7860,177 @@ msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
-#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
+#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
+#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
-#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
+#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
+#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
+#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
+#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:504
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:508
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500
+#: tools/gpgconf-comp.c:512
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:526
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:517
+#: tools/gpgconf-comp.c:529
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:521
+#: tools/gpgconf-comp.c:533
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:525
+#: tools/gpgconf-comp.c:537
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:541
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:545
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|käytä salasanoissa toimintatapaa N"
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:549
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NIMI|salaa vastaanottajalle NIMI"
 
-#: tools/gpgconf-comp.c:659
+#: tools/gpgconf-comp.c:671
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:664
+#: tools/gpgconf-comp.c:676
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:709
+#: tools/gpgconf-comp.c:721
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NIMI|käytä salasanoihin salausalgoritmia NIMI"
 
-#: tools/gpgconf-comp.c:732
+#: tools/gpgconf-comp.c:744
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:776
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:812
+#: tools/gpgconf-comp.c:824
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:822
+#: tools/gpgconf-comp.c:834
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:833
+#: tools/gpgconf-comp.c:845
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:838
+#: tools/gpgconf-comp.c:850
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:875
+#: tools/gpgconf-comp.c:887
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2706
+#: tools/gpgconf-comp.c:2955
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:56
+#: tools/gpgconf.c:57
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
+msgid "check all programs"
+msgstr ""
+
+#: tools/gpgconf.c:59
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:64
 #, fuzzy
 msgid "check global configuration file"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: tools/gpgconf.c:70
+#: tools/gpgconf.c:72
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:92
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:97
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:168 tools/gpgconf.c:201
+#: tools/gpgconf.c:176 tools/gpgconf.c:209
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: tools/gpgconf.c:170
+#: tools/gpgconf.c:178
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:179
+#: tools/gpgconf.c:187
 #, fuzzy
 msgid "Component not found"
 msgstr "julkista avainta ei löydy"
 
-#: tools/gpgconf.c:203
+#: tools/gpgconf.c:211
 #, fuzzy
 msgid "No argument allowed"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
@@ -8329,9 +8398,6 @@ msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 #~ msgid "bad key"
 #~ msgstr "avain ei kelpaa"
 
-#~ msgid "file read error"
-#~ msgstr "virhe tiedostoa luettaessa"
-
 #~ msgid "file write error"
 #~ msgstr "virhe tiedostoon kirjoitettaessa"
 
@@ -8392,9 +8458,6 @@ msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 #~ msgid "weak key"
 #~ msgstr "heikko avain"
 
-#~ msgid "invalid argument"
-#~ msgstr "virheellinen argumentti"
-
 #~ msgid "bad URI"
 #~ msgstr "URI ei kelpaa"
 
diff --git a/po/fr.po b/po/fr.po
index fe96b7e4f..8de310d8b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc2\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-08-28 19:28+0200\n"
+"POT-Creation-Date: 2007-08-29 18:43+0200\n"
 "PO-Revision-Date: 2005-06-28 00:24+0200\n"
 "Last-Translator: Ga�l Qu�ri <gael@lautre.net>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -282,7 +282,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
 #: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:67 tools/symcryptrun.c:164
+#: tools/gpgconf.c:69 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "bavard"
 
@@ -373,7 +373,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
 #: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:89 tools/symcryptrun.c:204
+#: tools/gpgconf.c:91 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr ""
@@ -690,44 +690,44 @@ msgstr "changer la phrase de passe"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:327 common/exechelp.c:415
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
 
-#: common/exechelp.c:391 common/exechelp.c:448
+#: common/exechelp.c:435 common/exechelp.c:492
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "impossible d'ouvir les donn�es sign�es `%s'\n"
 
-#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
+#: common/exechelp.c:471 common/exechelp.c:599 common/exechelp.c:834
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: common/exechelp.c:596 common/exechelp.c:640
+#: common/exechelp.c:645 common/exechelp.c:698
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:604
+#: common/exechelp.c:653
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr ""
 "erreur durant la lecture des informations contenues actuellement\n"
 "dans la cl�: %s\n"
 
-#: common/exechelp.c:610 common/exechelp.c:651
+#: common/exechelp.c:659 common/exechelp.c:709
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: common/exechelp.c:646
+#: common/exechelp.c:704
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:657
+#: common/exechelp.c:717
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
@@ -1557,7 +1557,7 @@ msgstr ""
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "cl� %s: cl� secr�te sans cl� publique - non prise en compte\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
 msgid ""
 "@Commands:\n"
 " "
@@ -1690,7 +1690,7 @@ msgid "run in server mode"
 msgstr ""
 
 #: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1720,11 +1720,11 @@ msgstr "|N|niveau de compression N (0 d
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
@@ -6633,6 +6633,71 @@ msgstr ""
 msgid "can't open fd %d: %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
 
+#: jnlib/argparse.c:176
+#, fuzzy
+msgid "argument not expected"
+msgstr "Les commandes d'administration ne sont pas permises\n"
+
+#: jnlib/argparse.c:178
+#, fuzzy
+msgid "read error"
+msgstr "erreur de lecture"
+
+#: jnlib/argparse.c:180
+#, fuzzy
+msgid "keyword too long"
+msgstr "ligne trop longue"
+
+#: jnlib/argparse.c:182
+#, fuzzy
+msgid "missing argument"
+msgstr "argument invalide"
+
+#: jnlib/argparse.c:184
+#, fuzzy
+msgid "invalid command"
+msgstr "La commande n'est utilisable qu'en mode administration\n"
+
+#: jnlib/argparse.c:186
+#, fuzzy
+msgid "invalid alias definition"
+msgstr "options de liste invalides\n"
+
+#: jnlib/argparse.c:188
+#, fuzzy
+msgid "invalid option"
+msgstr "options de liste invalides\n"
+
+#: jnlib/argparse.c:196
+#, c-format
+msgid "missing argument for option \"%.50s\"\n"
+msgstr ""
+
+#: jnlib/argparse.c:198
+#, c-format
+msgid "option \"%.50s\" does not expect an argument\n"
+msgstr ""
+
+#: jnlib/argparse.c:201
+#, fuzzy, c-format
+msgid "invalid command \"%.50s\"\n"
+msgstr "Commande invalide  (essayez �help�)\n"
+
+#: jnlib/argparse.c:203
+#, c-format
+msgid "option \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:205
+#, c-format
+msgid "command \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:207
+#, fuzzy, c-format
+msgid "invalid option \"%.50s\"\n"
+msgstr "options de liste invalides\n"
+
 #: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -7519,7 +7584,7 @@ msgstr "enlever les cl
 msgid "add this secret keyring to the list"
 msgstr "Il faut la cl� secr�te pour faire cela.\n"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
@@ -7761,7 +7826,7 @@ msgstr "                alias 
 msgid "This is a qualified signature\n"
 msgstr "Ceci sera une auto-signature.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "quitter"
@@ -7843,172 +7908,176 @@ msgstr ""
 "erreur pendant la recherche de l'enregistrement de confiance\n"
 "dans `%s': %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
-#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
+#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
+#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
-#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
+#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
+#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
+#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
+#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:504
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:508
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500
+#: tools/gpgconf-comp.c:512
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:526
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:517
+#: tools/gpgconf-comp.c:529
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:521
+#: tools/gpgconf-comp.c:533
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:525
+#: tools/gpgconf-comp.c:537
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:541
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:545
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "r�voquer la cl� ou les sous-cl�s s�lectionn�es"
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:549
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
 
-#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: tools/gpgconf-comp.c:659
+#: tools/gpgconf-comp.c:671
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:664
+#: tools/gpgconf-comp.c:676
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:709
+#: tools/gpgconf-comp.c:721
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:732
+#: tools/gpgconf-comp.c:744
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:776
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:812
+#: tools/gpgconf-comp.c:824
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:822
+#: tools/gpgconf-comp.c:834
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:833
+#: tools/gpgconf-comp.c:845
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:838
+#: tools/gpgconf-comp.c:850
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:875
+#: tools/gpgconf-comp.c:887
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2706
+#: tools/gpgconf-comp.c:2955
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:56
+#: tools/gpgconf.c:57
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
+msgid "check all programs"
+msgstr ""
+
+#: tools/gpgconf.c:59
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:64
 #, fuzzy
 msgid "check global configuration file"
 msgstr "�l�ment de configuration `%s' inconnu\n"
 
-#: tools/gpgconf.c:70
+#: tools/gpgconf.c:72
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:92
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:97
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:168 tools/gpgconf.c:201
+#: tools/gpgconf.c:176 tools/gpgconf.c:209
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "utilisation: gpg [options] "
 
-#: tools/gpgconf.c:170
+#: tools/gpgconf.c:178
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:179
+#: tools/gpgconf.c:187
 #, fuzzy
 msgid "Component not found"
 msgstr "cl� publique non trouv�e"
 
-#: tools/gpgconf.c:203
+#: tools/gpgconf.c:211
 #, fuzzy
 msgid "No argument allowed"
 msgstr "Les commandes d'administration ne sont pas permises\n"
@@ -8397,9 +8466,6 @@ msgstr "le hachage de protection %d n'est pas support
 #~ msgid "bad key"
 #~ msgstr "mauvaise cl�"
 
-#~ msgid "file read error"
-#~ msgstr "erreur de lecture"
-
 #~ msgid "file write error"
 #~ msgstr "erreur d'�criture"
 
@@ -8457,9 +8523,6 @@ msgstr "le hachage de protection %d n'est pas support
 #~ msgid "weak key"
 #~ msgstr "cl� faible"
 
-#~ msgid "invalid argument"
-#~ msgstr "argument invalide"
-
 #~ msgid "bad URI"
 #~ msgstr "mauvaise adresse (URI)"
 
diff --git a/po/gl.po b/po/gl.po
index e46cee208..70813e05b 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.4\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-08-28 19:28+0200\n"
+"POT-Creation-Date: 2007-08-29 18:43+0200\n"
 "PO-Revision-Date: 2003-12-04 11:39+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@trasno.net>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -272,7 +272,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
 #: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:67 tools/symcryptrun.c:164
+#: tools/gpgconf.c:69 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "lareto"
 
@@ -363,7 +363,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
 #: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:89 tools/symcryptrun.c:204
+#: tools/gpgconf.c:91 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr ""
@@ -678,42 +678,42 @@ msgstr "cambia-lo contrasinal"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:327 common/exechelp.c:415
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: common/exechelp.c:391 common/exechelp.c:448
+#: common/exechelp.c:435 common/exechelp.c:492
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "non se puido abrir un ficheiro: %s\n"
 
-#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
+#: common/exechelp.c:471 common/exechelp.c:599 common/exechelp.c:834
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: common/exechelp.c:596 common/exechelp.c:640
+#: common/exechelp.c:645 common/exechelp.c:698
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:604
+#: common/exechelp.c:653
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: common/exechelp.c:610 common/exechelp.c:651
+#: common/exechelp.c:659 common/exechelp.c:709
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: common/exechelp.c:646
+#: common/exechelp.c:704
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:657
+#: common/exechelp.c:717
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "erro lendo `%s': %s\n"
@@ -1559,7 +1559,7 @@ msgstr "empr
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sen chave p�blica - omitida\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
 msgid ""
 "@Commands:\n"
 " "
@@ -1693,7 +1693,7 @@ msgid "run in server mode"
 msgstr ""
 
 #: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1723,11 +1723,11 @@ msgstr "|N|axusta-lo nivel de compresi
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
 msgid "use as output file"
 msgstr "usar coma ficheiro de sa�da"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
 msgid "do not make any changes"
 msgstr "non facer ning�n cambio"
 
@@ -6601,6 +6601,71 @@ msgstr ""
 msgid "can't open fd %d: %s\n"
 msgstr "non se puido abrir `%s': %s\n"
 
+#: jnlib/argparse.c:176
+#, fuzzy
+msgid "argument not expected"
+msgstr "gravando a chave secreta en `%s'\n"
+
+#: jnlib/argparse.c:178
+#, fuzzy
+msgid "read error"
+msgstr "erro de lectura de ficheiro"
+
+#: jnlib/argparse.c:180
+#, fuzzy
+msgid "keyword too long"
+msgstr "li�a longa de m�is\n"
+
+#: jnlib/argparse.c:182
+#, fuzzy
+msgid "missing argument"
+msgstr "argumento non v�lido"
+
+#: jnlib/argparse.c:184
+#, fuzzy
+msgid "invalid command"
+msgstr "comandos conflictivos\n"
+
+#: jnlib/argparse.c:186
+#, fuzzy
+msgid "invalid alias definition"
+msgstr "opci�ns de importaci�n non v�lidas\n"
+
+#: jnlib/argparse.c:188
+#, fuzzy
+msgid "invalid option"
+msgstr "opci�ns de importaci�n non v�lidas\n"
+
+#: jnlib/argparse.c:196
+#, c-format
+msgid "missing argument for option \"%.50s\"\n"
+msgstr ""
+
+#: jnlib/argparse.c:198
+#, c-format
+msgid "option \"%.50s\" does not expect an argument\n"
+msgstr ""
+
+#: jnlib/argparse.c:201
+#, fuzzy, c-format
+msgid "invalid command \"%.50s\"\n"
+msgstr "Comando incorrecto (tente \"help\")\n"
+
+#: jnlib/argparse.c:203
+#, c-format
+msgid "option \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:205
+#, c-format
+msgid "command \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:207
+#, fuzzy, c-format
+msgid "invalid option \"%.50s\"\n"
+msgstr "opci�ns de importaci�n non v�lidas\n"
+
 #: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -7491,7 +7556,7 @@ msgstr "engadir este chaveiro 
 msgid "add this secret keyring to the list"
 msgstr "engadir este chaveiro secreto � lista"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|empregar NOME coma chave secreta por defecto"
 
@@ -7725,7 +7790,7 @@ msgstr ""
 "\n"
 "Esta ha ser unha auto-sinatura.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "abandonar"
@@ -7805,174 +7870,178 @@ msgstr "erro ao enviar a `%s': %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
-#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
+#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
+#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
-#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
+#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
 #, fuzzy
 msgid "Options useful for debugging"
 msgstr "habilitar depuraci�n total"
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
+#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
+#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
+#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:504
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:508
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500
+#: tools/gpgconf-comp.c:512
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:526
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:517
+#: tools/gpgconf-comp.c:529
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:521
+#: tools/gpgconf-comp.c:533
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:525
+#: tools/gpgconf-comp.c:537
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:541
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:545
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|emprega-lo modo de contrasinal N"
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:549
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOME|cifrar para NOME"
 
-#: tools/gpgconf-comp.c:659
+#: tools/gpgconf-comp.c:671
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:664
+#: tools/gpgconf-comp.c:676
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:709
+#: tools/gpgconf-comp.c:721
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NOME|emprega-lo algoritmo de cifrado NOME para os contrasinais"
 
-#: tools/gpgconf-comp.c:732
+#: tools/gpgconf-comp.c:744
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:776
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:812
+#: tools/gpgconf-comp.c:824
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:822
+#: tools/gpgconf-comp.c:834
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:833
+#: tools/gpgconf-comp.c:845
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:838
+#: tools/gpgconf-comp.c:850
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:875
+#: tools/gpgconf-comp.c:887
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2706
+#: tools/gpgconf-comp.c:2955
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:56
+#: tools/gpgconf.c:57
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
+msgid "check all programs"
+msgstr ""
+
+#: tools/gpgconf.c:59
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:64
 #, fuzzy
 msgid "check global configuration file"
 msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
 
-#: tools/gpgconf.c:70
+#: tools/gpgconf.c:72
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:92
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:97
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:168 tools/gpgconf.c:201
+#: tools/gpgconf.c:176 tools/gpgconf.c:209
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: tools/gpgconf.c:170
+#: tools/gpgconf.c:178
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:179
+#: tools/gpgconf.c:187
 #, fuzzy
 msgid "Component not found"
 msgstr "non se atopou a chave p�blica"
 
-#: tools/gpgconf.c:203
+#: tools/gpgconf.c:211
 #, fuzzy
 msgid "No argument allowed"
 msgstr "gravando a chave secreta en `%s'\n"
@@ -8351,9 +8420,6 @@ msgstr "o algoritmo de protecci
 #~ msgid "bad key"
 #~ msgstr "chave incorrecta"
 
-#~ msgid "file read error"
-#~ msgstr "erro de lectura de ficheiro"
-
 #~ msgid "file write error"
 #~ msgstr "erro de escritura de ficheiro"
 
@@ -8417,9 +8483,6 @@ msgstr "o algoritmo de protecci
 #~ msgid "weak key"
 #~ msgstr "chave feble"
 
-#~ msgid "invalid argument"
-#~ msgstr "argumento non v�lido"
-
 #~ msgid "bad URI"
 #~ msgstr "URI incorrecto"
 
diff --git a/po/hu.po b/po/hu.po
index 24bed108a..9c50a9d54 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-08-28 19:28+0200\n"
+"POT-Creation-Date: 2007-08-29 18:43+0200\n"
 "PO-Revision-Date: 2004-06-19 21:53+0200\n"
 "Last-Translator: Nagy Ferenc L�szl� <nfl@nfllab.com>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -271,7 +271,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
 #: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:67 tools/symcryptrun.c:164
+#: tools/gpgconf.c:69 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "b�besz�d� m�d"
 
@@ -360,7 +360,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
 #: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:89 tools/symcryptrun.c:204
+#: tools/gpgconf.c:91 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "A hib�kat (angolul) a <gnupg-bugs@gnu.org> c�mre �rja meg!\n"
@@ -673,42 +673,42 @@ msgstr "jelsz
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:327 common/exechelp.c:415
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: common/exechelp.c:391 common/exechelp.c:448
+#: common/exechelp.c:435 common/exechelp.c:492
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
 
-#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
+#: common/exechelp.c:471 common/exechelp.c:599 common/exechelp.c:834
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: common/exechelp.c:596 common/exechelp.c:640
+#: common/exechelp.c:645 common/exechelp.c:698
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:604
+#: common/exechelp.c:653
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
 
-#: common/exechelp.c:610 common/exechelp.c:651
+#: common/exechelp.c:659 common/exechelp.c:709
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: common/exechelp.c:646
+#: common/exechelp.c:704
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:657
+#: common/exechelp.c:717
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
@@ -1548,7 +1548,7 @@ msgstr "A %08lX m
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "%08lX kulcs: titkos kulcs nyilv�nos kulcs n�lk�l - kihagytam.\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
 msgid ""
 "@Commands:\n"
 " "
@@ -1682,7 +1682,7 @@ msgid "run in server mode"
 msgstr ""
 
 #: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1712,11 +1712,11 @@ msgstr "|N|t
 msgid "use canonical text mode"
 msgstr "kanonikus sz�veges m�d haszn�lata"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
 msgid "use as output file"
 msgstr "kimeneti �llom�ny megad�sa"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
 msgid "do not make any changes"
 msgstr "ne csin�ljon semmi v�ltoztat�st"
 
@@ -6566,6 +6566,71 @@ msgstr "A bemeneti sor (%u) t
 msgid "can't open fd %d: %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
 
+#: jnlib/argparse.c:176
+#, fuzzy
+msgid "argument not expected"
+msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
+
+#: jnlib/argparse.c:178
+#, fuzzy
+msgid "read error"
+msgstr "�llom�nyolvas�si hiba"
+
+#: jnlib/argparse.c:180
+#, fuzzy
+msgid "keyword too long"
+msgstr "A sor t�l hossz�!\n"
+
+#: jnlib/argparse.c:182
+#, fuzzy
+msgid "missing argument"
+msgstr "�rv�nytelen argumentum"
+
+#: jnlib/argparse.c:184
+#, fuzzy
+msgid "invalid command"
+msgstr "Egym�snak ellentmond� parancsok!\n"
+
+#: jnlib/argparse.c:186
+#, fuzzy
+msgid "invalid alias definition"
+msgstr "�rv�nytelen import opci�k!\n"
+
+#: jnlib/argparse.c:188
+#, fuzzy
+msgid "invalid option"
+msgstr "�rv�nytelen import opci�k!\n"
+
+#: jnlib/argparse.c:196
+#, c-format
+msgid "missing argument for option \"%.50s\"\n"
+msgstr ""
+
+#: jnlib/argparse.c:198
+#, c-format
+msgid "option \"%.50s\" does not expect an argument\n"
+msgstr ""
+
+#: jnlib/argparse.c:201
+#, fuzzy, c-format
+msgid "invalid command \"%.50s\"\n"
+msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
+
+#: jnlib/argparse.c:203
+#, c-format
+msgid "option \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:205
+#, c-format
+msgid "command \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:207
+#, fuzzy, c-format
+msgid "invalid option \"%.50s\"\n"
+msgstr "�rv�nytelen import opci�k!\n"
+
 #: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -7443,7 +7508,7 @@ msgstr "kulcskarika hozz
 msgid "add this secret keyring to the list"
 msgstr "titkoskulcs-karika hozz�ad�sa a list�hoz"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
 msgid "|NAME|use NAME as default secret key"
 msgstr "|N�V|N�V haszn�lata alap�rtelmezett titkos kulcsk�nt"
 
@@ -7677,7 +7742,7 @@ msgstr ""
 "\n"
 "Ez egy �nal��r�s lesz.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "kil�p�s|kilepes"
@@ -7757,173 +7822,177 @@ msgstr "Hiba %s-ra/-re k
 msgid "error sending standard options: %s\n"
 msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
-#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
+#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
+#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
-#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
+#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
+#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
+#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
+#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:504
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:508
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500
+#: tools/gpgconf-comp.c:512
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:526
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:517
+#: tools/gpgconf-comp.c:529
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:521
+#: tools/gpgconf-comp.c:533
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:525
+#: tools/gpgconf-comp.c:537
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:541
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:545
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|N. sorsz�m� jelsz�m�d haszn�lata"
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:549
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|N�V|titkos�t�s N�V r�sz�re"
 
-#: tools/gpgconf-comp.c:659
+#: tools/gpgconf-comp.c:671
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:664
+#: tools/gpgconf-comp.c:676
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:709
+#: tools/gpgconf-comp.c:721
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|N�V|N�V rejtjelez� algoritmus haszn. jelszavakhoz"
 
-#: tools/gpgconf-comp.c:732
+#: tools/gpgconf-comp.c:744
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:776
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:812
+#: tools/gpgconf-comp.c:824
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:822
+#: tools/gpgconf-comp.c:834
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:833
+#: tools/gpgconf-comp.c:845
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:838
+#: tools/gpgconf-comp.c:850
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:875
+#: tools/gpgconf-comp.c:887
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2706
+#: tools/gpgconf-comp.c:2955
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:56
+#: tools/gpgconf.c:57
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
+msgid "check all programs"
+msgstr ""
+
+#: tools/gpgconf.c:59
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:64
 #, fuzzy
 msgid "check global configuration file"
 msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
 
-#: tools/gpgconf.c:70
+#: tools/gpgconf.c:72
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:92
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:97
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:168 tools/gpgconf.c:201
+#: tools/gpgconf.c:176 tools/gpgconf.c:209
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: tools/gpgconf.c:170
+#: tools/gpgconf.c:178
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:179
+#: tools/gpgconf.c:187
 #, fuzzy
 msgid "Component not found"
 msgstr "nyilv�nos kulcs nem tal�lhat�"
 
-#: tools/gpgconf.c:203
+#: tools/gpgconf.c:211
 #, fuzzy
 msgid "No argument allowed"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
@@ -8291,9 +8360,6 @@ msgstr "%d%s v
 #~ msgid "bad key"
 #~ msgstr "rossz kulcs"
 
-#~ msgid "file read error"
-#~ msgstr "�llom�nyolvas�si hiba"
-
 #~ msgid "file write error"
 #~ msgstr "�llom�ny�r�si hiba"
 
@@ -8354,9 +8420,6 @@ msgstr "%d%s v
 #~ msgid "weak key"
 #~ msgstr "gyenge kulcs"
 
-#~ msgid "invalid argument"
-#~ msgstr "�rv�nytelen argumentum"
-
 #~ msgid "bad URI"
 #~ msgstr "rossz URI"
 
diff --git a/po/id.po b/po/id.po
index 6360f3311..d4aca5181 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-id\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-08-28 19:28+0200\n"
+"POT-Creation-Date: 2007-08-29 18:43+0200\n"
 "PO-Revision-Date: 2004-06-17 16:32+0700\n"
 "Last-Translator: Tedi Heriyanto <tedi_h@gmx.net>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -273,7 +273,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
 #: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:67 tools/symcryptrun.c:164
+#: tools/gpgconf.c:69 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "detil"
 
@@ -362,7 +362,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
 #: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:89 tools/symcryptrun.c:204
+#: tools/gpgconf.c:91 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Laporkan bug ke <gnupg-bugs@gnu.org>.\n"
@@ -675,42 +675,42 @@ msgstr "ubah passphrase"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:327 common/exechelp.c:415
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: common/exechelp.c:391 common/exechelp.c:448
+#: common/exechelp.c:435 common/exechelp.c:492
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "tidak dapat membuka file: %s\n"
 
-#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
+#: common/exechelp.c:471 common/exechelp.c:599 common/exechelp.c:834
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: common/exechelp.c:596 common/exechelp.c:640
+#: common/exechelp.c:645 common/exechelp.c:698
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:604
+#: common/exechelp.c:653
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: common/exechelp.c:610 common/exechelp.c:651
+#: common/exechelp.c:659 common/exechelp.c:709
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: common/exechelp.c:646
+#: common/exechelp.c:704
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:657
+#: common/exechelp.c:717
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "kesalahan membaca `%s': %s\n"
@@ -1550,7 +1550,7 @@ msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
 msgid ""
 "@Commands:\n"
 " "
@@ -1684,7 +1684,7 @@ msgid "run in server mode"
 msgstr ""
 
 #: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1714,11 +1714,11 @@ msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
 msgid "use as output file"
 msgstr "gunakan sebagai file output"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
@@ -6569,6 +6569,71 @@ msgstr "baris input %u terlalu panjang atau hilang LF\n"
 msgid "can't open fd %d: %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
+#: jnlib/argparse.c:176
+#, fuzzy
+msgid "argument not expected"
+msgstr "menulis kunci rahasia ke `%s'\n"
+
+#: jnlib/argparse.c:178
+#, fuzzy
+msgid "read error"
+msgstr "kesalahan baca file"
+
+#: jnlib/argparse.c:180
+#, fuzzy
+msgid "keyword too long"
+msgstr "baris terlalu panjang\n"
+
+#: jnlib/argparse.c:182
+#, fuzzy
+msgid "missing argument"
+msgstr "argumen tidak valid"
+
+#: jnlib/argparse.c:184
+#, fuzzy
+msgid "invalid command"
+msgstr "perintah saling konflik\n"
+
+#: jnlib/argparse.c:186
+#, fuzzy
+msgid "invalid alias definition"
+msgstr "opsi impor tidak valid\n"
+
+#: jnlib/argparse.c:188
+#, fuzzy
+msgid "invalid option"
+msgstr "opsi impor tidak valid\n"
+
+#: jnlib/argparse.c:196
+#, c-format
+msgid "missing argument for option \"%.50s\"\n"
+msgstr ""
+
+#: jnlib/argparse.c:198
+#, c-format
+msgid "option \"%.50s\" does not expect an argument\n"
+msgstr ""
+
+#: jnlib/argparse.c:201
+#, fuzzy, c-format
+msgid "invalid command \"%.50s\"\n"
+msgstr "Perintah tidak valid (coba \"help\")\n"
+
+#: jnlib/argparse.c:203
+#, c-format
+msgid "option \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:205
+#, c-format
+msgid "command \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:207
+#, fuzzy, c-format
+msgid "invalid option \"%.50s\"\n"
+msgstr "opsi impor tidak valid\n"
+
 #: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -7445,7 +7510,7 @@ msgstr "tambah keyring ini ke daftar keyring"
 msgid "add this secret keyring to the list"
 msgstr "tambah keyring rahasia ini ke daftar"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 
@@ -7679,7 +7744,7 @@ msgstr ""
 "\n"
 "Ini akan jadi self-signature.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "q|k|keluar"
@@ -7759,173 +7824,177 @@ msgstr "kesalahan mengirim ke `%s': %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
-#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
+#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
+#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
-#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
+#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
+#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
+#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
+#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:504
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:508
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500
+#: tools/gpgconf-comp.c:512
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:526
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:517
+#: tools/gpgconf-comp.c:529
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:521
+#: tools/gpgconf-comp.c:533
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:525
+#: tools/gpgconf-comp.c:537
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:541
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:545
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|gunakan passphrase mode N"
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:549
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: tools/gpgconf-comp.c:659
+#: tools/gpgconf-comp.c:671
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:664
+#: tools/gpgconf-comp.c:676
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:709
+#: tools/gpgconf-comp.c:721
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
 
-#: tools/gpgconf-comp.c:732
+#: tools/gpgconf-comp.c:744
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:776
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:812
+#: tools/gpgconf-comp.c:824
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:822
+#: tools/gpgconf-comp.c:834
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:833
+#: tools/gpgconf-comp.c:845
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:838
+#: tools/gpgconf-comp.c:850
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:875
+#: tools/gpgconf-comp.c:887
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2706
+#: tools/gpgconf-comp.c:2955
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:56
+#: tools/gpgconf.c:57
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
+msgid "check all programs"
+msgstr ""
+
+#: tools/gpgconf.c:59
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:64
 #, fuzzy
 msgid "check global configuration file"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: tools/gpgconf.c:70
+#: tools/gpgconf.c:72
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:92
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:97
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:168 tools/gpgconf.c:201
+#: tools/gpgconf.c:176 tools/gpgconf.c:209
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: tools/gpgconf.c:170
+#: tools/gpgconf.c:178
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:179
+#: tools/gpgconf.c:187
 #, fuzzy
 msgid "Component not found"
 msgstr "kunci publik tidak ditemukan"
 
-#: tools/gpgconf.c:203
+#: tools/gpgconf.c:211
 #, fuzzy
 msgid "No argument allowed"
 msgstr "menulis kunci rahasia ke `%s'\n"
@@ -8293,9 +8362,6 @@ msgstr "algoritma proteksi %d%s tidak didukung\n"
 #~ msgid "bad key"
 #~ msgstr "kunci yang buruk"
 
-#~ msgid "file read error"
-#~ msgstr "kesalahan baca file"
-
 #~ msgid "file write error"
 #~ msgstr "kesalahan tulis file"
 
@@ -8356,9 +8422,6 @@ msgstr "algoritma proteksi %d%s tidak didukung\n"
 #~ msgid "weak key"
 #~ msgstr "kunci lemah"
 
-#~ msgid "invalid argument"
-#~ msgstr "argumen tidak valid"
-
 #~ msgid "bad URI"
 #~ msgstr "URI yang buruk"
 
diff --git a/po/it.po b/po/it.po
index 4a1881676..12a91fceb 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.1.92\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-08-28 19:28+0200\n"
+"POT-Creation-Date: 2007-08-29 18:43+0200\n"
 "PO-Revision-Date: 2004-06-16 17:01+0200\n"
 "Last-Translator: Marco d'Itri <md@linux.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -271,7 +271,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
 #: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:67 tools/symcryptrun.c:164
+#: tools/gpgconf.c:69 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "prolisso"
 
@@ -360,7 +360,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
 #: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:89 tools/symcryptrun.c:204
+#: tools/gpgconf.c:91 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Per favore segnala i bug a <gnupg-bugs@gnu.org>.\n"
@@ -673,42 +673,42 @@ msgstr "cambia la passphrase"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:327 common/exechelp.c:415
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: common/exechelp.c:391 common/exechelp.c:448
+#: common/exechelp.c:435 common/exechelp.c:492
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "impossibile aprire il file: %s\n"
 
-#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
+#: common/exechelp.c:471 common/exechelp.c:599 common/exechelp.c:834
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: common/exechelp.c:596 common/exechelp.c:640
+#: common/exechelp.c:645 common/exechelp.c:698
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:604
+#: common/exechelp.c:653
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: common/exechelp.c:610 common/exechelp.c:651
+#: common/exechelp.c:659 common/exechelp.c:709
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: common/exechelp.c:646
+#: common/exechelp.c:704
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:657
+#: common/exechelp.c:717
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "errore leggendo `%s': %s\n"
@@ -1559,7 +1559,7 @@ msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
 msgid ""
 "@Commands:\n"
 " "
@@ -1693,7 +1693,7 @@ msgid "run in server mode"
 msgstr ""
 
 #: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1723,11 +1723,11 @@ msgstr "|N|imposta il livello di compressione (0 disab.)"
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
@@ -6615,6 +6615,71 @@ msgstr "linea di input %u troppo lunga o LF mancante\n"
 msgid "can't open fd %d: %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
+#: jnlib/argparse.c:176
+#, fuzzy
+msgid "argument not expected"
+msgstr "scrittura della chiave segreta in `%s'\n"
+
+#: jnlib/argparse.c:178
+#, fuzzy
+msgid "read error"
+msgstr "errore durante la lettura del file"
+
+#: jnlib/argparse.c:180
+#, fuzzy
+msgid "keyword too long"
+msgstr "riga troppo lunga\n"
+
+#: jnlib/argparse.c:182
+#, fuzzy
+msgid "missing argument"
+msgstr "argomento non valido"
+
+#: jnlib/argparse.c:184
+#, fuzzy
+msgid "invalid command"
+msgstr "comandi in conflitto\n"
+
+#: jnlib/argparse.c:186
+#, fuzzy
+msgid "invalid alias definition"
+msgstr "opzioni di importazione non valide\n"
+
+#: jnlib/argparse.c:188
+#, fuzzy
+msgid "invalid option"
+msgstr "opzioni di importazione non valide\n"
+
+#: jnlib/argparse.c:196
+#, c-format
+msgid "missing argument for option \"%.50s\"\n"
+msgstr ""
+
+#: jnlib/argparse.c:198
+#, c-format
+msgid "option \"%.50s\" does not expect an argument\n"
+msgstr ""
+
+#: jnlib/argparse.c:201
+#, fuzzy, c-format
+msgid "invalid command \"%.50s\"\n"
+msgstr "Comando non valido  (prova \"help\")\n"
+
+#: jnlib/argparse.c:203
+#, c-format
+msgid "option \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:205
+#, c-format
+msgid "command \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:207
+#, fuzzy, c-format
+msgid "invalid option \"%.50s\"\n"
+msgstr "opzioni di importazione non valide\n"
+
 #: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -7491,7 +7556,7 @@ msgstr "aggiungi questo portachiavi alla lista"
 msgid "add this secret keyring to the list"
 msgstr "aggiungi questo portachiavi segreto alla lista"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usa NOME come chiave segreta predefinita"
 
@@ -7725,7 +7790,7 @@ msgstr ""
 "\n"
 "Questa sar� una autofirma.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "quit"
@@ -7805,173 +7870,177 @@ msgstr "errore leggendo `%s': %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
-#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
+#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
+#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
-#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
+#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
+#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
+#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
+#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:504
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:508
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500
+#: tools/gpgconf-comp.c:512
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:526
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:517
+#: tools/gpgconf-comp.c:529
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:521
+#: tools/gpgconf-comp.c:533
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:525
+#: tools/gpgconf-comp.c:537
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:541
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:545
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|usa il modo N per la passphrase"
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:549
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOME|cifra per NOME"
 
-#: tools/gpgconf-comp.c:659
+#: tools/gpgconf-comp.c:671
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:664
+#: tools/gpgconf-comp.c:676
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:709
+#: tools/gpgconf-comp.c:721
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NOME|usa l'alg. di cifratura NOME per le passphrase"
 
-#: tools/gpgconf-comp.c:732
+#: tools/gpgconf-comp.c:744
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:776
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:812
+#: tools/gpgconf-comp.c:824
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:822
+#: tools/gpgconf-comp.c:834
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:833
+#: tools/gpgconf-comp.c:845
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:838
+#: tools/gpgconf-comp.c:850
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:875
+#: tools/gpgconf-comp.c:887
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2706
+#: tools/gpgconf-comp.c:2955
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:56
+#: tools/gpgconf.c:57
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
+msgid "check all programs"
+msgstr ""
+
+#: tools/gpgconf.c:59
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:64
 #, fuzzy
 msgid "check global configuration file"
 msgstr "elemento della configurazione sconosciuto \"%s\"\n"
 
-#: tools/gpgconf.c:70
+#: tools/gpgconf.c:72
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:92
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:97
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:168 tools/gpgconf.c:201
+#: tools/gpgconf.c:176 tools/gpgconf.c:209
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: tools/gpgconf.c:170
+#: tools/gpgconf.c:178
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:179
+#: tools/gpgconf.c:187
 #, fuzzy
 msgid "Component not found"
 msgstr "chiave pubblica non trovata"
 
-#: tools/gpgconf.c:203
+#: tools/gpgconf.c:211
 #, fuzzy
 msgid "No argument allowed"
 msgstr "scrittura della chiave segreta in `%s'\n"
@@ -8343,9 +8412,6 @@ msgstr "l'algoritmo di protezione %d%s non 
 #~ msgid "bad key"
 #~ msgstr "chiave sbagliata"
 
-#~ msgid "file read error"
-#~ msgstr "errore durante la lettura del file"
-
 #~ msgid "file write error"
 #~ msgstr "errore durante la scrittura del file"
 
@@ -8406,9 +8472,6 @@ msgstr "l'algoritmo di protezione %d%s non 
 #~ msgid "weak key"
 #~ msgstr "chiave debole"
 
-#~ msgid "invalid argument"
-#~ msgstr "argomento non valido"
-
 #~ msgid "bad URI"
 #~ msgstr "URI non valida"
 
diff --git a/po/ja.po b/po/ja.po
index 7a20f5e80..214a21006 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.3.92\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-08-28 19:28+0200\n"
+"POT-Creation-Date: 2007-08-29 18:43+0200\n"
 "PO-Revision-Date: 2004-11-23 11:14+0900\n"
 "Last-Translator: IIDA Yosiaki <iida@gnu.org>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -274,7 +274,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
 #: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:67 tools/symcryptrun.c:164
+#: tools/gpgconf.c:69 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "��Ĺ"
 
@@ -363,7 +363,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
 #: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:89 tools/symcryptrun.c:204
+#: tools/gpgconf.c:91 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "�Х��򸫤Ĥ����� <gnupg-bugs@gnu.org> �ޤǤ���𤯤�������\n"
@@ -676,42 +676,42 @@ msgstr "
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:327 common/exechelp.c:415
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
-#: common/exechelp.c:391 common/exechelp.c:448
+#: common/exechelp.c:435 common/exechelp.c:492
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "��̾���줿�ǡ�����%s�פ������ޤ���\n"
 
-#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
+#: common/exechelp.c:471 common/exechelp.c:599 common/exechelp.c:834
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: common/exechelp.c:596 common/exechelp.c:640
+#: common/exechelp.c:645 common/exechelp.c:698
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:604
+#: common/exechelp.c:653
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "���Ը�����μ������顼: %s\n"
 
-#: common/exechelp.c:610 common/exechelp.c:651
+#: common/exechelp.c:659 common/exechelp.c:709
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: common/exechelp.c:646
+#: common/exechelp.c:704
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:657
+#: common/exechelp.c:717
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
@@ -1508,7 +1508,7 @@ msgstr "
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "��%s: �������Τʤ���̩���Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
 msgid ""
 "@Commands:\n"
 " "
@@ -1641,7 +1641,7 @@ msgid "run in server mode"
 msgstr ""
 
 #: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1675,11 +1675,11 @@ msgstr ""
 msgid "use canonical text mode"
 msgstr "����ƥ����ȡ��⡼�ɤ����"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
 msgid "use as output file"
 msgstr "���ϥե�����Ȥ��ƻ���"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
 msgid "do not make any changes"
 msgstr "̵�ѹ�"
 
@@ -6380,6 +6380,71 @@ msgstr "
 msgid "can't open fd %d: %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
 
+#: jnlib/argparse.c:176
+#, fuzzy
+msgid "argument not expected"
+msgstr "�������ޥ�ɤ϶ػߤ���Ƥ��ޤ�\n"
+
+#: jnlib/argparse.c:178
+#, fuzzy
+msgid "read error"
+msgstr "�ե�������ɽФ����顼"
+
+#: jnlib/argparse.c:180
+#, fuzzy
+msgid "keyword too long"
+msgstr "�Ԥ�Ĺ�����ޤ�"
+
+#: jnlib/argparse.c:182
+#, fuzzy
+msgid "missing argument"
+msgstr "̵���ʻ���Ǥ�"
+
+#: jnlib/argparse.c:184
+#, fuzzy
+msgid "invalid command"
+msgstr "�������ѥ��ޥ��\n"
+
+#: jnlib/argparse.c:186
+#, fuzzy
+msgid "invalid alias definition"
+msgstr "̵���ʰ������ץ����Ǥ�\n"
+
+#: jnlib/argparse.c:188
+#, fuzzy
+msgid "invalid option"
+msgstr "̵���ʰ������ץ����Ǥ�\n"
+
+#: jnlib/argparse.c:196
+#, c-format
+msgid "missing argument for option \"%.50s\"\n"
+msgstr ""
+
+#: jnlib/argparse.c:198
+#, c-format
+msgid "option \"%.50s\" does not expect an argument\n"
+msgstr ""
+
+#: jnlib/argparse.c:201
+#, fuzzy, c-format
+msgid "invalid command \"%.50s\"\n"
+msgstr "̵���ʥ��ޥ�� (��help�ɤ򻲾�)\n"
+
+#: jnlib/argparse.c:203
+#, c-format
+msgid "option \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:205
+#, c-format
+msgid "command \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:207
+#, fuzzy, c-format
+msgid "invalid option \"%.50s\"\n"
+msgstr "̵���ʰ������ץ����Ǥ�\n"
+
 #: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -7257,7 +7322,7 @@ msgstr "
 msgid "add this secret keyring to the list"
 msgstr "���μ¹Ԥˤ���̩��������ޤ���\n"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
@@ -7493,7 +7558,7 @@ msgstr "                
 msgid "This is a qualified signature\n"
 msgstr "���ʽ�̾�ˤʤ�Ǥ��礦��\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "quit"
@@ -7573,172 +7638,176 @@ msgstr "
 msgid "error sending standard options: %s\n"
 msgstr "��%s�פǿ��ѥ쥳���ɤθ������顼: %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
-#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
+#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
+#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
-#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
+#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
+#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
+#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
+#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:504
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:508
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500
+#: tools/gpgconf-comp.c:512
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:526
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:517
+#: tools/gpgconf-comp.c:529
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:521
+#: tools/gpgconf-comp.c:533
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:525
+#: tools/gpgconf-comp.c:537
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:541
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:545
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "�������"
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:549
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
-#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|̾��|��̾�����Ѥ˰Ź沽"
 
-#: tools/gpgconf-comp.c:659
+#: tools/gpgconf-comp.c:671
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:664
+#: tools/gpgconf-comp.c:676
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:709
+#: tools/gpgconf-comp.c:721
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:732
+#: tools/gpgconf-comp.c:744
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:776
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:812
+#: tools/gpgconf-comp.c:824
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:822
+#: tools/gpgconf-comp.c:834
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:833
+#: tools/gpgconf-comp.c:845
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:838
+#: tools/gpgconf-comp.c:850
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:875
+#: tools/gpgconf-comp.c:887
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2706
+#: tools/gpgconf-comp.c:2955
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:56
+#: tools/gpgconf.c:57
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
+msgid "check all programs"
+msgstr ""
+
+#: tools/gpgconf.c:59
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:64
 #, fuzzy
 msgid "check global configuration file"
 msgstr "̤�Τι������ܡ�%s��\n"
 
-#: tools/gpgconf.c:70
+#: tools/gpgconf.c:72
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:92
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:97
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:168 tools/gpgconf.c:201
+#: tools/gpgconf.c:176 tools/gpgconf.c:209
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: tools/gpgconf.c:170
+#: tools/gpgconf.c:178
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:179
+#: tools/gpgconf.c:187
 #, fuzzy
 msgid "Component not found"
 msgstr "�����������Ĥ���ޤ���"
 
-#: tools/gpgconf.c:203
+#: tools/gpgconf.c:211
 #, fuzzy
 msgid "No argument allowed"
 msgstr "�������ޥ�ɤ϶ػߤ���Ƥ��ޤ�\n"
@@ -8124,9 +8193,6 @@ msgstr "
 #~ msgid "bad key"
 #~ msgstr "���������Ǥ�"
 
-#~ msgid "file read error"
-#~ msgstr "�ե�������ɽФ����顼"
-
 #~ msgid "file write error"
 #~ msgstr "�ե�����ν���ߥ��顼"
 
@@ -8184,9 +8250,6 @@ msgstr "
 #~ msgid "weak key"
 #~ msgstr "�夤���Ǥ�"
 
-#~ msgid "invalid argument"
-#~ msgstr "̵���ʻ���Ǥ�"
-
 #~ msgid "bad URI"
 #~ msgstr "URI�������Ǥ�"
 
diff --git a/po/nb.po b/po/nb.po
index ce605a736..96f33a154 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.3\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-08-28 19:28+0200\n"
+"POT-Creation-Date: 2007-08-29 18:43+0200\n"
 "PO-Revision-Date: 2006-06-13 20:31+0200\n"
 "Last-Translator: Trond Endrest�l <Trond.Endrestol@fagskolen.gjovik.no>\n"
 "Language-Team: Norwegian Bokm�l <i18n-nb@lister.ping.uio.no>\n"
@@ -274,7 +274,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
 #: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:67 tools/symcryptrun.c:164
+#: tools/gpgconf.c:69 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "fyldig output"
 
@@ -363,7 +363,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
 #: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:89 tools/symcryptrun.c:204
+#: tools/gpgconf.c:91 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Vennligst rapporter feil til <gnupg-bugs@gnu.org>.\n"
@@ -671,42 +671,42 @@ msgstr "endre passfrasen"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:327 common/exechelp.c:415
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: common/exechelp.c:391 common/exechelp.c:448
+#: common/exechelp.c:435 common/exechelp.c:492
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "kan ikke �pne n�kkelknippet"
 
-#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
+#: common/exechelp.c:471 common/exechelp.c:599 common/exechelp.c:834
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: common/exechelp.c:596 common/exechelp.c:640
+#: common/exechelp.c:645 common/exechelp.c:698
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:604
+#: common/exechelp.c:653
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
 
-#: common/exechelp.c:610 common/exechelp.c:651
+#: common/exechelp.c:659 common/exechelp.c:709
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: common/exechelp.c:646
+#: common/exechelp.c:704
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:657
+#: common/exechelp.c:717
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "feil ved lesing av �%s�: %s\n"
@@ -1504,7 +1504,7 @@ msgstr "bruker undern
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "n�kkel %s: hemmelig n�kkel uten offentlig n�kkel - hoppet over\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
 msgid ""
 "@Commands:\n"
 " "
@@ -1637,7 +1637,7 @@ msgid "run in server mode"
 msgstr ""
 
 #: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1667,11 +1667,11 @@ msgstr "|N|sette kompresjonsniv
 msgid "use canonical text mode"
 msgstr "bruk kanonisk tekstmodus"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
 msgid "use as output file"
 msgstr "bruk som outputfil"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
 msgid "do not make any changes"
 msgstr "ikke gj�r noen endringer"
 
@@ -6257,6 +6257,71 @@ msgstr ""
 msgid "can't open fd %d: %s\n"
 msgstr "kan ikke �pne �%s�: %s\n"
 
+#: jnlib/argparse.c:176
+#, fuzzy
+msgid "argument not expected"
+msgstr "Admin-kommandoer er ikke tillatt\n"
+
+#: jnlib/argparse.c:178
+#, fuzzy
+msgid "read error"
+msgstr "feil ved lesing av fil"
+
+#: jnlib/argparse.c:180
+#, fuzzy
+msgid "keyword too long"
+msgstr "for lang linje"
+
+#: jnlib/argparse.c:182
+#, fuzzy
+msgid "missing argument"
+msgstr "ugydig argument"
+
+#: jnlib/argparse.c:184
+#, fuzzy
+msgid "invalid command"
+msgstr "Admin-reservert kommando\n"
+
+#: jnlib/argparse.c:186
+#, fuzzy
+msgid "invalid alias definition"
+msgstr "ugyldige listevalg\n"
+
+#: jnlib/argparse.c:188
+#, fuzzy
+msgid "invalid option"
+msgstr "ugyldige listevalg\n"
+
+#: jnlib/argparse.c:196
+#, c-format
+msgid "missing argument for option \"%.50s\"\n"
+msgstr ""
+
+#: jnlib/argparse.c:198
+#, c-format
+msgid "option \"%.50s\" does not expect an argument\n"
+msgstr ""
+
+#: jnlib/argparse.c:201
+#, fuzzy, c-format
+msgid "invalid command \"%.50s\"\n"
+msgstr "Ugyldig kommando  (pr�v �help�)\n"
+
+#: jnlib/argparse.c:203
+#, c-format
+msgid "option \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:205
+#, c-format
+msgid "command \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:207
+#, fuzzy, c-format
+msgid "invalid option \"%.50s\"\n"
+msgstr "ugyldige listevalg\n"
+
 #: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -7127,7 +7192,7 @@ msgstr "hent n
 msgid "add this secret keyring to the list"
 msgstr "Trenger den hemmelige n�kkelen for � gj�re dette.\n"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
@@ -7363,7 +7428,7 @@ msgstr "                aka 
 msgid "This is a qualified signature\n"
 msgstr "Dette vil v�re en selvsignatur.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "avslutt"
@@ -7443,171 +7508,175 @@ msgstr "feil ved lesing av 
 msgid "error sending standard options: %s\n"
 msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
-#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
+#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
+#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
-#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
+#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
+#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
+#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
+#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:504
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:508
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500
+#: tools/gpgconf-comp.c:512
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:526
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:517
+#: tools/gpgconf-comp.c:529
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:521
+#: tools/gpgconf-comp.c:533
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:525
+#: tools/gpgconf-comp.c:537
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:541
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:545
 msgid "|N|expire the passphrase after N days"
 msgstr ""
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:549
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAVN|kryptere for NAVN"
 
-#: tools/gpgconf-comp.c:659
+#: tools/gpgconf-comp.c:671
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:664
+#: tools/gpgconf-comp.c:676
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:709
+#: tools/gpgconf-comp.c:721
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:732
+#: tools/gpgconf-comp.c:744
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:776
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:812
+#: tools/gpgconf-comp.c:824
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:822
+#: tools/gpgconf-comp.c:834
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:833
+#: tools/gpgconf-comp.c:845
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:838
+#: tools/gpgconf-comp.c:850
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:875
+#: tools/gpgconf-comp.c:887
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2706
+#: tools/gpgconf-comp.c:2955
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:56
+#: tools/gpgconf.c:57
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
+msgid "check all programs"
+msgstr ""
+
+#: tools/gpgconf.c:59
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:64
 #, fuzzy
 msgid "check global configuration file"
 msgstr "ukjent konfigurasjonspunkt �%s�\n"
 
-#: tools/gpgconf.c:70
+#: tools/gpgconf.c:72
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:92
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:97
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:168 tools/gpgconf.c:201
+#: tools/gpgconf.c:176 tools/gpgconf.c:209
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "bruksm�te: gpg [valg] "
 
-#: tools/gpgconf.c:170
+#: tools/gpgconf.c:178
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:179
+#: tools/gpgconf.c:187
 #, fuzzy
 msgid "Component not found"
 msgstr "fant ikke offentlig n�kkel"
 
-#: tools/gpgconf.c:203
+#: tools/gpgconf.c:211
 #, fuzzy
 msgid "No argument allowed"
 msgstr "Admin-kommandoer er ikke tillatt\n"
@@ -7970,9 +8039,6 @@ msgstr "ikke st
 #~ msgid "bad key"
 #~ msgstr "ugyldig n�kkel"
 
-#~ msgid "file read error"
-#~ msgstr "feil ved lesing av fil"
-
 #~ msgid "file write error"
 #~ msgstr "feil ved skriving av fil"
 
@@ -8030,9 +8096,6 @@ msgstr "ikke st
 #~ msgid "weak key"
 #~ msgstr "svak n�kkel"
 
-#~ msgid "invalid argument"
-#~ msgstr "ugydig argument"
-
 #~ msgid "bad URI"
 #~ msgstr "ugyldig URI"
 
diff --git a/po/pl.po b/po/pl.po
index 9070bf8f1..8d4a247a4 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-08-28 19:28+0200\n"
+"POT-Creation-Date: 2007-08-29 18:43+0200\n"
 "PO-Revision-Date: 2004-06-23 15:54+0200\n"
 "Last-Translator: Janusz A. Urbanowicz <alex@bofh.net.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -281,7 +281,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
 #: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:67 tools/symcryptrun.c:164
+#: tools/gpgconf.c:69 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "z dodatkowymi informacjami"
 
@@ -371,7 +371,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
 #: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:89 tools/symcryptrun.c:204
+#: tools/gpgconf.c:91 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "B��dy prosimy zg�asza� na adres <gnupg-bugs@gnu.org>.\n"
@@ -684,42 +684,42 @@ msgstr "zmiana has
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:327 common/exechelp.c:415
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: common/exechelp.c:391 common/exechelp.c:448
+#: common/exechelp.c:435 common/exechelp.c:492
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "nie mo�na otworzy� pliku: %s\n"
 
-#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
+#: common/exechelp.c:471 common/exechelp.c:599 common/exechelp.c:834
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: common/exechelp.c:596 common/exechelp.c:640
+#: common/exechelp.c:645 common/exechelp.c:698
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:604
+#: common/exechelp.c:653
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
 
-#: common/exechelp.c:610 common/exechelp.c:651
+#: common/exechelp.c:659 common/exechelp.c:709
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: common/exechelp.c:646
+#: common/exechelp.c:704
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:657
+#: common/exechelp.c:717
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
@@ -1561,7 +1561,7 @@ msgstr "u
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "klucz %08lX: klucz tajny bez klucza jawnego - pomini�ty\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
 msgid ""
 "@Commands:\n"
 " "
@@ -1695,7 +1695,7 @@ msgid "run in server mode"
 msgstr ""
 
 #: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1725,11 +1725,11 @@ msgstr "|N|poziom kompresji N (0 - bez)"
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
 msgid "use as output file"
 msgstr "plik wyj�ciowy"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
@@ -6599,6 +6599,71 @@ msgstr "linia wej
 msgid "can't open fd %d: %s\n"
 msgstr "nie mo�na otworzy� ,,%s'': %s\n"
 
+#: jnlib/argparse.c:176
+#, fuzzy
+msgid "argument not expected"
+msgstr "zapisuj� klucz tajny w '%s'\n"
+
+#: jnlib/argparse.c:178
+#, fuzzy
+msgid "read error"
+msgstr "b��d przy odczycie pliku"
+
+#: jnlib/argparse.c:180
+#, fuzzy
+msgid "keyword too long"
+msgstr "linia zbyt d�uga\n"
+
+#: jnlib/argparse.c:182
+#, fuzzy
+msgid "missing argument"
+msgstr "b��dny argument"
+
+#: jnlib/argparse.c:184
+#, fuzzy
+msgid "invalid command"
+msgstr "sprzeczne polecenia\n"
+
+#: jnlib/argparse.c:186
+#, fuzzy
+msgid "invalid alias definition"
+msgstr "niepoprawne opcje wczytania kluczy\n"
+
+#: jnlib/argparse.c:188
+#, fuzzy
+msgid "invalid option"
+msgstr "niepoprawne opcje wczytania kluczy\n"
+
+#: jnlib/argparse.c:196
+#, c-format
+msgid "missing argument for option \"%.50s\"\n"
+msgstr ""
+
+#: jnlib/argparse.c:198
+#, c-format
+msgid "option \"%.50s\" does not expect an argument\n"
+msgstr ""
+
+#: jnlib/argparse.c:201
+#, fuzzy, c-format
+msgid "invalid command \"%.50s\"\n"
+msgstr "Niepoprawna komenda  (spr�buj \"help\")\n"
+
+#: jnlib/argparse.c:203
+#, c-format
+msgid "option \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:205
+#, c-format
+msgid "command \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:207
+#, fuzzy, c-format
+msgid "invalid option \"%.50s\"\n"
+msgstr "niepoprawne opcje wczytania kluczy\n"
+
 #: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -7487,7 +7552,7 @@ msgstr "dodanie zbioru kluczy do u
 msgid "add this secret keyring to the list"
 msgstr "dodanie zbioru kluczy tajnych do u�ywanych"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAZWA|ustawienie NAZWA jako domy�lnego klucza prywatnego"
 
@@ -7721,7 +7786,7 @@ msgstr ""
 "\n"
 "To b�dzie podpis klucza nim samym.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "wyj�cie"
@@ -7801,174 +7866,178 @@ msgstr "b
 msgid "error sending standard options: %s\n"
 msgstr "b��d przy wysy�aniu do ,,%s'': %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
-#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
+#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
+#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
-#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
+#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
 #, fuzzy
 msgid "Options useful for debugging"
 msgstr "umo�liwienie pe�nego �ledzenia programu"
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
+#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
+#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
+#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:504
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:508
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500
+#: tools/gpgconf-comp.c:512
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:526
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:517
+#: tools/gpgconf-comp.c:529
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:521
+#: tools/gpgconf-comp.c:533
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:525
+#: tools/gpgconf-comp.c:537
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:541
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:545
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|N-ty tryb obliczania has�a"
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:549
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
 
-#: tools/gpgconf-comp.c:659
+#: tools/gpgconf-comp.c:671
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:664
+#: tools/gpgconf-comp.c:676
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:709
+#: tools/gpgconf-comp.c:721
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|ALG|wymuszenie algorytmu szyfruj�cego ALG dla has�a"
 
-#: tools/gpgconf-comp.c:732
+#: tools/gpgconf-comp.c:744
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:776
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:812
+#: tools/gpgconf-comp.c:824
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:822
+#: tools/gpgconf-comp.c:834
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:833
+#: tools/gpgconf-comp.c:845
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:838
+#: tools/gpgconf-comp.c:850
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:875
+#: tools/gpgconf-comp.c:887
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2706
+#: tools/gpgconf-comp.c:2955
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:56
+#: tools/gpgconf.c:57
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
+msgid "check all programs"
+msgstr ""
+
+#: tools/gpgconf.c:59
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:64
 #, fuzzy
 msgid "check global configuration file"
 msgstr "nieznana opcja ,,%s''\n"
 
-#: tools/gpgconf.c:70
+#: tools/gpgconf.c:72
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:92
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:97
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:168 tools/gpgconf.c:201
+#: tools/gpgconf.c:176 tools/gpgconf.c:209
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: tools/gpgconf.c:170
+#: tools/gpgconf.c:178
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:179
+#: tools/gpgconf.c:187
 #, fuzzy
 msgid "Component not found"
 msgstr "brak klucza publicznego"
 
-#: tools/gpgconf.c:203
+#: tools/gpgconf.c:211
 #, fuzzy
 msgid "No argument allowed"
 msgstr "zapisuj� klucz tajny w '%s'\n"
@@ -8353,9 +8422,6 @@ msgstr "algorytm ochrony %d%s nie jest obs
 #~ msgid "bad key"
 #~ msgstr "niepoprawny klucz"
 
-#~ msgid "file read error"
-#~ msgstr "b��d przy odczycie pliku"
-
 #~ msgid "file write error"
 #~ msgstr "b��d przy zapisie pliku"
 
@@ -8419,9 +8485,6 @@ msgstr "algorytm ochrony %d%s nie jest obs
 #~ msgid "weak key"
 #~ msgstr "klucz s�aby"
 
-#~ msgid "invalid argument"
-#~ msgstr "b��dny argument"
-
 #~ msgid "bad URI"
 #~ msgstr "niepoprawny URI"
 
diff --git a/po/pt.po b/po/pt.po
index 1b7989c1f..28581ad74 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-08-28 19:28+0200\n"
+"POT-Creation-Date: 2007-08-29 18:43+0200\n"
 "PO-Revision-Date: 2002-09-13 18:26+0100\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -274,7 +274,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
 #: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:67 tools/symcryptrun.c:164
+#: tools/gpgconf.c:69 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "detalhado"
 
@@ -364,7 +364,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
 #: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:89 tools/symcryptrun.c:204
+#: tools/gpgconf.c:91 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
@@ -677,42 +677,42 @@ msgstr "muda a frase secreta"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:327 common/exechelp.c:415
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: common/exechelp.c:391 common/exechelp.c:448
+#: common/exechelp.c:435 common/exechelp.c:492
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
+#: common/exechelp.c:471 common/exechelp.c:599 common/exechelp.c:834
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/exechelp.c:596 common/exechelp.c:640
+#: common/exechelp.c:645 common/exechelp.c:698
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:604
+#: common/exechelp.c:653
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: common/exechelp.c:610 common/exechelp.c:651
+#: common/exechelp.c:659 common/exechelp.c:709
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/exechelp.c:646
+#: common/exechelp.c:704
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:657
+#: common/exechelp.c:717
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -1552,7 +1552,7 @@ msgstr "usando chave secund
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
 msgid ""
 "@Commands:\n"
 " "
@@ -1686,7 +1686,7 @@ msgid "run in server mode"
 msgstr ""
 
 #: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1720,11 +1720,11 @@ msgstr ""
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
 msgid "use as output file"
 msgstr "usar como ficheiro de sa�da"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
@@ -6575,6 +6575,71 @@ msgstr "linha de entrada %u demasiado longa ou falta o LF\n"
 msgid "can't open fd %d: %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
+#: jnlib/argparse.c:176
+#, fuzzy
+msgid "argument not expected"
+msgstr "a escrever chave privada para `%s'\n"
+
+#: jnlib/argparse.c:178
+#, fuzzy
+msgid "read error"
+msgstr "erro de leitura"
+
+#: jnlib/argparse.c:180
+#, fuzzy
+msgid "keyword too long"
+msgstr "frase secreta demasiado longa\n"
+
+#: jnlib/argparse.c:182
+#, fuzzy
+msgid "missing argument"
+msgstr "argumento inv�lido"
+
+#: jnlib/argparse.c:184
+#, fuzzy
+msgid "invalid command"
+msgstr "comandos em conflito\n"
+
+#: jnlib/argparse.c:186
+#, fuzzy
+msgid "invalid alias definition"
+msgstr "op��es de importa��o inv�lidas\n"
+
+#: jnlib/argparse.c:188
+#, fuzzy
+msgid "invalid option"
+msgstr "op��es de importa��o inv�lidas\n"
+
+#: jnlib/argparse.c:196
+#, c-format
+msgid "missing argument for option \"%.50s\"\n"
+msgstr ""
+
+#: jnlib/argparse.c:198
+#, c-format
+msgid "option \"%.50s\" does not expect an argument\n"
+msgstr ""
+
+#: jnlib/argparse.c:201
+#, fuzzy, c-format
+msgid "invalid command \"%.50s\"\n"
+msgstr "Comando inv�lido (tente \"help\")\n"
+
+#: jnlib/argparse.c:203
+#, c-format
+msgid "option \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:205
+#, c-format
+msgid "command \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:207
+#, fuzzy, c-format
+msgid "invalid option \"%.50s\"\n"
+msgstr "op��es de importa��o inv�lidas\n"
+
 #: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -7455,7 +7520,7 @@ msgstr ""
 msgid "add this secret keyring to the list"
 msgstr "adicionar este porta-chaves secreto � lista"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta por omiss�o"
 
@@ -7691,7 +7756,7 @@ msgstr ""
 "\n"
 "Isto ser� uma auto-assinatura.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "sair"
@@ -7771,175 +7836,179 @@ msgstr "erro ao enviar para `%s': %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
-#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
+#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
+#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
-#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
+#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
+#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
+#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
+#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:504
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:508
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500
+#: tools/gpgconf-comp.c:512
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:526
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:517
+#: tools/gpgconf-comp.c:529
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:521
+#: tools/gpgconf-comp.c:533
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:525
+#: tools/gpgconf-comp.c:537
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:541
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:545
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|usar mode de frase secreta N"
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:549
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOME|cifrar para NOME"
 
-#: tools/gpgconf-comp.c:659
+#: tools/gpgconf-comp.c:671
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:664
+#: tools/gpgconf-comp.c:676
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:709
+#: tools/gpgconf-comp.c:721
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: tools/gpgconf-comp.c:732
+#: tools/gpgconf-comp.c:744
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:776
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:812
+#: tools/gpgconf-comp.c:824
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:822
+#: tools/gpgconf-comp.c:834
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:833
+#: tools/gpgconf-comp.c:845
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:838
+#: tools/gpgconf-comp.c:850
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:875
+#: tools/gpgconf-comp.c:887
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2706
+#: tools/gpgconf-comp.c:2955
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:56
+#: tools/gpgconf.c:57
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
+msgid "check all programs"
+msgstr ""
+
+#: tools/gpgconf.c:59
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:64
 #, fuzzy
 msgid "check global configuration file"
 msgstr "criado um novo ficheiro de configura��o `%s'\n"
 
-#: tools/gpgconf.c:70
+#: tools/gpgconf.c:72
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:92
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:97
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:168 tools/gpgconf.c:201
+#: tools/gpgconf.c:176 tools/gpgconf.c:209
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "uso: gpg [op��es] "
 
-#: tools/gpgconf.c:170
+#: tools/gpgconf.c:178
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:179
+#: tools/gpgconf.c:187
 #, fuzzy
 msgid "Component not found"
 msgstr "chave p�blica n�o encontrada"
 
-#: tools/gpgconf.c:203
+#: tools/gpgconf.c:211
 #, fuzzy
 msgid "No argument allowed"
 msgstr "a escrever chave privada para `%s'\n"
@@ -8294,9 +8363,6 @@ msgstr "algoritmo de protec
 #~ msgid "bad key"
 #~ msgstr "chave incorrecta"
 
-#~ msgid "file read error"
-#~ msgstr "erro de leitura"
-
 #~ msgid "file write error"
 #~ msgstr "erro de escrita"
 
@@ -8357,9 +8423,6 @@ msgstr "algoritmo de protec
 #~ msgid "weak key"
 #~ msgstr "chave fraca"
 
-#~ msgid "invalid argument"
-#~ msgstr "argumento inv�lido"
-
 #~ msgid "bad URI"
 #~ msgstr "URI incorrecto"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8054cc371..c7c2e4073 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-08-28 19:28+0200\n"
+"POT-Creation-Date: 2007-08-29 18:43+0200\n"
 "PO-Revision-Date: 2007-08-16 11:35+0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -279,7 +279,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
 #: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:67 tools/symcryptrun.c:164
+#: tools/gpgconf.c:69 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "detalhado"
 
@@ -368,7 +368,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
 #: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:89 tools/symcryptrun.c:204
+#: tools/gpgconf.c:91 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
@@ -678,42 +678,42 @@ msgstr "muda a frase secreta"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:327 common/exechelp.c:415
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: common/exechelp.c:391 common/exechelp.c:448
+#: common/exechelp.c:435 common/exechelp.c:492
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "imposs�vel abrir arquivo: %s\n"
 
-#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
+#: common/exechelp.c:471 common/exechelp.c:599 common/exechelp.c:834
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/exechelp.c:596 common/exechelp.c:640
+#: common/exechelp.c:645 common/exechelp.c:698
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:604
+#: common/exechelp.c:653
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: common/exechelp.c:610 common/exechelp.c:651
+#: common/exechelp.c:659 common/exechelp.c:709
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/exechelp.c:646
+#: common/exechelp.c:704
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:657
+#: common/exechelp.c:717
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -1551,7 +1551,7 @@ msgstr "usando chave secund
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
 msgid ""
 "@Commands:\n"
 " "
@@ -1691,7 +1691,7 @@ msgid "run in server mode"
 msgstr ""
 
 #: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1725,11 +1725,11 @@ msgstr ""
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
 msgid "use as output file"
 msgstr "usar como arquivo de sa�da"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
@@ -6517,6 +6517,72 @@ msgstr "linha %u muito longa ou sem LF\n"
 msgid "can't open fd %d: %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
+#: jnlib/argparse.c:176
+#, fuzzy
+msgid "argument not expected"
+msgstr "escrevendo certificado privado para `%s'\n"
+
+#: jnlib/argparse.c:178
+#, fuzzy
+msgid "read error"
+msgstr "erro de leitura"
+
+#: jnlib/argparse.c:180
+#, fuzzy
+msgid "keyword too long"
+msgstr "linha muito longa\n"
+
+#: jnlib/argparse.c:182
+#, fuzzy
+msgid "missing argument"
+msgstr "argumento inv�lido"
+
+#: jnlib/argparse.c:184
+#, fuzzy
+msgid "invalid command"
+msgstr "comandos conflitantes\n"
+
+#: jnlib/argparse.c:186
+#, fuzzy
+msgid "invalid alias definition"
+msgstr "armadura inv�lida"
+
+#: jnlib/argparse.c:188
+#, fuzzy
+msgid "invalid option"
+msgstr "armadura inv�lida"
+
+#: jnlib/argparse.c:196
+#, c-format
+msgid "missing argument for option \"%.50s\"\n"
+msgstr ""
+
+#: jnlib/argparse.c:198
+#, c-format
+msgid "option \"%.50s\" does not expect an argument\n"
+msgstr ""
+
+# help ou ajuda ???
+#: jnlib/argparse.c:201
+#, fuzzy, c-format
+msgid "invalid command \"%.50s\"\n"
+msgstr "Comando inv�lido (tente \"help\")\n"
+
+#: jnlib/argparse.c:203
+#, c-format
+msgid "option \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:205
+#, c-format
+msgid "command \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:207
+#, fuzzy, c-format
+msgid "invalid option \"%.50s\"\n"
+msgstr "armadura inv�lida"
+
 #: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -7406,7 +7472,7 @@ msgstr "adicionar este chaveiro 
 msgid "add this secret keyring to the list"
 msgstr "adicionar este chaveiro secreto � lista"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta padr�o"
 
@@ -7641,7 +7707,7 @@ msgid "This is a qualified signature\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
 # INICIO MENU
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "sair"
@@ -7721,176 +7787,180 @@ msgstr "erro na leitura de `%s': %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
-#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
+#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
+#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
-#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
+#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
 #, fuzzy
 msgid "Options useful for debugging"
 msgstr "habilitar depura��o completa"
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
+#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
+#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
+#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:504
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:508
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500
+#: tools/gpgconf-comp.c:512
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:526
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:517
+#: tools/gpgconf-comp.c:529
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:521
+#: tools/gpgconf-comp.c:533
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:525
+#: tools/gpgconf-comp.c:537
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:541
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:545
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|usar frase secreta modo N"
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:549
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOME|criptografar para NOME"
 
-#: tools/gpgconf-comp.c:659
+#: tools/gpgconf-comp.c:671
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:664
+#: tools/gpgconf-comp.c:676
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:709
+#: tools/gpgconf-comp.c:721
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: tools/gpgconf-comp.c:732
+#: tools/gpgconf-comp.c:744
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:776
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:812
+#: tools/gpgconf-comp.c:824
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:822
+#: tools/gpgconf-comp.c:834
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:833
+#: tools/gpgconf-comp.c:845
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:838
+#: tools/gpgconf-comp.c:850
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:875
+#: tools/gpgconf-comp.c:887
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2706
+#: tools/gpgconf-comp.c:2955
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:56
+#: tools/gpgconf.c:57
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
+msgid "check all programs"
+msgstr ""
+
+#: tools/gpgconf.c:59
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:64
 #, fuzzy
 msgid "check global configuration file"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: tools/gpgconf.c:70
+#: tools/gpgconf.c:72
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:92
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:97
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:168 tools/gpgconf.c:201
+#: tools/gpgconf.c:176 tools/gpgconf.c:209
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "uso: gpg [op��es] "
 
-#: tools/gpgconf.c:170
+#: tools/gpgconf.c:178
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:179
+#: tools/gpgconf.c:187
 #, fuzzy
 msgid "Component not found"
 msgstr "chave p�blica n�o encontrada"
 
-#: tools/gpgconf.c:203
+#: tools/gpgconf.c:211
 #, fuzzy
 msgid "No argument allowed"
 msgstr "escrevendo certificado privado para `%s'\n"
@@ -8225,9 +8295,6 @@ msgstr "algoritmo de prote
 #~ msgid "bad key"
 #~ msgstr "chave incorreta"
 
-#~ msgid "file read error"
-#~ msgstr "erro de leitura"
-
 #~ msgid "file write error"
 #~ msgstr "erro de escrita"
 
@@ -8291,9 +8358,6 @@ msgstr "algoritmo de prote
 #~ msgid "weak key"
 #~ msgstr "chave fraca"
 
-#~ msgid "invalid argument"
-#~ msgstr "argumento inv�lido"
-
 #~ msgid "bad URI"
 #~ msgstr "URI incorreto"
 
diff --git a/po/ro.po b/po/ro.po
index 3db0ab128..fca453f25 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc1\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-08-28 19:28+0200\n"
+"POT-Creation-Date: 2007-08-29 18:43+0200\n"
 "PO-Revision-Date: 2005-05-31 22:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -277,7 +277,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
 #: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:67 tools/symcryptrun.c:164
+#: tools/gpgconf.c:69 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "locvace"
 
@@ -366,7 +366,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
 #: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:89 tools/symcryptrun.c:204
+#: tools/gpgconf.c:91 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Raporta�i bug-uri la <gnupg-bugs@gnu.org>.\n"
@@ -682,42 +682,42 @@ msgstr "schimb
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:327 common/exechelp.c:415
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "eroare la crearea frazei-parol�: %s\n"
 
-#: common/exechelp.c:391 common/exechelp.c:448
+#: common/exechelp.c:435 common/exechelp.c:492
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "nu pot deschide fi�ierul: %s\n"
 
-#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
+#: common/exechelp.c:471 common/exechelp.c:599 common/exechelp.c:834
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: common/exechelp.c:596 common/exechelp.c:640
+#: common/exechelp.c:645 common/exechelp.c:698
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:604
+#: common/exechelp.c:653
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "eroare la ob�inerea informa�iei pentru cheia curent�: %s\n"
 
-#: common/exechelp.c:610 common/exechelp.c:651
+#: common/exechelp.c:659 common/exechelp.c:709
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: common/exechelp.c:646
+#: common/exechelp.c:704
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:657
+#: common/exechelp.c:717
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "eroare la citire `%s': %s\n"
@@ -1525,7 +1525,7 @@ msgstr "folosim subcheia %s 
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "cheia %s: cheie secret� f�r� cheie public� - s�rit�\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
 msgid ""
 "@Commands:\n"
 " "
@@ -1658,7 +1658,7 @@ msgid "run in server mode"
 msgstr ""
 
 #: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1688,11 +1688,11 @@ msgstr "|N|seteaz
 msgid "use canonical text mode"
 msgstr "folose�te modul text canonic"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
 msgid "use as output file"
 msgstr "folose�te ca fi�ier ie�ire"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
 msgid "do not make any changes"
 msgstr "nu face nici o schimbare"
 
@@ -6479,6 +6479,71 @@ msgstr "linia de intrare %u prea lung
 msgid "can't open fd %d: %s\n"
 msgstr "nu pot deschide `%s': %s\n"
 
+#: jnlib/argparse.c:176
+#, fuzzy
+msgid "argument not expected"
+msgstr "Nu sunt permise comenzi administrare\n"
+
+#: jnlib/argparse.c:178
+#, fuzzy
+msgid "read error"
+msgstr "eroare citire fi�ier"
+
+#: jnlib/argparse.c:180
+#, fuzzy
+msgid "keyword too long"
+msgstr "linie prea lung�"
+
+#: jnlib/argparse.c:182
+#, fuzzy
+msgid "missing argument"
+msgstr "argument invalid"
+
+#: jnlib/argparse.c:184
+#, fuzzy
+msgid "invalid command"
+msgstr "Comand� numai-administrare\n"
+
+#: jnlib/argparse.c:186
+#, fuzzy
+msgid "invalid alias definition"
+msgstr "op�iuni enumerare invalide\n"
+
+#: jnlib/argparse.c:188
+#, fuzzy
+msgid "invalid option"
+msgstr "op�iuni enumerare invalide\n"
+
+#: jnlib/argparse.c:196
+#, c-format
+msgid "missing argument for option \"%.50s\"\n"
+msgstr ""
+
+#: jnlib/argparse.c:198
+#, c-format
+msgid "option \"%.50s\" does not expect an argument\n"
+msgstr ""
+
+#: jnlib/argparse.c:201
+#, fuzzy, c-format
+msgid "invalid command \"%.50s\"\n"
+msgstr "Comand� invalid�  (�ncerca�i \"ajutor\")\n"
+
+#: jnlib/argparse.c:203
+#, c-format
+msgid "option \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:205
+#, c-format
+msgid "command \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:207
+#, fuzzy, c-format
+msgid "invalid option \"%.50s\"\n"
+msgstr "op�iuni enumerare invalide\n"
+
 #: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -7354,7 +7419,7 @@ msgstr "adaug
 msgid "add this secret keyring to the list"
 msgstr "adaug� acest inel de chei secret la list�"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NUME|folose�te NUME ca cheie secret� implicit�"
 
@@ -7586,7 +7651,7 @@ msgstr "                aka \"%s\""
 msgid "This is a qualified signature\n"
 msgstr "Aceasta va fi o auto-semn�tur�.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "termin�"
@@ -7666,173 +7731,177 @@ msgstr "eroare trimitere la `%s': %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
-#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
+#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
+#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
-#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
+#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
+#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
+#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
+#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:504
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:508
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500
+#: tools/gpgconf-comp.c:512
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:526
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:517
+#: tools/gpgconf-comp.c:529
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:521
+#: tools/gpgconf-comp.c:533
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:525
+#: tools/gpgconf-comp.c:537
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:541
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:545
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|folose�te modul fraz�-parol� N"
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:549
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "eroare la crearea frazei-parol�: %s\n"
 
-#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NUME|cifrare pentru NUME"
 
-#: tools/gpgconf-comp.c:659
+#: tools/gpgconf-comp.c:671
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:664
+#: tools/gpgconf-comp.c:676
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:709
+#: tools/gpgconf-comp.c:721
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NUME|folose�te algoritm cifrare NUME pentru fraza-parol�"
 
-#: tools/gpgconf-comp.c:732
+#: tools/gpgconf-comp.c:744
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:776
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:812
+#: tools/gpgconf-comp.c:824
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:822
+#: tools/gpgconf-comp.c:834
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:833
+#: tools/gpgconf-comp.c:845
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:838
+#: tools/gpgconf-comp.c:850
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:875
+#: tools/gpgconf-comp.c:887
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2706
+#: tools/gpgconf-comp.c:2955
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:56
+#: tools/gpgconf.c:57
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
+msgid "check all programs"
+msgstr ""
+
+#: tools/gpgconf.c:59
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:64
 #, fuzzy
 msgid "check global configuration file"
 msgstr "articol configurare necunoscut `%s'\n"
 
-#: tools/gpgconf.c:70
+#: tools/gpgconf.c:72
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:92
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:97
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:168 tools/gpgconf.c:201
+#: tools/gpgconf.c:176 tools/gpgconf.c:209
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "folosire: gpg [op�iuni] "
 
-#: tools/gpgconf.c:170
+#: tools/gpgconf.c:178
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:179
+#: tools/gpgconf.c:187
 #, fuzzy
 msgid "Component not found"
 msgstr "cheia public� nu a fost g�sit�"
 
-#: tools/gpgconf.c:203
+#: tools/gpgconf.c:211
 #, fuzzy
 msgid "No argument allowed"
 msgstr "Nu sunt permise comenzi administrare\n"
@@ -8229,9 +8298,6 @@ msgstr "algoritm rezumat %d nu este suportat\n"
 #~ msgid "bad key"
 #~ msgstr "cheie incorect�"
 
-#~ msgid "file read error"
-#~ msgstr "eroare citire fi�ier"
-
 #~ msgid "file write error"
 #~ msgstr "eroare scriere fi�ier"
 
@@ -8292,9 +8358,6 @@ msgstr "algoritm rezumat %d nu este suportat\n"
 #~ msgid "weak key"
 #~ msgstr "cheie slab�"
 
-#~ msgid "invalid argument"
-#~ msgstr "argument invalid"
-
 #~ msgid "bad URI"
 #~ msgstr "URI incorect"
 
diff --git a/po/ru.po b/po/ru.po
index b1edb77cf..471b867b8 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GnuPG 2.0.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-08-28 19:28+0200\n"
+"POT-Creation-Date: 2007-08-29 18:43+0200\n"
 "PO-Revision-Date: 2006-11-07 19:31+0300\n"
 "Last-Translator: Maxim Britov <maxim.britov@gmail.com>\n"
 "Language-Team: Russian <gnupg-ru@gnupg.org>\n"
@@ -260,7 +260,7 @@ msgstr "запуск в режиме демона (background)"
 
 #: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
 #: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:67 tools/symcryptrun.c:164
+#: tools/gpgconf.c:69 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "подробно"
 
@@ -344,7 +344,7 @@ msgstr "|FILE|сохранить состояние в файл"
 
 #: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
 #: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:89 tools/symcryptrun.c:204
+#: tools/gpgconf.c:91 tools/symcryptrun.c:204
 msgid "Please report bugs to <"
 msgstr "О найденных ошибках сообщайте <"
 
@@ -660,42 +660,42 @@ msgstr "сменить фразу-пароль"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:327 common/exechelp.c:415
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr ""
 
-#: common/exechelp.c:391 common/exechelp.c:448
+#: common/exechelp.c:435 common/exechelp.c:492
 #, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr ""
 
-#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
+#: common/exechelp.c:471 common/exechelp.c:599 common/exechelp.c:834
 #, c-format
 msgid "error forking process: %s\n"
 msgstr ""
 
-#: common/exechelp.c:596 common/exechelp.c:640
+#: common/exechelp.c:645 common/exechelp.c:698
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:604
+#: common/exechelp.c:653
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "ошибка получения кода возврата процесса %d: %s\n"
 
-#: common/exechelp.c:610 common/exechelp.c:651
+#: common/exechelp.c:659 common/exechelp.c:709
 #, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "ошибка чтения `%s': статус завершения %d\n"
 
-#: common/exechelp.c:646
+#: common/exechelp.c:704
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr "ошибка запуска `%s': позможно не установлен\n"
 
-#: common/exechelp.c:657
+#: common/exechelp.c:717
 #, c-format
 msgid "error running `%s': terminated\n"
 msgstr "ошибка чтения `%s': прервано\n"
@@ -1489,7 +1489,7 @@ msgstr "использую подклключ %s вместо главного 
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "ключ %s: секретный ключ без открытого ключа - пропущен\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
 msgid ""
 "@Commands:\n"
 " "
@@ -1622,7 +1622,7 @@ msgid "run in server mode"
 msgstr "запуск в режиме сервера"
 
 #: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1652,11 +1652,11 @@ msgstr "|N|установить уровень сжатия N (0 без сжат
 msgid "use canonical text mode"
 msgstr "использовать канонический текстовый режим"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
 msgid "use as output file"
 msgstr "вывод в указанный файл"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
 msgid "do not make any changes"
 msgstr "не делать никаких изменений"
 
@@ -6371,6 +6371,70 @@ msgstr "входная строка %u слишком длинная или пр
 msgid "can't open fd %d: %s\n"
 msgstr "не могу открыть `%s': %s\n"
 
+#: jnlib/argparse.c:176
+#, fuzzy
+msgid "argument not expected"
+msgstr "Команды администрирования не разрешены\n"
+
+#: jnlib/argparse.c:178
+#, fuzzy
+msgid "read error"
+msgstr "ошибка чтения в `%s': %s\n"
+
+#: jnlib/argparse.c:180
+#, fuzzy
+msgid "keyword too long"
+msgstr "строка слишком длинная"
+
+#: jnlib/argparse.c:182
+msgid "missing argument"
+msgstr ""
+
+#: jnlib/argparse.c:184
+#, fuzzy
+msgid "invalid command"
+msgstr "Команды администратора\n"
+
+#: jnlib/argparse.c:186
+#, fuzzy
+msgid "invalid alias definition"
+msgstr "недопустимый список параметров\n"
+
+#: jnlib/argparse.c:188
+#, fuzzy
+msgid "invalid option"
+msgstr "недопустимый список параметров\n"
+
+#: jnlib/argparse.c:196
+#, c-format
+msgid "missing argument for option \"%.50s\"\n"
+msgstr ""
+
+#: jnlib/argparse.c:198
+#, fuzzy, c-format
+msgid "option \"%.50s\" does not expect an argument\n"
+msgstr "параметр \"%s\" требует программы и опциональных аргументов\n"
+
+#: jnlib/argparse.c:201
+#, fuzzy, c-format
+msgid "invalid command \"%.50s\"\n"
+msgstr "Недопустимая команда  (список команд: \"help\")\n"
+
+#: jnlib/argparse.c:203
+#, fuzzy, c-format
+msgid "option \"%.50s\" is ambiguous\n"
+msgstr "параметр \"%s\" игнорирован по причине \"%s\"\n"
+
+#: jnlib/argparse.c:205
+#, c-format
+msgid "command \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:207
+#, fuzzy, c-format
+msgid "invalid option \"%.50s\"\n"
+msgstr "недопустимый список параметров\n"
+
 #: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -7220,7 +7284,7 @@ msgstr "добавить данную таблицу ключей в списо
 msgid "add this secret keyring to the list"
 msgstr "добавить данную таблицу секретных ключей в список"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|использовать NAME как секретный ключ по умолчанию"
 
@@ -7447,7 +7511,7 @@ msgstr "                aka"
 msgid "This is a qualified signature\n"
 msgstr "Это будет самоподпись.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
 msgid "quiet"
 msgstr ""
 
@@ -7526,153 +7590,157 @@ msgstr "ошибка отправки %s команды: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "ошибка отправки стандартных параметров: %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
-#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
 msgid "Options controlling the diagnostic output"
 msgstr "Параметры контролирующие вывод диагностики"
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
+#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
+#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
 msgid "Options controlling the configuration"
 msgstr "Параметры контролирующие конфигурацию"
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
-#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
+#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
 msgid "Options useful for debugging"
 msgstr "Параметры полезные для отладки"
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
+#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
+#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|сохранять журнал режима сервера в FILE"
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
+#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
 msgid "Options controlling the security"
 msgstr "Параметры контролирующие безопасность"
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:504
 #, fuzzy
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|кеш PIN просрочен после N секунд"
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:508
 #, fuzzy
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|кеш PIN просрочен после N секунд"
 
-#: tools/gpgconf-comp.c:500
+#: tools/gpgconf-comp.c:512
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:526
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:517
+#: tools/gpgconf-comp.c:529
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:521
+#: tools/gpgconf-comp.c:533
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:525
+#: tools/gpgconf-comp.c:537
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:541
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:545
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|кеш PIN просрочен после N секунд"
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:549
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "разрешить предустановленную фразу-пароль"
 
-#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAME|зашифровать для получателя NAME"
 
-#: tools/gpgconf-comp.c:659
+#: tools/gpgconf-comp.c:671
 msgid "Configuration for Keyservers"
 msgstr "Конфигурация серверов ключей"
 
-#: tools/gpgconf-comp.c:664
+#: tools/gpgconf-comp.c:676
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:709
+#: tools/gpgconf-comp.c:721
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:732
+#: tools/gpgconf-comp.c:744
 msgid "do not check CRLs for root certificates"
 msgstr "не проверять CRLd для корневых сертификатов"
 
-#: tools/gpgconf-comp.c:776
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the format of the output"
 msgstr "Параметры контрролирующие формат вывода"
 
-#: tools/gpgconf-comp.c:812
+#: tools/gpgconf-comp.c:824
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:822
+#: tools/gpgconf-comp.c:834
 msgid "Configuration for HTTP servers"
 msgstr "Настройки HTTP серверов"
 
-#: tools/gpgconf-comp.c:833
+#: tools/gpgconf-comp.c:845
 msgid "use system's HTTP proxy setting"
 msgstr "использовать системные настройки HTTP проки"
 
-#: tools/gpgconf-comp.c:838
+#: tools/gpgconf-comp.c:850
 msgid "Configuration of LDAP servers to use"
 msgstr "Настройки LDAP серверов"
 
-#: tools/gpgconf-comp.c:875
+#: tools/gpgconf-comp.c:887
 msgid "Configuration for OCSP"
 msgstr "Настройки OCSP"
 
-#: tools/gpgconf-comp.c:2706
+#: tools/gpgconf-comp.c:2955
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:56
+#: tools/gpgconf.c:57
 msgid "list all components"
 msgstr "вывод списка всех компонентов"
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
+msgid "check all programs"
+msgstr ""
+
+#: tools/gpgconf.c:59
 msgid "|COMPONENT|list options"
 msgstr "|COMPONENT|вывод списка параметров"
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|change options"
 msgstr "|COMPONENT|изменить параметры"
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:64
 #, fuzzy
 msgid "check global configuration file"
 msgstr "неизвестный параметр в файле конфигурации `%s'\n"
 
-#: tools/gpgconf.c:70
+#: tools/gpgconf.c:72
 msgid "activate changes at runtime, if possible"
 msgstr "применить изменения во время исполнения, если возможно"
 
-#: tools/gpgconf.c:92
+#: tools/gpgconf.c:94
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Использование: gpgconf [параметры] (-h для подсказки)"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:97
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
@@ -7680,19 +7748,19 @@ msgstr ""
 "Синтаксис: gpgconf [параметры]\n"
 "Управляет параметрами конфигурации инструментария GnuPG\n"
 
-#: tools/gpgconf.c:168 tools/gpgconf.c:201
+#: tools/gpgconf.c:176 tools/gpgconf.c:209
 msgid "usage: gpgconf [options] "
 msgstr "использование: gpgconf [параметры] "
 
-#: tools/gpgconf.c:170
+#: tools/gpgconf.c:178
 msgid "Need one component argument"
 msgstr "Требуется однокомпонентный аргумент"
 
-#: tools/gpgconf.c:179
+#: tools/gpgconf.c:187
 msgid "Component not found"
 msgstr "Компонент не найден"
 
-#: tools/gpgconf.c:203
+#: tools/gpgconf.c:211
 #, fuzzy
 msgid "No argument allowed"
 msgstr "Команды администрирования не разрешены\n"
diff --git a/po/sk.po b/po/sk.po
index 6378cfe79..c27beb530 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-08-28 19:28+0200\n"
+"POT-Creation-Date: 2007-08-29 18:43+0200\n"
 "PO-Revision-Date: 2004-07-20 15:52+0200\n"
 "Last-Translator: Michal Majer <mmajer@econ.umb.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -270,7 +270,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
 #: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:67 tools/symcryptrun.c:164
+#: tools/gpgconf.c:69 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "s dodato�n�mi inform�ciami"
 
@@ -359,7 +359,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
 #: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:89 tools/symcryptrun.c:204
+#: tools/gpgconf.c:91 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr ""
@@ -674,42 +674,42 @@ msgstr "zmeni
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:327 common/exechelp.c:415
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: common/exechelp.c:391 common/exechelp.c:448
+#: common/exechelp.c:435 common/exechelp.c:492
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "nemo�no otvori� s�bor: %s\n"
 
-#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
+#: common/exechelp.c:471 common/exechelp.c:599 common/exechelp.c:834
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: common/exechelp.c:596 common/exechelp.c:640
+#: common/exechelp.c:645 common/exechelp.c:698
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:604
+#: common/exechelp.c:653
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
 
-#: common/exechelp.c:610 common/exechelp.c:651
+#: common/exechelp.c:659 common/exechelp.c:709
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: common/exechelp.c:646
+#: common/exechelp.c:704
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:657
+#: common/exechelp.c:717
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
@@ -1551,7 +1551,7 @@ msgstr "pou
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "k��� %08lX: tajn� k��� bez verejn�ho k���a - presko�en�\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
 msgid ""
 "@Commands:\n"
 " "
@@ -1685,7 +1685,7 @@ msgid "run in server mode"
 msgstr ""
 
 #: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1719,11 +1719,11 @@ msgstr ""
 msgid "use canonical text mode"
 msgstr "pou�i� k�nonick� textov� m�d"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
 msgid "use as output file"
 msgstr "pou�i� ako v�stupn� s�bor"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
 msgid "do not make any changes"
 msgstr "nevykona� �iadne zmeny"
 
@@ -6579,6 +6579,71 @@ msgstr "vstupn
 msgid "can't open fd %d: %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
 
+#: jnlib/argparse.c:176
+#, fuzzy
+msgid "argument not expected"
+msgstr "zapisujem tajn� k��� do `%s'\n"
+
+#: jnlib/argparse.c:178
+#, fuzzy
+msgid "read error"
+msgstr "chyba pri ��tan� s�boru"
+
+#: jnlib/argparse.c:180
+#, fuzzy
+msgid "keyword too long"
+msgstr "riadok je pr�li� dlh�\n"
+
+#: jnlib/argparse.c:182
+#, fuzzy
+msgid "missing argument"
+msgstr "neplatn� argument"
+
+#: jnlib/argparse.c:184
+#, fuzzy
+msgid "invalid command"
+msgstr "konfliktn� pr�kazy\n"
+
+#: jnlib/argparse.c:186
+#, fuzzy
+msgid "invalid alias definition"
+msgstr "neplatn� parameter pre import\n"
+
+#: jnlib/argparse.c:188
+#, fuzzy
+msgid "invalid option"
+msgstr "neplatn� parameter pre import\n"
+
+#: jnlib/argparse.c:196
+#, c-format
+msgid "missing argument for option \"%.50s\"\n"
+msgstr ""
+
+#: jnlib/argparse.c:198
+#, c-format
+msgid "option \"%.50s\" does not expect an argument\n"
+msgstr ""
+
+#: jnlib/argparse.c:201
+#, fuzzy, c-format
+msgid "invalid command \"%.50s\"\n"
+msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
+
+#: jnlib/argparse.c:203
+#, c-format
+msgid "option \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:205
+#, c-format
+msgid "command \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:207
+#, fuzzy, c-format
+msgid "invalid option \"%.50s\"\n"
+msgstr "neplatn� parameter pre import\n"
+
 #: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -7461,7 +7526,7 @@ msgstr ""
 msgid "add this secret keyring to the list"
 msgstr "prida� tento s�bor tajn�ch k���ov do zoznamu"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
 msgid "|NAME|use NAME as default secret key"
 msgstr "|MENO|pou�i MENO ako implicitn� tajn� k���"
 
@@ -7697,7 +7762,7 @@ msgstr ""
 "\n"
 "Ide o podpis k���a n�m sam�m\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "ukon�i�"
@@ -7777,173 +7842,177 @@ msgstr "chyba pri posielan
 msgid "error sending standard options: %s\n"
 msgstr "chyba pri posielan� na `%s': %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
-#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
+#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
+#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
-#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
+#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
+#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
+#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
+#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:504
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:508
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500
+#: tools/gpgconf-comp.c:512
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:526
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:517
+#: tools/gpgconf-comp.c:529
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:521
+#: tools/gpgconf-comp.c:533
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:525
+#: tools/gpgconf-comp.c:537
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:541
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:545
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|pou�i� m�d hesla N"
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:549
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|MENO|�ifrova� pre MENO"
 
-#: tools/gpgconf-comp.c:659
+#: tools/gpgconf-comp.c:671
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:664
+#: tools/gpgconf-comp.c:676
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:709
+#: tools/gpgconf-comp.c:721
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|ALG|pou�i� �ifrovac� algoritmus ALG pre hesl�"
 
-#: tools/gpgconf-comp.c:732
+#: tools/gpgconf-comp.c:744
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:776
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:812
+#: tools/gpgconf-comp.c:824
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:822
+#: tools/gpgconf-comp.c:834
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:833
+#: tools/gpgconf-comp.c:845
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:838
+#: tools/gpgconf-comp.c:850
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:875
+#: tools/gpgconf-comp.c:887
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2706
+#: tools/gpgconf-comp.c:2955
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:56
+#: tools/gpgconf.c:57
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
+msgid "check all programs"
+msgstr ""
+
+#: tools/gpgconf.c:59
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:64
 #, fuzzy
 msgid "check global configuration file"
 msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
 
-#: tools/gpgconf.c:70
+#: tools/gpgconf.c:72
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:92
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:97
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:168 tools/gpgconf.c:201
+#: tools/gpgconf.c:176 tools/gpgconf.c:209
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: tools/gpgconf.c:170
+#: tools/gpgconf.c:178
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:179
+#: tools/gpgconf.c:187
 #, fuzzy
 msgid "Component not found"
 msgstr "verejn� k��� nen�jden�"
 
-#: tools/gpgconf.c:203
+#: tools/gpgconf.c:211
 #, fuzzy
 msgid "No argument allowed"
 msgstr "zapisujem tajn� k��� do `%s'\n"
@@ -8310,9 +8379,6 @@ msgstr "ochrann
 #~ msgid "bad key"
 #~ msgstr "nespr�vny k���"
 
-#~ msgid "file read error"
-#~ msgstr "chyba pri ��tan� s�boru"
-
 #~ msgid "file write error"
 #~ msgstr "chyba pri z�pise s�boru"
 
@@ -8373,9 +8439,6 @@ msgstr "ochrann
 #~ msgid "weak key"
 #~ msgstr "slab� k���"
 
-#~ msgid "invalid argument"
-#~ msgstr "neplatn� argument"
-
 #~ msgid "bad URI"
 #~ msgstr "nespr�vne URI"
 
diff --git a/po/sv.po b/po/sv.po
index ec605c908..e9a7a2b9b 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-08-28 19:28+0200\n"
+"POT-Creation-Date: 2007-08-29 18:43+0200\n"
 "PO-Revision-Date: 2007-02-17 13:13+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -293,7 +293,7 @@ msgstr "kör i demonläge (bakgrund)"
 
 #: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
 #: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:67 tools/symcryptrun.c:164
+#: tools/gpgconf.c:69 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "utförlig"
 
@@ -378,7 +378,7 @@ msgstr "|FIL|skriv miljöinställningar även till FIL"
 
 #: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
 #: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:89 tools/symcryptrun.c:204
+#: tools/gpgconf.c:91 tools/symcryptrun.c:204
 msgid "Please report bugs to <"
 msgstr "Rapportera fel till <"
 
@@ -695,43 +695,43 @@ msgstr "ändra en lösenfras"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:327 common/exechelp.c:415
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "fel när ett rör skapades: %s\n"
 
 # se förra kommentaren
-#: common/exechelp.c:391 common/exechelp.c:448
+#: common/exechelp.c:435 common/exechelp.c:492
 #, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "kan inte fdopen rör för läsning: %s\n"
 
-#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
+#: common/exechelp.c:471 common/exechelp.c:599 common/exechelp.c:834
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "fel vid grening av process: %s\n"
 
-#: common/exechelp.c:596 common/exechelp.c:640
+#: common/exechelp.c:645 common/exechelp.c:698
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "misslyckades med att vänta på att processen %d skulle avslutas: %s\n"
 
-#: common/exechelp.c:604
+#: common/exechelp.c:653
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "fel vid hämtning av avslutskod för processen %d: %s\n"
 
-#: common/exechelp.c:610 common/exechelp.c:651
+#: common/exechelp.c:659 common/exechelp.c:709
 #, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "fel vid körning av \"%s\": avslutsstatus %d\n"
 
-#: common/exechelp.c:646
+#: common/exechelp.c:704
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr "fel vid körning av \"%s\": antagligen inte installerat\n"
 
-#: common/exechelp.c:657
+#: common/exechelp.c:717
 #, c-format
 msgid "error running `%s': terminated\n"
 msgstr "fel vid körning av \"%s\": avslutades\n"
@@ -1540,7 +1540,7 @@ msgstr "använder undernyckeln %s istället för primära nyckeln %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "nyckel %s: hemlig nyckel utan publik nyckel - hoppades över\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
 msgid ""
 "@Commands:\n"
 " "
@@ -1675,7 +1675,7 @@ msgstr "kör i serverläge"
 
 # Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil.
 #: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1705,11 +1705,11 @@ msgstr "|N|ställ in komprimeringsnivån till N (0 för att inaktivera)"
 msgid "use canonical text mode"
 msgstr "använd \"ursprunglig text\"-läget"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
 msgid "use as output file"
 msgstr "använd som fil för utdata"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
 msgid "do not make any changes"
 msgstr "gör inga ändringar"
 
@@ -6572,6 +6572,70 @@ msgstr "raden %u är för lång, eller saknar nyradstecken\n"
 msgid "can't open fd %d: %s\n"
 msgstr "kan inte öppna fd %d: %s\n"
 
+#: jnlib/argparse.c:176
+#, fuzzy
+msgid "argument not expected"
+msgstr "Administrationskommandon tillåts inte\n"
+
+#: jnlib/argparse.c:178
+#, fuzzy
+msgid "read error"
+msgstr "läsfel i \"%s\":  %s\n"
+
+#: jnlib/argparse.c:180
+#, fuzzy
+msgid "keyword too long"
+msgstr "raden är för lång"
+
+#: jnlib/argparse.c:182
+msgid "missing argument"
+msgstr ""
+
+#: jnlib/argparse.c:184
+#, fuzzy
+msgid "invalid command"
+msgstr "Kommandon endast för administratör\n"
+
+#: jnlib/argparse.c:186
+#, fuzzy
+msgid "invalid alias definition"
+msgstr "ogiltiga listflaggor\n"
+
+#: jnlib/argparse.c:188
+#, fuzzy
+msgid "invalid option"
+msgstr "ogiltiga listflaggor\n"
+
+#: jnlib/argparse.c:196
+#, c-format
+msgid "missing argument for option \"%.50s\"\n"
+msgstr ""
+
+#: jnlib/argparse.c:198
+#, fuzzy, c-format
+msgid "option \"%.50s\" does not expect an argument\n"
+msgstr "flaggan \"%s\" kräver ett program och valfria argument\n"
+
+#: jnlib/argparse.c:201
+#, fuzzy, c-format
+msgid "invalid command \"%.50s\"\n"
+msgstr "Ogiltigt kommando (försök med \"help\")\n"
+
+#: jnlib/argparse.c:203
+#, fuzzy, c-format
+msgid "option \"%.50s\" is ambiguous\n"
+msgstr "flaggan \"%s\" ignoreras på grund av \"%s\"\n"
+
+#: jnlib/argparse.c:205
+#, c-format
+msgid "command \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:207
+#, fuzzy, c-format
+msgid "invalid option \"%.50s\"\n"
+msgstr "ogiltiga listflaggor\n"
+
 #: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -7423,7 +7487,7 @@ msgstr "lägg till denna nyckelring till listan över nyckelringar"
 msgid "add this secret keyring to the list"
 msgstr "lägg till denna hemliga nyckelring till listan"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
 
@@ -7660,7 +7724,7 @@ msgstr "      även känd som"
 msgid "This is a qualified signature\n"
 msgstr "Detta kommer att bli en självsignatur.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
 msgid "quiet"
 msgstr "tyst"
 
@@ -7739,153 +7803,157 @@ msgstr "fel vid sändning av %s-kommando: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "fel vid sändning av standardflaggor: %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
-#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
 msgid "Options controlling the diagnostic output"
 msgstr "Flaggor som kontrollerar diagnosutdata"
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
+#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
+#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
 msgid "Options controlling the configuration"
 msgstr "Flaggor som kontrollerar konfigurationen"
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
-#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
+#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
 msgid "Options useful for debugging"
 msgstr "Flaggor användbara för felsökning"
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
+#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
+#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FIL|skriv serverlägesloggar till FIL"
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
+#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
 msgid "Options controlling the security"
 msgstr "Flaggor som kontrollerar säkerheten"
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:504
 #, fuzzy
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|låt mellanlagrad PIN-koder gå ut efter N sekunder"
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:508
 #, fuzzy
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|låt mellanlagrad PIN-koder gå ut efter N sekunder"
 
-#: tools/gpgconf-comp.c:500
+#: tools/gpgconf-comp.c:512
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:526
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:517
+#: tools/gpgconf-comp.c:529
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:521
+#: tools/gpgconf-comp.c:533
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:525
+#: tools/gpgconf-comp.c:537
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:541
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:545
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|låt mellanlagrad PIN-koder gå ut efter N sekunder"
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:549
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "tillåt förinställning av lösenfras"
 
-#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAMN|kryptera för NAMN"
 
-#: tools/gpgconf-comp.c:659
+#: tools/gpgconf-comp.c:671
 msgid "Configuration for Keyservers"
 msgstr "Konfiguration för nyckelservrar"
 
-#: tools/gpgconf-comp.c:664
+#: tools/gpgconf-comp.c:676
 msgid "allow PKA lookups (DNS requests)"
 msgstr "tillåt PKA-uppslag (DNS-förfrågningar)"
 
-#: tools/gpgconf-comp.c:709
+#: tools/gpgconf-comp.c:721
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:732
+#: tools/gpgconf-comp.c:744
 msgid "do not check CRLs for root certificates"
 msgstr "kontrollera inte spärrlistor för rotcertifikat"
 
-#: tools/gpgconf-comp.c:776
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the format of the output"
 msgstr "Flaggor som kontrollerar formatet på utdata"
 
-#: tools/gpgconf-comp.c:812
+#: tools/gpgconf-comp.c:824
 msgid "Options controlling the interactivity and enforcement"
 msgstr "Flaggor som kontrollerar interaktivitet och framtvingande"
 
-#: tools/gpgconf-comp.c:822
+#: tools/gpgconf-comp.c:834
 msgid "Configuration for HTTP servers"
 msgstr "Konfiguration för HTTP-servrar"
 
-#: tools/gpgconf-comp.c:833
+#: tools/gpgconf-comp.c:845
 msgid "use system's HTTP proxy setting"
 msgstr "använd systemets HTTP-proxyinställningar"
 
-#: tools/gpgconf-comp.c:838
+#: tools/gpgconf-comp.c:850
 msgid "Configuration of LDAP servers to use"
 msgstr "Konfiguration av LDAP-servrar som ska användas"
 
-#: tools/gpgconf-comp.c:875
+#: tools/gpgconf-comp.c:887
 msgid "Configuration for OCSP"
 msgstr "Konfiguration för OCSP"
 
-#: tools/gpgconf-comp.c:2706
+#: tools/gpgconf-comp.c:2955
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:56
+#: tools/gpgconf.c:57
 msgid "list all components"
 msgstr "lista alla komponenter"
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
+msgid "check all programs"
+msgstr ""
+
+#: tools/gpgconf.c:59
 msgid "|COMPONENT|list options"
 msgstr "|KOMPONENT|lista flaggor"
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|change options"
 msgstr "|KOMPONENT|ändra flaggor"
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:64
 #, fuzzy
 msgid "check global configuration file"
 msgstr "okänd konfigurationspost \"%s\"\n"
 
-#: tools/gpgconf.c:70
+#: tools/gpgconf.c:72
 msgid "activate changes at runtime, if possible"
 msgstr "aktivera ändringar vid körtid, om möjligt"
 
-#: tools/gpgconf.c:92
+#: tools/gpgconf.c:94
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Användning: gpgconf [flaggor] (-h för hjälp)"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:97
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
@@ -7893,19 +7961,19 @@ msgstr ""
 "Syntax: gpgconf [flaggor]\n"
 "Hantera konfigurationsinställningar för verktygen i GnuPG-systemet\n"
 
-#: tools/gpgconf.c:168 tools/gpgconf.c:201
+#: tools/gpgconf.c:176 tools/gpgconf.c:209
 msgid "usage: gpgconf [options] "
 msgstr "användning: gpgconf [flaggor] "
 
-#: tools/gpgconf.c:170
+#: tools/gpgconf.c:178
 msgid "Need one component argument"
 msgstr "Behöver ett komponentargument"
 
-#: tools/gpgconf.c:179
+#: tools/gpgconf.c:187
 msgid "Component not found"
 msgstr "Komponenten hittades inte"
 
-#: tools/gpgconf.c:203
+#: tools/gpgconf.c:211
 #, fuzzy
 msgid "No argument allowed"
 msgstr "Administrationskommandon tillåts inte\n"
diff --git a/po/tr.po b/po/tr.po
index efe65c33a..888492848 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.9.94\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-08-28 19:28+0200\n"
+"POT-Creation-Date: 2007-08-29 18:43+0200\n"
 "PO-Revision-Date: 2006-11-04 03:45+0200\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@belgeler.gen.tr>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -263,7 +263,7 @@ msgstr "artalan süreci olarak çalışır"
 
 #: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
 #: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:67 tools/symcryptrun.c:164
+#: tools/gpgconf.c:69 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "ayrıntılı"
 
@@ -347,7 +347,7 @@ msgstr "|DOSYA|ortam ayarlarını ayrıca DOSYAya da yazar"
 
 #: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
 #: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:89 tools/symcryptrun.c:204
+#: tools/gpgconf.c:91 tools/symcryptrun.c:204
 msgid "Please report bugs to <"
 msgstr "Yazılım hatalarını lütfen <"
 
@@ -665,42 +665,42 @@ msgstr "anahtar parolası değiştirir"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:327 common/exechelp.c:415
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "boru oluşturulurken hata: %s\n"
 
-#: common/exechelp.c:391 common/exechelp.c:448
+#: common/exechelp.c:435 common/exechelp.c:492
 #, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "okumak için boruya fdopen yapılamadı: %s\n"
 
-#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
+#: common/exechelp.c:471 common/exechelp.c:599 common/exechelp.c:834
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "süreç çatallanırken hata: %s\n"
 
-#: common/exechelp.c:596 common/exechelp.c:640
+#: common/exechelp.c:645 common/exechelp.c:698
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "süreç %d sonlanacak diye beklerken başarısızlık: %s\n"
 
-#: common/exechelp.c:604
+#: common/exechelp.c:653
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "süreç %d çıkış kodu alınırken hata: %s\n"
 
-#: common/exechelp.c:610 common/exechelp.c:651
+#: common/exechelp.c:659 common/exechelp.c:709
 #, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "`%s' çalışırken hata: çıkış durumu: %d\n"
 
-#: common/exechelp.c:646
+#: common/exechelp.c:704
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr "`%s' çalıştırılırken hata: muhtemelen kurulu değil\n"
 
-#: common/exechelp.c:657
+#: common/exechelp.c:717
 #, c-format
 msgid "error running `%s': terminated\n"
 msgstr "`%s' çalışırken hata: sonlandırıldı\n"
@@ -1499,7 +1499,7 @@ msgstr "yardımcı anahtar %s, asıl anahtar %s yerine kullanılıyor\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "anahtar %s: genel anahtarsız gizli anahtar - atlandı\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
 msgid ""
 "@Commands:\n"
 " "
@@ -1632,7 +1632,7 @@ msgid "run in server mode"
 msgstr "sunucu kipinde çalışır"
 
 #: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1662,11 +1662,11 @@ msgstr "|N|sıkıştırma seviyesi N olarak ayarlanır (0 ise sıkıştırma yap
 msgid "use canonical text mode"
 msgstr "kurallı metin kipini kullanır"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
 msgid "use as output file"
 msgstr "çıktı dosyası olarak kullanılır"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
 msgid "do not make any changes"
 msgstr "hiçbir değişiklik yapmaz"
 
@@ -6452,6 +6452,70 @@ msgstr "girdi satırı %u ya çok uzun ya da sonunda satırsonu karakteri yok\n"
 msgid "can't open fd %d: %s\n"
 msgstr "`%s' açılamıyor: %s\n"
 
+#: jnlib/argparse.c:176
+#, fuzzy
+msgid "argument not expected"
+msgstr "Yönetici komutlarına izin verilmez\n"
+
+#: jnlib/argparse.c:178
+#, fuzzy
+msgid "read error"
+msgstr "`%s' için okuma hatası: %s\n"
+
+#: jnlib/argparse.c:180
+#, fuzzy
+msgid "keyword too long"
+msgstr "satır çok uzun"
+
+#: jnlib/argparse.c:182
+msgid "missing argument"
+msgstr ""
+
+#: jnlib/argparse.c:184
+#, fuzzy
+msgid "invalid command"
+msgstr "Yöneticiye özel komut\n"
+
+#: jnlib/argparse.c:186
+#, fuzzy
+msgid "invalid alias definition"
+msgstr "liste seçenekleri geçersiz\n"
+
+#: jnlib/argparse.c:188
+#, fuzzy
+msgid "invalid option"
+msgstr "liste seçenekleri geçersiz\n"
+
+#: jnlib/argparse.c:196
+#, c-format
+msgid "missing argument for option \"%.50s\"\n"
+msgstr ""
+
+#: jnlib/argparse.c:198
+#, fuzzy, c-format
+msgid "option \"%.50s\" does not expect an argument\n"
+msgstr "\"%s\" seçeneği bir program ve seçimlik argümanlar gerektirir\n"
+
+#: jnlib/argparse.c:201
+#, fuzzy, c-format
+msgid "invalid command \"%.50s\"\n"
+msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
+
+#: jnlib/argparse.c:203
+#, fuzzy, c-format
+msgid "option \"%.50s\" is ambiguous\n"
+msgstr "\"%2$s\" nedeniyle \"%1$s\" seçeneği yoksayıldı\n"
+
+#: jnlib/argparse.c:205
+#, c-format
+msgid "command \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:207
+#, fuzzy, c-format
+msgid "invalid option \"%.50s\"\n"
+msgstr "liste seçenekleri geçersiz\n"
+
 #: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -7302,7 +7366,7 @@ msgstr "bu anahtarlığı anahtarlık listesine ekler"
 msgid "add this secret keyring to the list"
 msgstr "bu gizli anahtarlığı listeye ekler"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
 msgid "|NAME|use NAME as default secret key"
 msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
 
@@ -7535,7 +7599,7 @@ msgstr "        nam-ı diğer"
 msgid "This is a qualified signature\n"
 msgstr "Bu bir öz-imza olacak.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
 msgid "quiet"
 msgstr "sessiz"
 
@@ -7614,153 +7678,157 @@ msgstr "%s komutu gönderilirken hata: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "standart seçenekler gönderilirken hata: %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
-#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
 msgid "Options controlling the diagnostic output"
 msgstr "Tanı çıktısını denetleyen seçenekler"
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
+#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
+#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
 msgid "Options controlling the configuration"
 msgstr "Yapılandırmayı denetleyen seçenekler"
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
-#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
+#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
 msgid "Options useful for debugging"
 msgstr "Hata ayıklamaya elverişli seçenekler"
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
+#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
+#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|DOSYA|sunucu kipi günlükleri DOSYAya yazar"
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
+#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
 msgid "Options controlling the security"
 msgstr "Güvenliği denetleyen seçenekler"
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:504
 #, fuzzy
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:508
 #, fuzzy
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
 
-#: tools/gpgconf-comp.c:500
+#: tools/gpgconf-comp.c:512
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:526
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:517
+#: tools/gpgconf-comp.c:529
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:521
+#: tools/gpgconf-comp.c:533
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:525
+#: tools/gpgconf-comp.c:537
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:541
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:545
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:549
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "anahtar parolasının önceden atanmasına izin verilir"
 
-#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|İSİM|İSİM için şifreleme yapar"
 
-#: tools/gpgconf-comp.c:659
+#: tools/gpgconf-comp.c:671
 msgid "Configuration for Keyservers"
 msgstr "Anahtar sunucular için yapılandırma"
 
-#: tools/gpgconf-comp.c:664
+#: tools/gpgconf-comp.c:676
 msgid "allow PKA lookups (DNS requests)"
 msgstr "PKA aramalarına izin verilir (DNS istekleri)"
 
-#: tools/gpgconf-comp.c:709
+#: tools/gpgconf-comp.c:721
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:732
+#: tools/gpgconf-comp.c:744
 msgid "do not check CRLs for root certificates"
 msgstr "kök sertifikalar için CRLler sınanmaz"
 
-#: tools/gpgconf-comp.c:776
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the format of the output"
 msgstr "Çıktı biçimini denetleyen seçenekler"
 
-#: tools/gpgconf-comp.c:812
+#: tools/gpgconf-comp.c:824
 msgid "Options controlling the interactivity and enforcement"
 msgstr "Etkileşimliliği ve zorlamayı denetleyen seçenekler"
 
-#: tools/gpgconf-comp.c:822
+#: tools/gpgconf-comp.c:834
 msgid "Configuration for HTTP servers"
 msgstr "HTTP sunucuları için yapılandırma"
 
-#: tools/gpgconf-comp.c:833
+#: tools/gpgconf-comp.c:845
 msgid "use system's HTTP proxy setting"
 msgstr "sistemin HTTP vekil ayarları kullanılır"
 
-#: tools/gpgconf-comp.c:838
+#: tools/gpgconf-comp.c:850
 msgid "Configuration of LDAP servers to use"
 msgstr "Kullanılacak LDAP sunucularının yapılandırması"
 
-#: tools/gpgconf-comp.c:875
+#: tools/gpgconf-comp.c:887
 msgid "Configuration for OCSP"
 msgstr "OCSP için yapılandırma"
 
-#: tools/gpgconf-comp.c:2706
+#: tools/gpgconf-comp.c:2955
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:56
+#: tools/gpgconf.c:57
 msgid "list all components"
 msgstr "tüm bileşenleri listeler"
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
+msgid "check all programs"
+msgstr ""
+
+#: tools/gpgconf.c:59
 msgid "|COMPONENT|list options"
 msgstr "|BİLEŞEN|seçenekleri listeler"
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|change options"
 msgstr "|BİLEŞEN|seçenekleri değiştirir"
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:64
 #, fuzzy
 msgid "check global configuration file"
 msgstr "yapılandırma öğesi '%s' bilinmiyor\n"
 
-#: tools/gpgconf.c:70
+#: tools/gpgconf.c:72
 msgid "activate changes at runtime, if possible"
 msgstr "mümkünse değişiklikleri çalışma sırasında etkin kılar"
 
-#: tools/gpgconf.c:92
+#: tools/gpgconf.c:94
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Kullanımı: gpgconf [seçenekler] (yardım için -h)"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:97
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
@@ -7768,19 +7836,19 @@ msgstr ""
 "Sözdizimi: gpgconf [seçenekler]\n"
 "GnuPG sisteminin araçları için yapılandırma seçeneklerini yönetir\n"
 
-#: tools/gpgconf.c:168 tools/gpgconf.c:201
+#: tools/gpgconf.c:176 tools/gpgconf.c:209
 msgid "usage: gpgconf [options] "
 msgstr "kullanımı: gpgconf [seçenekler] "
 
-#: tools/gpgconf.c:170
+#: tools/gpgconf.c:178
 msgid "Need one component argument"
 msgstr "Tek bileşen argümanı gerekiyor"
 
-#: tools/gpgconf.c:179
+#: tools/gpgconf.c:187
 msgid "Component not found"
 msgstr "Bileşen yok"
 
-#: tools/gpgconf.c:203
+#: tools/gpgconf.c:211
 #, fuzzy
 msgid "No argument allowed"
 msgstr "Yönetici komutlarına izin verilmez\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 277dcae58..3ddfeae25 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.4\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-08-28 19:28+0200\n"
+"POT-Creation-Date: 2007-08-29 18:43+0200\n"
 "PO-Revision-Date: 2006-07-02 10:58+0800\n"
 "Last-Translator: Meng Jie <zuxyhere@eastday.com>\n"
 "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
@@ -276,7 +276,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
 #: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:67 tools/symcryptrun.c:164
+#: tools/gpgconf.c:69 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "详细模式"
 
@@ -365,7 +365,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
 #: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:89 tools/symcryptrun.c:204
+#: tools/gpgconf.c:91 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr ""
@@ -680,42 +680,42 @@ msgstr "更改密码"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:327 common/exechelp.c:415
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: common/exechelp.c:391 common/exechelp.c:448
+#: common/exechelp.c:435 common/exechelp.c:492
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "无法打开有签名的数据‘%s’\n"
 
-#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
+#: common/exechelp.c:471 common/exechelp.c:599 common/exechelp.c:834
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: common/exechelp.c:596 common/exechelp.c:640
+#: common/exechelp.c:645 common/exechelp.c:698
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:604
+#: common/exechelp.c:653
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "取得当前密钥信息时出错：%s\n"
 
-#: common/exechelp.c:610 common/exechelp.c:651
+#: common/exechelp.c:659 common/exechelp.c:709
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: common/exechelp.c:646
+#: common/exechelp.c:704
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:657
+#: common/exechelp.c:717
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "读取‘%s’时出错：%s\n"
@@ -1502,7 +1502,7 @@ msgstr "使用子钥 %s 而非主钥 %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "密钥 %s：无相应公钥的私钥――已跳过\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
 msgid ""
 "@Commands:\n"
 " "
@@ -1635,7 +1635,7 @@ msgid "run in server mode"
 msgstr ""
 
 #: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1665,11 +1665,11 @@ msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
 msgid "use canonical text mode"
 msgstr "使用标准的文本模式"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
 msgid "use as output file"
 msgstr "指定输出文件"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
 msgid "do not make any changes"
 msgstr "不做任何改变"
 
@@ -6284,6 +6284,71 @@ msgstr "输入行 %u 太长或者行末的换行符 LF 遗失\n"
 msgid "can't open fd %d: %s\n"
 msgstr "无法打开‘%s’： %s\n"
 
+#: jnlib/argparse.c:176
+#, fuzzy
+msgid "argument not expected"
+msgstr "不允许使用管理员命令\n"
+
+#: jnlib/argparse.c:178
+#, fuzzy
+msgid "read error"
+msgstr "文件读取错误"
+
+#: jnlib/argparse.c:180
+#, fuzzy
+msgid "keyword too long"
+msgstr "列太长"
+
+#: jnlib/argparse.c:182
+#, fuzzy
+msgid "missing argument"
+msgstr "无效的参数"
+
+#: jnlib/argparse.c:184
+#, fuzzy
+msgid "invalid command"
+msgstr "仅供管理员使用的命令\n"
+
+#: jnlib/argparse.c:186
+#, fuzzy
+msgid "invalid alias definition"
+msgstr "无效的列表选项\n"
+
+#: jnlib/argparse.c:188
+#, fuzzy
+msgid "invalid option"
+msgstr "无效的列表选项\n"
+
+#: jnlib/argparse.c:196
+#, c-format
+msgid "missing argument for option \"%.50s\"\n"
+msgstr ""
+
+#: jnlib/argparse.c:198
+#, c-format
+msgid "option \"%.50s\" does not expect an argument\n"
+msgstr ""
+
+#: jnlib/argparse.c:201
+#, fuzzy, c-format
+msgid "invalid command \"%.50s\"\n"
+msgstr "无效的指令(尝试“help”)\n"
+
+#: jnlib/argparse.c:203
+#, c-format
+msgid "option \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:205
+#, c-format
+msgid "command \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:207
+#, fuzzy, c-format
+msgid "invalid option \"%.50s\"\n"
+msgstr "无效的列表选项\n"
+
 #: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -7159,7 +7224,7 @@ msgstr "从这个钥匙环里取用密钥"
 msgid "add this secret keyring to the list"
 msgstr "要有私钥才能这么做。\n"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
@@ -7395,7 +7460,7 @@ msgstr "              亦即“%s”"
 msgid "This is a qualified signature\n"
 msgstr "这将是一个自身签名。\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "quit"
@@ -7475,172 +7540,176 @@ msgstr "读取‘%s’时出错：%s\n"
 msgid "error sending standard options: %s\n"
 msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
-#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
+#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
+#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
-#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
+#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
+#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
+#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
+#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:504
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:508
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500
+#: tools/gpgconf-comp.c:512
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:526
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:517
+#: tools/gpgconf-comp.c:529
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:521
+#: tools/gpgconf-comp.c:533
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:525
+#: tools/gpgconf-comp.c:537
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:541
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:545
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "从导出的子钥中删除所有密码"
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:549
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|某甲|为收件者“某甲”加密"
 
-#: tools/gpgconf-comp.c:659
+#: tools/gpgconf-comp.c:671
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:664
+#: tools/gpgconf-comp.c:676
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:709
+#: tools/gpgconf-comp.c:721
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:732
+#: tools/gpgconf-comp.c:744
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:776
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:812
+#: tools/gpgconf-comp.c:824
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:822
+#: tools/gpgconf-comp.c:834
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:833
+#: tools/gpgconf-comp.c:845
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:838
+#: tools/gpgconf-comp.c:850
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:875
+#: tools/gpgconf-comp.c:887
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2706
+#: tools/gpgconf-comp.c:2955
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:56
+#: tools/gpgconf.c:57
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
+msgid "check all programs"
+msgstr ""
+
+#: tools/gpgconf.c:59
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:64
 #, fuzzy
 msgid "check global configuration file"
 msgstr "未知的配置项‘%s’\n"
 
-#: tools/gpgconf.c:70
+#: tools/gpgconf.c:72
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:92
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:97
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:168 tools/gpgconf.c:201
+#: tools/gpgconf.c:176 tools/gpgconf.c:209
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "用法：gpg [选项] "
 
-#: tools/gpgconf.c:170
+#: tools/gpgconf.c:178
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:179
+#: tools/gpgconf.c:187
 #, fuzzy
 msgid "Component not found"
 msgstr "找不到公钥"
 
-#: tools/gpgconf.c:203
+#: tools/gpgconf.c:211
 #, fuzzy
 msgid "No argument allowed"
 msgstr "不允许使用管理员命令\n"
@@ -8020,9 +8089,6 @@ msgstr "不支持保护散列 %d\n"
 #~ msgid "bad key"
 #~ msgstr "密钥已损坏"
 
-#~ msgid "file read error"
-#~ msgstr "文件读取错误"
-
 #~ msgid "file write error"
 #~ msgstr "文件写入错误"
 
@@ -8080,9 +8146,6 @@ msgstr "不支持保护散列 %d\n"
 #~ msgid "weak key"
 #~ msgstr "弱密钥"
 
-#~ msgid "invalid argument"
-#~ msgstr "无效的参数"
-
 #~ msgid "bad URI"
 #~ msgstr "URI 已损坏"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index cc14bba4b..62b5f2473 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-08-28 19:28+0200\n"
+"POT-Creation-Date: 2007-08-29 18:43+0200\n"
 "PO-Revision-Date: 2005-07-29 09:49+0800\n"
 "Last-Translator: Jedi <Jedi@Jedi.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -274,7 +274,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
 #: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:67 tools/symcryptrun.c:164
+#: tools/gpgconf.c:69 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "囉唆模式"
 
@@ -363,7 +363,7 @@ msgstr ""
 
 #: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
 #: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:89 tools/symcryptrun.c:204
+#: tools/gpgconf.c:91 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "請向 <gnupg-bugs@gnu.org> 回報程式瑕疵.\n"
@@ -676,42 +676,42 @@ msgstr "更改密語"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:327 common/exechelp.c:415
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "建立密語的時候發生錯誤: %s\n"
 
-#: common/exechelp.c:391 common/exechelp.c:448
+#: common/exechelp.c:435 common/exechelp.c:492
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "無法開啟被簽署過的資料 `%s'\n"
 
-#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
+#: common/exechelp.c:471 common/exechelp.c:599 common/exechelp.c:834
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
 
-#: common/exechelp.c:596 common/exechelp.c:640
+#: common/exechelp.c:645 common/exechelp.c:698
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:604
+#: common/exechelp.c:653
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "取得現用金鑰資訊時發生錯誤: %s\n"
 
-#: common/exechelp.c:610 common/exechelp.c:651
+#: common/exechelp.c:659 common/exechelp.c:709
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
 
-#: common/exechelp.c:646
+#: common/exechelp.c:704
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:657
+#: common/exechelp.c:717
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
@@ -1501,7 +1501,7 @@ msgstr "正在使用次鑰 %s 來替換主鑰 %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "金鑰 %s: 祇有私鑰而沒有公鑰 - 已跳過\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
 msgid ""
 "@Commands:\n"
 " "
@@ -1634,7 +1634,7 @@ msgid "run in server mode"
 msgstr ""
 
 #: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:64 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1664,11 +1664,11 @@ msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
 msgid "use canonical text mode"
 msgstr "使用標準的文字模式"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:66
+#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
 msgid "use as output file"
 msgstr "當作輸出檔案來使用"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
 msgid "do not make any changes"
 msgstr "不要做任何改變"
 
@@ -6326,6 +6326,71 @@ msgstr "輸入列 %u 太長或者列末的 LF 遺失了\n"
 msgid "can't open fd %d: %s\n"
 msgstr "無法開啟 `%s': %s\n"
 
+#: jnlib/argparse.c:176
+#, fuzzy
+msgid "argument not expected"
+msgstr "未允許使用管理者指令\n"
+
+#: jnlib/argparse.c:178
+#, fuzzy
+msgid "read error"
+msgstr "檔案讀取錯誤"
+
+#: jnlib/argparse.c:180
+#, fuzzy
+msgid "keyword too long"
+msgstr "列太長"
+
+#: jnlib/argparse.c:182
+#, fuzzy
+msgid "missing argument"
+msgstr "無效的參數"
+
+#: jnlib/argparse.c:184
+#, fuzzy
+msgid "invalid command"
+msgstr "限管理者使用的指令\n"
+
+#: jnlib/argparse.c:186
+#, fuzzy
+msgid "invalid alias definition"
+msgstr "無效的清單選項\n"
+
+#: jnlib/argparse.c:188
+#, fuzzy
+msgid "invalid option"
+msgstr "無效的清單選項\n"
+
+#: jnlib/argparse.c:196
+#, c-format
+msgid "missing argument for option \"%.50s\"\n"
+msgstr ""
+
+#: jnlib/argparse.c:198
+#, c-format
+msgid "option \"%.50s\" does not expect an argument\n"
+msgstr ""
+
+#: jnlib/argparse.c:201
+#, fuzzy, c-format
+msgid "invalid command \"%.50s\"\n"
+msgstr "無效的指令  (試試看 \"help\")\n"
+
+#: jnlib/argparse.c:203
+#, c-format
+msgid "option \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:205
+#, c-format
+msgid "command \"%.50s\" is ambiguous\n"
+msgstr ""
+
+#: jnlib/argparse.c:207
+#, fuzzy, c-format
+msgid "invalid option \"%.50s\"\n"
+msgstr "無效的清單選項\n"
+
 #: jnlib/logging.c:624
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -7199,7 +7264,7 @@ msgstr "從這個鑰匙圈裡取用金鑰"
 msgid "add this secret keyring to the list"
 msgstr "要有私鑰纔能這麼做.\n"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
@@ -7435,7 +7500,7 @@ msgstr "                亦即 \"%s\""
 msgid "This is a qualified signature\n"
 msgstr "這將會是一份自我簽章.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:68 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "quit"
@@ -7515,172 +7580,176 @@ msgstr "讀取 `%s' 時發生錯誤: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "在 `%s' 中尋找信任記錄時出錯: %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
-#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
+#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
+#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
+#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
-#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
+#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
+#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
+#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
+#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:504
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:508
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500
+#: tools/gpgconf-comp.c:512
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:526
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:517
+#: tools/gpgconf-comp.c:529
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:521
+#: tools/gpgconf-comp.c:533
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:525
+#: tools/gpgconf-comp.c:537
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:541
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:545
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "撤銷金鑰或所選的次鑰"
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:549
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "建立密語的時候發生錯誤: %s\n"
 
-#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|名字|以「名字」作為加密對象"
 
-#: tools/gpgconf-comp.c:659
+#: tools/gpgconf-comp.c:671
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:664
+#: tools/gpgconf-comp.c:676
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:709
+#: tools/gpgconf-comp.c:721
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:732
+#: tools/gpgconf-comp.c:744
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:776
+#: tools/gpgconf-comp.c:788
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:812
+#: tools/gpgconf-comp.c:824
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:822
+#: tools/gpgconf-comp.c:834
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:833
+#: tools/gpgconf-comp.c:845
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:838
+#: tools/gpgconf-comp.c:850
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:875
+#: tools/gpgconf-comp.c:887
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2706
+#: tools/gpgconf-comp.c:2955
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:56
+#: tools/gpgconf.c:57
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
+msgid "check all programs"
+msgstr ""
+
+#: tools/gpgconf.c:59
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:64
 #, fuzzy
 msgid "check global configuration file"
 msgstr "未知的組態項目 `%s'\n"
 
-#: tools/gpgconf.c:70
+#: tools/gpgconf.c:72
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:92
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:97
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:168 tools/gpgconf.c:201
+#: tools/gpgconf.c:176 tools/gpgconf.c:209
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "用法: gpg [選項] "
 
-#: tools/gpgconf.c:170
+#: tools/gpgconf.c:178
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:179
+#: tools/gpgconf.c:187
 #, fuzzy
 msgid "Component not found"
 msgstr "找不到公鑰"
 
-#: tools/gpgconf.c:203
+#: tools/gpgconf.c:211
 #, fuzzy
 msgid "No argument allowed"
 msgstr "未允許使用管理者指令\n"
@@ -8059,9 +8128,6 @@ msgstr "保護摘要 %d 未被支援\n"
 #~ msgid "bad key"
 #~ msgstr "損壞的金鑰"
 
-#~ msgid "file read error"
-#~ msgstr "檔案讀取錯誤"
-
 #~ msgid "file write error"
 #~ msgstr "檔案寫入錯誤"
 
@@ -8119,9 +8185,6 @@ msgstr "保護摘要 %d 未被支援\n"
 #~ msgid "weak key"
 #~ msgstr "金鑰薄弱"
 
-#~ msgid "invalid argument"
-#~ msgstr "無效的參數"
-
 #~ msgid "bad URI"
 #~ msgstr "損壞的 URI"
 
diff --git a/sm/import.c b/sm/import.c
index 069408f85..f76c54d1e 100644
--- a/sm/import.c
+++ b/sm/import.c
@@ -622,7 +622,7 @@ parse_p12 (ctrl_t ctrl, ksba_reader_t reader,
     }
 
 
-  /* If we found no error in the output of the cild, setup a suitable
+  /* If we found no error in the output of the child, setup a suitable
      error code, which will later be reset if the exit status of the
      child is 0. */
   if (!child_err)
diff --git a/tools/ChangeLog b/tools/ChangeLog
index 7e7784dd5..bc020286f 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,10 +1,11 @@
 2007-08-29  Werner Koch  <wk@g10code.com>
 
-	* gpgconf.c: New comamnd --check-programs.
+	* gpgconf.c: New command --check-programs.
 	* gpgconf-comp.c (gc_component_check_programs): New.
 	(gc_backend): Add member MODULE_NAME and add these module names.
 	(retrieve_options_from_program): Use module name so that we use an
 	absolute file name and don't rely on $PATH.
+	(collect_error_output): New.
 	* no-libgcrypt.c (gcry_control): New.
 
 2007-08-28  Werner Koch  <wk@g10code.com>
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 748db7edd..349bc29c1 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -31,6 +31,7 @@
 #include <time.h>
 #include <stdarg.h>
 #include <signal.h>
+#include <ctype.h>
 #ifdef HAVE_W32_SYSTEM
 # define WIN32_LEAN_AND_MEAN 1
 # include <windows.h>
@@ -953,6 +954,21 @@ static struct
     { "dirmngr", NULL, "Directory Manager", gc_options_dirmngr }
   };
 
+
+
+/* Structure used to collect error output of the backend programs.  */
+struct error_line_s;
+typedef struct error_line_s *error_line_t;
+struct error_line_s
+{
+  error_line_t next;   /* Link to next item.  */
+  const char *fname;   /* Name of the config file (points into BUFFER).  */
+  unsigned int lineno; /* Line number of the config file.  */
+  const char *errtext; /* Text of the error message (points into BUFFER).  */
+  char buffer[1];  /* Helper buffer.  */
+};
+
+
 
 /* Engine specific support.  */
 void
@@ -1142,10 +1158,112 @@ gc_component_list_components (FILE *out)
 
 
 
+static int
+all_digits_p (const char *p, size_t len)
+{
+  if (!len)
+    return 0; /* No. */
+  for (; len; len--, p++)
+    if (!isascii (*p) || !isdigit (*p))
+      return 0; /* No.  */
+  return 1; /* Yes.  */
+}
+
+
+/* Collect all error lines from file descriptor FD. Only lines
+   prefixed with TAG are considered.  Close that file descriptor
+   then.  Returns a list of error line items (which may be empty).
+   There is no error return.  */
+static error_line_t
+collect_error_output (int fd, const char *tag)
+{
+  FILE *fp;
+  char buffer[1024];
+  char *p, *p2, *p3;
+  int c, cont_line;
+  unsigned int pos;
+  error_line_t eitem, errlines, *errlines_tail;
+  size_t taglen = strlen (tag);
+
+  fp = fdopen (fd, "r");
+  if (!fp)
+    gc_error (1, errno, "can't fdopen pipe for reading");
+
+  errlines = NULL;
+  errlines_tail = &errlines;
+  pos = 0;
+  cont_line = 0;
+  while ((c=getc (fp)) != EOF)
+    {
+      buffer[pos++] = c;
+      if (pos >= sizeof buffer - 5 || c == '\n')
+        {
+          buffer[pos - (c == '\n')] = 0;
+          if (cont_line)
+            ; /*Ignore continuations of previous line. */
+          else if (!strncmp (buffer, tag, taglen) && buffer[taglen] == ':') 
+            {
+              /* "gpgsm: foo:4: bla" */
+              /* Yep, we are interested in this line.  */
+              p = buffer + taglen + 1;
+              while (*p == ' ' || *p == '\t')
+                p++;
+              if (!*p)
+                ; /* Empty lines are ignored.  */
+              else if ( (p2 = strchr (p, ':')) && (p3 = strchr (p2+1, ':'))
+                        && all_digits_p (p2+1, p3 - (p2+1)))
+                {
+                  /* Line in standard compiler format.  */
+                  p3++;
+                  while (*p3 == ' ' || *p3 == '\t')
+                    p3++;
+                  eitem = xmalloc (sizeof *eitem + strlen (p));
+                  eitem->next = NULL;
+                  strcpy (eitem->buffer, p);
+                  eitem->fname = eitem->buffer;
+                  eitem->buffer[p2-p] = 0;
+                  eitem->errtext = eitem->buffer + (p3 - p);
+                  /* (we already checked that there are only ascii
+                     digits followed by a colon) */
+                  eitem->lineno = 0;
+                  for (p2++; isdigit (*p2); p2++)
+                    eitem->lineno = eitem->lineno*10 + (*p2 - '0');
+                  *errlines_tail = eitem;
+                  errlines_tail = &eitem->next;
+                }
+              else
+                {
+                  /* Other error output.  */
+                  eitem = xmalloc (sizeof *eitem + strlen (p));
+                  eitem->next = NULL;
+                  strcpy (eitem->buffer, p);
+                  eitem->fname = NULL;
+                  eitem->errtext = eitem->buffer;
+                  eitem->lineno = 0;
+                  *errlines_tail = eitem;
+                  errlines_tail = &eitem->next;
+                }
+            }
+          pos = 0;
+          /* If this was not a complete line mark that we are in a
+             continuation.  */
+          cont_line = (c != '\n');
+        }
+    }
+  
+  /* We ignore error lines not terminated by a LF.  */
+
+  fclose (fp);
+  return errlines;
+}
+
+
+
 /* Check all components that are available.  */
 void
 gc_component_check_programs (FILE *out)
 {
+  gpg_error_t err;
   gc_component_t component;
   unsigned int result;
   int backend_seen[GC_BACKEND_NR];
@@ -1156,7 +1274,13 @@ gc_component_check_programs (FILE *out)
   const char *argv[2];
   pid_t pid;
   int exitcode;
+  int filedes[2];
+  error_line_t errlines, errptr;
 
+  /* We use a temporary file to collect the error output.  It would be
+     better to use a pipe here but as of now we have no suitable
+     fucntion to create a portable pipe outside of exechelp.  Thus it
+     is easier to use the tempfile approach.  */
   for (component = 0; component < GC_COMPONENT_NR; component++)
     {
       if (!gc_component[component].options)
@@ -1184,18 +1308,31 @@ gc_component_check_programs (FILE *out)
           argv[0] = "--gpgconf-test";
           argv[1] = NULL;
 
-          /* Note that under Windows the spawn fucntion returns an
-             error if the progrom could not be executed whereas under
-             Unix the wait function returns an error.  */
+          err = gnupg_create_inbound_pipe (filedes);
+          if (err)
+            gc_error (1, 0, _("error creating a pipe: %s\n"), 
+                      gpg_strerror (err));
+
           result = 0;
-          if (gnupg_spawn_process_fd (pgmname, argv, -1, -1, -1, &pid))
-            result |= 1; /* Program could not be run.  */
-          else if (gnupg_wait_process (pgmname, pid, &exitcode))
+          errlines = NULL;
+          if (gnupg_spawn_process_fd (pgmname, argv, -1, -1, filedes[1], &pid))
             {
-              if (exitcode == -1)
-                result |= 1; /* Program could not be run or it
-                                terminated abnormally.  */
-              result |= 2; /* Program returned an error.  */
+              close (filedes[0]);
+              close (filedes[1]);
+              result |= 1; /* Program could not be run.  */
+            }
+          else 
+            {
+              close (filedes[1]);
+              errlines = collect_error_output (filedes[0], 
+                                               gc_component[component].name);
+              if (gnupg_wait_process (pgmname, pid, &exitcode))
+                {
+                  if (exitcode == -1)
+                    result |= 1; /* Program could not be run or it
+                                    terminated abnormally.  */
+                  result |= 2; /* Program returned an error.  */
+                }
             }
           
           /* If the program could not be run, we can't tell whether
@@ -1208,7 +1345,28 @@ gc_component_check_programs (FILE *out)
           fprintf (out, "%s:%s:",
                    gc_component[component].name, my_percent_escape (desc));
           fputs (my_percent_escape (pgmname), out);
-          fprintf (out, ":%d:%d:\n", !(result & 1), !(result & 2));
+          fprintf (out, ":%d:%d:", !(result & 1), !(result & 2));
+          for (errptr = errlines; errptr; errptr = errptr->next)
+            {
+              if (errptr != errlines)
+                fputs ("\n:::::", out); /* Continuation line.  */
+              if (errptr->fname)
+                fputs (my_percent_escape (errptr->fname), out);
+              putc (':', out);
+              if (errptr->fname)
+                fprintf (out, "%u", errptr->lineno);
+              putc (':', out);
+              fputs (my_percent_escape (errptr->errtext), out);
+              putc (':', out);
+            }
+          putc ('\n', out);
+          
+          while (errlines)
+            {
+              error_line_t tmp = errlines->next;
+              xfree (errlines);
+              errlines = tmp;
+            }
           break; /* Loop over options of this component  */
         }
     }