diff --git a/src/libs/utils/submiteditorwidget.cpp b/src/libs/utils/submiteditorwidget.cpp
index b4a5be893411bf74df1abad3130cc3f1ac32b87a..0c8aa30a1c4bf04f1c23c33f78ab08ba59e8e43e 100644
--- a/src/libs/utils/submiteditorwidget.cpp
+++ b/src/libs/utils/submiteditorwidget.cpp
@@ -570,7 +570,9 @@ void SubmitEditorWidget::fileListCustomContextMenuRequested(const QPoint & pos)
{
// Execute menu offering to check/uncheck all
QMenu menu;
+ //: Check all for submit
QAction *checkAllAction = menu.addAction(tr("Check All"));
+ //: Uncheck all for submit
QAction *uncheckAllAction = menu.addAction(tr("Uncheck All"));
QAction *action = menu.exec(m_d->m_ui.fileView->mapToGlobal(pos));
if (action == checkAllAction) {
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index dbfa14b899e967a8186bad4fc8d99d5abcdcdf43..7d55dc7f4137108f9ab0a4d37c25023b92dcb4d8 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -462,9 +462,10 @@ static inline QString formattedValue(const WatchData &data, int format)
result = WatchHandler::tr("<invalid>");
else if (result == QLatin1String("<not accessible>"))
result = WatchHandler::tr("<not accessible>");
- else if (result.endsWith(" items>"))
- result = WatchHandler::tr("<%1 items>")
- .arg(result.mid(1, result.indexOf(' ') - 1));
+ else if (result.endsWith(" items>")) {
+ const int size = result.mid(1, result.indexOf(' ') - 1).toInt();
+ result = WatchHandler::tr("<%n items>", 0, size);
+ }
}
return result;
}
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index f403f08c001cca92d63c892c3de70602835afaba..1403dd5cec72bc0d4616c2114b8aff3d774bbf16 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -1458,7 +1458,7 @@ bool GitClient::getCommitData(const QString &workingDirectory,
args << QLatin1String("--max-count=1") << QLatin1String("--pretty=format:%h@%B");
const Utils::SynchronousProcessResponse sp = synchronousGit(repoDirectory, args);
if (sp.result != Utils::SynchronousProcessResponse::Finished) {
- *errorMessage = tr("Unable to retrieve the last commit data from %1.").arg(repoDirectory);
+ *errorMessage = tr("Unable to retrieve the last commit data of the repository %1.").arg(repoDirectory);
return false;
}
const int separatorPos = sp.stdOut.indexOf(QLatin1Char('@'));
diff --git a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
index 478cdd8392f1e12e9d5bb6bf171b9116aebdad27..1790072cce826f2e30758384eefdc01a2744a680 100644
--- a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
@@ -317,8 +317,8 @@ void BuildSettingsWidget::cloneConfiguration()
void BuildSettingsWidget::deleteConfiguration()
{
- QMessageBox msgBox(QMessageBox::Question, tr("Remove Build Configuration?"),
- tr("Do you really want to delete build configuration <b>%1</b>.").arg(m_buildConfiguration->displayName()),
+ QMessageBox msgBox(QMessageBox::Question, tr("Remove Build Configuration"),
+ tr("Do you really want to delete the build configuration <b>%1</b>?").arg(m_buildConfiguration->displayName()),
QMessageBox::Yes|QMessageBox::No, this);
msgBox.setDefaultButton(QMessageBox::No);
msgBox.setEscapeButton(QMessageBox::No);
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index a17b36ddd145d24212180fe89357344f48580a9b..b8e9fb31ccf9ed939f3baed0041654abd183b6e7 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -719,8 +719,8 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
globalcontext);
mfilec->addAction(cmd, Constants::G_FILE_OTHER);
- // remove project action
- d->m_removeProjectAction = new QAction(tr("Remove Project"), this);
+ //: Remove project from parent profile (Project explorer view); will not physically delete any files.
+ d->m_removeProjectAction = new QAction(tr("Remove Project..."), this);
cmd = am->registerAction(d->m_removeProjectAction, ProjectExplorer::Constants::REMOVEPROJECT,
globalcontext);
msubProject->addAction(cmd, Constants::G_PROJECT_FILES);
@@ -2136,7 +2136,7 @@ void ProjectExplorerPlugin::removeFile()
Q_ASSERT(projectNode);
if (!projectNode->removeFiles(fileNode->fileType(), QStringList(filePath))) {
- QMessageBox::warning(core->mainWindow(), tr("Remove file failed"),
+ QMessageBox::warning(core->mainWindow(), tr("Remove File Failed"),
tr("Could not remove file %1 from project %2.").arg(filePath).arg(projectNode->displayName()));
return;
}
diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.cpp b/src/plugins/projectexplorer/runsettingspropertiespage.cpp
index 194ff6f66c56ed326aaa50a61b918e0d21d8ed06..b0d15b9c642d2fc2294c60882c51247cb8e19828 100644
--- a/src/plugins/projectexplorer/runsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/runsettingspropertiespage.cpp
@@ -366,7 +366,7 @@ void RunSettingsWidget::removeDeployConfiguration()
{
DeployConfiguration *dc = m_target->activeDeployConfiguration();
QMessageBox msgBox(QMessageBox::Question, tr("Remove Deploy Configuration?"),
- tr("Do you really want to delete deploy configuration <b>%1</b>.").arg(dc->displayName()),
+ tr("Do you really want to delete deploy configuration <b>%1</b>?").arg(dc->displayName()),
QMessageBox::Yes|QMessageBox::No, this);
msgBox.setDefaultButton(QMessageBox::No);
msgBox.setEscapeButton(QMessageBox::No);
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
index 04cbe1170092cf61d1eb614269b63a8ec22dfc81..4c64fa90f3d2f8a6adb9f05041351b070e6d4599 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
@@ -178,7 +178,7 @@ QString MaemoRunConfiguration::defaultDisplayName()
if (!m_proFilePath.isEmpty())
return (QFileInfo(m_proFilePath).completeBaseName());
//: Maemo run configuration default display name
- return tr("Run on maemo device");
+ return tr("Run on Maemo device");
}
MaemoDeviceConfig MaemoRunConfiguration::deviceConfig() const
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
index 6f223d2e815c45b7a9b4a202a8da0100dfb51f12..9b2db9c75b1e238e85da07777ed564f35f1f6ebe 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
@@ -606,13 +606,11 @@ void S60DeviceRunControl::processStopped(uint pc, uint pid, uint tid, const QStr
QMessageBox *S60DeviceRunControl::createTrkWaitingMessageBox(const QString &port, QWidget *parent)
{
- const QString title = QCoreApplication::translate("Qt4ProjectManager::Internal::S60DeviceRunControlBase",
- "Waiting for App TRK");
- const QString text = QCoreApplication::translate("Qt4ProjectManager::Internal::S60DeviceRunControlBase",
- "Qt creator waiting for the TRK application.<br>"
- "Please make sure the application is running on "
- "your mobile phone and the right port is "
- "configured in the project settings.").arg(port);
+ const QString title = tr("Waiting for App TRK");
+ const QString text = tr("Qt Creator is waiting for the TRK application to connect.<br>"
+ "Please make sure the application is running on "
+ "your mobile phone and the right port is "
+ "configured in the project settings.").arg(port);
QMessageBox *rc = new QMessageBox(QMessageBox::Information, title, text,
QMessageBox::Cancel, parent);
return rc;
diff --git a/src/plugins/qt4projectmanager/qt-s60/sbsv2parser.cpp b/src/plugins/qt4projectmanager/qt-s60/sbsv2parser.cpp
index 50b4ceb716fe8c71797f0bb4af9fe97668ec8158..fb9f04fc64aa5becae042e867c1763b7f5bd6115 100644
--- a/src/plugins/qt4projectmanager/qt-s60/sbsv2parser.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/sbsv2parser.cpp
@@ -109,7 +109,7 @@ void SbsV2Parser::parseLogFile(const QString &file)
if (m_log.name() == QLatin1String("buildlog"))
readBuildLog();
else
- m_log.raiseError(QObject::tr("The file is not SBSv2 log file."));
+ m_log.raiseError(tr("The file '%1' is not a SBSv2 log file.").arg(file));
}
}
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
index a2ae1a231c4274c747b9b86931855514b7305038..cd01c460dcd90114a3c45ce16ea53e72a8955171 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
@@ -346,10 +346,12 @@ void Qt4ProjectConfigWidget::updateImportLabel()
QString type;
switch (task.type) {
case ProjectExplorer::Task::Error:
- type = tr("Error: ");
+ type = tr("Error:");
+ type += QLatin1Char(' ');
break;
case ProjectExplorer::Task::Warning:
- type = tr("Warning: ");
+ type = tr("Warning:");
+ type += QLatin1Char(' ');
break;
case ProjectExplorer::Task::Unknown:
default:
diff --git a/src/plugins/vcsbase/basecheckoutwizardpage.ui b/src/plugins/vcsbase/basecheckoutwizardpage.ui
index 81011403b15d8703bde381197793dfbf143ea20f..eb48ba9b4671bb57a5f09afc770361bc4e618e23 100644
--- a/src/plugins/vcsbase/basecheckoutwizardpage.ui
+++ b/src/plugins/vcsbase/basecheckoutwizardpage.ui
@@ -45,7 +45,7 @@
<item row="3" column="0">
<widget class="QLabel" name="branchLabel">
<property name="text">
- <string>Branches:</string>
+ <string>Branch:</string>
</property>
</widget>
</item>