feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

UI text: check capitalization and tooltips

Browse Source 
Change-Id: I3686ac83e5fdc009b03e84ab3c7b24a052d119c4
Reviewed-on: http://codereview.qt.nokia.com/569
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Leena Miettinen
2011-06-21 17:07:45 +02:00
committed by Friedemann Kleint
parent efeefef10a
commit f1889864db
27 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/extensionsystem/pluginspec.cpp
View File

@@ -490,7 +490,7 @@ bool PluginSpecPrivate::read(const QString &fileName)
dependencies.clear(); dependencies.clear();
QFile file(fileName); QFile file(fileName);
if (!file.open(QIODevice::ReadOnly)) 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())); .arg(QDir::toNativeSeparators(file.fileName()), file.errorString()));
QFileInfo fileInfo(file); QFileInfo fileInfo(file);
location = fileInfo.absolutePath(); location = fileInfo.absolutePath();

8
src/plugins/analyzerbase/startremotedialog.ui
View File

@@ -52,7 +52,7 @@
<item row="3" column="0"> <item row="3" column="0">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_4">
<property name="toolTip"> <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>
<property name="text"> <property name="text">
<string>Password:</string> <string>Password:</string>
@@ -95,10 +95,10 @@
<item row="4" column="0"> <item row="4" column="0">
<widget class="QLabel" name="label_8"> <widget class="QLabel" name="label_8">
<property name="toolTip"> <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>
<property name="text"> <property name="text">
<string>Private Key:</string> <string>Private key:</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -137,7 +137,7 @@
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="label_7"> <widget class="QLabel" name="label_7">
<property name="text"> <property name="text">
<string>Working Directory:</string> <string>Working directory:</string>
</property> </property>
</widget> </widget>
</item> </item>

2
src/plugins/bazaar/bazaarcommitpanel.ui
View File

@@ -38,7 +38,7 @@
<widget class="QCheckBox" name="isLocalCheckBox"> <widget class="QCheckBox" name="isLocalCheckBox">
<property name="toolTip"> <property name="toolTip">
<string>Perform a local commit in a bound branch. <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>
<property name="text"> <property name="text">
<string>Local commit</string> <string>Local commit</string>

12
src/plugins/bazaar/cloneoptionspanel.ui
View File

@@ -39,7 +39,7 @@
<widget class="QCheckBox" name="useExistingDirCheckBox"> <widget class="QCheckBox" name="useExistingDirCheckBox">
<property name="toolTip"> <property name="toolTip">
<string>By default, branch will fail if the target directory exists, but does not already have a control directory. <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>
<property name="text"> <property name="text">
<string>Use existing directory</string> <string>Use existing directory</string>
@@ -50,7 +50,7 @@ This flag will allow branch to proceed</string>
<widget class="QCheckBox" name="stackedCheckBox"> <widget class="QCheckBox" name="stackedCheckBox">
<property name="toolTip"> <property name="toolTip">
<string>Create a stacked branch referring to the source branch. <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>
<property name="text"> <property name="text">
<string>Stacked</string> <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"> <item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="standAloneCheckBox"> <widget class="QCheckBox" name="standAloneCheckBox">
<property name="toolTip"> <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>
<property name="text"> <property name="text">
<string>Standalone</string> <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"> <item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="switchCheckBox"> <widget class="QCheckBox" name="switchCheckBox">
<property name="toolTip"> <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>
<property name="text"> <property name="text">
<string>Switch checkout</string> <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"> <item row="5" column="0" colspan="2">
<widget class="QCheckBox" name="hardlinkCheckBox"> <widget class="QCheckBox" name="hardlinkCheckBox">
<property name="toolTip"> <property name="toolTip">
<string>Hard-link working tree files where possible</string> <string>Hard-link working tree files where possible.</string>
</property> </property>
<property name="text"> <property name="text">
<string>Hardlink</string> <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"> <item row="6" column="0" colspan="2">
<widget class="QCheckBox" name="noTreeCheckBox"> <widget class="QCheckBox" name="noTreeCheckBox">
<property name="toolTip"> <property name="toolTip">
<string>Create a branch without a working-tree</string> <string>Create a branch without a working-tree.</string>
</property> </property>
<property name="text"> <property name="text">
<string>No working-tree</string> <string>No working-tree</string>

