* Application.C (Application): initialize correctly current_view_.

[lyx.git] / src / gettext.h

diff --git a/src/gettext.h b/src/gettext.h
index be41aef8dcc7a67400e9b4b55e21c8a68068d3cf..0624d8be83ef5379ad9824fda22f73f3c9c3f24b 100644 (file)
--- a/src/gettext.h
+++ b/src/gettext.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file gettext.h
+ * \file src/gettext.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -13,6 +13,11 @@
 #ifndef GETTEXT_H
 #define GETTEXT_H
 
+#include "support/docstring.h"
+
+
+namespace lyx {
+
 /*
  * Native Language Support
  *
@@ -41,12 +46,11 @@
  *   Panic/fatal (that should not happen) messages need not be translated
  */
 
-#include "support/std_string.h"
 
 //#ifdef ENABLE_NLS
 
 ///
-string const _(string const &);
+docstring const _(std::string const &);
 
 //#else // ENABLE_NLS
 
@@ -57,7 +61,17 @@ string const _(string const &);
 
 #  define N_(str) (str)              // for detecting static strings
 
+/**
+ * Translate \p name if it is possible.
+ * This should be used to translate strings that come from configuration
+ * files like .ui files. These strings could already be in the native
+ * language if they come from a file in the personal directory. */
+docstring const translateIfPossible(docstring const & name);
+
 ///
 void locale_init();
 
+
+} // namespace lyx
+
 #endif