Don't assume compiler can avoid copy to const ref.

[ardour.git] / libs / ardour / i18n.h

diff --git a/libs/ardour/i18n.h b/libs/ardour/i18n.h
index 3ace2504192fc540986dc3975a86b3d4a8802775..43ae07cac130dadd05b158a4afae3039b2134809 100644 (file)
--- a/libs/ardour/i18n.h
+++ b/libs/ardour/i18n.h
@@ -1,16 +1,20 @@
 #ifndef __i18n_h__
 #define __i18n_h__
 
-#include <pbd/compose.h>
+#include "pbd/compose.h"
+#include "pbd/convert.h"
 #include "gettext.h"
 
 #include <vector>
 #include <string>
 
-std::vector<std::string> internationalize (const char **);
-
 #define _(Text)  dgettext (PACKAGE,Text)
 #define N_(Text) gettext_noop (Text)
 #define X_(Text) Text
+#define I18N(Array) PBD::internationalize (PACKAGE, Array)
+/** Use this to translate strings that have different meanings in different places.
+ *  Text should be of the form Context|Message.
+ */
+#define S_(Text) PBD::sgettext (PACKAGE, Text)
 
 #endif // __i18n_h__