Commit 0ef59d99 authored by Friedemann Kleint's avatar Friedemann Kleint

tr()-Fixes for 2.3: Small spelling/notr-fixes.

Change-Id: I66b8b0e20b225429b4399dfca154a2806260ac61
Reviewed-on: http://codereview.qt.nokia.com/483Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@nokia.com>
parent a6c63854
......@@ -43,6 +43,7 @@
#include <QtCore/QStringList>
#include <QtCore/QDebug>
#include <QtCore/QFileInfo>
#include <QtCore/QCoreApplication>
namespace Valgrind {
namespace Callgrind {
......@@ -214,9 +215,9 @@ QString Function::location() const
if (f.isEmpty() || f == "???")
return o;
if (pos.isEmpty())
return QObject::tr("%1 in %2").arg(f, o);
return QCoreApplication::translate("Valgrind::Callgrind::Function", "%1 in %2").arg(f, o);
return QObject::tr("%1:%2 in %3").arg(f, pos, o);
return QCoreApplication::translate("Valgrind::Callgrind::Function", "%1:%2 in %3").arg(f, pos, o);
}
int Function::lineNumber() const
......
......@@ -144,7 +144,7 @@ void MemcheckRunner::startRemotely(const Utils::SshConnectionParameters &sshPara
QHostAddress hostAddr;
if (possibleHostAddresses.isEmpty()) {
emit processErrorReceived(tr("No network interface found to use for remote analyzation."),
emit processErrorReceived(tr("No network interface found for remote analysis."),
QProcess::FailedToStart);
return;
} else if (possibleHostAddresses.size() > 1) {
......@@ -153,7 +153,7 @@ void MemcheckRunner::startRemotely(const Utils::SshConnectionParameters &sshPara
QVBoxLayout *layout = new QVBoxLayout;
QLabel *description = new QLabel;
description->setWordWrap(true);
description->setText(tr("More than one network interface was found on your machine. Please select which one you want to use for remote analyzation."));
description->setText(tr("More than one network interface was found on your machine. Please select which one you want to use for remote analysis."));
layout->addWidget(description);
QListWidget *list = new QListWidget;
foreach (const QHostAddress &address, possibleHostAddresses)
......
......@@ -72,7 +72,7 @@
<item row="2" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Port</string>
<string>Port:</string>
</property>
<property name="buddy">
<cstring>port</cstring>
......
......@@ -340,7 +340,7 @@
<widget class="QCheckBox" name="alignAssignments">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
Enables alignment to tokens after =, += etc. When the option is disabled regular continuation line indentation will be used.&lt;br&gt;
Enables alignment to tokens after =, += etc. When the option is disabled, regular continuation line indentation will be used.&lt;br&gt;
&lt;br&gt;
With alignment:
&lt;pre&gt;
......
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>QmlJSTools::Internal::QmlJSCodeStyleSettingsPage</class>
<widget class="QWidget" name="QmlJSCodeStyleSettingsPage">
<widget class="QWidget" name="QmlJSTools::Internal::QmlJSCodeStyleSettingsPage">
<property name="geometry">
<rect>
<x>0</x>
......@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
<string notr="true">Form</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
......@@ -27,7 +27,7 @@
<item>
<widget class="TextEditor::SnippetEditorWidget" name="previewTextEdit">
<property name="plainText">
<string>import QtQuick 1.0
<string notr="true">import QtQuick 1.0
Rectangle {
width: 360
......
......@@ -17,11 +17,7 @@
<item>
<widget class="QLabel" name="noValidQtVersionsLabel">
<property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;No valid qt versions found.&lt;/span&gt;&lt;br /&gt;Please add a Qt version in Tools/Options or via the maintenance tool of the SDK.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;No valid Qt versions found.&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please add a Qt version in &lt;i&gt;Tools/Options&lt;/i&gt; or via the maintenance tool of the SDK.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
......@@ -74,8 +70,8 @@ p, li { white-space: pre-wrap; }
<rect>
<x>0</x>
<y>0</y>
<width>541</width>
<height>381</height>
<width>533</width>
<height>352</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2"/>
......
......@@ -151,13 +151,13 @@ void DebuggingHelperBuildTask::run(QFutureInterface<void> &future)
const QString error
= QCoreApplication::translate(
"QtVersion",
"Build failed!");
"Build failed.");
log(QString(), error);
} else {
const QString result
= QCoreApplication::translate(
"QtVersion",
"Build succeeded!");
"Build succeeded.");
log(result, QString());
}
......
......@@ -367,7 +367,7 @@ void MaemoPublisherFremantleFree::runDpkgBuildPackage()
QtSupport::BaseQtVersion *lqt = m_buildConfig->qtVersion();
if (!lqt)
finishWithFailure(QString(), tr("No qt version set"));
finishWithFailure(QString(), tr("No Qt version set"));
if (m_state == Inactive)
return;
......
......@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>416</width>
<width>494</width>
<height>565</height>
</rect>
</property>
......@@ -64,14 +64,9 @@
<item row="0" column="0">
<widget class="QCheckBox" name="enableCacheSim">
<property name="toolTip">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
&lt;p&gt;Specify if you want to do full cache simulation.&lt;/p&gt;
&lt;p&gt;By default, only instruction read accesses will be counted (&quot;Ir&quot;).&lt;/p&gt;
&lt;p&gt;
With cache simulation, further event counters are enabled:
&lt;ul&gt;&lt;li&gt;Cache misses on instruction reads (&quot;I1mr&quot;/&quot;I2mr&quot;)&lt;/li&gt;
......@@ -89,10 +84,7 @@ For more information, see ???.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<item row="1" column="0">
<widget class="QCheckBox" name="enableBranchSim">
<property name="toolTip">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
&lt;p&gt;Specify if you want to do branch prediction simulation.&lt;/p&gt;
&lt;p&gt;Further event counters are enabled: &lt;/p&gt;
&lt;ul&gt;&lt;li&gt;Number of executed conditional branches and related predictor misses (
......@@ -121,7 +113,7 @@ p, li { white-space: pre-wrap; }
<string>This specifies whether the number of global bus events executed should be collected. The event type &quot;Ge&quot; is used for these events.</string>
</property>
<property name="text">
<string>Collect global bus events:</string>
<string>Collect global bus events</string>
</property>
</widget>
</item>
......
......@@ -954,7 +954,7 @@ bool VCSBasePlugin::runPatch(const QByteArray &input, const QString &workingDire
VCSBaseOutputWindow *ow = VCSBaseOutputWindow::instance();
const QString patch = Internal::VCSPlugin::instance()->settings().patchCommand;
if (patch.isEmpty()) {
ow->appendError(tr("There is no patch-command configured in the commone 'Version Control' settings."));
ow->appendError(tr("There is no patch-command configured in the common 'Version Control' settings."));
return false;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment