* flower/libc-extension.cc: idem.

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

diff --git a/flower/include/international.hh b/flower/include/international.hh
index 730b9924e6e38511733763ef734f8aa63a155b86..bce42e30d4f516b41c37c5285cf1ae32cfc4106b 100644 (file)
--- a/flower/include/international.hh
+++ b/flower/include/international.hh
@@ -3,14 +3,34 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--2003 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 
 #ifndef INTERNATIONAL_HH
 #define INTERNATIONAL_HH
 
-#define _(str) str
+#include "string.hh"
 
-#endif /* INTERNATIONAL_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.
+ */
+#define _i(sz) sz
+
+// don't inline: get warnings only once
+/**
+ Internationalisation: _ ("to be translated") gets "translated" by GNU gettext
+*/
+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 = "");
+
+#endif // INTERNATIONAL_HH