Revise error messages for accordance with GNU standards:

begin messages with a capital letter, unless they are prefixed
with `file:line:' or their exact look is important due to
compatibility reasons. Do not end messages with a period.
Avoid using contracted negations.

21 files changed, 95 insertions, 94 deletions

diff --git a/mh/fmtcheck.c b/mh/fmtcheck.c
index 4194a973c..6c69ccc6c 100644
--- a/mh/fmtcheck.c
+++ b/mh/fmtcheck.c
@@ -59,7 +59,7 @@ action_dump ()
 {
   if (!format_str)
     {
-      mh_error (_("format string not specified"));
+      mh_error (_("Format string not specified"));
       return 1;
     }
   mh_format_dump (&format);
diff --git a/mh/folder.c b/mh/folder.c
index 8955b96b5..03cace260 100644
--- a/mh/folder.c
+++ b/mh/folder.c
@@ -305,7 +305,7 @@ _scan (const char *name, int depth)
 
   if (!dir)
     {
-      mh_error (_("can't scan folder %s: %s"), name, strerror (errno));
+      mh_error (_("Cannot scan folder %s: %s"), name, strerror (errno));
       return;
     }
 
@@ -322,7 +322,7 @@ _scan (const char *name, int depth)
 	{
 	  asprintf (&p, "%s/%s", name, entry->d_name);
 	  if (stat (p, &st) < 0)
-	    mh_error (_("can't stat %s: %s"), p, strerror (errno));
+	    mh_error (_("Cannot stat %s: %s"), p, strerror (errno));
 	  else if (S_ISDIR (st.st_mode))
 	    {
 	      info.others++;
@@ -564,7 +564,7 @@ main (int argc, char **argv)
     }
   else if (argc - index > 1)
     {
-      mh_error (_("too many arguments"));
+      mh_error (_("Too many arguments"));
       exit (1);
     }
   
diff --git a/mh/forw.c b/mh/forw.c
index b1f6c90ff..3b9350d5c 100644
--- a/mh/forw.c
+++ b/mh/forw.c
@@ -192,7 +192,7 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state)
     case ARG_INPLACE:
     case ARG_WHATNOWPROC:
     case ARG_NOWHATNOWPROC:
-      argp_error (state, _("option is not yet implemented"));
+      argp_error (state, _("Option is not yet implemented"));
       exit (1);
       
     case ARG_LICENSE:
@@ -281,7 +281,7 @@ finish_draft ()
 				MU_STREAM_WRITE|MU_STREAM_CREAT)) != 0
       || (rc = stream_open (stream)))
     {
-      mh_error (_("cannot open output file \"%s\": %s"),
+      mh_error (_("Cannot open output file \"%s\": %s"),
 		wh_env.file, mu_strerror (rc));
       exit (1);
     }
diff --git a/mh/inc.c b/mh/inc.c
index 764b72cd3..97f57856e 100644
--- a/mh/inc.c
+++ b/mh/inc.c
@@ -196,7 +196,7 @@ main (int argc, char **argv)
     {
       if ((rc = mailbox_create_default (&input, NULL)) != 0)
 	{
-	  mh_error (_("Can not create default mailbox"),
+	  mh_error (_("Cannot create default mailbox"),
 		    mu_strerror (rc));
 	  exit (1);
 	}
@@ -205,7 +205,7 @@ main (int argc, char **argv)
     }
   else if ((rc = mailbox_create_default (&input, input_file)) != 0)
     {
-      mh_error (_("Can not create mailbox %s: %s"),
+      mh_error (_("Cannot create mailbox %s: %s"),
 		input_file, mu_strerror (rc));
       exit (1);
     }
@@ -214,7 +214,7 @@ main (int argc, char **argv)
     {
       url_t url;
       mailbox_get_url (input, &url);
-      mh_error (_("Can not open mailbox %s: %s"),
+      mh_error (_("Cannot open mailbox %s: %s"),
 		url_to_string (url),
 		mu_strerror (errno));
       exit (1);
@@ -222,14 +222,14 @@ main (int argc, char **argv)
 
   if ((rc = mailbox_messages_count (input, &total)) != 0)
     {
-      mh_error (_("Can not read input mailbox: %s"), mu_strerror (errno));
+      mh_error (_("Cannot read input mailbox: %s"), mu_strerror (errno));
       exit (1);
     }
 
   output = mh_open_folder (append_folder, 1);
   if ((rc = mailbox_messages_count (output, &lastmsg)) != 0)
     {
-      mh_error (_("Can not read output mailbox: %s"),
+      mh_error (_("Cannot read output mailbox: %s"),
 		mu_strerror (errno));
       exit (1);
     }
@@ -250,7 +250,7 @@ main (int argc, char **argv)
       
       if ((rc = mailbox_get_message (input, n, &imsg)) != 0)
 	{
-	  mh_error (_("%d: can't get message: %s"),
+	  mh_error (_("%d: cannot get message: %s"),
 		    n, mu_strerror (errno));
 	  continue;
 	}
diff --git a/mh/mark.c b/mh/mark.c
index 1fcdc0a00..3d3f83e4e 100644
--- a/mh/mark.c
+++ b/mh/mark.c
@@ -69,7 +69,7 @@ add_sequence (char *name)
 {
   if (!seq_list && list_create (&seq_list))
     {
-      mh_error (_("can't create sequence list"));
+      mh_error (_("Cannot create sequence list"));
       exit (1);
     }
   list_append (seq_list, name);
diff --git a/mh/mh_argp.c b/mh/mh_argp.c
index 0d6691d3c..7c1fa95c6 100644
--- a/mh/mh_argp.c
+++ b/mh/mh_argp.c
@@ -172,7 +172,7 @@ mh_argp_parse (int *pargc, char **pargv[],
     *pindex = index;
   else if (extra)
     {
-      mh_error (_("extra arguments"));
+      mh_error (_("Extra arguments"));
       exit (1);
     }
   mh_init2 ();
diff --git a/mh/mh_ctx.c b/mh/mh_ctx.c
index 92f84148b..4a6049a84 100644
--- a/mh/mh_ctx.c
+++ b/mh/mh_ctx.c
@@ -88,7 +88,7 @@ mh_context_write (mh_context_t *ctx)
   fp = fopen (ctx->name, "w");
   if (!fp)
     {
-      mh_error (_("can't write context file %s: %s"),
+      mh_error (_("Cannot write context file %s: %s"),
 		ctx->name, strerror (errno));
       return MU_ERR_FAILURE;
     }
@@ -138,7 +138,7 @@ mh_context_set_value (mh_context_t *ctx, const char *name, const char *value)
       int rc;
       if ((rc = header_create (&ctx->header, NULL, 0, NULL)) != 0)
 	{
-	  mh_error (_("Can't create context %s: %s"),
+	  mh_error (_("Cannot create context %s: %s"),
 		    ctx->name,
 		    mu_strerror (rc));
 	  return 1;
diff --git a/mh/mh_fmtgram.y b/mh/mh_fmtgram.y
index 19fb11677..65d314d6e 100644
--- a/mh/mh_fmtgram.y
+++ b/mh/mh_fmtgram.y
@@ -636,7 +636,7 @@ mh_code_builtin (mh_builtin_t *bp, int argtype)
 	    }
 	  else
 	    {
-	      mh_error (_("missing argument for %s"), bp->name);
+	      mh_error (_("Missing argument for %s"), bp->name);
 	      return 0;
 	    }
 	}
@@ -645,7 +645,7 @@ mh_code_builtin (mh_builtin_t *bp, int argtype)
 	  switch (bp->argtype)
 	    {
 	    case mhtype_none:
-	      mh_error (_("extra arguments to %s"), bp->name);
+	      mh_error (_("Extra arguments to %s"), bp->name);
 	      return 0;
 	      
 	    case mhtype_num:
diff --git a/mh/mh_format.c b/mh/mh_format.c
index e6bab5497..9bc2b1492 100644
--- a/mh/mh_format.c
+++ b/mh/mh_format.c
@@ -941,6 +941,7 @@ builtin_divide (struct mh_machine *mach)
 {
   if (!mach->arg_num)
     {
+      /* TRANSLATORS: Do not translate the word 'format'! */
       mh_error (_("format: divide by zero"));
       mach->stop = 1;
     }
diff --git a/mh/mh_init.c b/mh/mh_init.c
index 2107f0c8b..b052c38d9 100644
--- a/mh/mh_init.c
+++ b/mh/mh_init.c
@@ -65,14 +65,14 @@ mh_read_formfile (char *name, char **pformat)
 
   if (stat (name, &st))
     {
-      mh_error (_("can't stat format file %s: %s"), name, strerror (errno));
+      mh_error (_("Cannot stat format file %s: %s"), name, strerror (errno));
       return -1;
     }
   
   fp = fopen (name, "r");
   if (!fp)
     {
-      mh_error (_("can't open format file %s: %s"), name, strerror (errno));
+      mh_error (_("Cannot open format file %s: %s"), name, strerror (errno));
       return -1;
     }
 
@@ -107,7 +107,7 @@ mh_read_formfile (char *name, char **pformat)
 void
 mh_err_memory (int fatal)
 {
-  mh_error (_("not enough memory"));
+  mh_error (_("Not enough memory"));
   if (fatal)
     abort ();
 }
@@ -123,7 +123,7 @@ mh_get_my_name (char *name)
       struct passwd *pw = getpwuid (getuid ());
       if (!pw)
 	{
-	  mh_error (_("can't determine my username"));
+	  mh_error (_("Cannot determine my username"));
 	  return;
 	}
       name = pw->pw_name;
@@ -210,7 +210,7 @@ mh_check_folder (char *pathname, int confirm)
 		perm = strtoul (pb, NULL, 8);
 	      if (mkdir (p, perm)) 
 		{
-		  mh_error (_("Can't create directory %s: %s"),
+		  mh_error (_("Cannot create directory %s: %s"),
 			    p, strerror (errno));
 		  return 1;
 		}
@@ -221,7 +221,7 @@ mh_check_folder (char *pathname, int confirm)
 	}
       else
 	{
-	  mh_error (_("can't stat %s: %s"), p, strerror (errno));
+	  mh_error (_("Cannot stat %s: %s"), p, strerror (errno));
 	  return 1;
 	}
     }
@@ -315,7 +315,7 @@ mh_audit_open (char *name, mailbox_t mbox)
       asprintf (&p, "%s/%s", mu_path_folder_dir, namep);
       if (!p)
 	{
-	  mh_error (_("low memory"));
+	  mh_error (_("Not enough memory"));
 	  exit (1);
 	}
       free (namep);
@@ -325,7 +325,7 @@ mh_audit_open (char *name, mailbox_t mbox)
   fp = fopen (namep, "a");
   if (!fp)
     {
-      mh_error (_("Can't open audit file %s: %s"), namep, strerror (errno));
+      mh_error (_("Cannot open audit file %s: %s"), namep, strerror (errno));
       free (namep);
       return NULL;
     }
@@ -368,7 +368,7 @@ mh_open_folder (const char *folder, int create)
     
   if (mailbox_create_default (&mbox, name))
     {
-      mh_error (_("Can't create mailbox %s: %s"),
+      mh_error (_("Cannot create mailbox %s: %s"),
 		name, strerror (errno));
       exit (1);
     }
@@ -378,7 +378,7 @@ mh_open_folder (const char *folder, int create)
   
   if (mailbox_open (mbox, flags))
     {
-      mh_error (_("Can't open mailbox %s: %s"), name, strerror (errno));
+      mh_error (_("Cannot open mailbox %s: %s"), name, strerror (errno));
       exit (1);
     }
 
@@ -456,7 +456,7 @@ mh_iterate (mailbox_t mbox, mh_msgset_t *msgset,
       num = msgset->list[i];
       if ((rc = mailbox_get_message (mbox, num, &msg)) != 0)
 	{
-	  mh_error (_("can't get message %d: %s"), num, mu_strerror (rc));
+	  mh_error (_("Cannot get message %d: %s"), num, mu_strerror (rc));
 	  return 1;
 	}
 
@@ -474,7 +474,7 @@ mh_spawnp (const char *prog, const char *file)
 
   if (argcv_get (prog, "", "#", &argc, &argv))
     {
-      mh_error (_("cannot split line %s"), prog);
+      mh_error (_("Cannot split line %s"), prog);
       argcv_free (argc, argv);
       return 1;
     }
@@ -526,7 +526,7 @@ mh_file_copy (const char *from, const char *to)
   if ((rc = file_stream_create (&in, from, MU_STREAM_READ)) != 0
       || (rc = stream_open (in)))
     {
-      mh_error (_("cannot open input file \"%s\": %s"),
+      mh_error (_("Cannot open input file \"%s\": %s"),
 		from, mu_strerror (rc));
       free (buffer);
       return 1;
@@ -535,7 +535,7 @@ mh_file_copy (const char *from, const char *to)
   if ((rc = file_stream_create (&out, to, MU_STREAM_RDWR|MU_STREAM_CREAT)) != 0
       || (rc = stream_open (out)))
     {
-      mh_error (_("cannot open output file \"%s\": %s"),
+      mh_error (_("Cannot open output file \"%s\": %s"),
 		to, mu_strerror (rc));
       free (buffer);
       stream_close (in);
@@ -549,7 +549,7 @@ mh_file_copy (const char *from, const char *to)
     {
       if ((rc = stream_sequential_write (out, buffer, rdsize)) != 0)
 	{
-	  mh_error (_("write error on \"%s\": %s"),
+	  mh_error (_("Write error on \"%s\": %s"),
 		    to, mu_strerror (rc));
 	  break;
 	}
@@ -578,20 +578,20 @@ mh_file_to_message (char *folder, char *file_name)
   
   if (stat (file_name, &st) < 0)
     {
-      mh_error (_("can't stat file %s: %s"), file_name, strerror (errno));
+      mh_error (_("Cannot stat file %s: %s"), file_name, strerror (errno));
       return NULL;
     }
   
   if ((rc = file_stream_create (&instream, file_name, MU_STREAM_READ)))
     {
-      mh_error (_("can't create input stream (file %s): %s"),
+      mh_error (_("Cannot create input stream (file %s): %s"),
 		file_name, mu_strerror (rc));
       return NULL;
     }
   
   if ((rc = stream_open (instream)))
     {
-      mh_error (_("can't open input stream (file %s): %s"),
+      mh_error (_("Cannot open input stream (file %s): %s"),
 		file_name, mu_strerror (rc));
       stream_destroy (&instream, stream_get_owner (instream));
       return NULL;
@@ -667,7 +667,7 @@ mh_real_install (char *name, int automode)
   fp = fopen (name, "w");
   if (!fp)
     {
-      mu_error (_("cannot open file %s: %s"), name, mu_strerror (errno));
+      mu_error (_("Cannot open file %s: %s"), name, mu_strerror (errno));
       exit (1);
     }
   fprintf (fp, "Path: %s\n", mhdir);
@@ -703,7 +703,7 @@ mh_install (char *name, int automode)
 	}
       else
 	{
-	  mh_error(_("cannot stat %s: %s"), name, mu_strerror (errno));
+	  mh_error(_("Cannot stat %s: %s"), name, mu_strerror (errno));
 	  exit (1);
 	}
     }
diff --git a/mh/mh_list.c b/mh/mh_list.c
index 962a08b21..7d4d42825 100644
--- a/mh/mh_list.c
+++ b/mh/mh_list.c
@@ -135,7 +135,7 @@ parse_component (locus_t *loc, list_t formlist, char *compname, char *str)
   stmt->v.component.name = compname;
   if (list_create (&stmt->v.component.format))
     {
-      mh_error (_("%s:%d: can't create list"),
+      mh_error (_("%s:%d: cannot create list"),
 		loc->filename,
 		loc->line);
       exit (1); /* FIXME */
@@ -207,7 +207,7 @@ parse_variable (locus_t *loc, list_t formlist, char *str)
 	case dt_format:
 	  if (mh_format_parse (value, &fmt))
 	    {
-	      mh_error (_("%s:%d: Bad format string"),
+	      mh_error (_("%s:%d: bad format string"),
 			loc->filename,
 			loc->line);
 	      exit (1);
@@ -260,14 +260,14 @@ mhl_format_compile (char *name)
   fp = fopen (name, "r");
   if (!fp)
     {
-      mh_error (_("cannot open file %s: %s"), name, mu_strerror (errno));
+      mh_error (_("Cannot open file %s: %s"), name, mu_strerror (errno));
       return NULL;
     }
 
   if (list_create (&formlist))
     {
       fclose (fp);
-      mh_error (_("can't create list"));
+      mh_error (_("Cannot create list"));
       return NULL;
     }
 
diff --git a/mh/mh_msgset.c b/mh/mh_msgset.c
index c27262da7..423a2578b 100644
--- a/mh/mh_msgset.c
+++ b/mh/mh_msgset.c
@@ -38,7 +38,7 @@ _expand (size_t *msgcnt, size_t **msglist, size_t inc)
 static void
 msgset_abort (const char *arg)
 {
-  mh_error (_("bad message list `%s'"), arg);
+  mh_error (_("Bad message list `%s'"), arg);
   exit (1);
 }
 
