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 f009bfc2d21f7fe704fb6cd0b9017a71b9212d0a..a2df8d0d4791fb502316e8c2645221d564cca6b3 100644 (file)
--- 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())