Commit f1889864 authored by Leena Miettinen's avatar Leena Miettinen Committed by Friedemann Kleint
Browse files

UI text: check capitalization and tooltips

Change-Id: I3686ac83e5fdc009b03e84ab3c7b24a052d119c4
Reviewed-on: http://codereview.qt.nokia.com/569

Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@nokia.com>
parent efeefef1
......@@ -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();
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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;
}
}
......
......@@ -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>
......
......@@ -149,7 +149,7 @@
<bool>false</bool>
</property>
<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 name="textFormat">
<enum>Qt::RichText</enum>
......
......@@ -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>
......
......@@ -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>&amp;Automatically insert brackets</string>
......
......@@ -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:")}
};
......
......@@ -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>
......
......@@ -15,7 +15,7 @@
<widget class="QLabel" name="label">
<property name="text">
<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 name="textFormat">
<enum>Qt::AutoText</enum>
......
......@@ -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
......
......@@ -109,7 +109,7 @@
<item row="6" column="0">
<widget class="QLabel" name="overrideStartScriptLabel">
<property name="text">
<string>Override S&amp;tart script:</string>
<string>Override s&amp;tart script:</string>
</property>
<property name="buddy">
<cstring>overrideStartScriptPathChooser</cstring>
......
......@@ -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>
......
......@@ -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()
......
......@@ -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;
......
......@@ -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;
}
......
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