Release: bump Welcome versions.

[lilypond.git] / flower / international.cc

diff --git a/flower/international.cc b/flower/international.cc
index c50a3bad3381349dd9a418ffb50ec5dda0dd7637..1518182a2c379c8286022a0d6501e675849dfb30 100644 (file)
--- a/flower/international.cc
+++ b/flower/international.cc
@@ -1,9 +1,20 @@
 /*
-  international.cc -- implement stuff for internationalisation
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1997--2006 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/>.
 */
 
 #include "config.hh"
@@ -21,25 +32,31 @@ gettext (char const *s)
 #include <libintl.h>
 #endif
 
-std::string
+string
 _ (char const *ch)
 {
-  return std::string (gettext (ch));
+  return string (gettext (ch));
 }
 
-std::string
+string
 _f (char const *format, ...)
 {
   va_list args;
   va_start (args, format);
-  std::string str = String_convert::vform_string (gettext (format), args);
+  string str = v_f (format, args);
   va_end (args);
   return str;
 }
 
-std::string
-_f (char const *format, std::string s, std::string s2, std::string s3)
+string
+v_f (char const *format, va_list args)
+{
+  return String_convert::vform_string (gettext (format), args);
+}
+
+string
+_f (char const *format, const string &s, const string &s2, const string &s3)
 {
   return String_convert::form_string (gettext (format), s.c_str (), s2.c_str (),
-                                     s3.c_str ());
+                                      s3.c_str ());
 }