@@ -60,7 +60,7 @@ msgset_last (mailbox_t mbox, size_t *pnum)
   rc = mailbox_messages_count (mbox, &count);
   if (rc)
     {
-      mh_error (_("can't get last message: %s"), mu_strerror (rc));
+      mh_error (_("Cannot get last message: %s"), mu_strerror (rc));
       exit (1);
     }
   *pnum = count;
@@ -161,7 +161,7 @@ msgset_preproc_part (mailbox_t mbox, char *arg, char **rest)
 	rc = mailbox_get_message (mbox, num, &msg);
 	if (rc)
 	  {
-	    mh_error (_("can't get message %d: %s"), num, mu_strerror (rc));
+	    mh_error (_("Cannot get message %d: %s"), num, mu_strerror (rc));
 	    exit (1);
 	  }
 	message_get_uid (msg, &uid);
@@ -602,7 +602,7 @@ mh_msgset_negate (mailbox_t mbox, mh_msgset_t *msgset)
   list = realloc (list, sizeof (list[0]) * msgno);
   if (!list)
     {
-      mh_error (_("not enough memory"));
+      mh_error (_("Not enough memory"));
       abort ();
     }
   mh_msgset_free (msgset);
diff --git a/mh/mh_whom.c b/mh/mh_whom.c
index 28dc98d4e..a154c52a4 100644
--- a/mh/mh_whom.c
+++ b/mh/mh_whom.c
@@ -34,7 +34,7 @@ addrcp (list_t *list, char *addr, int isbcc)
   p->isbcc = isbcc;
   if (!*list && (rc = list_create (list)))
     {
-      mh_error (_("can't create list: %s"), mu_strerror (rc));
+      mh_error (_("Cannot create list: %s"), mu_strerror (rc));
       exit (1);
     }
   list_append (*list, p);