2
src/plugins/bazaar/optionspage.ui
View File

@@ -92,7 +92,7 @@
<item row="0" column="1"> <item row="0" column="1">
<widget class="QSpinBox" name="logEntriesCount"> <widget class="QSpinBox" name="logEntriesCount">
<property name="toolTip"> <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>
<property name="maximum"> <property name="maximum">
<number>1000</number> <number>1000</number>

12
src/plugins/bazaar/pullorpushdialog.ui
View File

@@ -47,7 +47,7 @@
<item row="2" column="0"> <item row="2" column="0">
<widget class="QRadioButton" name="urlButton"> <widget class="QRadioButton" name="urlButton">
<property name="toolTip"> <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>
<property name="text"> <property name="text">
<string>Specify URL:</string> <string>Specify URL:</string>
@@ -60,7 +60,7 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="toolTip"> <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>
</widget> </widget>
</item> </item>
@@ -87,7 +87,7 @@
<widget class="QCheckBox" name="overwriteCheckBox"> <widget class="QCheckBox" name="overwriteCheckBox">
<property name="toolTip"> <property name="toolTip">
<string>Ignore differences between branches and overwrite <string>Ignore differences between branches and overwrite
unconditionally</string> unconditionally.</string>
</property> </property>
<property name="text"> <property name="text">
<string>Overwrite</string> <string>Overwrite</string>
@@ -98,7 +98,7 @@ unconditionally</string>
<widget class="QCheckBox" name="useExistingDirCheckBox"> <widget class="QCheckBox" name="useExistingDirCheckBox">
<property name="toolTip"> <property name="toolTip">
<string>By default, push will fail if the target directory exists, but does not already have a control directory. <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>
<property name="text"> <property name="text">
<string>Use existing directory</string> <string>Use existing directory</string>
@@ -108,7 +108,7 @@ This flag will allow push to proceed</string>
<item row="4" column="0" colspan="2"> <item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="createPrefixCheckBox"> <widget class="QCheckBox" name="createPrefixCheckBox">
<property name="toolTip"> <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>
<property name="text"> <property name="text">
<string>Create prefix</string> <string>Create prefix</string>
@@ -129,7 +129,7 @@ This flag will allow push to proceed</string>
<widget class="QCheckBox" name="localCheckBox"> <widget class="QCheckBox" name="localCheckBox">
<property name="toolTip"> <property name="toolTip">
<string>Perform a local pull in a bound branch. <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>
<property name="text"> <property name="text">
<string>Local</string> <string>Local</string>

4
src/plugins/coreplugin/editormanager/editormanager.cpp
View File

@@ -1469,7 +1469,7 @@ EditorManager::makeFileWritable(IFile *file)
switch (FileManager::promptReadOnlyFile(fileName, versionControl, m_d->m_core->mainWindow(), file->isSaveAsAllowed())) { switch (FileManager::promptReadOnlyFile(fileName, versionControl, m_d->m_core->mainWindow(), file->isSaveAsAllowed())) {
case FileManager::RO_OpenVCS: case FileManager::RO_OpenVCS:
if (!versionControl->vcsOpen(fileName)) { 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; return Failed;
} }
file->checkPermissions(); file->checkPermissions();
@@ -1477,7 +1477,7 @@ EditorManager::makeFileWritable(IFile *file)
case FileManager::RO_MakeWriteable: { case FileManager::RO_MakeWriteable: {
const bool permsOk = QFile::setPermissions(fileName, QFile::permissions(fileName) | QFile::WriteUser); const bool permsOk = QFile::setPermissions(fileName, QFile::permissions(fileName) | QFile::WriteUser);
if (!permsOk) { 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; return Failed;
} }
} }

8
src/plugins/coreplugin/generalsettings.ui
View File

