Merge branch 'master' into lilypond/translation

[lilypond.git] / lily / main.cc

diff --git a/lily/main.cc b/lily/main.cc
index 29f3e685b363f42ce6729055492f7ca930e64557..1413854b1b33ce8de7ba25942259989e8c677552 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "main.hh"
@@ -12,6 +12,7 @@
 #include <clocale>
 #include <cstring>
 #include <cerrno>
+#include <cstdio>
 using namespace std;
 
 #include <unistd.h>
@@ -127,7 +128,7 @@ static Getopt_long *option_parser = 0;
 
 /* Internationalisation kludge in two steps:
  * use _i () to get entry in POT file
- * call gettext () explicitely for actual "translation"  */
+ * call gettext () explicitly for actual "translation"  */
 
 static Long_option_init options_static[]
 = {
@@ -218,8 +219,8 @@ dir_info (FILE *out)
 static void
 copyright ()
 {
-  printf (_f ("Copyright (c) %s by\n%s  and others.",
-             "1996--2008",
+  /* Do not update the copyright years here, run grand-replace.sh.  */
+  printf (_f ("Copyright (c) %s by\n%s  and others.", "1996--2009",
              AUTHORS).c_str ());
   printf ("\n");
 }
@@ -258,6 +259,10 @@ LY_DEFINE (ly_usage, "ly:usage",
   printf ("\n");
   printf (Long_option_init::table_string (options_static).c_str ());
   printf ("\n");
+  /* Translators, please translate this string as
+         "Report bugs in English via %s",
+     or if there is a LilyPond users list or forum in your language
+         "Report bugs in English via %s or in YOUR_LANG via URI"  */
   printf (_f ("Report bugs via %s",
              "http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs"
              ).c_str ());