@@ -224,7 +224,7 @@ mh_whom (char *filename, int check)
   ctx = mh_context_create (filename, 1);
   if (mh_context_read (ctx))
     {
-      mh_error (_("malformed message"));
+      mh_error (_("Malformed message"));
       rc = -1;
     }
   else
diff --git a/mh/mhl.c b/mh/mhl.c
index 1465da803..36fc94576 100644
--- a/mh/mhl.c
+++ b/mh/mhl.c
@@ -164,13 +164,13 @@ open_output ()
 
   if (rc)
     {
-      mh_error (_("cannot create output stream: %s"), mu_strerror (rc));
+      mh_error (_("Cannot create output stream: %s"), mu_strerror (rc));
       exit (1);
     }
 
   if ((rc = stream_open (output)))
     {
-      mh_error (_("cannot open output stream: %s"), mu_strerror (rc));
+      mh_error (_("Cannot open output stream: %s"), mu_strerror (rc));
       exit (1);
     }
   return output;
@@ -189,13 +189,13 @@ list_message (char *name, stream_t output)
     rc = file_stream_create (&input, name, MU_STREAM_READ);
   if (rc)
     {
-      mh_error (_("cannot create input stream: %s"), mu_strerror (rc));
+      mh_error (_("Cannot create input stream: %s"), mu_strerror (rc));
       return;
     }
 
   if ((rc = stream_open (input)))
     {
-      mh_error (_("cannot open input stream: %s"), mu_strerror (rc));
+      mh_error (_("Cannot open input stream: %s"), mu_strerror (rc));
       stream_destroy (&input, stream_get_owner (input));
       return;
     }
