* flower/international.cc:

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

diff --git a/flower/include/international.hh b/flower/include/international.hh
index 42c83f4ee080d5bda8b89cd5788e52bde8860fd4..bba4a5a3305c0303f54810b14594e0b6dd544c4c 100644 (file)
--- a/flower/include/international.hh
+++ b/flower/include/international.hh
@@ -1,35 +1,35 @@
-/*   
+/*
   international.hh -- declare stuff for internationalization
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
-  
- */
+
+  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #ifndef INTERNATIONAL_HH
 #define INTERNATIONAL_HH
 
+#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 explicitely 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);
+Std_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 = "");
+Std_string _f (char const *format, ...);
+Std_string _f (char const *format, Std_string s, Std_string s2 = "", Std_string s3 = "");
 
 #endif // INTERNATIONAL_HH