X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgettext.C;h=925e433363d50ab80972a4c4c70d3f5df129db64;hb=8cc9180ba8b606837a9e874014c8191cd85f9310;hp=ea38cc88e9e2ade06473572ddb741e7a6259eb25;hpb=5aa348d9691cb85721d789c61935caa17ec1b84b;p=lyx.git

diff --git a/src/gettext.C b/src/gettext.C
index ea38cc88e9..925e433363 100644
--- a/src/gettext.C
+++ b/src/gettext.C
@@ -14,19 +14,22 @@
 #include "gettext.h"
 #include "messages.h"
 #include "support/environment.h"
-#include "support/docstring.h"
+
+
+namespace lyx {
 
 #ifdef HAVE_LOCALE_H
 #  include <locale.h>
 #endif
 
+using support::setEnv;
+
 using std::string;
-using lyx::support::setEnv;
 
 
 namespace {
 
-Messages & getLyXMessages()
+static Messages & getLyXMessages()
 {
 	static Messages lyx_messages;
 
@@ -36,9 +39,9 @@ Messages & getLyXMessages()
 } // anon namespace
 
 
-string const _(string const & str)
+docstring const _(string const & str)
 {
-	return lyx::to_utf8(getLyXMessages().get(str));
+	return getLyXMessages().get(str);
 }
 
 
@@ -63,3 +66,6 @@ void locale_init()
 }
 
 #endif
+
+
+} // namespace lyx