Minor changes

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
@@ -206,12 +206,13 @@ cb_ifexec (void *data, mu_config_value_t *val)
     mu_error (_("cannot append acl entry: %s"), mu_strerror (rc));
   return rc;
 }
 
 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."),
     N_("addr: IP") },
   { "deny", mu_cfg_callback, NULL, 0, cb_deny,
     N_("Deny connections from this IP address."),
diff --git a/mail/mail.c b/mail/mail.c
index 69bda9e77..723fdc88a 100644
--- a/mail/mail.c
+++ b/mail/mail.c
@@ -259,15 +259,17 @@ static struct mu_option mail_options[] = {
 
   { "content-type", 0, N_("TYPE"), MU_OPTION_DEFAULT,
     N_("set content type for subsequent --attach 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 },
 
   { "attach",  'A', N_("FILE"), MU_OPTION_DEFAULT,
     N_("attach FILE"),
     mu_c_string, NULL, cli_attach },
@@ -290,12 +292,13 @@ static const char *alt_args[] = {
   NULL
 };
 
 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."),
   N_("[address...]"),
   alt_args,
   NULL,
diff --git a/mail/mailline.c b/mail/mailline.c
index 0e6407d63..0b57cbece 100644
--- a/mail/mailline.c
+++ b/mail/mailline.c
@@ -510,12 +510,14 @@ new_folder (mu_folder_t *pfolder, mu_url_t url, int type)
     }
 
   if (!mu_folder_is_local (folder))
     {
       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;
 	}
 
       /* Set ticket for a remote folder */
diff --git a/mail/mailvar.c b/mail/mailvar.c
index 754b35cb2..64b49938e 100644
--- a/mail/mailvar.c
+++ b/mail/mailvar.c
@@ -59,15 +59,17 @@ struct mailvar_symbol mailvar_tab[] =
     { { mailvar_name_allnet, }, MAILVAR_HIDDEN },
 
     /* For compatibility with other mailx implementations.
        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),
       N_("prompt user for bcc before composing the message") },
     { { mailvar_name_askcc, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
@@ -78,12 +80,13 @@ struct mailvar_symbol mailvar_tab[] =
     { { mailvar_name_asksub, }, MAILVAR_ALIAS, NULL },
     { { mailvar_name_autoinc, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       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),
       N_("record outgoing messages in a file named after the first recipient; "
 	 "overrides the `record' variable") },
     { { mailvar_name_bang, },
@@ -92,12 +95,13 @@ struct mailvar_symbol mailvar_tab[] =
 	 " with the last executed command") },
     { { mailvar_name_charset, },
       MAILVAR_TYPEMASK (mailvar_type_string),
       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),
       N_("number of columns on terminal screen") },
     { { mailvar_name_crt, },
       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
@@ -637,12 +637,13 @@ add_attachments (compose_env_t *env, mu_message_t *pmsg)
 	  else if (mu_c_strcasecmp (name, MU_HEADER_MIME_VERSION) == 0 ||
 		   mu_c_strncasecmp (name, "Content-", 8) == 0)
 	    {
 	      mu_error (_("%s: not setting header"), name);
 	      continue;
 	    }
+
 	  else
 	    mu_header_set_value (outhdr, name, value, 1);
 	}
     }
   mu_iterator_destroy (&itr);
 
diff --git a/mh/forw.c b/mh/forw.c
index 7fb51c40e..4016af195 100644
--- a/mh/forw.c
+++ b/mh/forw.c
@@ -129,12 +129,13 @@ static struct mu_option options[] = {
   { "width",         0, N_("NUMBER"), MU_OPTION_DEFAULT,
     N_("Set output width"),
     mu_c_int, &width },
   { "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" },
   { "use",           0, NULL, MU_OPTION_DEFAULT,
     N_("use draft file preserved after the last session"),
     mu_c_bool, &use_draft },
diff --git a/mh/repl.c b/mh/repl.c
index 73336e8c6..6ab52fb94 100644
--- a/mh/repl.c
+++ b/mh/repl.c
@@ -154,12 +154,13 @@ static struct mu_option options[] = {
   { "width",    0, N_("NUMBER"), MU_OPTION_DEFAULT,
     N_("set output width"),
     mu_c_int, &width },
   { "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" },
   { "use", 0, NULL, MU_OPTION_DEFAULT,
     N_("use draft file preserved after the last session"),
     mu_c_bool, &use_draft },
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
@@ -28,13 +28,13 @@ int value_option;
 int path_option;
 int verbose_option;
 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"),
     mu_c_bool, &value_option },
   { "program", 'p', N_("NAME"), MU_OPTION_DEFAULT,
     N_("set program name for configuration lookup"),
diff --git a/sieve/sieve.c b/sieve/sieve.c
index b0bb1bfe5..4b01c63aa 100644
--- a/sieve/sieve.c
+++ b/sieve/sieve.c
@@ -299,13 +299,13 @@ static char *sieve_capa[] = {
 };
 
 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\
   trace1  -  print parse tree before optimization\n\
   trace2  -  print parse tree after optimization\n\
   trace3  -  print parser traces\n\