3 files changed, 13 insertions, 8 deletions
diff --git a/tools/linguist/linguist/main.cpp b/tools/linguist/linguist/main.cpp
index 018fbc5f7d..a6a0d27b4e 100644
--- a/tools/linguist/linguist/main.cpp
+++ b/tools/linguist/linguist/main.cpp
@@ -80,12 +80,15 @@ int main(int argc, char **argv)
     }
 
     QTranslator translator;
-    translator.load(QLatin1String("linguist_") + QLocale::system().name(), resourceDir);
-    app.installTranslator(&translator);
-
     QTranslator qtTranslator;
-    qtTranslator.load(QLatin1String("qt_") + QLocale::system().name(), resourceDir);
-    app.installTranslator(&qtTranslator);
+    QString sysLocale = QLocale::system().name();
+    if (translator.load(QLatin1String("linguist_") + sysLocale, resourceDir)) {
+        app.installTranslator(&translator);
+        if (qtTranslator.load(QLatin1String("qt_") + sysLocale, resourceDir))
+            app.installTranslator(&qtTranslator);
+        else
+            app.removeTranslator(&translator);
+    }
 
     app.setOrganizationName(QLatin1String("Trolltech"));
     app.setApplicationName(QLatin1String("Linguist"));
diff --git a/tools/linguist/linguist/messageeditor.cpp b/tools/linguist/linguist/messageeditor.cpp
index dc8b8e46a7..3fc91e30f6 100644
--- a/tools/linguist/linguist/messageeditor.cpp
+++ b/tools/linguist/linguist/messageeditor.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-/*  TRANSLATOR MsgEdit
+/*  TRANSLATOR MessageEditor
 
   This is the right panel of the main window.
 */
diff --git a/tools/linguist/linguist/phrasebookbox.cpp b/tools/linguist/linguist/phrasebookbox.cpp
index 50749d7ce1..d3bb937c0c 100644
--- a/tools/linguist/linguist/phrasebookbox.cpp
+++ b/tools/linguist/linguist/phrasebookbox.cpp
@@ -56,13 +56,15 @@
 
 QT_BEGIN_NAMESPACE
 
-#define NewPhrase tr("(New Entry)")
-
 PhraseBookBox::PhraseBookBox(PhraseBook *phraseBook, QWidget *parent)
     : QDialog(parent),
       m_phraseBook(phraseBook),
       m_translationSettingsDialog(0)
 {
+
+// This definition needs to be within class context for lupdate to find it
+#define NewPhrase tr("(New Entry)")
+
     setupUi(this);
     setWindowTitle(tr("%1[*] - Qt Linguist").arg(m_phraseBook->friendlyPhraseBookName()));
     setWindowModified(m_phraseBook->isModified());