From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Thu, 19 Jul 2018 19:02:31 +0000 (+0200)
Subject: Fixup 30ec879d and 41ebc3fc
X-Git-Tag: lyx-2.4.0dev-acb2ca7b~3282
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=30c6d4fafe0707acc116793531c47fc619ba167c;p=features.git

Fixup 30ec879d and 41ebc3fc

Remove the #if 0 area, which does not seem really useful. Some tweaks
to the code.
---

diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index f009bfc2d2..a2df8d0d47 100644
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -671,28 +671,25 @@ public:
 		: QTranslator(parent)
 	{}
 
-#if QT_VERSION >= 0x050000
 	virtual QString translate(const char * /* context */,
 		const char *sourceText,
+#if QT_VERSION >= 0x050000
 		const char * /* disambiguation */ = 0, int /* n */ = -1) const
 #else
-	QString translate(const char * /*context*/,
-	  const char * sourceText,
-	  const char * /*comment*/ = 0) const
+		const char * /*comment*/ = 0) const
 #endif
 	{
-#if 0
 		// Here we declare the strings that need to be translated from Qt own GUI
 		// This is needed to include these strings to po files
 		_("About %1");
 		_("Preferences");
 		_("Reconfigure");
-		_("Quit %1"));
-#endif
+		_("Quit %1");
 		_("&OK");
 		// Already in po: "Cancel", "&Cancel"
 		_("Apply"); // Already in po: "&Apply"
 		_("Reset"); // Already in po: "&Reset" "R&eset" "Rese&t"
+
 		docstring s = getGuiMessages().getIfFound(sourceText);
 		// This test should eventually be removed when translations are updated
 		if (s.empty())