@@ -78,7 +78,7 @@
<item> <item>
<widget class="QPushButton" name="resetButton"> <widget class="QPushButton" name="resetButton">
<property name="toolTip"> <property name="toolTip">
<string>Reset to default</string> <string>Reset to default.</string>
</property> </property>
<property name="text"> <property name="text">
<string>Reset</string> <string>Reset</string>
@@ -196,7 +196,7 @@
<item row="0" column="2"> <item row="0" column="2">
<widget class="QPushButton" name="resetTerminalButton"> <widget class="QPushButton" name="resetTerminalButton">
<property name="toolTip"> <property name="toolTip">
<string>Reset to default</string> <string>Reset to default.</string>
</property> </property>
<property name="text"> <property name="text">
<string>Reset</string> <string>Reset</string>
@@ -206,7 +206,7 @@
<item row="1" column="2"> <item row="1" column="2">
<widget class="QPushButton" name="resetFileBrowserButton"> <widget class="QPushButton" name="resetFileBrowserButton">
<property name="toolTip"> <property name="toolTip">
<string>Reset to default</string> <string>Reset to default.</string>
</property> </property>
<property name="text"> <property name="text">
<string>Reset</string> <string>Reset</string>
@@ -218,7 +218,7 @@
<item> <item>
<widget class="QCheckBox" name="autoSaveCheckBox"> <widget class="QCheckBox" name="autoSaveCheckBox">
<property name="toolTip"> <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>
<property name="text"> <property name="text">
<string>Auto-save modified files</string> <string>Auto-save modified files</string>

2
src/plugins/coreplugin/mimetypemagicdialog.ui
View File

@@ -149,7 +149,7 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="text"> <property name="text">
<string>&lt;i&gt;Note: Wide range values might impact on Qt Creator's performance when opening files.&lt;/i&gt;</string> <string>&lt;i&gt;Note: Wide range values might impact Qt Creator's performance when opening files.&lt;/i&gt;</string>
</property> </property>
<property name="textFormat"> <property name="textFormat">
<enum>Qt::RichText</enum> <enum>Qt::RichText</enum>

2
src/plugins/coreplugin/mimetypesettingspage.ui
View File

@@ -33,7 +33,7 @@
<item row="1" column="0"> <item row="1" column="0">
<widget class="QPushButton" name="resetButton"> <widget class="QPushButton" name="resetButton">
<property name="toolTip"> <property name="toolTip">
<string>Reset all to default</string> <string>Reset all to default.</string>
</property> </property>
<property name="text"> <property name="text">
<string>Reset All</string> <string>Reset All</string>

2
src/plugins/cpptools/completionsettingspage.ui
View File

@@ -107,7 +107,7 @@
<item row="3" column="0" colspan="3"> <item row="3" column="0" colspan="3">
<widget class="QCheckBox" name="autoInsertBrackets"> <widget class="QCheckBox" name="autoInsertBrackets">
<property name="toolTip"> <property name="toolTip">
<string>Automatically insert (, ) and ; when appropriate.</string> <string>Automatically insert brackets and semicolons when appropriate.</string>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Automatically insert brackets</string> <string>&amp;Automatically insert brackets</string>

4
src/plugins/debugger/cdb/cdboptionspage.cpp
View File

@@ -62,9 +62,9 @@ const EventsDescription eventDescriptions[] =
{"et", false, QT_TRANSLATE_NOOP("Debugger::Cdb::CdbBreakEventWidget", {"et", false, QT_TRANSLATE_NOOP("Debugger::Cdb::CdbBreakEventWidget",
"Thread exit")}, "Thread exit")},
{"ld", true, QT_TRANSLATE_NOOP("Debugger::Cdb::CdbBreakEventWidget", {"ld", true, QT_TRANSLATE_NOOP("Debugger::Cdb::CdbBreakEventWidget",
"Load Module:")}, "Load module:")},
{"ud", true, QT_TRANSLATE_NOOP("Debugger::Cdb::CdbBreakEventWidget", {"ud", true, QT_TRANSLATE_NOOP("Debugger::Cdb::CdbBreakEventWidget",
"Unload Module:")}, "Unload module:")},
{"out", true, QT_TRANSLATE_NOOP("Debugger::Cdb::CdbBreakEventWidget", {"out", true, QT_TRANSLATE_NOOP("Debugger::Cdb::CdbBreakEventWidget",
"Output:")} "Output:")}
}; };

