Added missing N_() markers.

9 files changed, 54 insertions, 48 deletions

diff --git a/mh/fmtcheck.c b/mh/fmtcheck.c
index 2efa01255..52dcbf436 100644
--- a/mh/fmtcheck.c
+++ b/mh/fmtcheck.c
@@ -25,8 +25,8 @@ static char args_doc[] = "";
 
 /* GNU options */
 static struct argp_option options[] = {
-  {"form",    'F', "FILE",   0, N_("Read format from given file")},
-  {"format",  't', "FORMAT", 0, N_("Use this format string")},
+  {"form",    'F', N_("FILE"),   0, N_("Read format from given file")},
+  {"format",  't', N_("FORMAT"), 0, N_("Use this format string")},
   {"dump",    'd', NULL,     0, N_("Dump the listing of compiled format code")},
   { N_("\nUse -help switch to obtain the list of traditional MH options. "), 0, 0, OPTION_DOC, "" },
   
diff --git a/mh/folder.c b/mh/folder.c
index f30f3f9a7..915da26a3 100644
--- a/mh/folder.c
+++ b/mh/folder.c
@@ -43,7 +43,7 @@ static struct argp_option options[] = {
   {N_("Actions are:"), 0, 0, OPTION_DOC, "", 0 },
   {"print", 'p', NULL, 0, N_("List the folders (default)"), 1 },
   {"list", 'l', NULL, 0, N_("List the contents of the folder stack"), 1},
-  {"push", ARG_PUSH, "FOLDER", OPTION_ARG_OPTIONAL,
+  {"push", ARG_PUSH, N_("FOLDER"), OPTION_ARG_OPTIONAL,
     N_("Push the folder on the folder stack. If FOLDER is specified, it is pushed. "
        "Otherwise, if a folder is given in the command line (via + or --folder), "
        "it is pushed on stack. Otherwise, the current folder and the top of the folder "
@@ -51,14 +51,20 @@ static struct argp_option options[] = {
   {"pop", ARG_POP, NULL, 0, N_("Pop the folder off the folder stack"), 1},
   
   {N_("Options are:"), 0, 0, OPTION_DOC, "", 2 },
-  {"folder",  'f', "FOLDER", 0, N_("Specify folder to operate upon"), 3},
+  {"folder",  'f', N_("FOLDER"), 0, N_("Specify folder to operate upon"), 3},
   {"all", 'a', NULL, 0, N_("List all folders"), 3},
-  {"create", 'c', "BOOL", OPTION_ARG_OPTIONAL, N_("Create non-existing folders"), 3},
-  {"fast", 'F', "BOOL", OPTION_ARG_OPTIONAL, N_("List only the folder names"), 3},
-  {"header", 'h', "BOOL", OPTION_ARG_OPTIONAL, N_("Print the header line"), 3},
-  {"recurse", 'r', "BOOL", OPTION_ARG_OPTIONAL, N_("Scan folders recursively"), 3},
-  {"total", 't', "BOOL", OPTION_ARG_OPTIONAL, N_("Output the total statistics"), 3},
-  { N_("\nUse -help switch to obtain the list of traditional MH options. "), 0, 0, OPTION_DOC, "", 4 },
+  {"create", 'c', N_("BOOL"), OPTION_ARG_OPTIONAL, 
+    N_("Create non-existing folders"), 3},
+  {"fast", 'F', N_("BOOL"), OPTION_ARG_OPTIONAL, 
+    N_("List only the folder names"), 3},
+  {"header", 'h', N_("BOOL"), OPTION_ARG_OPTIONAL, 
+    N_("Print the header line"), 3},
+  {"recurse", 'r', N_("BOOL"), OPTION_ARG_OPTIONAL,
+    N_("Scan folders recursively"), 3},
+  {"total", 't', N_("BOOL"), OPTION_ARG_OPTIONAL, 
+    N_("Output the total statistics"), 3},
+  { N_("\nUse -help switch to obtain the list of traditional MH options. "), 
+    0, 0, OPTION_DOC, "", 4 },
   
   {NULL},
 };
diff --git a/mh/inc.c b/mh/inc.c
index b0179e270..4e4d1f977 100644
--- a/mh/inc.c
+++ b/mh/inc.c
@@ -25,17 +25,17 @@ static char args_doc[] = N_("[+folder]");
 
 /* GNU options */
 static struct argp_option options[] = {
-  {"file",    'i', "FILE",   0, N_("Incorporate mail from named file")},
-  {"folder",  'f', "FOLDER", 0, N_("Specify folder to incorporate mail to")},
-  {"audit",   'a', "FILE", 0, N_("Enable audit")},
+  {"file",    'i', N_("FILE"),   0, N_("Incorporate mail from named file")},
+  {"folder",  'f', N_("FOLDER"), 0, N_("Specify folder to incorporate mail to")},
+  {"audit",   'a', N_("FILE"), 0, N_("Enable audit")},
   {"noaudit", 'n', 0, 0, N_("Disable audit")},
-  {"changecur", 'c', "BOOL", OPTION_ARG_OPTIONAL,
+  {"changecur", 'c', N_("BOOL"), OPTION_ARG_OPTIONAL,
    N_("Mark first incorporated message as current (default)")},
-  {"form",    'F', "FILE",   0, N_("Read format from given file")},
-  {"format",  't', "FORMAT", 0, N_("Use this format string")},
-  {"truncate", 'T', "BOOL", OPTION_ARG_OPTIONAL,
+  {"form",    'F', N_("FILE"),   0, N_("Read format from given file")},
+  {"format",  't', N_("FORMAT"), 0, N_("Use this format string")},
+  {"truncate", 'T', N_("BOOL"), OPTION_ARG_OPTIONAL,
    N_("Truncate source mailbox after incorporating (default)")},
-  {"width",   'w', "NUMBER", 0, N_("Set output width")},
+  {"width",   'w', N_("NUMBER"), 0, N_("Set output width")},
   {"quiet",   'q', 0,        0, N_("Be quiet")},
   {"license", 'l', 0,        0, N_("Display software license"), -1},
 
@@ -46,7 +46,7 @@ static struct argp_option options[] = {
 
 /* Traditional MH options */
 struct mh_option mh_option[] = {
-  {"audit",   5,  'a', MH_OPT_ARG, "audit-file"},
+  {"audit",   5,  'a', MH_OPT_ARG, "audit-file" },
   {"noaudit", 3,  'n', 0, },
   {"changecur", 1, 'c',MH_OPT_BOOL},
   {"file",    2, 'i', MH_OPT_ARG, "input-file"},
diff --git a/mh/mhpath.c b/mh/mhpath.c
index 1497bb296..5914c1fb4 100644
--- a/mh/mhpath.c
+++ b/mh/mhpath.c
@@ -25,7 +25,7 @@ static char args_doc[] = N_("[+folder] [msgs]");
 
 /* GNU options */
 static struct argp_option options[] = {
-  {"folder",  'f', "FOLDER", 0, N_("Specify folder to operate upon")},
+  {"folder",  'f', N_("FOLDER"), 0, N_("Specify folder to operate upon")},
   { N_("\nUse -help switch to obtain the list of traditional MH options. "), 0, 0, OPTION_DOC, "" },
   { 0 }
 };
diff --git a/mh/refile.c b/mh/refile.c
index 6e4abcdb9..fe3f8385c 100644
--- a/mh/refile.c
+++ b/mh/refile.c
@@ -30,16 +30,16 @@ static char args_doc[] = N_("messages folder [folder...]");
 
 /* GNU options */
 static struct argp_option options[] = {
-  {"folder",  'f', "FOLDER", 0, N_("Specify folder to operate upon")},
+  {"folder",  'f', N_("FOLDER"), 0, N_("Specify folder to operate upon")},
   {"draft",   'd', NULL, 0, N_("Use <mh-dir>/draft as the source message")},
-  {"link",    'l', "BOOL", OPTION_ARG_OPTIONAL,
+  {"link",    'l', N_("BOOL"), OPTION_ARG_OPTIONAL,
    N_("(not implemented) Preserve the source folder copy")},
-  {"preserve", 'p', "BOOL", OPTION_ARG_OPTIONAL,
+  {"preserve", 'p', N_("BOOL"), OPTION_ARG_OPTIONAL,
    N_("(not implemented) Try to preserve message sequence numbers")},
-  {"source", 's', "FOLDER", 0,
+  {"source", 's', N_("FOLDER"), 0,
    N_("Specify source folder. FOLDER will became the current folder after the program exits.")},
   {"src", 0, NULL, OPTION_ALIAS, NULL},
-  {"file", 'F', "FILE", 0, N_("Use FILE as the source message")},
+  {"file", 'F', N_("FILE"), 0, N_("Use FILE as the source message")},
   { N_("\nUse -help switch to obtain the list of traditional MH options. "), 0, 0, OPTION_DOC, "" },
   { 0 }
 };
diff --git a/mh/repl.c b/mh/repl.c
index 13416a71b..bd2a0b28f 100644
--- a/mh/repl.c
+++ b/mh/repl.c
@@ -34,27 +34,27 @@ static char args_doc[] = N_("[+folder] [msg]");
 
 /* GNU options */
 static struct argp_option options[] = {
-  {"annotate", 'a', "BOOL", OPTION_ARG_OPTIONAL,
+  {"annotate", 'a', N_("BOOL"), OPTION_ARG_OPTIONAL,
    N_("Add Replied: header to the message being replied to")},
-  {"draftfolder", 'd', "FOLDER", 0,
+  {"draftfolder", 'd', N_("FOLDER"), 0,
    N_("Invoke the draftfolder facility")},
-  {"draftmessage" , 'm', "MSG", 0,
+  {"draftmessage" , 'm', N_("MSG"), 0,
    N_("Invoke the draftmessage facility")},
   {"cc",       'c', "{all|to|cc|me}", 0,
    N_("Specify whom to place on the Cc: list of the reply")},
   {"nocc",     'n', "{all|to|cc|me}", 0,
    N_("Specify whom to remove from the Cc: list of the reply")},
-  {"folder",  'f', "FOLDER", 0, N_("Specify folder to operate upon")},
-  {"editor",  'e', "PROG", 0, N_("Set the editor program to use")},
+  {"folder",  'f', N_("FOLDER"), 0, N_("Specify folder to operate upon")},
+  {"editor",  'e', N_("PROG"), 0, N_("Set the editor program to use")},
   {"noedit", ARG_NOEDIT, 0, 0, N_("Suppress the initial edit")},
-  {"fcc",    ARG_FCC, "FOLDER", 0, N_("Set the folder to receive Fcc's.")},
-  {"filter", ARG_FILTER, "PROG", 0,
+  {"fcc",    ARG_FCC, N_("FOLDER"), 0, N_("Set the folder to receive Fcc's.")},
+  {"filter", ARG_FILTER, N_("PROG"), 0,
    N_("Set the filter program to preprocess the body of the message being replied")},
-  {"form",   'F', "FILE", 0, N_("Read format from given file")},
-  {"inplace", ARG_INPLACE, "BOOL", 0, N_("Annotate the message in place")},
-  {"query", ARG_QUERY, "BOOL", 0, N_("Query for addresses to place in To: and Cc: lists")},
-  {"width", 'w', "NUMBER", 0, N_("Set output width")},
-  {"whatnowproc", ARG_WHATNOWPROC, "PROG", 0,
+  {"form",   'F', N_("FILE"), 0, N_("Read format from given file")},
+  {"inplace", ARG_INPLACE, N_("BOOL"), 0, N_("Annotate the message in place")},
+  {"query", ARG_QUERY, N_("BOOL"), 0, N_("Query for addresses to place in To: and Cc: lists")},
+  {"width", 'w', N_("NUMBER"), 0, N_("Set output width")},
+  {"whatnowproc", ARG_WHATNOWPROC, N_("PROG"), 0,
    N_("Set the replacement for whatnow program")},
   { N_("\nUse -help switch to obtain the list of traditional MH options. "), 0, 0, OPTION_DOC, "" },
   { 0 }
diff --git a/mh/rmf.c b/mh/rmf.c
index b5c305f55..31870f534 100644
--- a/mh/rmf.c
+++ b/mh/rmf.c
@@ -34,8 +34,8 @@ static char args_doc[] = N_("[+folder]");
 
 /* GNU options */
 static struct argp_option options[] = {
-  {"folder",  'f', "FOLDER", 0, N_("Specify the folder to delete")},
-  {"interactive", 'i', "BOOL", OPTION_ARG_OPTIONAL,
+  {"folder",  'f', N_("FOLDER"), 0, N_("Specify the folder to delete")},
+  {"interactive", 'i', N_("BOOL"), OPTION_ARG_OPTIONAL,
     N_("Interactive mode: ask for confirmation before removing each folder")},
   {"recursive", 'r', NULL, 0, N_("Recursively delete all subfolders")},
   { N_("\nUse -help switch to obtain the list of traditional MH options. "), 0, 0, OPTION_DOC, "" },
diff --git a/mh/rmm.c b/mh/rmm.c
index 491a4d509..09db00133 100644
--- a/mh/rmm.c
+++ b/mh/rmm.c
@@ -25,7 +25,7 @@ static char args_doc[] = N_("[+folder] [msgs]");
 
 /* GNU options */
 static struct argp_option options[] = {
-  {"folder",  'f', "FOLDER", 0, N_("Specify folder to operate upon")},
+  {"folder",  'f', N_("FOLDER"), 0, N_("Specify folder to operate upon")},
   { N_("\nUse -help switch to obtain the list of traditional MH options. "),
    0, 0, OPTION_DOC, "" },
   { 0 }
diff --git a/mh/scan.c b/mh/scan.c
index 3e3bf2c13..c73672b9f 100644
--- a/mh/scan.c
+++ b/mh/scan.c
@@ -31,15 +31,15 @@ static char args_doc[] = N_("[+folder] [msgs]");
 
 /* GNU options */
 static struct argp_option options[] = {
-  {"folder",  'f', "FOLDER", 0, N_("Specify folder to scan")},
-  {"clear",   'c', "BOOL",   OPTION_ARG_OPTIONAL,
+  {"folder",  'f', N_("FOLDER"), 0, N_("Specify folder to scan")},
+  {"clear",   'c', N_("BOOL"),   OPTION_ARG_OPTIONAL,
    N_("Clear screen after displaying the list")},
-  {"form",    'F', "FILE",   0, N_("Read format from given file")},
-  {"format",  't', "FORMAT", 0, N_("Use this format string")},
-  {"header",  'H', "BOOL",   OPTION_ARG_OPTIONAL, N_("Display header")},
-  {"width",   'w', "NUMBER", 0, N_("Set output width")},
-  {"reverse", 'r', "BOOL",   OPTION_ARG_OPTIONAL, N_("List messages in reverse order")},
-  {"file",    'i', "FILE",   0, N_("[Not yet implemented]")},
+  {"form",    'F', N_("FILE"),   0, N_("Read format from given file")},
+  {"format",  't', N_("FORMAT"), 0, N_("Use this format string")},
+  {"header",  'H', N_("BOOL"),   OPTION_ARG_OPTIONAL, N_("Display header")},
+  {"width",   'w', N_("NUMBER"), 0, N_("Set output width")},
+  {"reverse", 'r', N_("BOOL"),   OPTION_ARG_OPTIONAL, N_("List messages in reverse order")},
+  {"file",    'i', N_("FILE"),   0, N_("[Not yet implemented]")},
   
   {"license", 'l', 0,        0, N_("Display software license"), -1},