diff --git a/src/libs/extensionsystem/pluginspec.cpp b/src/libs/extensionsystem/pluginspec.cpp
index 0344940596352ee21a168d7a1c18968a43d568db..8ae4914c97c6afc50736e6053e667c55a7b1d8c9 100644
--- a/src/libs/extensionsystem/pluginspec.cpp
+++ b/src/libs/extensionsystem/pluginspec.cpp
@@ -490,7 +490,7 @@ bool PluginSpecPrivate::read(const QString &fileName)
dependencies.clear();
QFile file(fileName);
if (!file.open(QIODevice::ReadOnly))
- return reportError(tr("Could not open file %1 for read: %2")
+ return reportError(tr("Cannot open file %1 for reading: %2")
.arg(QDir::toNativeSeparators(file.fileName()), file.errorString()));
QFileInfo fileInfo(file);
location = fileInfo.absolutePath();
diff --git a/src/plugins/analyzerbase/startremotedialog.ui b/src/plugins/analyzerbase/startremotedialog.ui
index aab423947d971e2f3bdd6d7a0d71104503e89d10..d14131742850f0af36229602ceb80a8c2286c698 100644
--- a/src/plugins/analyzerbase/startremotedialog.ui
+++ b/src/plugins/analyzerbase/startremotedialog.ui
@@ -52,7 +52,7 @@
<item row="3" column="0">
<widget class="QLabel" name="label_4">
<property name="toolTip">
- <string>You need to pass either a password or a SSH Key.</string>
+ <string>You need to pass either a password or an SSH key.</string>
</property>
<property name="text">
<string>Password:</string>
@@ -95,10 +95,10 @@
<item row="4" column="0">
<widget class="QLabel" name="label_8">
<property name="toolTip">
- <string>You need to pass either a password or a SSH Key.</string>
+ <string>You need to pass either a password or an SSH key.</string>
</property>
<property name="text">
- <string>Private Key:</string>
+ <string>Private key:</string>
</property>
</widget>
</item>
@@ -137,7 +137,7 @@
<item row="2" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
- <string>Working Directory:</string>
+ <string>Working directory:</string>
</property>
</widget>
</item>
diff --git a/src/plugins/bazaar/bazaarcommitpanel.ui b/src/plugins/bazaar/bazaarcommitpanel.ui
index dc07abe9e93faf6fc5e594012caf0d38a046f8fd..1a57ceffa7480f2a8095254a72fca2de8e6b27c6 100644
--- a/src/plugins/bazaar/bazaarcommitpanel.ui
+++ b/src/plugins/bazaar/bazaarcommitpanel.ui
@@ -38,7 +38,7 @@
<widget class="QCheckBox" name="isLocalCheckBox">
<property name="toolTip">
<string>Perform a local commit in a bound branch.
-Local commits are not pushed to the master branch until a normal commit is performed</string>
+Local commits are not pushed to the master branch until a normal commit is performed.</string>
</property>
<property name="text">
<string>Local commit</string>
diff --git a/src/plugins/bazaar/cloneoptionspanel.ui b/src/plugins/bazaar/cloneoptionspanel.ui
index 55ae024b6d65b7361bf88ff9cf4201d8b462c85e..2d08db91e67d9e95af79a99540551dfd8694398e 100644
--- a/src/plugins/bazaar/cloneoptionspanel.ui
+++ b/src/plugins/bazaar/cloneoptionspanel.ui
@@ -39,7 +39,7 @@
<widget class="QCheckBox" name="useExistingDirCheckBox">
<property name="toolTip">
<string>By default, branch will fail if the target directory exists, but does not already have a control directory.
-This flag will allow branch to proceed</string>
+This flag will allow branch to proceed.</string>
</property>
<property name="text">
<string>Use existing directory</string>
@@ -50,7 +50,7 @@ This flag will allow branch to proceed</string>
<widget class="QCheckBox" name="stackedCheckBox">
<property name="toolTip">
<string>Create a stacked branch referring to the source branch.
-The new branch will depend on the availability of the source branch for all operations</string>
+The new branch will depend on the availability of the source branch for all operations.</string>
</property>
<property name="text">
<string>Stacked</string>
@@ -60,7 +60,7 @@ The new branch will depend on the availability of the source branch for all oper
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="standAloneCheckBox">
<property name="toolTip">
- <string>Do not use a shared repository, even if available</string>
+ <string>Do not use a shared repository, even if available.</string>
</property>
<property name="text">
<string>Standalone</string>
@@ -77,7 +77,7 @@ The new branch will depend on the availability of the source branch for all oper
<item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="switchCheckBox">
<property name="toolTip">
- <string>Switch the checkout in the current directory to the new branch</string>
+ <string>Switch the checkout in the current directory to the new branch.</string>
</property>
<property name="text">
<string>Switch checkout</string>
@@ -87,7 +87,7 @@ The new branch will depend on the availability of the source branch for all oper
<item row="5" column="0" colspan="2">
<widget class="QCheckBox" name="hardlinkCheckBox">
<property name="toolTip">
- <string>Hard-link working tree files where possible</string>
+ <string>Hard-link working tree files where possible.</string>
</property>
<property name="text">
<string>Hardlink</string>
@@ -97,7 +97,7 @@ The new branch will depend on the availability of the source branch for all oper
<item row="6" column="0" colspan="2">
<widget class="QCheckBox" name="noTreeCheckBox">
<property name="toolTip">
- <string>Create a branch without a working-tree</string>
+ <string>Create a branch without a working-tree.</string>
</property>
<property name="text">
<string>No working-tree</string>
diff --git a/src/plugins/bazaar/optionspage.ui b/src/plugins/bazaar/optionspage.ui
index d1a0c0dca31dd38618cd7af2f86325ff52d8f400..069cfdb538743285ef90b53d45fb4b72b35b2c73 100644
--- a/src/plugins/bazaar/optionspage.ui
+++ b/src/plugins/bazaar/optionspage.ui
@@ -92,7 +92,7 @@
<item row="0" column="1">
<widget class="QSpinBox" name="logEntriesCount">
<property name="toolTip">
- <string>The number of recent commit logs to show, choose 0 to see all enteries</string>
+ <string>The number of recent commit logs to show. Choose 0 to see all entries.</string>
</property>
<property name="maximum">
<number>1000</number>
diff --git a/src/plugins/bazaar/pullorpushdialog.ui b/src/plugins/bazaar/pullorpushdialog.ui
index 4bae81b36bc99f6a527b31b75a225eb621f799b8..624265764eb3dc53e3e7358ae7078978519dbdf6 100644
--- a/src/plugins/bazaar/pullorpushdialog.ui
+++ b/src/plugins/bazaar/pullorpushdialog.ui
@@ -47,7 +47,7 @@
<item row="2" column="0">
<widget class="QRadioButton" name="urlButton">
<property name="toolTip">
- <string>for example https://[user[:pass]@]host[:port]/[path]</string>
+ <string>For example: https://[user[:pass]@]host[:port]/[path]</string>
</property>
<property name="text">
<string>Specify URL:</string>
@@ -60,7 +60,7 @@
<bool>false</bool>
</property>
<property name="toolTip">
- <string>for example https://[user[:pass]@]host[:port]/[path]</string>
+ <string>For example: https://[user[:pass]@]host[:port]/[path]</string>
</property>
</widget>
</item>
@@ -87,7 +87,7 @@
<widget class="QCheckBox" name="overwriteCheckBox">
<property name="toolTip">
<string>Ignore differences between branches and overwrite
-unconditionally</string>
+unconditionally.</string>
</property>
<property name="text">
<string>Overwrite</string>
@@ -98,7 +98,7 @@ unconditionally</string>
<widget class="QCheckBox" name="useExistingDirCheckBox">
<property name="toolTip">
<string>By default, push will fail if the target directory exists, but does not already have a control directory.
-This flag will allow push to proceed</string>
+This flag will allow push to proceed.</string>
</property>
<property name="text">
<string>Use existing directory</string>
@@ -108,7 +108,7 @@ This flag will allow push to proceed</string>
<item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="createPrefixCheckBox">
<property name="toolTip">
- <string>Create the path leading up to the branch if it does not already exist</string>
+ <string>Create the path leading up to the branch if it does not already exist.</string>
</property>
<property name="text">
<string>Create prefix</string>
@@ -129,7 +129,7 @@ This flag will allow push to proceed</string>
<widget class="QCheckBox" name="localCheckBox">
<property name="toolTip">
<string>Perform a local pull in a bound branch.
-Local pulls are not applied to the master branch</string>
+Local pulls are not applied to the master branch.</string>
</property>
<property name="text">
<string>Local</string>
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 0460f37ee720099d61c6a0776942d5a2dc7ebe85..bb471a2f299eb758513cd80d2ab34606b2dea3b2 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -1469,7 +1469,7 @@ EditorManager::makeFileWritable(IFile *file)
switch (FileManager::promptReadOnlyFile(fileName, versionControl, m_d->m_core->mainWindow(), file->isSaveAsAllowed())) {
case FileManager::RO_OpenVCS:
if (!versionControl->vcsOpen(fileName)) {
- QMessageBox::warning(m_d->m_core->mainWindow(), tr("Failed!"), tr("Could not open the file for editing with SCC."));
+ QMessageBox::warning(m_d->m_core->mainWindow(), tr("Cannot Open File"), tr("Cannot open the file for editing with SCC."));
return Failed;
}
file->checkPermissions();
@@ -1477,7 +1477,7 @@ EditorManager::makeFileWritable(IFile *file)
case FileManager::RO_MakeWriteable: {
const bool permsOk = QFile::setPermissions(fileName, QFile::permissions(fileName) | QFile::WriteUser);
if (!permsOk) {
- QMessageBox::warning(m_d->m_core->mainWindow(), tr("Failed!"), tr("Could not set permissions to writable."));
+ QMessageBox::warning(m_d->m_core->mainWindow(), tr("Cannot Set Permissions"), tr("Cannot set permissions to writable."));
return Failed;
}
}
diff --git a/src/plugins/coreplugin/generalsettings.ui b/src/plugins/coreplugin/generalsettings.ui
index 52b386b1bb2774f3ba112a5f407956f6ecec036b..82398e3e196c104ab0ef03f5165a262d9d795fee 100644
--- a/src/plugins/coreplugin/generalsettings.ui
+++ b/src/plugins/coreplugin/generalsettings.ui
@@ -78,7 +78,7 @@
<item>
<widget class="QPushButton" name="resetButton">
<property name="toolTip">
- <string>Reset to default</string>
+ <string>Reset to default.</string>
</property>
<property name="text">
<string>Reset</string>
@@ -196,7 +196,7 @@
<item row="0" column="2">
<widget class="QPushButton" name="resetTerminalButton">
<property name="toolTip">
- <string>Reset to default</string>
+ <string>Reset to default.</string>
</property>
<property name="text">
<string>Reset</string>
@@ -206,7 +206,7 @@
<item row="1" column="2">
<widget class="QPushButton" name="resetFileBrowserButton">
<property name="toolTip">
- <string>Reset to default</string>
+ <string>Reset to default.</string>
</property>
<property name="text">
<string>Reset</string>
@@ -218,7 +218,7 @@
<item>
<widget class="QCheckBox" name="autoSaveCheckBox">
<property name="toolTip">
- <string>If checked, temporary copies of modified files will be created automatically. If Qt Creator is restarted after a crash or power failure, it will ask whether the auto-saved content should be recovered.</string>
+ <string>Automatically create temporary copies of modified files. If Qt Creator is restarted after a crash or power failure, it asks whether to recover the auto-saved content.</string>
</property>
<property name="text">
<string>Auto-save modified files</string>
diff --git a/src/plugins/coreplugin/mimetypemagicdialog.ui b/src/plugins/coreplugin/mimetypemagicdialog.ui
index 3da4ddbeaf84a86939e5e389c7f23557bef2c867..0976d1ad27f66658cb676fe9e88ab5fab8bcd999 100644
--- a/src/plugins/coreplugin/mimetypemagicdialog.ui
+++ b/src/plugins/coreplugin/mimetypemagicdialog.ui
@@ -149,7 +149,7 @@
<bool>false</bool>
</property>
<property name="text">
- <string><i>Note: Wide range values might impact on Qt Creator's performance when opening files.</i></string>
+ <string><i>Note: Wide range values might impact Qt Creator's performance when opening files.</i></string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
diff --git a/src/plugins/coreplugin/mimetypesettingspage.ui b/src/plugins/coreplugin/mimetypesettingspage.ui
index 29dab60049f0208f271b7147e371e3624053ebdd..dce431163120c589cd8bd251851e2375c3167bf8 100644
--- a/src/plugins/coreplugin/mimetypesettingspage.ui
+++ b/src/plugins/coreplugin/mimetypesettingspage.ui
@@ -33,7 +33,7 @@
<item row="1" column="0">
<widget class="QPushButton" name="resetButton">
<property name="toolTip">
- <string>Reset all to default</string>
+ <string>Reset all to default.</string>
</property>
<property name="text">
<string>Reset All</string>
diff --git a/src/plugins/cpptools/completionsettingspage.ui b/src/plugins/cpptools/completionsettingspage.ui
index d2ec0b0817cae949eb73e0d23b6bccb136353008..8570db4d0d178272ec0a373aa9cd4678e86d8e96 100644
--- a/src/plugins/cpptools/completionsettingspage.ui
+++ b/src/plugins/cpptools/completionsettingspage.ui
@@ -107,7 +107,7 @@
<item row="3" column="0" colspan="3">
<widget class="QCheckBox" name="autoInsertBrackets">
<property name="toolTip">
- <string>Automatically insert (, ) and ; when appropriate.</string>
+ <string>Automatically insert brackets and semicolons when appropriate.</string>
</property>
<property name="text">
<string>&Automatically insert brackets</string>
diff --git a/src/plugins/debugger/cdb/cdboptionspage.cpp b/src/plugins/debugger/cdb/cdboptionspage.cpp
index c6f95806f982f37009ec804ab67256fb94788b3b..ae243a53cfd9d3ae28f2431318846e906175f13b 100644
--- a/src/plugins/debugger/cdb/cdboptionspage.cpp
+++ b/src/plugins/debugger/cdb/cdboptionspage.cpp
@@ -62,9 +62,9 @@ const EventsDescription eventDescriptions[] =
{"et", false, QT_TRANSLATE_NOOP("Debugger::Cdb::CdbBreakEventWidget",
"Thread exit")},
{"ld", true, QT_TRANSLATE_NOOP("Debugger::Cdb::CdbBreakEventWidget",
- "Load Module:")},
+ "Load module:")},
{"ud", true, QT_TRANSLATE_NOOP("Debugger::Cdb::CdbBreakEventWidget",
- "Unload Module:")},
+ "Unload module:")},
{"out", true, QT_TRANSLATE_NOOP("Debugger::Cdb::CdbBreakEventWidget",
"Output:")}
};
diff --git a/src/plugins/debugger/commonoptionspage.ui b/src/plugins/debugger/commonoptionspage.ui
index 2051f59f5affb88e576342efe8247c12049418a1..3e40c11c9059467b2fdff18a0dcce96b6a730c33 100644
--- a/src/plugins/debugger/commonoptionspage.ui
+++ b/src/plugins/debugger/commonoptionspage.ui
@@ -26,12 +26,12 @@
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="checkBoxFontSizeFollowsEditor">
+ <property name="toolTip">
+ <string>Change the font size in the debugger views when the font size in the main editor changes.</string>
+ </property>
<property name="text">
<string>Debugger font size follows main editor</string>
</property>
- <property name="toolTip">
- <string>Selecting this results in font size changes in the debugger views whenever the font size in the main editor changes.</string>
- </property>
</widget>
</item>
<item row="3" column="0" colspan="2">
@@ -44,7 +44,7 @@
<item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="checkBoxListSourceFiles">
<property name="toolTip">
- <string>Checking this will populate the source file view automatically but might slow down debugger startup considerably.</string>
+ <string>Populate the source file view automatically. This might slow down debugger startup considerably.</string>
</property>
<property name="text">
<string>Populate source file view automatically</string>
@@ -90,7 +90,7 @@
</sizepolicy>
</property>
<property name="text">
- <string>Maximal stack depth:</string>
+ <string>Maximum stack depth:</string>
</property>
</widget>
</item>
diff --git a/src/plugins/debugger/dumperoptionpage.ui b/src/plugins/debugger/dumperoptionpage.ui
index ff71eb9f697807d241006618d7a721657c5736b6..eb8c227ff476420458b9822d45f16335dff30e7f 100644
--- a/src/plugins/debugger/dumperoptionpage.ui
+++ b/src/plugins/debugger/dumperoptionpage.ui
@@ -15,7 +15,7 @@
<widget class="QLabel" name="label">
<property name="text">
<string><html><head/><body>
-<p>The debugging helper is only used to produce a nice display of objects of certain types like QString or std::map in the &quot;Locals and Watchers&quot; view. It is not strictly necessary for debugging with Qt Creator. </p></body></html></string>
+<p>The debugging helper is only used to produce a nice display of objects of certain types like QString or std::map in the &quot;Locals and Expressions&quot; view. It is not strictly necessary for debugging with Qt Creator. </p></body></html></string>
</property>
<property name="textFormat">
<enum>Qt::AutoText</enum>
diff --git a/src/plugins/debugger/gdb/abstractgdbadapter.cpp b/src/plugins/debugger/gdb/abstractgdbadapter.cpp
index aa7fc7e02d8211cbfc1fd70b8f1ffbe84d6d97a6..d465eb3e2211af1a608625380b1a52f28b478d10 100644
--- a/src/plugins/debugger/gdb/abstractgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/abstractgdbadapter.cpp
@@ -90,7 +90,7 @@ bool AbstractGdbAdapter::prepareCommand()
// perr == BadQuoting is never returned on Windows
// FIXME? QTCREATORBUG-2809
m_engine->handleAdapterStartFailed(QCoreApplication::translate("DebuggerEngine", // Same message in CdbEngine
- "Debugging complex command lines is currently not supported under Windows"), QString());
+ "Debugging complex command lines is currently not supported on Windows."), QString());
return false;
}
#endif
diff --git a/src/plugins/debugger/startremotedialog.ui b/src/plugins/debugger/startremotedialog.ui
index 12e03cd4bbb5520efdbec29ee692fb00c2e2cca5..d975dab15ee6a025a8d4016ed38f6f8748ffc3e6 100644
--- a/src/plugins/debugger/startremotedialog.ui
+++ b/src/plugins/debugger/startremotedialog.ui
@@ -109,7 +109,7 @@
<item row="6" column="0">
<widget class="QLabel" name="overrideStartScriptLabel">
<property name="text">
- <string>Override S&tart script:</string>
+ <string>Override s&tart script:</string>
</property>
<property name="buddy">
<cstring>overrideStartScriptPathChooser</cstring>
diff --git a/src/plugins/fakevim/fakevimoptions.ui b/src/plugins/fakevim/fakevimoptions.ui
index 3142a28de424f94d6af2b8aa05c861a567f98088..9045b3f9f301ee01a92aecb6c69dd2aeca091d2e 100644
--- a/src/plugins/fakevim/fakevimoptions.ui
+++ b/src/plugins/fakevim/fakevimoptions.ui
@@ -83,7 +83,7 @@
<item row="3" column="2">
<widget class="QCheckBox" name="checkBoxPassControlKey">
<property name="toolTip">
- <string>Checking this box passes key sequences like Ctrl-S to the Creator core instead of interpreting them in FakeVim. This gives easier access to Creator core functionality at the price of losing some features of FakeVim.</string>
+ <string>Pass key sequences like Ctrl-S to Qt Creator core instead of interpreting them in FakeVim. This gives easier access to Qt Creator core functionality at the price of losing some features of FakeVim.</string>
</property>
<property name="text">
<string>Pass control key</string>
diff --git a/src/plugins/help/generalsettingspage.cpp b/src/plugins/help/generalsettingspage.cpp
index 214ce8449f70aa248bf6ff1c39b1cfa19f3457d8..cb1b90ea043ce8633f25abd4efe4fc63cd2fc0e1 100644
--- a/src/plugins/help/generalsettingspage.cpp
+++ b/src/plugins/help/generalsettingspage.cpp
@@ -255,7 +255,7 @@ void GeneralSettingsPage::importBookmarks()
}
m_ui->errorLabel->setVisible(true);
- m_ui->errorLabel->setText(tr("There was an error while importing bookmarks!"));
+ m_ui->errorLabel->setText(tr("Cannot import bookmarks."));
}
void GeneralSettingsPage::exportBookmarks()
diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp
index c793f77a7438ca2cb8252572a7324dc6e96c2abc..554a3c5d5aad55b78fa5cacb6181c8f1c965ff9d 100644
--- a/src/plugins/perforce/perforceplugin.cpp
+++ b/src/plugins/perforce/perforceplugin.cpp
@@ -1356,7 +1356,7 @@ bool PerforcePlugin::submitEditorAboutToClose(VCSBase::VCSBaseSubmitEditor *subm
const VCSBase::VCSBaseSubmitEditor::PromptSubmitResult answer =
perforceEditor->promptSubmit(tr("Closing p4 Editor"),
tr("Do you want to submit this change list?"),
- tr("The commit message check failed. Do you want to submit this change list"),
+ tr("The commit message check failed. Do you want to submit this change list?"),
&wantsPrompt, !m_submitActionTriggered);
m_submitActionTriggered = false;
diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp
index 44b195471bb8f6608e0c2b71eee61e34e341c02e..5da804a96a03b972f4910b8d4f8d21c64ea68d64 100644
--- a/src/plugins/qt4projectmanager/makestep.cpp
+++ b/src/plugins/qt4projectmanager/makestep.cpp
@@ -133,7 +133,7 @@ bool MakeStep::init()
m_tasks.clear();
if (!bc->toolChain()) {
m_tasks.append(ProjectExplorer::Task(ProjectExplorer::Task::Error,
- tr("Qt Creator needs a tool chain set up to build. Please configure a tool chain in Project mode."),
+ tr("Qt Creator needs a tool chain set up to build. Configure a tool chain in Project mode."),
QString(), -1,
QLatin1String(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)));
}
@@ -229,7 +229,7 @@ void MakeStep::run(QFutureInterface<bool> & fi)
if (!QFileInfo(m_makeFileToCheck).exists()) {
if (!m_clean)
- emit addOutput(tr("Makefile not found. Please check your build settings"), BuildStep::MessageOutput);
+ emit addOutput(tr("Cannot find Makefile. Check your build settings."), BuildStep::MessageOutput);
fi.reportResult(m_clean);
return;
}
@@ -242,7 +242,7 @@ void MakeStep::run(QFutureInterface<bool> & fi)
canContinue = false;
}
if (!canContinue) {
- emit addOutput(tr("Configuration is faulty, please check the Build Issues view for details."), BuildStep::MessageOutput);
+ emit addOutput(tr("Configuration is faulty. Check the Build Issues view for details."), BuildStep::MessageOutput);
fi.reportResult(false);
return;
}
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
index a2151e3154dc153431f28a47e146d6523a3b494a..6c443b55ed8f7c14e915aae45a4b188986373952 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
@@ -163,7 +163,7 @@ bool S60DeployStep::init()
m_channel = deployConfiguration->communicationChannel();
if (m_signedPackages.isEmpty()) {
- appendMessage(tr("No package has been found. Please specify at least one installation package."), true);
+ appendMessage(tr("No package has been found. Specify at least one installation package."), true);
return false;
}
@@ -238,13 +238,13 @@ void S60DeployStep::start()
bool serialConnection = m_channel == S60DeployConfiguration::CommunicationCodaSerialConnection;
if (serialConnection && m_serialPortName.isEmpty()) {
- errorMessage = tr("No device is connected. Please connect a device and try again.");
+ errorMessage = tr("No device is connected. Connect a device and try again.");
reportError(errorMessage);
return;
}
QTC_ASSERT(!m_codaDevice.data(), return);
if (m_address.isEmpty() && !serialConnection) {
- errorMessage = tr("No address for a device has been defined. Please define an address and try again.");
+ errorMessage = tr("No address for a device has been defined. Define an address and try again.");
reportError(errorMessage);
return;
}
@@ -444,7 +444,7 @@ void S60DeployStep::initFileInstallation()
} else {
m_codaDevice->sendSymbianInstallUIInstallCommand(Coda::CodaCallback(this, &S60DeployStep::handleSymbianInstall),
remoteFileLocation.toAscii());
- appendMessage(tr("Please continue the installation on your device."), false);
+ appendMessage(tr("Continue the installation on your device."), false);
emit manualInstallation();
}
}
@@ -586,7 +586,7 @@ void S60DeployStep::checkForTimeout()
void S60DeployStep::showManualInstallationInfo()
{
const QString title = tr("Installation");
- const QString text = tr("Please continue the installation on your device.");
+ const QString text = tr("Continue the installation on your device.");
QMessageBox *mb = new QMessageBox(QMessageBox::Information, title, text,
QMessageBox::Ok, Core::ICore::instance()->mainWindow());
connect(this, SIGNAL(allFilesInstalled()), mb, SLOT(close()));
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.cpp b/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.cpp
index 86ed6fdb67cd3de88c98acec71a7b65499c48a18..fb7b986f5289d92592adc97d697fb05f0f275eae 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.cpp
@@ -88,9 +88,9 @@ S60PublishingBuildSettingsPageOvi::S60PublishingBuildSettingsPageOvi(S60Publishe
m_ui->buildConfigInfoLabel->setVisible(list.isEmpty());
m_ui->buildConfigInfoLabel->setToolTip(tr("No valid build configuration has been detected.<br>"
- "Please define a correct build configuration in \"Options > Qt4\""));
+ "Define a correct build configuration in \"Options > Qt4\""));
m_ui->toolchainInfoIconLabel->setToolTip(tr("No valid tool chain has been detected.<br>"
- "Please define a correct tool chain in \"Options > Tool Chains\""));
+ "Define a correct tool chain in \"Options > Tool Chains\""));
populateToolchainList(m_bc);
//change the build configuration if the user changes it
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index a1640debb82125e9abc2e927fa2296ed91137a57..2d51465872c283c517da90091556a20d851fdab8 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -975,14 +975,14 @@ bool Qt4PriFileNode::priFileWritable(const QString &path)
switch (Core::FileManager::promptReadOnlyFile(path, versionControl, core->mainWindow(), false)) {
case Core::FileManager::RO_OpenVCS:
if (!versionControl->vcsOpen(path)) {
- QMessageBox::warning(core->mainWindow(), tr("Failed!"), tr("Could not open the file for edit with VCS."));
+ QMessageBox::warning(core->mainWindow(), tr("Cannot Open File"), tr("Cannot open the file for edit with VCS."));
return false;
}
break;
case Core::FileManager::RO_MakeWriteable: {
const bool permsOk = QFile::setPermissions(path, QFile::permissions(path) | QFile::WriteUser);
if (!permsOk) {
- QMessageBox::warning(core->mainWindow(), tr("Failed!"), tr("Could not set permissions to writable."));
+ QMessageBox::warning(core->mainWindow(), tr("Cannot Set Permissions"), tr("Cannot set permissions to writable."));
return false;
}
break;
diff --git a/src/plugins/qt4projectmanager/qt4target.cpp b/src/plugins/qt4projectmanager/qt4target.cpp
index 5b2e1e445d13b2d8e870e001fd7d75bc290e05c6..5cd90d4613e8a63aa3e4cc5f729408e850317cc5 100644
--- a/src/plugins/qt4projectmanager/qt4target.cpp
+++ b/src/plugins/qt4projectmanager/qt4target.cpp
@@ -199,7 +199,7 @@ QString Qt4BaseTargetFactory::msgBuildConfigurationName(const BuildConfiguration
return (info.buildConfig & QtSupport::BaseQtVersion::DebugBuild) ?
//: Name of a debug build configuration to created by a project wizard, %1 being the Qt version name. We recommend not translating it.
tr("%1 Debug").arg(qtVersionName) :
- //: Name of a release build configuration to created by a project wizard, %1 being the Qt version name. We recommend not translating it.
+ //: Name of a release build configuration to be created by a project wizard, %1 being the Qt version name. We recommend not translating it.
tr("%1 Release").arg(qtVersionName);
}
@@ -709,14 +709,14 @@ void Qt4DefaultTargetSetupWidget::addImportClicked()
if (!info.isValid()) {
QMessageBox::critical(this,
tr("No build found"),
- tr("No Build found in %1 matching project %2.").arg(m_importLinePath->path()).arg(m_proFilePath));
+ tr("No build found in %1 matching project %2.").arg(m_importLinePath->path()).arg(m_proFilePath));
return;
}
if (!info.version->supportsTargetId(m_id)) {
QMessageBox::critical(this,
tr("Incompatible build found"),
- tr("The Build found in %1 is incompatible with this target").arg(m_importLinePath->path()));
+ tr("The build found in %1 is incompatible with this target").arg(m_importLinePath->path()));
return;
}
diff --git a/src/plugins/remotelinux/maemopublisherfremantlefree.cpp b/src/plugins/remotelinux/maemopublisherfremantlefree.cpp
index 432e777ba59572bd63d4b30c3d320e572deba1e5..edfbd264c48abd0c61a6d77691812c4610558071 100644
--- a/src/plugins/remotelinux/maemopublisherfremantlefree.cpp
+++ b/src/plugins/remotelinux/maemopublisherfremantlefree.cpp
@@ -140,12 +140,12 @@ void MaemoPublisherFremantleFree::createPackage()
return;
}
if (!copyRecursively(m_project->projectDirectory(), m_tmpProjectDir)) {
- finishWithFailure(tr("Error: Could not copy project directory"),
+ finishWithFailure(tr("Error: Could not copy project directory."),
tr("Publishing failed: Could not create source package."));
return;
}
if (!fixNewlines()) {
- finishWithFailure(tr("Error: Could not fix newlines"),
+ finishWithFailure(tr("Error: Could not fix newlines."),
tr("Publishing failed: Could not create source package."));
return;
}
@@ -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;
@@ -421,7 +421,7 @@ void MaemoPublisherFremantleFree::handleUploadJobFinished(int exitStatus)
|| m_uploader->process()->exitCode() != 0)) {
QString error;
if (exitStatus != SshRemoteProcess::ExitedNormally) {
- error = tr("Error uploading file: %1")
+ error = tr("Error uploading file: %1.")
.arg(m_uploader->process()->errorString());
} else {
error = tr("Error uploading file.");
@@ -459,7 +459,7 @@ void MaemoPublisherFremantleFree::sendFile()
const QString filePath = m_filesToUpload.takeFirst();
QFile file(filePath);
if (!file.open(QIODevice::ReadOnly)) {
- finishWithFailure(tr("Cannot open file for reading: %1")
+ finishWithFailure(tr("Cannot open file for reading: %1.")
.arg(file.errorString()), tr("Upload failed."));
return;
}
@@ -506,7 +506,7 @@ void MaemoPublisherFremantleFree::handleScpStdOut(const QByteArray &output)
const QByteArray error = m_scpOutput.mid(1, m_scpOutput.count() - 2);
QString progressError;
if (!error.isEmpty()) {
- progressError = tr("Error uploading file: %1")
+ progressError = tr("Error uploading file: %1.")
.arg(QString::fromUtf8(error));
} else {
progressError = tr("Error uploading file.");
diff --git a/src/plugins/valgrind/callgrindconfigwidget.ui b/src/plugins/valgrind/callgrindconfigwidget.ui
index 077a4af750f7bbf6abfd9453b5886770c91c62a6..877c88a5253e8e1ede640356e5b0351bdf2930ab 100644
--- a/src/plugins/valgrind/callgrindconfigwidget.ui
+++ b/src/plugins/valgrind/callgrindconfigwidget.ui
@@ -26,7 +26,7 @@
<item row="0" column="0">
<widget class="QLabel" name="minimumInclusiveCostRatioLabel">
<property name="toolTip">
- <string>This option limits the amount of results the profiler will give you. A lower limit will likely increase performance.</string>
+ <string>Limits the amount of results the profiler gives you. A lower limit will likely increase performance.</string>
</property>
<property name="text">
<string>Result view: Show events with inclusive costs higher than:</string>
@@ -65,7 +65,7 @@
<widget class="QCheckBox" name="enableCacheSim">
<property name="toolTip">
<string><html><head/><body>
-<p>Specify if you want to do full cache simulation.</p>
+<p>Does full cache simulation.</p>
<p>By default, only instruction read accesses will be counted ("Ir").</p>
<p>
With cache simulation, further event counters are enabled:
@@ -74,7 +74,7 @@ With cache simulation, further event counters are enabled:
<li>Data write accesses ("Dw") and related cache misses ("D1mw"/"D2mw")</li></ul>
</p>
-For more information, see ???.</p></body></html></string>
+</body></html></string>
</property>
<property name="text">
<string>Enable cache simulation</string>
@@ -85,7 +85,7 @@ For more information, see ???.</p></body></html></string>
<widget class="QCheckBox" name="enableBranchSim">
<property name="toolTip">
<string><html><head/><body>
-<p>Specify if you want to do branch prediction simulation.</p>
+<p>Do branch prediction simulation.</p>
<p>Further event counters are enabled: </p>
<ul><li>Number of executed conditional branches and related predictor misses (
"Bc"/"Bcm")</li>
@@ -100,7 +100,7 @@ For more information, see ???.</p></body></html></string>
<item row="2" column="0">
<widget class="QCheckBox" name="collectSystime">
<property name="toolTip">
- <string>This specifies whether information for system call times should be collected.</string>
+ <string>Collect information for system call times.</string>
</property>
<property name="text">
<string>Collect system call time</string>
@@ -110,7 +110,7 @@ For more information, see ???.</p></body></html></string>
<item row="3" column="0">
<widget class="QCheckBox" name="collectBusEvents">
<property name="toolTip">
- <string>This specifies whether the number of global bus events executed should be collected. The event type "Ge" is used for these events.</string>
+ <string>Collect the number of global bus events that are executed. The event type "Ge" is used for these events.</string>
</property>
<property name="text">
<string>Collect global bus events</string>
diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
index 86c5dd16c927ef953808b1c18d17ea6f35eb2d40..8b4431fe2af83fb0d63f1a868f73b2046e8a2c7d 100644
--- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
+++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
@@ -640,7 +640,7 @@ bool VCSBaseSubmitEditor::runSubmitMessageCheckScript(const QString &checkScript
return false;
}
if (checkProcess.exitStatus() != QProcess::NormalExit) {
- *errorMessage = tr("The check script '%1' crashed").
+ *errorMessage = tr("The check script '%1' crashed.").
arg(QDir::toNativeSeparators(checkScript));
return false;
}