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) ...@@ -72,7 +72,7 @@ imap4d_bye0 (int reason, struct imap4d_command *command)
72 72
73 default: 73 default:
74 util_out (RESP_BYE, "Quitting (reason unknown)"); 74 util_out (RESP_BYE, "Quitting (reason unknown)");
75 syslog (LOG_ERR, _("Unknown quit")); 75 syslog (LOG_ERR, _("Quitting (numeric reason %d)"));
76 break; 76 break;
77 } 77 }
78 78
......
...@@ -481,7 +481,8 @@ parse_equiv_key (struct parsebuf *pb) ...@@ -481,7 +481,8 @@ parse_equiv_key (struct parsebuf *pb)
481 if (parse_search_key_list (pb)) 481 if (parse_search_key_list (pb))
482 { 482 {
483 /* shouldn't happen */ 483 /* shouldn't happen */
484 syslog(LOG_CRIT, _("%s:%d: INTERNAL ERROR"), __FILE__, __LINE__); 484 syslog(LOG_CRIT, _("%s:%d: INTERNAL ERROR (please report)"),
485 __FILE__, __LINE__);
485 abort (); 486 abort ();
486 } 487 }
487 488
...@@ -568,7 +569,8 @@ parse_simple_key (struct parsebuf *pb) ...@@ -568,7 +569,8 @@ parse_simple_key (struct parsebuf *pb)
568 put_code (pb, (inst_t) parse_regmem (pb, set)); 569 put_code (pb, (inst_t) parse_regmem (pb, set));
569 break; 570 break;
570 default: 571 default:
571 syslog(LOG_CRIT, _("%s:%d: INTERNAL ERROR"), __FILE__, __LINE__); 572 syslog(LOG_CRIT, _("%s:%d: INTERNAL ERROR (please report)"),
573 __FILE__, __LINE__);
572 abort (); /* should never happen */ 574 abort (); /* should never happen */
573 } 575 }
574 } 576 }
...@@ -635,7 +637,7 @@ _search_pop (struct parsebuf *pb) ...@@ -635,7 +637,7 @@ _search_pop (struct parsebuf *pb)
635 { 637 {
636 if (pb->tos == 0) 638 if (pb->tos == 0)
637 { 639 {
638 syslog(LOG_CRIT, _("%s:%d: INTERNAL ERROR"), __FILE__, __LINE__); 640 syslog(LOG_CRIT, _("%s:%d: INTERNAL ERROR (please report)"), __FILE__, __LINE__);
639 abort (); /* shouldn't happen */ 641 abort (); /* shouldn't happen */
640 } 642 }
641 return pb->stack[--pb->tos]; 643 return pb->stack[--pb->tos];
......
...@@ -52,13 +52,13 @@ sieve_require (list_t slist) ...@@ -52,13 +52,13 @@ sieve_require (list_t slist)
52 { 52 {
53 name += 11; 53 name += 11;
54 reqfn = sieve_require_comparator; 54 reqfn = sieve_require_comparator;
55 text = "comparator"; 55 text = _("required comparator");
56 } 56 }
57 else if (strncmp (name, "test-", 5) == 0) /* GNU extension */ 57 else if (strncmp (name, "test-", 5) == 0) /* GNU extension */
58 { 58 {
59 name += 5; 59 name += 5;
60 reqfn = sieve_require_test; 60 reqfn = sieve_require_test;
61 text = "test"; 61 text = _("required test");
62 } 62 }
63 else if (strcmp (name, "relational") == 0) /* RFC 3431 */ 63 else if (strcmp (name, "relational") == 0) /* RFC 3431 */
64 { 64 {
...@@ -68,13 +68,13 @@ sieve_require (list_t slist) ...@@ -68,13 +68,13 @@ sieve_require (list_t slist)
68 else 68 else
69 { 69 {
70 reqfn = sieve_require_action; 70 reqfn = sieve_require_action;
71 text = "action"; 71 text = _("required action");
72 } 72 }
73 73
74 if (reqfn (sieve_machine, name)) 74 if (reqfn (sieve_machine, name))
75 { 75 {
76 sieve_compile_error (sieve_filename, sieve_line_num, 76 sieve_compile_error (sieve_filename, sieve_line_num,
77 _("source for the required %s %s is not available"), 77 _("source for the %s %s is not available"),
78 text, 78 text,
79 name); 79 name);
80 } 80 }
......
...@@ -438,7 +438,7 @@ mu_common_argp_parser (int key, char *arg, struct argp_state *state) ...@@ -438,7 +438,7 @@ mu_common_argp_parser (int key, char *arg, struct argp_state *state)
438 p = mu_normalize_maildir (mu_path_maildir); 438 p = mu_normalize_maildir (mu_path_maildir);
439 if (!p) 439 if (!p)
440 { 440 {
441 argp_error (state, _("badly formed maildir: %s"), mu_path_maildir); 441 argp_error (state, _("badly formed mailspool path: %s"), mu_path_maildir);
442 } 442 }
443 mu_path_maildir = p; 443 mu_path_maildir = p;
444 break; 444 break;
...@@ -838,7 +838,7 @@ mu_build_argp (const struct argp *template, const char *capa[]) ...@@ -838,7 +838,7 @@ mu_build_argp (const struct argp *template, const char *capa[])
838 struct argp_child *child = find_argp_child (capa[n]); 838 struct argp_child *child = find_argp_child (capa[n]);
839 if (!child) 839 if (!child)
840 { 840 {
841 mu_error (_("INTERNAL ERROR: requested unknown argp capability %s"), 841 mu_error (_("INTERNAL ERROR: requested unknown argp capability %s (please report)"),
842 capa[n]); 842 capa[n]);
843 abort (); 843 abort ();
844 } 844 }
...@@ -891,7 +891,7 @@ mu_auth_init () ...@@ -891,7 +891,7 @@ mu_auth_init ()
891 extern struct argp_child mu_auth_argp_child; 891 extern struct argp_child mu_auth_argp_child;
892 if (mu_register_capa ("auth", &mu_auth_argp_child)) 892 if (mu_register_capa ("auth", &mu_auth_argp_child))
893 { 893 {
894 mu_error (_("INTERNAL ERROR: cannot register argp capability auth")); 894 mu_error (_("INTERNAL ERROR: cannot register argp capability auth (please report)"));
895 abort (); 895 abort ();
896 } 896 }
897 } 897 }
......
...@@ -95,7 +95,7 @@ pitem : item ...@@ -95,7 +95,7 @@ pitem : item
95 break; 95 break;
96 96
97 default: 97 default:
98 yyerror (_("UNEXPECTED item TYPE")); 98 yyerror (_("INTERNAL ERROR: unexpected item type (please report)"));
99 abort (); 99 abort ();
100 } 100 }
101 $$ = pc; 101 $$ = pc;
...@@ -620,7 +620,7 @@ mh_code_builtin (mh_builtin_t *bp, int argtype) ...@@ -620,7 +620,7 @@ mh_code_builtin (mh_builtin_t *bp, int argtype)
620 break; 620 break;
621 621
622 default: 622 default:
623 yyerror (_("UNKNOWN ARGTYPE")); 623 yyerror (_("INTERNAL ERROR: unknown argtype (please report)"));
624 abort (); 624 abort ();
625 } 625 }
626 } 626 }
......
...@@ -419,7 +419,7 @@ mh_format (mh_format_t *fmt, message_t msg, size_t msgno, ...@@ -419,7 +419,7 @@ mh_format (mh_format_t *fmt, message_t msg, size_t msgno,
419 break; 419 break;
420 420
421 default: 421 default:
422 mh_error (_("Unknown opcode: %x"), opcode); 422 mh_error (_("INTERNAL ERROR: Unknown opcode: %x"), opcode);
423 abort (); 423 abort ();
424 } 424 }
425 } 425 }
......
...@@ -124,7 +124,7 @@ pop3d_abquit (int reason) ...@@ -124,7 +124,7 @@ pop3d_abquit (int reason)
124 124
125 default: 125 default:
126 pop3d_outf ("-ERR Quitting (reason unknown)\r\n"); 126 pop3d_outf ("-ERR Quitting (reason unknown)\r\n");
127 syslog (LOG_ERR, _("Unknown quit")); 127 syslog (LOG_ERR, _("Quitting (numeric reason %d)"));
128 break; 128 break;
129 } 129 }
130 130
......