Further unification of diagnostic style

@@ -418,7 +418,7 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags)
       sieve_error (mach,
 		   /* TRANSLATORS: 'redirect' is the name of a Sieve action.
 		      Do not translate it! */
-		   _("%d: redirect - cannot create from address <%s>: %s\n"),
+		   _("%d: redirect - cannot create sender address <%s>: %s\n"),
 		   sieve_get_message_num (mach),
 		   fromaddr, mu_strerror (rc));
       free (fromaddr);

@@ -31,9 +31,9 @@ static error_t sieve_argp_parser __P((int key, char *arg,
 /* Options used by programs that use extended authentication mechanisms. */
 static struct argp_option sieve_argp_option[] = {
   { "includedir", 'I', N_("DIR"), 0,
-    "Append directory DIR to the list of directories searched for include files", 0 },
+    _("Append directory DIR to the list of directories searched for include files"), 0 },
   { "libdir", 'L', N_("DIR"), 0,
-    "Append directory DIR to the list of directories searched for library files", 0 },
+    _("Append directory DIR to the list of directories searched for library files"), 0 },
   { NULL,      0, NULL, 0, NULL, 0 }
 };
 

@@ -104,7 +104,9 @@ dbm_retrieve_quota (char *name, size_t *quota)
       unlimited = 1;
   else if (MU_DATUM_SIZE (contentd) > sizeof(buffer)-1)
     {
-      mu_error (_("Mailbox quota for `%s' is too big: %d digits"),
+      mu_error (ngettext ("Mailbox quota for `%s' is too big: %d digit",
+			  "Mailbox quota for `%s' is too big: %d digits",
+			  MU_DATUM_SIZE (contentd)),
 		name, MU_DATUM_SIZE (contentd));
       *quota = groupquota;
     }

@@ -46,7 +46,7 @@ static struct argp_option options[] = {
   {"to",      't', 0,      0, N_("Precede message by a list of addresses"), 0},
   {"user",    'u', N_("USER"), 0, N_("Operate on USER's mailbox"), 0},
   {"append",  'a', N_("HEADER: VALUE"), 0,
-   N_("Append given header to the message being sent."), 0},
+   N_("Append given header to the message being sent"), 0},
   { NULL,      0, NULL, 0, NULL, 0 }
 };
 

@@ -80,7 +80,7 @@ static struct argp_option mu_mailbox_argp_option[] = {
   {"lock-expire-timeout", ARG_LOCK_EXPIRE_TIMEOUT, N_("SECONDS"), 0,
    N_("Number of seconds after which the lock expires"), },
   {"external-locker", ARG_LOCK_EXTERNAL_PROGRAM, N_("PATH"), 0,
-   N_("Set full path to the external locker program.") },
+   N_("Set full path to the external locker program") },
   { NULL,      0, NULL, 0, NULL, 0 }
 };
 

@@ -32,7 +32,7 @@ static struct argp_option options[] = {
   {"annotate",      ARG_ANNOTATE,      N_("BOOL"), OPTION_ARG_OPTIONAL,
    N_("* Add Replied: header to the message being replied to")},
   {"build",         ARG_BUILD,         0, 0,
-   N_("Build the draft and quit immediately.")},
+   N_("Build the draft and quit immediately")},
   {"draftfolder",   ARG_DRAFTFOLDER,   N_("FOLDER"), 0,
    N_("Specify the folder for message drafts")},
   {"nodraftfolder", ARG_NODRAFTFOLDER, 0, 0,
@@ -65,7 +65,7 @@ static struct argp_option options[] = {
   {"whatnowproc",   ARG_WHATNOWPROC,   N_("PROG"), 0,
    N_("* Set the replacement for whatnow program")},
   {"nowhatnowproc", ARG_NOWHATNOWPROC, NULL, 0,
-   N_("* Ignore whatnowproc variable. Use standard `whatnow' shell instead.")},
+   N_("* Ignore whatnowproc variable. Use standard `whatnow' shell instead")},
   {"use",           ARG_USE,           N_("BOOL"), OPTION_ARG_OPTIONAL,
    N_("Use draft file preserved after the last session") },
   {"nouse",         ARG_NOUSE,         N_("BOOL"), OPTION_HIDDEN, "" },

@@ -44,7 +44,7 @@ static struct argp_option options[] = {
   {"preserve", ARG_PRESERVE, N_("BOOL"), OPTION_ARG_OPTIONAL,
    N_("* Try to preserve message sequence numbers")},
   {"source", ARG_SOURCE, N_("FOLDER"), 0,
-   N_("Specify source folder. FOLDER will become the current folder after the program exits.")},
+   N_("Specify source folder. FOLDER will become the current folder after the program exits")},
   {"src", 0, NULL, OPTION_ALIAS, NULL},
   {"file", ARG_FILE, N_("FILE"), 0, N_("Use FILE as the source message")},
   {"license", ARG_LICENSE, 0,      0,

@@ -51,12 +51,12 @@ static struct argp_option options[] = {
    N_("Construct a group or followup reply") },
   {"editor", ARG_EDITOR, N_("PROG"), 0, N_("Set the editor program to use")},
   {"noedit", ARG_NOEDIT, 0, 0, N_("Suppress the initial edit")},
-  {"fcc",    ARG_FCC, N_("FOLDER"), 0, N_("* Set the folder to receive Fcc's.")},
+  {"fcc",    ARG_FCC, N_("FOLDER"), 0, N_("* Set the folder to receive Fcc's")},
   {"filter", ARG_FILTER, N_("MHL-FILTER"), 0,
    N_("Set the mhl filter to preprocess the body of the message being replied")},
   {"form",   ARG_FORM, N_("FILE"), 0, N_("Read format from given file")},
   {"format", ARG_FORMAT, N_("BOOL"), OPTION_ARG_OPTIONAL,
-   N_("Include a copy of the message being replied. The message will be processed using either the default filter \"mhl.reply\", or the filter specified by --filter option.") },
+   N_("Include a copy of the message being replied. The message will be processed using either the default filter \"mhl.reply\", or the filter specified by --filter option") },
   {"inplace", ARG_INPLACE, N_("BOOL"), OPTION_ARG_OPTIONAL,
    N_("* Annotate the message in place")},
   {"query", ARG_QUERY, N_("BOOL"), OPTION_ARG_OPTIONAL,

@@ -52,7 +52,7 @@ static struct argp_option options[] = {
    N_("* Reformat To: and Cc: addresses") },
   {"noformat",      ARG_NOFORMAT,      NULL, OPTION_HIDDEN, "" },
   {"forward",       ARG_FORWARD,       N_("BOOL"), OPTION_ARG_OPTIONAL,
-   N_("* In case of failure forward the draft along with the failure notice to the sender.") },
+   N_("* In case of failure forward the draft along with the failure notice to the sender") },
   {"noforward",     ARG_NOFORWARD,     NULL, OPTION_HIDDEN, "" },
   {"mime",          ARG_MIME,          N_("BOOL"), OPTION_ARG_OPTIONAL,
    N_("* Use MIME encapsulation") },

@@ -53,7 +53,7 @@ N_("GNU sieve -- a mail filtering tool\n\
 \v\
 Debug flags:\n\
   g - main parser traces\n\
-  T - mailutil traces (MU_DEBUG_TRACE)\n\
+  T - mailutils traces (MU_DEBUG_TRACE)\n\
   P - network protocols (MU_DEBUG_PROT)\n\
   t - sieve trace (MU_SIEVE_DEBUG_TRACE)\n\
   i - sieve instructions trace (MU_SIEVE_DEBUG_INSTR)\n");