Uniformize, internalize.

[lilypond.git] / lily / main.cc

diff --git a/lily/main.cc b/lily/main.cc
index cbab023671bfb8ac7a1259c6905885684c9c80f0..e5b6ef1f7a3d2c6be6b4dde7c15e036a63fa8378 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -86,10 +86,10 @@ static char const *PROGRAM_NAME = "lilypond";
 static char const *PROGRAM_URL = "http://lilypond.org";
 
 static char const *NOTICE =
-_i ("This program is free software.  It is covered by the GNU General Public\n"
+_f ("This program is free software.  It is covered by the GNU General Public\n"
     "License and you are welcome to change it and/or distribute copies of it\n"
-    "under certain conditions.  Invoke as `lilypond --warranty' for more\n"
-    "information.\n");
+    "under certain conditions.  Invoke as `%s --warranty' for more\n"
+    "information.\n", "lilypond").to_str0 ();
   
 static char const *WARRANTY =
 _i ("    This program is free software; you can redistribute it and/or\n"
@@ -337,7 +337,7 @@ static void
 add_output_format (String format)
 {
   if (output_format_global != "")
-    output_format_global += ", ";
+    output_format_global += ",";
   output_format_global += format;
 }