10
src/plugins/debugger/commonoptionspage.ui
View File

@@ -26,12 +26,12 @@
</item> </item>
<item row="2" column="0" colspan="2"> <item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="checkBoxFontSizeFollowsEditor"> <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"> <property name="text">
<string>Debugger font size follows main editor</string> <string>Debugger font size follows main editor</string>
</property> </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> </widget>
</item> </item>
<item row="3" column="0" colspan="2"> <item row="3" column="0" colspan="2">
@@ -44,7 +44,7 @@
<item row="4" column="0" colspan="2"> <item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="checkBoxListSourceFiles"> <widget class="QCheckBox" name="checkBoxListSourceFiles">
<property name="toolTip"> <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>
<property name="text"> <property name="text">
<string>Populate source file view automatically</string> <string>Populate source file view automatically</string>
@@ -90,7 +90,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>Maximal stack depth:</string> <string>Maximum stack depth:</string>
</property> </property>
</widget> </widget>
</item> </item>

2
src/plugins/debugger/dumperoptionpage.ui
View File

@@ -15,7 +15,7 @@
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt; <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
&lt;p&gt;The debugging helper is only used to produce a nice display of objects of certain types like QString or std::map in the &amp;quot;Locals and Watchers&amp;quot; view. It is not strictly necessary for debugging with Qt Creator. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;p&gt;The debugging helper is only used to produce a nice display of objects of certain types like QString or std::map in the &amp;quot;Locals and Expressions&amp;quot; view. It is not strictly necessary for debugging with Qt Creator. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="textFormat"> <property name="textFormat">
<enum>Qt::AutoText</enum> <enum>Qt::AutoText</enum>

2
src/plugins/debugger/gdb/abstractgdbadapter.cpp
View File

@@ -90,7 +90,7 @@ bool AbstractGdbAdapter::prepareCommand()
// perr == BadQuoting is never returned on Windows // perr == BadQuoting is never returned on Windows
// FIXME? QTCREATORBUG-2809 // FIXME? QTCREATORBUG-2809
m_engine->handleAdapterStartFailed(QCoreApplication::translate("DebuggerEngine", // Same message in CdbEngine 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; return false;
} }
#endif #endif

2
src/plugins/debugger/startremotedialog.ui
View File

@@ -109,7 +109,7 @@
<item row="6" column="0"> <item row="6" column="0">
<widget class="QLabel" name="overrideStartScriptLabel"> <widget class="QLabel" name="overrideStartScriptLabel">
<property name="text"> <property name="text">
<string>Override S&amp;tart script:</string> <string>Override s&amp;tart script:</string>
</property> </property>
<property name="buddy"> <property name="buddy">
<cstring>overrideStartScriptPathChooser</cstring> <cstring>overrideStartScriptPathChooser</cstring>

2
src/plugins/fakevim/fakevimoptions.ui
View File

@@ -83,7 +83,7 @@
<item row="3" column="2"> <item row="3" column="2">
<widget class="QCheckBox" name="checkBoxPassControlKey"> <widget class="QCheckBox" name="checkBoxPassControlKey">
<property name="toolTip"> <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>
<property name="text"> <property name="text">
<string>Pass control key</string> <string>Pass control key</string>

2
src/plugins/help/generalsettingspage.cpp
View File

@@ -255,7 +255,7 @@ void GeneralSettingsPage::importBookmarks()
} }
m_ui->errorLabel->setVisible(true); 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() void GeneralSettingsPage::exportBookmarks()

2
src/plugins/perforce/perforceplugin.cpp
View File

