X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Finternational.hh;h=e317efda456b97a4cf53469a5c226f01f02e4f94;hb=c39d188d28fdc84cef8cbaea7b8d6e2fb718c30f;hp=5d1d27f40e00a17751ec5dd338d308384828a691;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/flower/include/international.hh b/flower/include/international.hh
index 5d1d27f40e..e317efda45 100644
--- a/flower/include/international.hh
+++ b/flower/include/international.hh
@@ -1,17 +1,32 @@
 /*
-  international.hh -- declare stuff for internationalization
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2014 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef INTERNATIONAL_HH
 #define INTERNATIONAL_HH
 
+#include <stdarg.h>
+
+#include "std-string.hh"
+
 /**
    Internationalisation: _i ("to be translated") gets an entry in the POT file
-   gettext () must be invoked explicitely to do the actual "translation".
+   gettext () must be invoked explicitly to do the actual "translation".
    See flower/getopt-long.cc.
 */
 #define _i(sz) sz
@@ -20,14 +35,19 @@
 /**
    Internationalisation: _ ("to be translated") gets "translated" by GNU gettext
 */
-String _ (char const *ch);
+string _ (char const *ch);
 
 /**
    Internationalisation: _f ("Usage: %s [FILE]", "lilypond") gets "translated" by
    GNU gettext
 */
-String _f (char const *format, ...);
-String _f (char const *format, String s, String s2 = "", String s3 = "");
+string _f (char const *format, ...)
+__attribute__ ((format (printf, 1, 2)));
+string _f (char const *format, const string &s, const string &s2 = "", const string &s3 = "");
+/**
+   va_list version of _f
+ */
+string v_f (char const *format, va_list args);
 
 #endif // INTERNATIONAL_HH