Commit 755f928e 755f928e2b8b1ee601482a2839de961de2049930 by Sergey Poznyakoff

Cleaned wording in diagnostics.

1 parent 9bc619bf
......@@ -72,7 +72,7 @@ imap4d_bye0 (int reason, struct imap4d_command *command)
default:
util_out (RESP_BYE, "Quitting (reason unknown)");
syslog (LOG_ERR, _("Unknown quit"));
syslog (LOG_ERR, _("Quitting (numeric reason %d)"));
break;
}
......
......@@ -481,7 +481,8 @@ parse_equiv_key (struct parsebuf *pb)
if (parse_search_key_list (pb))
{
/* shouldn't happen */
syslog(LOG_CRIT, _("%s:%d: INTERNAL ERROR"), __FILE__, __LINE__);
syslog(LOG_CRIT, _("%s:%d: INTERNAL ERROR (please report)"),
__FILE__, __LINE__);
abort ();
}
......@@ -568,7 +569,8 @@ parse_simple_key (struct parsebuf *pb)
put_code (pb, (inst_t) parse_regmem (pb, set));
break;
default:
syslog(LOG_CRIT, _("%s:%d: INTERNAL ERROR"), __FILE__, __LINE__);
syslog(LOG_CRIT, _("%s:%d: INTERNAL ERROR (please report)"),
__FILE__, __LINE__);
abort (); /* should never happen */
}
}
......@@ -635,7 +637,7 @@ _search_pop (struct parsebuf *pb)
{
if (pb->tos == 0)
{
syslog(LOG_CRIT, _("%s:%d: INTERNAL ERROR"), __FILE__, __LINE__);
syslog(LOG_CRIT, _("%s:%d: INTERNAL ERROR (please report)"), __FILE__, __LINE__);
abort (); /* shouldn't happen */
}
return pb->stack[--pb->tos];
......
......@@ -52,13 +52,13 @@ sieve_require (list_t slist)
{
name += 11;
reqfn = sieve_require_comparator;
text = "comparator";
text = _("required comparator");
}
else if (strncmp (name, "test-", 5) == 0) /* GNU extension */
{
name += 5;
reqfn = sieve_require_test;
text = "test";
text = _("required test");
}
else if (strcmp (name, "relational") == 0) /* RFC 3431 */
{
......@@ -68,13 +68,13 @@ sieve_require (list_t slist)
else
{
reqfn = sieve_require_action;
text = "action";
text = _("required action");
}
if (reqfn (sieve_machine, name))
{
sieve_compile_error (sieve_filename, sieve_line_num,
_("source for the required %s %s is not available"),
_("source for the %s %s is not available"),
text,
name);
}
......
......@@ -438,7 +438,7 @@ mu_common_argp_parser (int key, char *arg, struct argp_state *state)
p = mu_normalize_maildir (mu_path_maildir);
if (!p)
{
argp_error (state, _("badly formed maildir: %s"), mu_path_maildir);
argp_error (state, _("badly formed mailspool path: %s"), mu_path_maildir);
}
mu_path_maildir = p;
break;
......@@ -838,7 +838,7 @@ mu_build_argp (const struct argp *template, const char *capa[])
struct argp_child *child = find_argp_child (capa[n]);
if (!child)
{
mu_error (_("INTERNAL ERROR: requested unknown argp capability %s"),
mu_error (_("INTERNAL ERROR: requested unknown argp capability %s (please report)"),
capa[n]);
abort ();
}
......@@ -891,7 +891,7 @@ mu_auth_init ()
extern struct argp_child mu_auth_argp_child;
if (mu_register_capa ("auth", &mu_auth_argp_child))
{
mu_error (_("INTERNAL ERROR: cannot register argp capability auth"));
mu_error (_("INTERNAL ERROR: cannot register argp capability auth (please report)"));
abort ();
}
}
......
......@@ -95,7 +95,7 @@ pitem : item
break;
default:
yyerror (_("UNEXPECTED item TYPE"));
yyerror (_("INTERNAL ERROR: unexpected item type (please report)"));
abort ();
}
$$ = pc;
......@@ -620,7 +620,7 @@ mh_code_builtin (mh_builtin_t *bp, int argtype)
break;
default:
yyerror (_("UNKNOWN ARGTYPE"));
yyerror (_("INTERNAL ERROR: unknown argtype (please report)"));
abort ();
}
}
......
......@@ -419,7 +419,7 @@ mh_format (mh_format_t *fmt, message_t msg, size_t msgno,
break;
default:
mh_error (_("Unknown opcode: %x"), opcode);
mh_error (_("INTERNAL ERROR: Unknown opcode: %x"), opcode);
abort ();
}
}
......
......@@ -124,7 +124,7 @@ pop3d_abquit (int reason)
default:
pop3d_outf ("-ERR Quitting (reason unknown)\r\n");
syslog (LOG_ERR, _("Unknown quit"));
syslog (LOG_ERR, _("Quitting (numeric reason %d)"));
break;
}
......