Commit 504ef5f4 504ef5f42376716fa3dd50b8ab4243a87c34b164 by Sergey Poznyakoff

Add translators comment

1 parent d4cca7e4
...@@ -50,6 +50,9 @@ append_arg (char *arg) ...@@ -50,6 +50,9 @@ append_arg (char *arg)
50 50
51 static struct argp_option options[] = { 51 static struct argp_option options[] = {
52 {NULL, 0, NULL, 0, 52 {NULL, 0, NULL, 0,
53 /* TRANSLATORS: (command-line) is the name of Guile function. Do not
54 translate it.
55 */
53 N_("The following switches stop argument processing, and pass all\n" 56 N_("The following switches stop argument processing, and pass all\n"
54 "remaining arguments as the value of (command-line):"), 1}, 57 "remaining arguments as the value of (command-line):"), 1},
55 {"code", 'c', N_("EXPR"), 0, N_("Execute given scheme expression."), 1}, 58 {"code", 'c', N_("EXPR"), 0, N_("Execute given scheme expression."), 1},
......
...@@ -60,7 +60,10 @@ sieve_action_fileinto (sieve_machine_t mach, list_t args, list_t tags) ...@@ -60,7 +60,10 @@ sieve_action_fileinto (sieve_machine_t mach, list_t args, list_t tags)
60 sieve_value_t *val = sieve_value_get (args, 0); 60 sieve_value_t *val = sieve_value_get (args, 0);
61 if (!val) 61 if (!val)
62 { 62 {
63 sieve_error (mach, _("fileinto: can't get filename!")); 63 sieve_error (mach,
64 /* TRANSLATORS: 'fileinto' is the name of a Sieve action.
65 Do not translate it! */
66 _("fileinto: can't get filename!"));
64 sieve_abort (mach); 67 sieve_abort (mach);
65 } 68 }
66 sieve_log_action (mach, "FILEINTO", _("delivering into %s"), val->v.string); 69 sieve_log_action (mach, "FILEINTO", _("delivering into %s"), val->v.string);
...@@ -70,7 +73,10 @@ sieve_action_fileinto (sieve_machine_t mach, list_t args, list_t tags) ...@@ -70,7 +73,10 @@ sieve_action_fileinto (sieve_machine_t mach, list_t args, list_t tags)
70 rc = message_save_to_mailbox (mach->msg, mach->ticket, mach->mu_debug, 73 rc = message_save_to_mailbox (mach->msg, mach->ticket, mach->mu_debug,
71 val->v.string); 74 val->v.string);
72 if (rc) 75 if (rc)
73 sieve_error (mach, _("fileinto: cannot save to mailbox: %s"), 76 sieve_error (mach,
77 /* TRANSLATORS: 'fileinto' is the name of a Sieve action.
78 Do not translate it! */
79 _("fileinto: cannot save to mailbox: %s"),
74 mu_strerror (rc)); 80 mu_strerror (rc));
75 else 81 else
76 sieve_mark_deleted (mach->msg, 1); 82 sieve_mark_deleted (mach->msg, 1);
...@@ -239,7 +245,10 @@ sieve_action_reject (sieve_machine_t mach, list_t args, list_t tags) ...@@ -239,7 +245,10 @@ sieve_action_reject (sieve_machine_t mach, list_t args, list_t tags)
239 sieve_value_t *val = sieve_value_get (args, 0); 245 sieve_value_t *val = sieve_value_get (args, 0);
240 if (!val) 246 if (!val)
241 { 247 {
242 sieve_error (mach, _("reject: can't get text!")); 248 sieve_error (mach,
249 /* TRANSLATORS: 'reject' is the name of a Sieve action.
250 Do not translate it! */
251 _("reject: can't get text!"));
243 sieve_abort (mach); 252 sieve_abort (mach);
244 } 253 }
245 sieve_log_action (mach, "REJECT", NULL); 254 sieve_log_action (mach, "REJECT", NULL);
...@@ -255,6 +264,8 @@ sieve_action_reject (sieve_machine_t mach, list_t args, list_t tags) ...@@ -255,6 +264,8 @@ sieve_action_reject (sieve_machine_t mach, list_t args, list_t tags)
255 if (rc) 264 if (rc)
256 { 265 {
257 sieve_error (mach, 266 sieve_error (mach,
267 /* TRANSLATORS: 'reject' is the name of a Sieve action.
268 Do not translate it! */
258 _("%d: reject - can't create to address <%s>: %s\n"), 269 _("%d: reject - can't create to address <%s>: %s\n"),
259 sieve_get_message_num (mach), 270 sieve_get_message_num (mach),
260 addrtext, mu_strerror (rc)); 271 addrtext, mu_strerror (rc));
...@@ -267,6 +278,8 @@ sieve_action_reject (sieve_machine_t mach, list_t args, list_t tags) ...@@ -267,6 +278,8 @@ sieve_action_reject (sieve_machine_t mach, list_t args, list_t tags)
267 if (rc) 278 if (rc)
268 { 279 {
269 sieve_error (mach, 280 sieve_error (mach,
281 /* TRANSLATORS: 'reject' is the name of a Sieve action.
282 Do not translate it! */
270 _("%d: reject - can't create from address <%s>: %s\n"), 283 _("%d: reject - can't create from address <%s>: %s\n"),
271 sieve_get_message_num (mach), 284 sieve_get_message_num (mach),
272 sieve_get_daemon_email (mach), 285 sieve_get_daemon_email (mach),
...@@ -281,6 +294,8 @@ sieve_action_reject (sieve_machine_t mach, list_t args, list_t tags) ...@@ -281,6 +294,8 @@ sieve_action_reject (sieve_machine_t mach, list_t args, list_t tags)
281 mailer_get_url (mailer, &url); 294 mailer_get_url (mailer, &url);
282 295
283 sieve_error (mach, 296 sieve_error (mach,
297 /* TRANSLATORS: 'reject' is the name of a Sieve action.
298 Do not translate it! */
284 _("%d: reject - can't open mailer %s: %s\n"), 299 _("%d: reject - can't open mailer %s: %s\n"),
285 sieve_get_message_num (mach), 300 sieve_get_message_num (mach),
286 url_to_string (url), 301 url_to_string (url),
...@@ -356,6 +371,8 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags) ...@@ -356,6 +371,8 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags)
356 sieve_value_t *val = sieve_value_get (args, 0); 371 sieve_value_t *val = sieve_value_get (args, 0);
357 if (!val) 372 if (!val)
358 { 373 {
374 /* TRANSLATORS: 'redirect' is the name of a Sieve action.
375 Do not translate it! */
359 sieve_error (mach, _("redirect: can't get address!")); 376 sieve_error (mach, _("redirect: can't get address!"));
360 sieve_abort (mach); 377 sieve_abort (mach);
361 } 378 }
...@@ -364,6 +381,8 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags) ...@@ -364,6 +381,8 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags)
364 if (rc) 381 if (rc)
365 { 382 {
366 sieve_error (mach, 383 sieve_error (mach,
384 /* TRANSLATORS: 'redirect' is the name of a Sieve action.
385 Do not translate it! */
367 _("%d: redirect - parsing to `%s' failed: %s\n"), 386 _("%d: redirect - parsing to `%s' failed: %s\n"),
368 sieve_get_message_num (mach), 387 sieve_get_message_num (mach),
369 val->v.string, mu_strerror (rc)); 388 val->v.string, mu_strerror (rc));
...@@ -386,6 +405,8 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags) ...@@ -386,6 +405,8 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags)
386 if (rc) 405 if (rc)
387 { 406 {
388 sieve_error (mach, 407 sieve_error (mach,
408 /* TRANSLATORS: 'redirect' is the name of a Sieve action.
409 Do not translate it! */
389 _("%d: redirect - can't get envelope sender: %s\n"), 410 _("%d: redirect - can't get envelope sender: %s\n"),
390 sieve_get_message_num (mach), mu_strerror (rc)); 411 sieve_get_message_num (mach), mu_strerror (rc));
391 goto end; 412 goto end;
...@@ -395,6 +416,8 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags) ...@@ -395,6 +416,8 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags)
395 if (rc) 416 if (rc)
396 { 417 {
397 sieve_error (mach, 418 sieve_error (mach,
419 /* TRANSLATORS: 'redirect' is the name of a Sieve action.
420 Do not translate it! */
398 _("%d: redirect - can't create from address <%s>: %s\n"), 421 _("%d: redirect - can't create from address <%s>: %s\n"),
399 sieve_get_message_num (mach), 422 sieve_get_message_num (mach),
400 fromaddr, mu_strerror (rc)); 423 fromaddr, mu_strerror (rc));
...@@ -434,6 +457,8 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags) ...@@ -434,6 +457,8 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags)
434 mailer_get_url (mailer, &url); 457 mailer_get_url (mailer, &url);
435 458
436 sieve_error (mach, 459 sieve_error (mach,
460 /* TRANSLATORS: 'redirect' is the name of a Sieve action.
461 Do not translate it! */
437 _("%d: redirect - can't open mailer %s: %s\n"), 462 _("%d: redirect - can't open mailer %s: %s\n"),
438 sieve_get_message_num (mach), 463 sieve_get_message_num (mach),
439 url_to_string (url), 464 url_to_string (url),
......
...@@ -270,6 +270,7 @@ sieve_match_part_checker (const char *name, list_t tags, list_t args) ...@@ -270,6 +270,7 @@ sieve_match_part_checker (const char *name, list_t tags, list_t args)
270 if (comp && strcmp (comp->arg->v.string, "i;ascii-numeric")) 270 if (comp && strcmp (comp->arg->v.string, "i;ascii-numeric"))
271 { 271 {
272 sieve_compile_error (sieve_filename, sieve_line_num, 272 sieve_compile_error (sieve_filename, sieve_line_num,
273 /* TRANSLATORS: Do not translate ':count'. It is the name of a Sieve tag */
273 _("comparator %s is incompatible with :count in call to `%s'"), 274 _("comparator %s is incompatible with :count in call to `%s'"),
274 comp->arg->v.string, 275 comp->arg->v.string,
275 name); 276 name);
......
...@@ -127,13 +127,19 @@ sieve_test_address (sieve_machine_t mach, list_t args, list_t tags) ...@@ -127,13 +127,19 @@ sieve_test_address (sieve_machine_t mach, list_t args, list_t tags)
127 h = sieve_value_get (args, 0); 127 h = sieve_value_get (args, 0);
128 if (!h) 128 if (!h)
129 { 129 {
130 sieve_error (mach, _("address: can't get argument 1")); 130 sieve_error (mach,
131 /* TRANSLATORS: 'address' is the name of a Sieve test.
132 Do not translate it! */
133 _("address: can't get argument 1"));
131 sieve_abort (mach); 134 sieve_abort (mach);
132 } 135 }
133 v = sieve_value_get (args, 1); 136 v = sieve_value_get (args, 1);
134 if (!v) 137 if (!v)
135 { 138 {
136 sieve_error (mach, _("address: can't get argument 2")); 139 sieve_error (mach,
140 /* TRANSLATORS: 'address' is the name of a Sieve test.
141 Do not translate it! */
142 _("address: can't get argument 2"));
137 sieve_abort (mach); 143 sieve_abort (mach);
138 } 144 }
139 145
...@@ -193,13 +199,19 @@ sieve_test_header (sieve_machine_t mach, list_t args, list_t tags) ...@@ -193,13 +199,19 @@ sieve_test_header (sieve_machine_t mach, list_t args, list_t tags)
193 h = sieve_value_get (args, 0); 199 h = sieve_value_get (args, 0);
194 if (!h) 200 if (!h)
195 { 201 {
196 sieve_error (mach, _("header: can't get argument 1")); 202 sieve_error (mach,
203 /* TRANSLATORS: 'header' is the name of a Sieve test.
204 Do not translate it! */
205 _("header: can't get argument 1"));
197 sieve_abort (mach); 206 sieve_abort (mach);
198 } 207 }
199 v = sieve_value_get (args, 1); 208 v = sieve_value_get (args, 1);
200 if (!v) 209 if (!v)
201 { 210 {
202 sieve_error (mach, _("header: can't get argument 2")); 211 sieve_error (mach,
212 /* TRANSLATORS: 'header' is the name of a Sieve test.
213 Do not translate it! */
214 _("header: can't get argument 2"));
203 sieve_abort (mach); 215 sieve_abort (mach);
204 } 216 }
205 217
...@@ -286,7 +298,10 @@ sieve_test_envelope (sieve_machine_t mach, list_t args, list_t tags) ...@@ -286,7 +298,10 @@ sieve_test_envelope (sieve_machine_t mach, list_t args, list_t tags)
286 v = sieve_value_get (args, 1); 298 v = sieve_value_get (args, 1);
287 if (!v) 299 if (!v)
288 { 300 {
289 sieve_error (mach, _("header: can't get argument 2")); 301 sieve_error (mach,
302 /* TRANSLATORS: 'header' is the name of a Sieve test.
303 Do not translate it! */
304 _("header: can't get argument 2"));
290 sieve_abort (mach); 305 sieve_abort (mach);
291 } 306 }
292 307
...@@ -309,7 +324,10 @@ sieve_test_size (sieve_machine_t mach, list_t args, list_t tags) ...@@ -309,7 +324,10 @@ sieve_test_size (sieve_machine_t mach, list_t args, list_t tags)
309 sieve_value_t *val = sieve_value_get (args, 0); 324 sieve_value_t *val = sieve_value_get (args, 0);
310 if (!val) 325 if (!val)
311 { 326 {
312 sieve_error (mach, _("size: can't get argument!")); 327 sieve_error (mach,
328 /* TRANSLATORS: 'size' is the name of a Sieve test.
329 Do not translate it! */
330 _("size: can't get argument!"));
313 sieve_abort (mach); 331 sieve_abort (mach);
314 } 332 }
315 333
...@@ -366,7 +384,10 @@ sieve_test_exists (sieve_machine_t mach, list_t args, list_t tags) ...@@ -366,7 +384,10 @@ sieve_test_exists (sieve_machine_t mach, list_t args, list_t tags)
366 val = sieve_value_get (args, 0); 384 val = sieve_value_get (args, 0);
367 if (!val) 385 if (!val)
368 { 386 {
369 sieve_error (mach, _("exists: can't get argument!")); 387 sieve_error (mach,
388 /* TRANSLATORS: 'size' is the name of a Sieve test.
389 Do not translate it! */
390 _("exists: can't get argument!"));
370 sieve_abort (mach); 391 sieve_abort (mach);
371 } 392 }
372 393
......
...@@ -85,6 +85,7 @@ mail_if (int argc, char **argv) ...@@ -85,6 +85,7 @@ mail_if (int argc, char **argv)
85 85
86 if (argc != 2) 86 if (argc != 2)
87 { 87 {
88 /* TRANSLATORS: 'if' is the function name. Do not translate it */
88 util_error(_("if requires an argument: s | r | t")); 89 util_error(_("if requires an argument: s | r | t"));
89 return 1; 90 return 1;
90 } 91 }
...@@ -131,6 +132,7 @@ mail_else (int argc ARG_UNUSED, char **argv ARG_UNUSED) ...@@ -131,6 +132,7 @@ mail_else (int argc ARG_UNUSED, char **argv ARG_UNUSED)
131 132
132 if (_cond_level == 0) 133 if (_cond_level == 0)
133 { 134 {
135 /* TRANSLATORS: 'else' and 'if' are function names. Do not translate them */
134 util_error(_("else without matching if")); 136 util_error(_("else without matching if"));
135 return 1; 137 return 1;
136 } 138 }
...@@ -146,6 +148,7 @@ mail_endif (int argc ARG_UNUSED, char **argv ARG_UNUSED) ...@@ -146,6 +148,7 @@ mail_endif (int argc ARG_UNUSED, char **argv ARG_UNUSED)
146 { 148 {
147 if (_cond_level == 0) 149 if (_cond_level == 0)
148 { 150 {
151 /* TRANSLATORS: 'endif' and 'if' are function names. Do not translate them */
149 util_error(_("endif without matching if")); 152 util_error(_("endif without matching if"));
150 return 1; 153 return 1;
151 } 154 }
......
...@@ -446,6 +446,8 @@ fill_pass (struct action_data *ap) ...@@ -446,6 +446,8 @@ fill_pass (struct action_data *ap)
446 if (!p) 446 if (!p)
447 exit (1); 447 exit (1);
448 ap->passwd = strdup (p); 448 ap->passwd = strdup (p);
449 /* TRANSLATORS: Please try to format this string so that it has
450 the same length as the translation of 'Password:' above */
449 p = getpass (_("Confirm :")); 451 p = getpass (_("Confirm :"));
450 if (strcmp (ap->passwd, p) == 0) 452 if (strcmp (ap->passwd, p) == 0)
451 break; 453 break;
......