@@ -203,7 +203,7 @@ list_message (char *name, stream_t output)
   msg = mh_stream_to_message (input);
   if (!msg)
     {
-      mh_error (_("input stream %s is not a message (%s)"),
+      mh_error (_("Input stream %s is not a message (%s)"),
 		name, mu_strerror (rc));
       stream_close (input);
       stream_destroy (&input, stream_get_owner (input));
diff --git a/mh/mhn.c b/mh/mhn.c
index a11bccbaf..8365593fc 100644
--- a/mh/mhn.c
+++ b/mh/mhn.c
@@ -548,7 +548,7 @@ msg_part_parse (char *str)
 	  str = endp;
 	  break;
 	default:
-	  mh_error (_("malformed part specification (near %s)"), endp);
+	  mh_error (_("Malformed part specification (near %s)"), endp);
 	  exit (1);
 	}
       msg_part_incr (p);
@@ -1251,7 +1251,7 @@ show_internal (message_t msg, msg_part_t part, char *encoding, stream_t out)
 
   if ((rc = message_get_body (msg, &body)))
     {
-      mh_error (_("%lu: can't get message body: %s"),
+      mh_error (_("%lu: cannot get message body: %s"),
 		(unsigned long) msg_part_subpart (part, 0),
 		mu_strerror (rc));
       return 0;
@@ -1273,14 +1273,14 @@ mhn_exec (stream_t *str, char *cmd, int flags)
   int rc = prog_stream_create (str, cmd, MU_STREAM_WRITE);
   if (rc)
     {
-      mh_error (_("can't create proc stream (command %s): %s"),
+      mh_error (_("Cannot create proc stream (command %s): %s"),
 		cmd, mu_strerror (rc));
     }
   else
     {
       rc = stream_open (*str);
       if (rc)
-	mh_error (_("can't open proc stream (command %s): %s"),
+	mh_error (_("Cannot open proc stream (command %s): %s"),
 		  cmd, mu_strerror (rc));
     }
   return rc;
@@ -1321,14 +1321,14 @@ mhn_run_command (message_t msg, msg_part_t part,
       
       if (argcv_get (cmd, "", "#", &argc, &argv))
 	{
-	  mh_error (_("can't parse command line `%s'"), cmd);
+	  mh_error (_("Cannot parse command line `%s'"), cmd);
 	  return ENOSYS;
 	}
 
       rc = file_stream_create (&tmp, tempfile, MU_STREAM_RDWR);
       if (rc)
 	{
-	  mh_error (_("can't create temporary stream (file %s): %s"),
+	  mh_error (_("Cannot create temporary stream (file %s): %s"),
 		    tempfile, mu_strerror (rc));
 	  argcv_free (argc, argv);
 	  return rc;
@@ -1336,7 +1336,7 @@ mhn_run_command (message_t msg, msg_part_t part,
       rc = stream_open (tmp);
       if (rc)
 	{
-	  mh_error (_("can't open temporary stream (file %s): %s"),
+	  mh_error (_("Cannot open temporary stream (file %s): %s"),
 		    tempfile, mu_strerror (rc));
 	  stream_destroy (&tmp, stream_get_owner (tmp));
 	  argcv_free (argc, argv);
@@ -1461,13 +1461,13 @@ mhn_show ()
   rc = stdio_stream_create (&ostr, stdout, 0);
   if (rc)
     {
-      mh_error (_("can't create output stream: %s"), mu_strerror (rc));
+      mh_error (_("Cannot create output stream: %s"), mu_strerror (rc));
       exit (1);
     }
   rc = stream_open (ostr);
   if (rc)
     {
-      mh_error (_("can't open output stream: %s"), mu_strerror (rc));
+      mh_error (_("Cannot open output stream: %s"), mu_strerror (rc));
       exit (1);
     }
   
@@ -1676,7 +1676,7 @@ store_handler (message_t msg, msg_part_t part, char *type, char *encoding,
   rc = file_stream_create (&out, name, MU_STREAM_WRITE|MU_STREAM_CREAT);
   if (rc)
     {
-      mh_error (_("can't create output stream (file %s): %s"),
+      mh_error (_("Cannot create output stream (file %s): %s"),
 		name, mu_strerror (rc));
       free (name);
       return rc;
@@ -1684,7 +1684,7 @@ store_handler (message_t msg, msg_part_t part, char *type, char *encoding,
   rc = stream_open (out);
   if (rc)
     {
-      mh_error (_("can't open output stream (file %s): %s"),
+      mh_error (_("Cannot open output stream (file %s): %s"),
 		name, mu_strerror (rc));
       free (name);
       stream_destroy (&out, stream_get_owner (out));
@@ -2019,7 +2019,7 @@ edit_extern (char *cmd, struct compose_env *env, message_t *msg, int level)
   
   if ((rc = header_create (&hdr2, NULL, 0, NULL)) != 0)
     {
-      mh_error (_("cannot create header: %s"),
+      mh_error (_("Cannot create header: %s"),
 		mu_strerror (rc));
       return 1;
     }
@@ -2227,14 +2227,14 @@ edit_mime (char *cmd, struct compose_env *env, message_t *msg, int level)
       rc = file_stream_create (&in, cmd, MU_STREAM_READ);
       if (rc)
 	{
-	  mh_error (_("can't create input stream (file %s): %s"),
+	  mh_error (_("Cannot create input stream (file %s): %s"),
 		    cmd, mu_strerror (rc));
 	  return rc;
 	}
       rc = stream_open (in);
       if (rc)
 	{
-	  mh_error (_("can't open input stream (file %s): %s"),
+	  mh_error (_("Cannot open input stream (file %s): %s"),
 		    cmd, mu_strerror (rc));
 	  stream_destroy (&in, stream_get_owner (in));
 	  return rc;
@@ -2272,7 +2272,7 @@ edit_mime (char *cmd, struct compose_env *env, message_t *msg, int level)
   rc = stream_open (fstr);
   if (rc)
     {
-      mh_error (_("can't open filter stream: %s"),
+      mh_error (_("Cannot open filter stream: %s"),
 		mu_strerror (rc));
       return rc;
     }
@@ -2493,7 +2493,7 @@ mhn_compose ()
   rc = file_stream_create (&stream, name, MU_STREAM_RDWR|MU_STREAM_CREAT);
   if (rc)
     {
-      mh_error (_("can't create output stream (file %s): %s"),
+      mh_error (_("Cannot create output stream (file %s): %s"),
 		name, mu_strerror (rc));
       free (name);
       return rc;
@@ -2501,7 +2501,7 @@ mhn_compose ()
   rc = stream_open (stream);
   if (rc)
     {
-      mh_error (_("can't open output stream (file %s): %s"),
+      mh_error (_("Cannot open output stream (file %s): %s"),
 		name, mu_strerror (rc));
       free (name);
       stream_destroy (&stream, stream_get_owner (stream));
diff --git a/mh/pick.c b/mh/pick.c
index f60a30fb1..a3207a543 100644
--- a/mh/pick.c
+++ b/mh/pick.c
@@ -137,7 +137,7 @@ add_sequence (char *name)
 {
   if (!seq_list && list_create (&seq_list))
     {
-      mh_error (_("can't create sequence list"));
+      mh_error (_("Cannot create sequence list"));
       exit (1);
     }
   list_append (seq_list, name);
@@ -264,7 +264,7 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state)
       s = state->argv[state->next - 1];
       if (memcmp (s, "--", 2))
 	{
-	  argp_error (state, _("invalid option -- %s"), s);
+	  argp_error (state, _("Invalid option -- %s"), s);
 	  exit (1);
 	}
       p = strchr (s, '=');
@@ -277,7 +277,7 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state)
 	{
 	  if (state->next == state->argc)
 	    {
-	      mh_error (_("invalid option -- %s"), s);
+	      mh_error (_("Invalid option -- %s"), s);
 	      exit (1);
 	    }
 	  p = state->argv[state->next++];
diff --git a/mh/refile.c b/mh/refile.c
index db7bb093f..c50fc1785 100644
--- a/mh/refile.c
+++ b/mh/refile.c
@@ -39,7 +39,7 @@ static struct argp_option options[] = {
   {"draft",   ARG_DRAFT, NULL, 0,
    N_("Use <mh-dir>/draft as the source message")},
   {"copy",    ARG_LINK, N_("BOOL"), OPTION_ARG_OPTIONAL,
-   N_("Preserve the source folder copy.")},
+   N_("Preserve the source folder copy")},
   {"link",    0, NULL, OPTION_ALIAS, NULL},
   {"preserve", ARG_PRESERVE, N_("BOOL"), OPTION_ARG_OPTIONAL,
    N_("* Try to preserve message sequence numbers")},
@@ -73,7 +73,7 @@ add_folder (const char *folder)
 {
   if (!folder_name_list && list_create (&folder_name_list))
     {
-      mh_error (_("can't create folder list"));
+      mh_error (_("Cannot create folder list"));
       exit (1);
     }
   list_append (folder_name_list, strdup (folder));
@@ -86,19 +86,19 @@ open_folders ()
 
   if (!folder_name_list)
     {
-      mh_error (_("no folder specified"));
+      mh_error (_("No folder specified"));
       exit (1);
     }
 
   if (list_create (&folder_mbox_list))
     {
-      mh_error (_("can't create folder list"));
+      mh_error (_("Cannot create folder list"));
       exit (1);
     }
 
   if (list_get_iterator (folder_name_list, &itr))
     {
-      mh_error (_("can't create iterator"));
+      mh_error (_("Cannot create iterator"));
       exit (1);
     }
 
@@ -123,7 +123,7 @@ enumerate_folders (void (*f) __P((void *, mailbox_t)), void *data)
 
   if (list_get_iterator (folder_mbox_list, &itr))
     {
-      mh_error (_("can't create iterator"));
+      mh_error (_("Cannot create iterator"));
       exit (1);
     }
 
@@ -197,7 +197,7 @@ refile_folder (void *data, mailbox_t mbox)
   rc = mailbox_append_message (mbox, msg);
   if (rc)
     {
-      mh_error (_("error appending message: %s"), mu_strerror (rc));
+      mh_error (_("Error appending message: %s"), mu_strerror (rc));
       exit (1);
     }
 }
@@ -257,7 +257,7 @@ main (int argc, char **argv)
       
       if (argc > 0)
 	{
-	  mh_error (_("both message set and source file given"));
+	  mh_error (_("Both message set and source file given"));
 	  exit (1);
 	}
       msg = mh_file_to_message (mu_path_folder_dir, source_file);
diff --git a/mh/repl.c b/mh/repl.c
index 2e1e352cc..7d26a1f2c 100644
--- a/mh/repl.c
+++ b/mh/repl.c
@@ -235,7 +235,7 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state)
     case ARG_INPLACE:
     case ARG_WHATNOWPROC:
     case ARG_NOWHATNOWPROC:
-      argp_error (state, _("option is not yet implemented"));
+      argp_error (state, _("Option is not yet implemented"));
       exit (1);
       
     case ARG_LICENSE:
@@ -294,7 +294,7 @@ make_draft (mailbox_t mbox, int disp, struct mh_whatnow_env *wh)
   rc = mailbox_get_message (mbox, msgset.list[0], &msg);
   if (rc)
     {
-      mh_error (_("cannot read message %lu: %s"),
+      mh_error (_("Cannot read message %lu: %s"),
 		(unsigned long) msgset.list[0],
 		mu_strerror (rc));
       exit (1);
@@ -309,14 +309,14 @@ make_draft (mailbox_t mbox, int disp, struct mh_whatnow_env *wh)
 			       MU_STREAM_WRITE|MU_STREAM_CREAT);
       if (rc)
 	{
-	  mh_error (_("cannot create draft file stream %s: %s"),
+	  mh_error (_("Cannot create draft file stream %s: %s"),
 		    wh->file, mu_strerror (rc));
 	  exit (1);
 	}
 
       if ((rc = stream_open (str)))
 	{
-	  mh_error (_("cannot open draft file %s: %s"),
+	  mh_error (_("Cannot open draft file %s: %s"),
 		    wh->file, mu_strerror (rc));
 	  exit (1);
 	}	  
diff --git a/mh/rmf.c b/mh/rmf.c
index 9bdfa43d0..dfdbd4961 100644
--- a/mh/rmf.c
+++ b/mh/rmf.c
@@ -124,7 +124,7 @@ rmf (const char *name)
 
   if (!dir)
     {
-      mh_error (_("can't scan folder %s: %s"), name, strerror (errno));
+      mh_error (_("Cannot scan folder %s: %s"), name, strerror (errno));
       return 1;
     }
 
@@ -143,7 +143,7 @@ rmf (const char *name)
       asprintf (&p, "%s/%s", name, entry->d_name);
       if (stat (p, &st) < 0)
 	{
-	  mh_error (_("can't stat %s: %s"), p, strerror (errno));
+	  mh_error (_("Cannot stat %s: %s"), p, strerror (errno));
 	}
       else if (S_ISDIR (st.st_mode))
 	{
@@ -160,7 +160,7 @@ rmf (const char *name)
 	{
 	  if (unlink (p))
 	    {
-	      mh_error (_("can't unlink %s: %s"), p, strerror (errno));
+	      mh_error (_("Cannot unlink %s: %s"), p, strerror (errno));
 	      failures++;
 	    }
 	}
diff --git a/mh/scan.c b/mh/scan.c
index 7ddb7f705..e91edb9a8 100644
--- a/mh/scan.c
+++ b/mh/scan.c
@@ -134,7 +134,7 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state)
       break;
       
     case ARG_FILE:
-      argp_error (state, _("option is not yet implemented"));
+      argp_error (state, _("Option is not yet implemented"));
       break;
       
     case ARG_LICENSE:
diff --git a/mh/send.c b/mh/send.c
index 1800324e8..afe345c6b 100644
--- a/mh/send.c
+++ b/mh/send.c
@@ -263,7 +263,7 @@ check_file (char *name)
     return 1;
   if (!mesg_list && list_create (&mesg_list))
     {
-      mh_error (_("can't create message list"));
+      mh_error (_("Cannot create message list"));
       return 1;
     }
   
@@ -302,7 +302,7 @@ open_mailer (