X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=enscript.git;a=blobdiff_plain;f=src%2Fmain.c;h=a9175db83a82dd5600411c25eab29e7d641a6424;hp=1eb424cb9adadc01877d91bf88c57bb82fe0776d;hb=3cdbcb6ae69304350294ec250d84b6ce9ea688b0;hpb=c09b925450a5d3e26c8e63f4af79f7c666a12ebc

diff --git a/src/main.c b/src/main.c
index 1eb424c..a9175db 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1085,10 +1085,8 @@ _("This is probably an installation error.  Please, try to rebuild:")));
 		  ERROR ((stderr, _("\tmake")));
 		  ERROR ((stderr, _("\tmake check")));
 		  ERROR ((stderr, _("\tmake install")));
-		  ERROR ((stderr,
-_("or set the environment variable `ENSCRIPT_LIBRARY' to point to your")));
-		  ERROR ((stderr,
-_("library directory.")));
+		  ERROR ((stderr, _("or set the environment variable `ENSCRIPT_LIBRARY'"
+			" to point to your library directory.")));
 		  exit (1);
 		}
 
@@ -1756,8 +1754,15 @@ name             width\theight\tllx\tlly\turx\tury\n\
 	real_total_pages = total_pages;
 
       /* We did something, tell what.  */
-      MESSAGE (0, (stderr, _("[ %d pages * %d copy ]"), real_total_pages,
-		   num_copies));
+      char message[80];
+      snprintf(message, sizeof message, "%s%s%s%s%s",
+	       "[ ",
+	       ngettext("%d page", "%d pages", real_total_pages),
+	       " * ",
+	       ngettext("%d copy", "%d copies", num_copies),
+	       " ]");
+      MESSAGE (0, (stderr, message, real_total_pages, num_copies));
+
       if (output_file == OUTPUT_FILE_NONE)
 	MESSAGE (0, (stderr, _(" sent to %s\n"),
 		     printer ? printer : _("printer")));
@@ -2001,7 +2006,7 @@ handle_options (int argc, char *argv[])
       int i;
 
       c = getopt_long (argc, argv,
-		       "#:123456789a:A:b:BcC::d:D:e::E::f:F:gGhH::i:I:jJ:kKlL:mM:n:N:o:Op:P:qrRs:S:t:T:u::U:vVwW:X:zZ",
+		       "#:123456789a:A:b:BcC::d:D:e::E::f:F:gGhH::i:I:jJ:kKlL:mM:n:N:o:Op:P:qrRs:S:t:T:u::U:vVw:W:X:zZ",
 		       long_options, &option_index);
 
       if (c == -1)
@@ -2519,16 +2524,16 @@ Mandatory arguments to long options are mandatory for short options too.\n\
   -b, --header=HEADER        set page header\n\
   -B, --no-header            no page headers\n\
   -c, --truncate-lines       cut long lines (default is to wrap)\n\
-  -C, --line-numbers[=START]\n\
+  -C[START], --line-numbers[=START]\n\
                              precede each line with its line number\n\
   -d                         an alias for option --printer\n\
   -D, --setpagedevice=KEY[:VALUE]\n\
                              pass a page device definition to output\n\
-  -e, --escapes[=CHAR]       enable special escape interpretation\n"),
+  -e[CHAR], --escapes[=CHAR]       enable special escape interpretation\n"),
           program);
 
   printf (_("\
-  -E, --highlight[=LANG]     highlight source code\n"));
+  -E[LANG], --highlight[=LANG]     highlight source code\n"));
 
   printf (_("\
   -f, --font=NAME            use font NAME for body text\n\
@@ -2537,7 +2542,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
   -G                         same as --fancy-header\n\
       --fancy-header[=NAME]  select fancy page header\n\
   -h, --no-job-header        suppress the job header page\n\
-  -H, --highlight-bars=NUM   specify how high highlight bars are\n\
+  -H[NUM], --highlight-bars[=NUM]  specify how high highlight bars are\n\
   -i, --indent=NUM           set line indent to NUM characters\n\
   -I, --filter=CMD           read input files through input filter CMD\n\
   -j, --borders              print borders around columns\n\
@@ -2571,7 +2576,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
   -t, --title=TITLE          set banner page's job title to TITLE.  Option\n\
                              sets also the name of the input file stdin.\n\
   -T, --tabsize=NUM          set tabulator size to NUM\n\
-  -u, --underlay[=TEXT]      print TEXT under every page\n\
+  -u[TEXT], --underlay[=TEXT]      print TEXT under every page\n\
   -U, --nup=NUM              print NUM logical pages on each output page\n\
   -v, --verbose              tell what we are doing\n\
   -V, --version              print version number\n\