diff options
| -rw-r--r-- | libmailutils/cli/acl.c | 1 | ||||
| -rw-r--r-- | mail/mail.c | 3 | ||||
| -rw-r--r-- | mail/mailline.c | 2 | ||||
| -rw-r--r-- | mail/mailvar.c | 4 | ||||
| -rw-r--r-- | mail/send.c | 1 | ||||
| -rw-r--r-- | mh/forw.c | 1 | ||||
| -rw-r--r-- | mh/repl.c | 1 | ||||
| -rw-r--r-- | mu/libexec/query.c | 2 | ||||
| -rw-r--r-- | sieve/sieve.c | 2 |
9 files changed, 15 insertions, 2 deletions
diff --git a/libmailutils/cli/acl.c b/libmailutils/cli/acl.c index e77bc6b9e..b0bc3b14a 100644 --- a/libmailutils/cli/acl.c +++ b/libmailutils/cli/acl.c @@ -209,6 +209,7 @@ cb_ifexec (void *data, mu_config_value_t *val) static struct mu_cfg_param acl_param[] = { { "allow", mu_cfg_callback, NULL, 0, cb_allow, + /* TRANSLATORS: Don't translate `from'. */ N_("Allow connections from this IP address. Optional word `from' is " "allowed between it and its argument. The same holds true for other " "actions below."), diff --git a/mail/mail.c b/mail/mail.c index 69bda9e77..723fdc88a 100644 --- a/mail/mail.c +++ b/mail/mail.c @@ -262,9 +262,11 @@ static struct mu_option mail_options[] = { mu_c_string, &default_content_type }, { "content-name", 0, N_("NAME"), MU_OPTION_DEFAULT, + /* TRANSLATORS: Don't translate "Content-Type" and "name"! */ N_("set the Content-Type name parameter for the next --attach option"), mu_c_string, &content_name }, { "content-filename", 0, N_("NAME"), MU_OPTION_DEFAULT, + /* TRANSLATORS: Don't translate "Content-Disposition" and "filename"! */ N_("set the Content-Disposition filename parameter for the next --attach option"), mu_c_string, &content_filename }, @@ -293,6 +295,7 @@ static const char *alt_args[] = { static struct mu_cli_setup cli = { options, NULL, + /* TRANSLATORS: "mail" is the name of the program. Don't translate it. */ N_("GNU mail -- process mail messages.\n" "If -f or --file is given, mail operates on the mailbox named " "by the first argument, or the user's mbox, if no argument given."), diff --git a/mail/mailline.c b/mail/mailline.c index 0e6407d63..0b57cbece 100644 --- a/mail/mailline.c +++ b/mail/mailline.c @@ -513,6 +513,8 @@ new_folder (mu_folder_t *pfolder, mu_url_t url, int type) { if (type == local_folder) { + /* TRANSLATORS: The subject of this sentence ("folder") is the + name of the variable. Don't translate it. */ mu_error ("%s", _("folder must be set to a local folder")); mu_folder_destroy (&folder); return -1; diff --git a/mail/mailvar.c b/mail/mailvar.c index 754b35cb2..64b49938e 100644 --- a/mail/mailvar.c +++ b/mail/mailvar.c @@ -62,9 +62,11 @@ struct mailvar_symbol mailvar_tab[] = Never used, always true. */ { { mailvar_name_append, }, MAILVAR_TYPEMASK (mailvar_type_boolean) | MAILVAR_RDONLY, + /* TRANSLATORS: "mbox" is the name of a command. Don't translate it. */ N_("messages saved in mbox are appended to the end rather than prepended") }, { { mailvar_name_appenddeadletter, }, MAILVAR_TYPEMASK (mailvar_type_boolean), + /* TRANSLATORS: Don't translate "dead.letter". */ N_("append the contents of canceled letter to dead.letter file") }, { { mailvar_name_askbcc, }, MAILVAR_TYPEMASK (mailvar_type_boolean), @@ -81,6 +83,7 @@ struct mailvar_symbol mailvar_tab[] = N_("automatically incorporate newly arrived messages")}, { { mailvar_name_autoprint, }, MAILVAR_TYPEMASK (mailvar_type_boolean), + /* TRANSLATORS: "delete" and "dp" are command names. */ N_("delete command behaves like dp") }, { { mailvar_name_byname }, MAILVAR_TYPEMASK (mailvar_type_boolean), @@ -95,6 +98,7 @@ struct mailvar_symbol mailvar_tab[] = N_("output character set for decoded header fields") }, { { mailvar_name_cmd, }, MAILVAR_TYPEMASK (mailvar_type_string), + /* TRANSLATORS: "pipe" is the command name. */ N_("default shell command for pipe") }, { { mailvar_name_columns, }, MAILVAR_TYPEMASK (mailvar_type_number), diff --git a/mail/send.c b/mail/send.c index 0b6149662..f2be36af4 100644 --- a/mail/send.c +++ b/mail/send.c @@ -640,6 +640,7 @@ add_attachments (compose_env_t *env, mu_message_t *pmsg) mu_error (_("%s: not setting header"), name); continue; } + else mu_header_set_value (outhdr, name, value, 1); } @@ -132,6 +132,7 @@ static struct mu_option options[] = { { "whatnowproc", 0, N_("PROG"), MU_OPTION_DEFAULT, N_("set the replacement for whatnow program"), mu_c_string, &whatnowproc }, + /* TRANSLATORS: "whatnowproc" is the variable name */ { "nowhatnowproc", 0, NULL, MU_OPTION_DEFAULT, N_("don't run whatnowproc"), mu_c_int, &wh_env.nowhatnowproc, NULL, "1" }, @@ -157,6 +157,7 @@ static struct mu_option options[] = { { "whatnowproc", 0, N_("PROG"), MU_OPTION_DEFAULT, N_("set the replacement for whatnow program"), mu_c_string, NULL, set_whatnowproc }, + /* TRANSLATORS: "whatnowproc" is the variable name */ { "nowhatnowproc", 0, NULL, MU_OPTION_DEFAULT, N_("don't run whatnowproc"), mu_c_int, &wh_env.nowhatnowproc, NULL, "1" }, diff --git a/mu/libexec/query.c b/mu/libexec/query.c index 0f22ae024..af38489b8 100644 --- a/mu/libexec/query.c +++ b/mu/libexec/query.c @@ -31,7 +31,7 @@ char *progname; static struct mu_option query_options[] = { { "file", 'f', N_("FILE"), MU_OPTION_DEFAULT, - N_("query configuration values from FILE (default mailutils.rc)"), + N_("query configuration values from FILE (default mailutils.conf)"), mu_c_string, &file_name }, { "value", 0, NULL, MU_OPTION_DEFAULT, N_("display parameter values only"), diff --git a/sieve/sieve.c b/sieve/sieve.c index b0bb1bfe5..4b01c63aa 100644 --- a/sieve/sieve.c +++ b/sieve/sieve.c @@ -302,7 +302,7 @@ static struct mu_cli_setup cli = { options, sieve_cfg_param, N_("GNU sieve -- a mail filtering tool."), - "SCRIPT", + N_("SCRIPT"), NULL, N_("Sieve-specific debug levels:\n\ \n\ |