tr()-Fixes for 2.4

Change-Id: I151e75ebec7bff17a3779f1b367849ca514512c6 Reviewed-on: http://codereview.qt-project.org/5550 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

tr()-Fixes for 2.4
Change-Id: I151e75ebec7bff17a3779f1b367849ca514512c6 Reviewed-on: http://codereview.qt-project.org/5550 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
580f834a · Friedemann Kleint · 12c58839 · 580f834a · 580f834a · 580f834a
Commit 580f834a authored Sep 26, 2011 by Friedemann Kleint
--- a/share/qtcreator/templates/wizards/qmakeconsole/wizard.xml
+++ b/share/qtcreator/templates/wizards/qmakeconsole/wizard.xml
@@ -41,7 +41,7 @@ leave room for the Qt 4 target page.
        class="qt4project" firstpage="10"
        id="R.QMake Console" category="I.Projects">
    <icon>console.png</icon>
-    <description>Creates a pure console project using QMake, not using the Qt library.</description>
+    <description>Creates a qmake-based, pure console project, which does not use the Qt library.</description>
    <displayname>Plain C++ Project</displayname>;
    <displaycategory>Other Project</displaycategory>
    <files>

--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -1429,7 +1429,7 @@ QString BreakHandler::BreakpointItem::toToolTip() const
    QString rc;
    QTextStream str(&rc);
    str << "<html><body><table>"
-        //<< "<tr><td>" << tr("Id:") << "</td><td>" << m_id << "</td></tr>"
+        //<< "<tr><td>" << tr("ID:") << "</td><td>" << m_id << "</td></tr>"
        << "<tr><td>" << tr("State:")
        << "</td><td>" << (data.enabled ? tr("Enabled") : tr("Disabled"));
    if (response.pending)

--- a/src/plugins/debugger/threadshandler.cpp
+++ b/src/plugins/debugger/threadshandler.cpp
@@ -178,7 +178,7 @@ QVariant ThreadsHandler::headerData
        return QVariant();
    switch (section) {
    case ThreadData::IdColumn:
-        return QString(QLatin1String("  ") + tr("Id") + QLatin1String("  "));
+        return QString(QLatin1String("  ") + tr("ID") + QLatin1String("  "));
    case ThreadData::FunctionColumn:
        return tr("Function");
    case ThreadData::FileColumn:
@@ -192,7 +192,7 @@ QVariant ThreadsHandler::headerData
    case ThreadData::StateColumn:
        return tr("State");
    case ThreadData::TargetIdColumn:
-        return tr("Target Id");
+        return tr("Target ID");
    case ThreadData::NameColumn:
        return tr("Name");
    }

--- a/src/plugins/qmljstools/qmljsplugindumper.cpp
+++ b/src/plugins/qmljstools/qmljsplugindumper.cpp
@@ -415,7 +415,7 @@ void PluginDumper::dump(const Plugin &plugin)
        } else {
            errorMessage = qmldumpErrorMessage(plugin.qmldirPath,
                    tr("Could not locate the helper application for dumping type information from C++ plugins.\n"
-                       "Please build the qmldump applcation on the Qt version options page."));
+                       "Please build the qmldump application on the Qt version options page."));
        }

        libraryInfo.setPluginTypeInfoStatus(LibraryInfo::DumpError, errorMessage);

--- a/src/plugins/texteditor/texteditorsettings.cpp
+++ b/src/plugins/texteditor/texteditorsettings.cpp
@@ -174,7 +174,7 @@ TextEditorSettings::TextEditorSettings(QObject *parent)
    jsGlobalFormat.setForeground(QColor(0, 85, 175)); // light blue
    jsGlobalFormat.setItalic(true);
    formatDescriptions.append(FormatDescription(QLatin1String(C_JS_IMPORT_VAR), tr("JavaScript Import"), jsGlobalFormat));
-    formatDescriptions.append(FormatDescription(QLatin1String(C_JS_GLOBAL_VAR), tr("JavaScript Global Var"), jsGlobalFormat));
+    formatDescriptions.append(FormatDescription(QLatin1String(C_JS_GLOBAL_VAR), tr("JavaScript Global Variable"), jsGlobalFormat));

    formatDescriptions.append(FormatDescription(QLatin1String(C_KEYWORD), tr("Keyword"), Qt::darkYellow));
    formatDescriptions.append(FormatDescription(QLatin1String(C_OPERATOR), tr("Operator")));