diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-09-26 16:48:54 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-09-26 16:54:45 +0200 |
| commit | 580f834a5d6d30c6eabafd480da05c1b42d3dc55 (patch) | |
| tree | 36b5a4fe3f007c999310562a875953d8f67302b6 /src | |
| parent | 12c58839c3d7a23bf0b670c552924b4965e9599f (diff) | |
| download | qt-creator-580f834a5d6d30c6eabafd480da05c1b42d3dc55.tar.gz | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/debugger/breakhandler.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/debugger/threadshandler.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/qmljstools/qmljsplugindumper.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/texteditor/texteditorsettings.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp index 898d70c485..379ad29f6d 100644 --- 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) diff --git a/src/plugins/debugger/threadshandler.cpp b/src/plugins/debugger/threadshandler.cpp index 8a2c1e67cc..47350c0aa7 100644 --- 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"); } diff --git a/src/plugins/qmljstools/qmljsplugindumper.cpp b/src/plugins/qmljstools/qmljsplugindumper.cpp index 8d10e930c1..f54d73251c 100644 --- 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); diff --git a/src/plugins/texteditor/texteditorsettings.cpp b/src/plugins/texteditor/texteditorsettings.cpp index 1f626a3df9..1235bb3500 100644 --- 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"))); |