X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Finternational.hh;h=f2f48996de62ca288b80ae2d9857da79a65709b0;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=5ebbb65aeeaf18946e81d80782e6d656534a4e7e;hpb=47d57fc7c6db37f356f7d0a4413e36fd9d25718a;p=lilypond.git

diff --git a/flower/include/international.hh b/flower/include/international.hh
index 5ebbb65aee..f2f48996de 100644
--- a/flower/include/international.hh
+++ b/flower/include/international.hh
@@ -1,36 +1,53 @@
-/*   
-  international.hh -- declare stuff for internationalization
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c)  1997--1999 Jan Nieuwenhuizen <janneke@gnu.org>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1997--2015 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 "string.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".
- See flower/getopt-long.cc.
- */
+   Internationalisation: _i ("to be translated") gets an entry in the POT file
+   gettext () must be invoked explicitly to do the actual "translation".
+   See flower/getopt-long.cc.
+*/
 #define _i(sz) sz
 
 // don't inline: get warnings only once
 /**
- Internationalisation: _ ("to be translated") gets "translated" by GNU gettext
+   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
+   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