@@ -1356,7 +1356,7 @@ bool PerforcePlugin::submitEditorAboutToClose(VCSBase::VCSBaseSubmitEditor *subm
const VCSBase::VCSBaseSubmitEditor::PromptSubmitResult answer = const VCSBase::VCSBaseSubmitEditor::PromptSubmitResult answer =
perforceEditor->promptSubmit(tr("Closing p4 Editor"), perforceEditor->promptSubmit(tr("Closing p4 Editor"),
tr("Do you want to submit this change list?"), 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); &wantsPrompt, !m_submitActionTriggered);
m_submitActionTriggered = false; m_submitActionTriggered = false;

6
src/plugins/qt4projectmanager/makestep.cpp
View File

@@ -133,7 +133,7 @@ bool MakeStep::init()
m_tasks.clear(); m_tasks.clear();
if (!bc->toolChain()) { if (!bc->toolChain()) {
m_tasks.append(ProjectExplorer::Task(ProjectExplorer::Task::Error, 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, QString(), -1,
QLatin1String(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM))); QLatin1String(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)));
} }
@@ -229,7 +229,7 @@ void MakeStep::run(QFutureInterface<bool> & fi)
if (!QFileInfo(m_makeFileToCheck).exists()) { if (!QFileInfo(m_makeFileToCheck).exists()) {
if (!m_clean) 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); fi.reportResult(m_clean);
return; return;
} }
@@ -242,7 +242,7 @@ void MakeStep::run(QFutureInterface<bool> & fi)
canContinue = false; canContinue = false;
} }
if (!canContinue) { 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); fi.reportResult(false);
return; return;
} }

10
src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
View File

