diff --git a/ChangeLog b/ChangeLog index 364dbd6..b76ada9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2008-03-07 Sergey Poznyakoff <gray@gnu.org.ua> + * comsat/comsat.c, imap4d/imap4d.c, imap4d/preauth.c, + libargp/sieve.c, libcfg/ldap.c, libcfg/sieve.c: Fix translatable + strings. + +2008-03-07 Sergey Poznyakoff <gray@gnu.org.ua> + * configure.ac: Require gettext 0.17 * auth/ldap.c, auth/radius.c, libargp/tls.c, mailbox/cfg_lexer.c, pop3d/logindelay.c: Fix diagnostic messages. diff --git a/comsat/comsat.c b/comsat/comsat.c index 99b8372..cf19c77 100644 --- a/comsat/comsat.c +++ b/comsat/comsat.c @@ -126,8 +126,7 @@ struct mu_cfg_param comsat_cfg_param[] = { { "max-lines", mu_cfg_int, &maxlines, 0, NULL, N_("Maximum number of message body lines to be output.") }, { "max-requests", mu_cfg_uint, &maxrequests, 0, NULL, - N_("Maximum number of incoming requests per `request-control-interval' " - "seconds.") }, + N_("Maximum number of incoming requests per request control interval.") }, { "request-control-interval", mu_cfg_time, &request_control_interval, 0, NULL, N_("Set control interval.") }, diff --git a/imap4d/imap4d.c b/imap4d/imap4d.c index 521aba4..602a03e 100644 --- a/imap4d/imap4d.c +++ b/imap4d/imap4d.c @@ -308,7 +308,7 @@ static struct mu_cfg_param imap4d_cfg_param[] = { " prog:///<full-program-name: string>\n" " ident[://:<port: string-or-number>]\n" " stdio"), - N_("MODE") }, + N_("mode") }, { "preauth-only", mu_cfg_bool, &preauth_only, 0, NULL, N_("Use only preauth mode. If unable to setup it, disconnect " "immediately.") }, diff --git a/imap4d/preauth.c b/imap4d/preauth.c index 7dc4468..7ee250e 100644 --- a/imap4d/preauth.c +++ b/imap4d/preauth.c @@ -341,7 +341,7 @@ do_preauth_ident (struct sockaddr *clt_sa, struct sockaddr *srv_sa) if (srv_sa->sa_family != AF_INET) { mu_diag_output (MU_DIAG_ERROR, - _("Invalid socket family (%d) IDENT preauth"), + _("Invalid address family (%d) for IDENT preauth"), srv_sa->sa_family); return NULL; } @@ -394,7 +394,7 @@ do_preauth_ident (struct sockaddr *clt_sa, struct sockaddr *srv_sa) if (!ident_keyfile) { mu_diag_output (MU_DIAG_ERROR, - _("Keydile not specified in config; " + _("Keyfile not specified in config; " "use `ident-keyfile FILE'")); name = NULL; } diff --git a/libargp/sieve.c b/libargp/sieve.c index fa1b94e..365de14 100644 --- a/libargp/sieve.c +++ b/libargp/sieve.c @@ -36,7 +36,7 @@ static struct argp_option sieve_argp_option[] = { { "clear-include-path", OPT_CLEAR_INCLUDE_PATH, NULL, 0, N_("Clear Sieve include path"), 0 }, { "clear-library-path", OPT_CLEAR_LIBRARY_PATH, NULL, 0, - N_("Clear Sieve lobrary path"), 0 }, + N_("Clear Sieve library path"), 0 }, { "clearpath", 0, NULL, OPTION_ALIAS, NULL }, { NULL, 0, NULL, 0, NULL, 0 } }; diff --git a/libcfg/ldap.c b/libcfg/ldap.c index efc2f08..1fc0867 100644 --- a/libcfg/ldap.c +++ b/libcfg/ldap.c @@ -61,7 +61,7 @@ static struct mu_cfg_param mu_ldap_param[] = { " <name: string>=<attr: string>\n" "where <name> is one of the following: name, passwd, uid, gid, " "gecos, dir, shell, mailbox, quota, and <attr> is the name of " - "the correspondind LDAP attribute."), + "the corresponding LDAP attribute."), N_("map") }, { "getpwnam", mu_cfg_string, &ldap_settings.getpwnam_filter, 0, NULL, N_("LDAP filter to use for getpwnam requests."), diff --git a/libcfg/sieve.c b/libcfg/sieve.c index 7691c26..059bffc 100644 --- a/libcfg/sieve.c +++ b/libcfg/sieve.c @@ -98,11 +98,11 @@ static struct mu_cfg_param mu_sieve_param[] = { N_("Clear include search path.") }, { "library-path", mu_cfg_callback, NULL, 0, cb_library_path, N_("Add directories to the library search path. Argument is a " - "comma-separated list of directories."), + "colon-separated list of directories."), N_("list") }, { "include-path", mu_cfg_callback, NULL, 0, cb_include_path, N_("Add directories to the include search path. Argument is a " - "comma-separated list of directories."), + "colon-separated list of directories."), N_("list") }, { NULL } };