From 5dd8dfba300ab7e0438f81de72e0cab1909c21ff Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Tue, 23 Mar 2010 17:24:59 +0100
Subject: [PATCH] tr()-Fixes
---
src/libs/qmljs/qmljsinterpreter.cpp | 11 +++++-----
src/plugins/coreplugin/generalsettings.ui | 2 +-
src/plugins/git/gitclient.cpp | 8 ++++----
src/plugins/help/docsettingspage.ui | 10 +++------
src/plugins/help/filtersettingspage.ui | 25 +++++++++++------------
5 files changed, 26 insertions(+), 30 deletions(-)
diff --git a/src/libs/qmljs/qmljsinterpreter.cpp b/src/libs/qmljs/qmljsinterpreter.cpp
index fb825e7acc8..8de65a1b5bf 100644
--- a/src/libs/qmljs/qmljsinterpreter.cpp
+++ b/src/libs/qmljs/qmljsinterpreter.cpp
@@ -38,6 +38,7 @@
#include <QtCore/QMetaObject>
#include <QtCore/QMetaProperty>
#include <QtCore/QXmlStreamReader>
+#include <QtCore/QCoreApplication>
#include <QtCore/QDebug>
using namespace QmlJS::Interpreter;
@@ -315,7 +316,7 @@ public:
if (_xml.name() == "module")
readModule();
else
- _xml.raiseError(QObject::tr("The file is not module file."));
+ _xml.raiseError(QCoreApplication::translate("QmlJS::Interpreter::QmlXmlReader", "The file is not module file."));
}
return !_xml.error();
@@ -327,7 +328,7 @@ public:
private:
void unexpectedElement(const QStringRef &child, const QString &parent) {
- _xml.raiseError(QObject::tr("Unexpected element <%1> in <%2>").arg(child.toString(), parent));
+ _xml.raiseError(QCoreApplication::translate("QmlJS::Interpreter::QmlXmlReader", "Unexpected element <%1> in <%2>").arg(child.toString(), parent));
}
void ignoreAttr(const QXmlStreamAttribute &attr) {
@@ -336,11 +337,11 @@ private:
}
void invalidAttr(const QString &value, const QString &attrName, const QString &tag) {
- _xml.raiseError(QObject::tr("invalid value '%1' for attribute %2 in <%3>").arg(value, attrName, tag));
+ _xml.raiseError(QCoreApplication::translate("QmlJS::Interpreter::QmlXmlReader", "invalid value '%1' for attribute %2 in <%3>").arg(value, attrName, tag));
}
void noValidAttr(const QString &attrName, const QString &tag) {
- _xml.raiseError(QObject::tr("<%1> has no valid %2 attribute").arg(tag, attrName));
+ _xml.raiseError(QCoreApplication::translate("QmlJS::Interpreter::QmlXmlReader", "<%1> has no valid %2 attribute").arg(tag, attrName));
}
void readModule()
@@ -1857,7 +1858,7 @@ QStringList MetaTypeSystem::load(const QFileInfoList &xmlFiles)
}
file.close();
} else {
- errorMsgs.append(QObject::tr("%1: %2").arg(xmlFile.absoluteFilePath(),
+ errorMsgs.append(QCoreApplication::translate("QmlJS::Interpreter::QmlXmlReader", "%1: %2").arg(xmlFile.absoluteFilePath(),
file.errorString()));
}
}
diff --git a/src/plugins/coreplugin/generalsettings.ui b/src/plugins/coreplugin/generalsettings.ui
index a143b0eddd2..c708be98693 100644
--- a/src/plugins/coreplugin/generalsettings.ui
+++ b/src/plugins/coreplugin/generalsettings.ui
@@ -234,7 +234,7 @@
</item>
<item>
<property name="text">
- <string>Reload all unmodified files</string>
+ <string>Reload all unchanged editors</string>
</property>
</item>
<item>
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index ab8094672ba..a2310888c24 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -924,7 +924,7 @@ bool GitClient::synchronousBranchCmd(const QString &workingDirectory, QStringLis
QByteArray errorText;
const bool rc = synchronousGit(workingDirectory, branchArgs, &outputText, &errorText);
if (!rc) {
- *errorMessage = tr("Unable to run branch command: %1: %2").arg(workingDirectory, commandOutputFromLocal8Bit(errorText));
+ *errorMessage = tr("Unable to run a 'git branch' command in %1: %2").arg(workingDirectory, commandOutputFromLocal8Bit(errorText));
return false;
}
*output = commandOutputFromLocal8Bit(outputText);
@@ -942,7 +942,7 @@ bool GitClient::synchronousShow(const QString &workingDirectory, const QString &
QByteArray errorText;
const bool rc = synchronousGit(workingDirectory, args, &outputText, &errorText);
if (!rc) {
- *errorMessage = tr("Unable to run show: %1: %2").arg(workingDirectory, commandOutputFromLocal8Bit(errorText));
+ *errorMessage = tr("Unable to run 'git show' in %1: %2").arg(workingDirectory, commandOutputFromLocal8Bit(errorText));
return false;
}
*output = commandOutputFromLocal8Bit(outputText);
@@ -962,7 +962,7 @@ bool GitClient::synchronousCleanList(const QString &workingDirectory,
QByteArray errorText;
const bool rc = synchronousGit(workingDirectory, args, &outputText, &errorText);
if (!rc) {
- *errorMessage = tr("Unable to run clean --dry-run: %1: %2").arg(workingDirectory, commandOutputFromLocal8Bit(errorText));
+ *errorMessage = tr("Unable to run 'git clean' in %1: %2").arg(workingDirectory, commandOutputFromLocal8Bit(errorText));
return false;
}
// Filter files that git would remove
@@ -1469,7 +1469,7 @@ void GitClient::slotPullRebaseFinished(bool ok, int exitCode, const QVariant &co
return;
// Abort rebase to clean if something goes wrong
VCSBase::VCSBaseOutputWindow *outwin = VCSBase::VCSBaseOutputWindow::instance();
- outwin->appendError(tr("git pull --rebase failed, aborting rebase."));
+ outwin->appendError(tr("The command 'git pull --rebase' failed, aborting rebase."));
const QString workingDir = cookie.toString();
QStringList arguments;
arguments << QLatin1String("rebase") << QLatin1String("--abort");
diff --git a/src/plugins/help/docsettingspage.ui b/src/plugins/help/docsettingspage.ui
index 03b5963b16d..07061ca2ed0 100644
--- a/src/plugins/help/docsettingspage.ui
+++ b/src/plugins/help/docsettingspage.ui
@@ -11,13 +11,9 @@
</rect>
</property>
<property name="toolTip">
- <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial,Geneva,Helvetica,sans-serif'; font-size:8pt;">The Documentation</span><span style=" font-family:'Arial,Geneva,Helvetica,sans-serif'; font-size:8pt; font-weight:600;"> </span><span style=" font-family:'Arial,Geneva,Helvetica,sans-serif'; font-size:8pt;">page lets you install and remove compressed help files.</span></p>
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Arial,Geneva,Helvetica,sans-serif'; font-size:8pt;"></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial,Geneva,Helvetica,sans-serif'; font-size:8pt;">Click the </span><span style=" font-family:'Arial,Geneva,Helvetica,sans-serif'; font-size:8pt; font-weight:600;">Install</span><span style=" font-family:'Arial,Geneva,Helvetica,sans-serif'; font-size:8pt;"> button and choose the path of the compressed help file (*.qch) you would like to install. To delete a help file, select a documentation set in the list and click </span><span style=" font-family:'Arial,Geneva,Helvetica,sans-serif'; font-size:8pt; font-weight:600;">Remove</span><span style=" font-family:'Arial,Geneva,Helvetica,sans-serif'; font-size:8pt;">.</span></p></body></html></string>
+ <string><html><body><p>The Documentation page lets you install and remove compressed help files.</p>
+<p>Click the <b>Install</b> button and choose the path of the compressed help file (*.qch) you would like to install. To delete a help file, select a documentation set in the list and click <b>Remove</b>.</p></body></html>
+</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
diff --git a/src/plugins/help/filtersettingspage.ui b/src/plugins/help/filtersettingspage.ui
index 76cae9b91e1..ec03b86d7ec 100644
--- a/src/plugins/help/filtersettingspage.ui
+++ b/src/plugins/help/filtersettingspage.ui
@@ -11,19 +11,18 @@
</rect>
</property>
<property name="toolTip">
- <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial,Geneva,Helvetica,sans-serif';">The </span><span style=" font-family:'Arial,Geneva,Helvetica,sans-serif';">Filters</span><span style=" font-family:'Arial,Geneva,Helvetica,sans-serif';"> page lets you create and remove documentation filters.</span></p>
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Arial,Geneva,Helvetica,sans-serif';"></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial,Geneva,Helvetica,sans-serif';">To add a new filter, click the </span><span style=" font-family:'Arial,Geneva,Helvetica,sans-serif'; font-weight:600;">Add</span><span style=" font-family:'Arial,Geneva,Helvetica,sans-serif';"> button, specify a filter name in the pop-up dialog and click </span><span style=" font-family:'Arial,Geneva,Helvetica,sans-serif'; font-weight:600;">OK</span><span style=" font-family:'Arial,Geneva,Helvetica,sans-serif';">, then select the filter attributes in the list box on the right hand side. You can delete a filter by selecting it and clicking the </span><span style=" font-family:'Arial,Geneva,Helvetica,sans-serif'; font-weight:600;">Remove</span><span style=" font-family:'Arial,Geneva,Helvetica,sans-serif';"> button.</span></p>
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">A filter is identified by its name and contains a list of filter attributes. An attribute is just a string that can be freely chosen. Attributes are defined by the documentation itself, this means that every documentation set usually has one or more attributes.</span></p>
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">For example, the Qt 4.7.0 Linguist documentation defines the attributes '</span><span style=" font-size:8pt; font-weight:600;">qt</span><span style=" font-size:8pt;">', '</span><span style=" font-size:8pt; font-weight:600;">tools</span><span style=" font-size:8pt;">' and '</span><span style=" font-size:8pt; font-weight:600;">4.7.0'</span><span style=" font-size:8pt;">, Qt Designer defines </span><span style=" font-size:8pt; font-weight:600;">'designer</span><span style=" font-size:8pt;">', '</span><span style=" font-size:8pt; font-weight:600;">tools</span><span style=" font-size:8pt;">' and '</span><span style=" font-size:8pt; font-weight:600;">4.7.0</span><span style=" font-size:8pt;">'. The filter to display all tools would then define only the attribute '</span><span style=" font-size:8pt; font-weight:600;">tools'</span><span style=" font-size:8pt;"> since this attribute is part of both documentation sets. </span></p>
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Adding the attribute '</span><span style=" font-size:8pt; font-weight:600;">qmake'</span><span style=" font-size:8pt;"> to the filter would then only show qmake documentation, since the Qt Designer documentation does not contain this attribute. Having an empty list of attributes in a filter will match all documentation; i.e., it is equivalent to requesting unfiltered documentation.</span></p></body></html></string>
+ <string><html><body>
+<p>
+The Filters page lets you create and remove documentation filters.
+</p><p>
+To add a new filter, click the <b>Add</b> button, specify a filter name in the pop-up dialog and click <b>OK</b>, then select the filter attributes in the list box on the right hand side. You can delete a filter by selecting it and clicking the <b>Remove</b> button.
+</p><p>
+A filter is identified by its name and contains a list of filter attributes. An attribute is just a string that can be freely chosen. Attributes are defined by the documentation itself, this means that every documentation set usually has one or more attributes.
+</p><p>
+For example, the Qt 4.7.0 Linguist documentation defines the attributes '<b>qt</b>', '<b>tools</b>' and '<b>4.7.0</b>', Qt Designer defines '<b>designer</b>', '<b>tools</b>' and '<b>4.7.0</b>'. The filter to display all tools would then define only the attribute '<b>tools</b>' since this attribute is part of both documentation sets.
+</p><p>
+Adding the attribute '<b>qmake</b>' to the filter would then only show qmake documentation, since the Qt Designer documentation does not contain this attribute. Having an empty list of attributes in a filter will match all documentation; i.e., it is equivalent to requesting unfiltered documentation.
+</p></body></html></string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
--
GitLab