@@ -163,7 +163,7 @@ bool S60DeployStep::init()
m_channel = deployConfiguration->communicationChannel(); m_channel = deployConfiguration->communicationChannel();
if (m_signedPackages.isEmpty()) { 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; return false;
} }
@@ -238,13 +238,13 @@ void S60DeployStep::start()
bool serialConnection = m_channel == S60DeployConfiguration::CommunicationCodaSerialConnection; bool serialConnection = m_channel == S60DeployConfiguration::CommunicationCodaSerialConnection;
if (serialConnection && m_serialPortName.isEmpty()) { 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); reportError(errorMessage);
return; return;
} }
QTC_ASSERT(!m_codaDevice.data(), return); QTC_ASSERT(!m_codaDevice.data(), return);
if (m_address.isEmpty() && !serialConnection) { 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); reportError(errorMessage);
return; return;
} }
@@ -444,7 +444,7 @@ void S60DeployStep::initFileInstallation()
} else { } else {
m_codaDevice->sendSymbianInstallUIInstallCommand(Coda::CodaCallback(this, &S60DeployStep::handleSymbianInstall), m_codaDevice->sendSymbianInstallUIInstallCommand(Coda::CodaCallback(this, &S60DeployStep::handleSymbianInstall),
remoteFileLocation.toAscii()); remoteFileLocation.toAscii());
appendMessage(tr("Please continue the installation on your device."), false); appendMessage(tr("Continue the installation on your device."), false);
emit manualInstallation(); emit manualInstallation();
} }
} }
@@ -586,7 +586,7 @@ void S60DeployStep::checkForTimeout()
void S60DeployStep::showManualInstallationInfo() void S60DeployStep::showManualInstallationInfo()
{ {
const QString title = tr("Installation"); 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 *mb = new QMessageBox(QMessageBox::Information, title, text,
QMessageBox::Ok, Core::ICore::instance()->mainWindow()); QMessageBox::Ok, Core::ICore::instance()->mainWindow());
connect(this, SIGNAL(allFilesInstalled()), mb, SLOT(close())); connect(this, SIGNAL(allFilesInstalled()), mb, SLOT(close()));

4
src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.cpp
View File

@@ -88,9 +88,9 @@ S60PublishingBuildSettingsPageOvi::S60PublishingBuildSettingsPageOvi(S60Publishe
m_ui->buildConfigInfoLabel->setVisible(list.isEmpty()); m_ui->buildConfigInfoLabel->setVisible(list.isEmpty());
m_ui->buildConfigInfoLabel->setToolTip(tr("No valid build configuration has been detected.<br>" 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>" 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); populateToolchainList(m_bc);
//change the build configuration if the user changes it //change the build configuration if the user changes it

4
src/plugins/qt4projectmanager/qt4nodes.cpp
View File

@@ -975,14 +975,14 @@ bool Qt4PriFileNode::priFileWritable(const QString &path)
switch (Core::FileManager::promptReadOnlyFile(path, versionControl, core->mainWindow(), false)) { switch (Core::FileManager::promptReadOnlyFile(path, versionControl, core->mainWindow(), false)) {
case Core::FileManager::RO_OpenVCS: case Core::FileManager::RO_OpenVCS:
if (!versionControl->vcsOpen(path)) { 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; return false;
} }
break; break;
case Core::FileManager::RO_MakeWriteable: { case Core::FileManager::RO_MakeWriteable: {
const bool permsOk = QFile::setPermissions(path, QFile::permissions(path) | QFile::WriteUser); const bool permsOk = QFile::setPermissions(path, QFile::permissions(path) | QFile::WriteUser);
if (!permsOk) { 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; return false;
} }
break; break;

6
src/plugins/qt4projectmanager/qt4target.cpp
View File

@@ -199,7 +199,7 @@ QString Qt4BaseTargetFactory::msgBuildConfigurationName(const BuildConfiguration
return (info.buildConfig & QtSupport::BaseQtVersion::DebugBuild) ? 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. //: 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) : 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); tr("%1 Release").arg(qtVersionName);
} }
@@ -709,14 +709,14 @@ void Qt4DefaultTargetSetupWidget::addImportClicked()
if (!info.isValid()) { if (!info.isValid()) {
QMessageBox::critical(this, QMessageBox::critical(this,
tr("No build found"), 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; return;
} }
if (!info.version->supportsTargetId(m_id)) { if (!info.version->supportsTargetId(m_id)) {
QMessageBox::critical(this, QMessageBox::critical(this,
tr("Incompatible build found"), 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; return;
} }

12
src/plugins/remotelinux/maemopublisherfremantlefree.cpp
View File

@@ -140,12 +140,12 @@ void MaemoPublisherFremantleFree::createPackage()
return; return;
} }
if (!copyRecursively(m_project->projectDirectory(), m_tmpProjectDir)) { 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.")); tr("Publishing failed: Could not create source package."));
return; return;
} }
if (!fixNewlines()) { if (!fixNewlines()) {
finishWithFailure(tr("Error: Could not fix newlines"), finishWithFailure(tr("Error: Could not fix newlines."),
tr("Publishing failed: Could not create source package.")); tr("Publishing failed: Could not create source package."));
return; return;
} }
@@ -367,7 +367,7 @@ void MaemoPublisherFremantleFree::runDpkgBuildPackage()
QtSupport::BaseQtVersion *lqt = m_buildConfig->qtVersion(); QtSupport::BaseQtVersion *lqt = m_buildConfig->qtVersion();
if (!lqt) if (!lqt)
finishWithFailure(QString(), tr("No Qt version set")); finishWithFailure(QString(), tr("No Qt version set."));
if (m_state == Inactive) if (m_state == Inactive)
return; return;
@@ -421,7 +421,7 @@ void MaemoPublisherFremantleFree::handleUploadJobFinished(int exitStatus)
|| m_uploader->process()->exitCode() != 0)) { || m_uploader->process()->exitCode() != 0)) {
QString error; QString error;
if (exitStatus != SshRemoteProcess::ExitedNormally) { if (exitStatus != SshRemoteProcess::ExitedNormally) {
error = tr("Error uploading file: %1") error = tr("Error uploading file: %1.")
.arg(m_uploader->process()->errorString()); .arg(m_uploader->process()->errorString());
} else { } else {
error = tr("Error uploading file."); error = tr("Error uploading file.");
@@ -459,7 +459,7 @@ void MaemoPublisherFremantleFree::sendFile()
const QString filePath = m_filesToUpload.takeFirst(); const QString filePath = m_filesToUpload.takeFirst();
QFile file(filePath); QFile file(filePath);
if (!file.open(QIODevice::ReadOnly)) { 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.")); .arg(file.errorString()), tr("Upload failed."));
return; return;
} }
@@ -506,7 +506,7 @@ void MaemoPublisherFremantleFree::handleScpStdOut(const QByteArray &output)
const QByteArray error = m_scpOutput.mid(1, m_scpOutput.count() - 2); const QByteArray error = m_scpOutput.mid(1, m_scpOutput.count() - 2);
QString progressError; QString progressError;
if (!error.isEmpty()) { if (!error.isEmpty()) {
progressError = tr("Error uploading file: %1") progressError = tr("Error uploading file: %1.")
.arg(QString::fromUtf8(error)); .arg(QString::fromUtf8(error));
} else { } else {
progressError = tr("Error uploading file."); progressError = tr("Error uploading file.");

12
src/plugins/valgrind/callgrindconfigwidget.ui
View File

@@ -26,7 +26,7 @@
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="minimumInclusiveCostRatioLabel"> <widget class="QLabel" name="minimumInclusiveCostRatioLabel">
<property name="toolTip"> <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>
<property name="text"> <property name="text">
<string>Result view: Show events with inclusive costs higher than:</string> <string>Result view: Show events with inclusive costs higher than:</string>
@@ -65,7 +65,7 @@
<widget class="QCheckBox" name="enableCacheSim"> <widget class="QCheckBox" name="enableCacheSim">
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&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;Does 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;By default, only instruction read accesses will be counted (&quot;Ir&quot;).&lt;/p&gt;
&lt;p&gt; &lt;p&gt;
With cache simulation, further event counters are enabled: With cache simulation, further event counters are enabled:
@@ -74,7 +74,7 @@ With cache simulation, further event counters are enabled:
&lt;li&gt;Data write accesses (&quot;Dw&quot;) and related cache misses (&quot;D1mw&quot;/&quot;D2mw&quot;)&lt;/li&gt;&lt;/ul&gt; &lt;li&gt;Data write accesses (&quot;Dw&quot;) and related cache misses (&quot;D1mw&quot;/&quot;D2mw&quot;)&lt;/li&gt;&lt;/ul&gt;
&lt;/p&gt; &lt;/p&gt;
For more information, see ???.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="text"> <property name="text">
<string>Enable cache simulation</string> <string>Enable cache simulation</string>
@@ -85,7 +85,7 @@ For more information, see ???.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<widget class="QCheckBox" name="enableBranchSim"> <widget class="QCheckBox" name="enableBranchSim">
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&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;Do branch prediction simulation.&lt;/p&gt;
&lt;p&gt;Further event counters are enabled: &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 ( &lt;ul&gt;&lt;li&gt;Number of executed conditional branches and related predictor misses (
&quot;Bc&quot;/&quot;Bcm&quot;)&lt;/li&gt; &quot;Bc&quot;/&quot;Bcm&quot;)&lt;/li&gt;
@@ -100,7 +100,7 @@ For more information, see ???.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QCheckBox" name="collectSystime"> <widget class="QCheckBox" name="collectSystime">
<property name="toolTip"> <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>
<property name="text"> <property name="text">
<string>Collect system call time</string> <string>Collect system call time</string>
@@ -110,7 +110,7 @@ For more information, see ???.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<item row="3" column="0"> <item row="3" column="0">
<widget class="QCheckBox" name="collectBusEvents"> <widget class="QCheckBox" name="collectBusEvents">
<property name="toolTip"> <property name="toolTip">
<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> <string>Collect the number of global bus events that are executed. The event type &quot;Ge&quot; is used for these events.</string>
</property> </property>
<property name="text"> <property name="text">
<string>Collect global bus events</string> <string>Collect global bus events</string>

2
src/plugins/vcsbase/vcsbasesubmiteditor.cpp
View File

@@ -640,7 +640,7 @@ bool VCSBaseSubmitEditor::runSubmitMessageCheckScript(const QString &checkScript
return false; return false;
} }
if (checkProcess.exitStatus() != QProcess::NormalExit) { if (checkProcess.exitStatus() != QProcess::NormalExit) {
*errorMessage = tr("The check script '%1' crashed"). *errorMessage = tr("The check script '%1' crashed.").
arg(QDir::toNativeSeparators(checkScript)); arg(QDir::toNativeSeparators(checkScript));
return false; return false;
} }