initial.

[lilypond.git] / lily / main.cc

diff --git a/lily/main.cc b/lily/main.cc
index 728cd89508570f2fff306e3dd3a9ddc679c9c5bb..63f4a24263769ba607c30147cbccaa2a618f7598 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -152,9 +152,9 @@ static Long_option_init options_static[]
 = {
   {_i ("BACK"), "backend", 'b', _i ("use backend BACK (gnome, ps,eps,\nscm, svg, tex, texstr)\ndefault: PS")},
 
-  {_i ("SYM=VAL"), "define-default", 'd',
-   _i ("set a Scheme program option. Uses #t if VAL is not specified\n"
-       "Try -dhelp for help.")},
+  {_i ("SYM[=VAL]"), "define-default", 'd',
+   _i ("set Scheme program option SYM to VAL (default: #t)\n"
+       "Use -dhelp for help.")},
 
   {_i ("EXPR"), "evaluate", 'e', _i ("evaluate scheme code")},
   /* Bug in option parser: --output =foe is taken as an abbreviation
@@ -166,7 +166,7 @@ static Long_option_init options_static[]
   {0, "png", 0, _i ("generate PNG")},
   {0, "ps", 0, _i ("generate PostScript")},
   {0, "tex", 0, _i ("generate TeX (tex backend only)")},
-  {0, "help", 'h',  _i ("print this help")},
+  {0, "help", 'h',  _i ("show this help and exit")},
   {_i ("FIELD"), "header", 'H',  _i ("dump a header field to file BASENAME.FIELD")},
   {_i ("DIR"), "include", 'I',  _i ("add DIR to search path")},
   {_i ("FILE"), "init", 'i',  _i ("use FILE as init file")},
@@ -178,7 +178,7 @@ static Long_option_init options_static[]
   {_i ("FILE"), "output", 'o',  _i ("write output to FILE (suffix will be added)")},
   {0, "preview", 'p',  _i ("generate a preview of the first system")},
   {0, "safe-mode", 's',  _i ("disallow unsafe Scheme and PostScript operations")},
-  {0, "version", 'v',  _i ("print version number")},
+  {0, "version", 'v',  _i ("show version number and exit")},
   {0, "verbose", 'V', _i ("be verbose")},
   {0, "warranty", 'w',  _i ("show warranty and copyright")},
   {0, 0, 0, 0}
@@ -320,7 +320,7 @@ do_chroot_jail ()
       if (errno == 0)
        error (_f ("no such user: %s", components[USER_NAME]));
       else
-       error (_f ("can't get user id from user name: %s: %s",
+       error (_f (cannot get user id from user name: %s: %s",
                   components[USER_NAME],
                   strerror (errno)));
       exit (3);
@@ -337,7 +337,7 @@ do_chroot_jail ()
       if (errno == 0)
        error (_f ("no such group: %s", components[GROUP_NAME]));
       else
-       error (_f ("can't get group id from group name: %s: %s",
+       error (_f (cannot get group id from group name: %s: %s",
                   components[GROUP_NAME],
                   strerror (errno)));
       exit (3);
@@ -345,26 +345,26 @@ do_chroot_jail ()
 
   if (chroot (components[JAIL].c_str ()))
     {
-      error (_f ("can't chroot to: %s: %s", components[JAIL],
+      error (_f (cannot chroot to: %s: %s", components[JAIL],
                 strerror (errno)));
       exit (3);
     }
 
   if (setgid (gid))
     {
-      error (_f ("can't change group id to: %d: %s", gid, strerror (errno)));
+      error (_f (cannot change group id to: %d: %s", gid, strerror (errno)));
       exit (3);
     }
 
   if (setuid (uid))
     {
-      error (_f ("can't change user id to: %d: %s", uid, strerror (errno)));
+      error (_f (cannot change user id to: %d: %s", uid, strerror (errno)));
       exit (3);
     }
 
   if (chdir (components[DIR].c_str ()))
     {
-      error (_f ("can't change working directory to: %s: %s", components[DIR],
+      error (_f (cannot change working directory to: %s: %s", components[DIR],
                 strerror (errno)));
       exit (3);
     }