Commit 66ad76de authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

I18n: tr-fixes.

parent 947f0f3a
......@@ -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) {
......
......@@ -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;
}
......
......@@ -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('@'));
......
......@@ -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);
......
......@@ -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;
}
......
......@@ -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);
......
......@@ -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
......
......@@ -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;
......
......@@ -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));
}
}
......
......@@ -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:
......
......@@ -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>
......
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