Merge branch 'master' into lilypond/translation

[lilypond.git] / flower / include / international.hh

diff --git a/flower/include/international.hh b/flower/include/international.hh
index fdf41a9b964112206b41507c33c0d698b85116f5..549b9c64d12d97466e1f139cc75df080b82debd7 100644 (file)
--- a/flower/include/international.hh
+++ b/flower/include/international.hh
@@ -3,17 +3,19 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #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
@@ -22,14 +24,19 @@
 /**
    Internationalisation: _ ("to be translated") gets "translated" by GNU gettext
 */
-std::string _ (char const *ch);
+string _ (char const *ch);
 
 /**
    Internationalisation: _f ("Usage: %s [FILE]", "lilypond") gets "translated" by
    GNU gettext
 */
-std::string _f (char const *format, ...);
-std::string _f (char const *format, std::string s, std::string s2 = "", std::string s3 = "");
+string _f (char const *format, ...)
+          __attribute__ ((format (printf, 1, 2)));
+string _f (char const *format, string s, string s2 = "", string s3 = "");
+/**
+   va_list version of _f
+ */
+string v_f (char const *format, va_list args);
 
 #endif // INTERNATIONAL_HH