partial: 1.3.56.jcn

[lilypond.git] / midi2ly / main.cc

diff --git a/midi2ly/main.cc b/midi2ly/main.cc
index 016921ed1befdf9ba9b062b576c84f27a9304ef8..6a683a03e4d74f1dd7e6000765754c331f7dc914 100644 (file)
--- a/midi2ly/main.cc
+++ b/midi2ly/main.cc
@@ -3,6 +3,7 @@
 //
 // copyright 1997 Jan Nieuwenhuizen <janneke@gnu.org>
 
+#include <iostream.h>
 #include <assert.h>
 #include <locale.h>
 #include "config.h"
@@ -56,7 +57,7 @@ version ()
     "midi2ly");
   cout << endl;
 
-  cout << _f ("Copyright (c) %s by", "1996--1999");
+  cout << _f ("Copyright (c) %s by", "1996--2000");
   cout << "Han-Wen Nienhuys <hanwen@cs.uu.nl>\n"
        << "Jan Nieuwenhuizen <janneke@gnu.org>\n";
 }
@@ -91,16 +92,16 @@ Long_option_init long_option_init_a[] =
   {0, "debug", 'd', _i ("enable debugging output")},
   {0, "help", 'h', _i ("this help")},
   {_i ("ACC[:MINOR]"), "key", 'k', _i ("set key: ACC +sharps/-flats; :1 minor")},
-  {0, "no-silly", 'n', _i ("assume no tuplets or double dots, smallest is 32")},
+  {0, "no-silly", 'n', _i ("don't output tuplets or double dots, smallest is 32")},
   {_i ("FILE"), "output", 'o', _i ("set FILE as default output")},
-  {0, "no-tuplets", 'p', _i ("assume no tuplets")},
+  {0, "no-tuplets", 'p', _i ("don't output tuplets")},
   {0, "quiet", 'q', _i ("be quiet")},
-  {_i ("DUR"), "smallest", 's', _i ("Set smallest duration (?)")},
+  {_i ("DUR"), "smallest", 's', _i ("set smallest duration")},
   {0, "no-timestamps", 'T', _i ("don't timestamp the output")},
+  {0, "version", 'V', _i ("print version number")},
   {0, "verbose", 'v', _i ("be verbose")},
   {0, "warranty", 'w', _i ("show warranty and copyright")},
   {0, "no-double-dots", 'x', _i ("assume no double dotted notes")},
-  {0, "version", 'V', _i ("print version number")},
   {0,0,0, 0}
 };
 
@@ -109,14 +110,14 @@ usage()
 {
   cout << _f ("Usage: %s [OPTION]... [FILE]", "midi2ly");
   cout << '\n';
-  cout << _ ("Translate midi-file to mudela");
+  cout << _ ("Translate MIDI-file to mudela");
   cout << '\n';
   cout << '\n';
   cout << _ ("Options:");
   cout << '\n';
   cout << Long_option_init::table_str (long_option_init_a) << endl;
 
-  cout << _("Report bugs to") << " bug-gnu-music@gnu.org" << endl;
+  cout << _f ("Report bugs to %s", "bug-gnu-music@gnu.org") << endl;
 }
 
 int