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

Use double quotes instead of single quotes as per our guidelines.

Browse Source 
Change-Id: Ib608bb49e26781aef1914085a5d801fcdcd5eb56
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
This commit is contained in:
Christian Kandeler
2014-04-17 14:09:47 +02:00
parent c20f40e12e
commit eccc1198d6
123 changed files with 293 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/git/branchdialog.cpp
View File

@@ -256,11 +256,11 @@ void BranchDialog::remove()
const bool wasMerged = isTag ? true : m_model->branchIsMerged(selected);
QString message;
if (isTag)
message = tr("Would you like to delete the tag '%1'?").arg(branchName);
message = tr("Would you like to delete the tag \"%1\"?").arg(branchName);
else if (wasMerged)
message = tr("Would you like to delete the branch '%1'?").arg(branchName);
message = tr("Would you like to delete the branch \"%1\"?").arg(branchName);
else
message = tr("Would you like to delete the <b>unmerged</b> branch '%1'?").arg(branchName);
message = tr("Would you like to delete the <b>unmerged</b> branch \"%1\"?").arg(branchName);
if (QMessageBox::question(this, isTag ? tr("Delete Tag") : tr("Delete Branch"),
message, QMessageBox::Yes | QMessageBox::No,
@@ -329,7 +329,7 @@ void BranchDialog::reset()
if (currentName.isEmpty() || branchName.isEmpty())
return;
if (QMessageBox::question(this, tr("Git Reset"), tr("Hard reset branch '%1' to '%2'?")
if (QMessageBox::question(this, tr("Git Reset"), tr("Hard reset branch \"%1\" to \"%2\"?")
.arg(currentName).arg(branchName),
QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes) {
GitPlugin::instance()->gitClient()->reset(QString(m_repository), QLatin1String("--hard"),

8
src/plugins/git/gerrit/gerritmodel.cpp
View File

@@ -544,7 +544,7 @@ static bool parseOutput(const QSharedPointer<GerritParameters> &parameters,
QJsonParseError error;
const QJsonDocument doc = QJsonDocument::fromJson(line, &error);
if (doc.isNull()) {
QString errorMessage = GerritModel::tr("Parse error: '%1' -> %2")
QString errorMessage = GerritModel::tr("Parse error: \"%1\" -> %2")
.arg(QString::fromLocal8Bit(line))
.arg(error.errorString());
qWarning() << errorMessage;
@@ -597,7 +597,7 @@ static bool parseOutput(const QSharedPointer<GerritParameters> &parameters,
} else {
qWarning("%s: Parse error: '%s'.", Q_FUNC_INFO, line.constData());
VcsBase::VcsBaseOutputWindow::instance()
->appendError(GerritModel::tr("Parse error: '%1'")
->appendError(GerritModel::tr("Parse error: \"%1\"")
.arg(QString::fromLocal8Bit(line)));
res = false;
}
@@ -669,7 +669,7 @@ static bool parseOutput(const QSharedPointer<GerritParameters> &parameters,
continue;
Utils::JsonValue *objectValue = Utils::JsonValue::create(QString::fromUtf8(line), &pool);
if (!objectValue) {
QString errorMessage = GerritModel::tr("Parse error: '%1'")
QString errorMessage = GerritModel::tr("Parse error: \"%1\"")
.arg(QString::fromLocal8Bit(line));
qWarning() << errorMessage;
VcsBase::VcsBaseOutputWindow::instance()->appendError(errorMessage);
@@ -740,7 +740,7 @@ static bool parseOutput(const QSharedPointer<GerritParameters> &parameters,
if (change->isValid()) {
result.push_back(change);
} else {
QString errorMessage = GerritModel::tr("Parse error in line '%1'")
QString errorMessage = GerritModel::tr("Parse error in line \"%1\"")
.arg(QString::fromLocal8Bit(line));
VcsBase::VcsBaseOutputWindow::instance()->appendError(errorMessage);
qWarning("%s: Parse error in line '%s'.", Q_FUNC_INFO, line.constData());

2
src/plugins/git/gerrit/gerritplugin.cpp
View File

@@ -491,7 +491,7 @@ void GerritPlugin::fetch(const QSharedPointer<GerritChange> &change, int mode)
if (!verifiedRepository) {
// Ask the user for a repository to retrieve the change.
const QString title =
tr("Enter Local Repository for '%1' (%2)").arg(change->project, change->branch);
tr("Enter Local Repository for \"%1\" (%2)").arg(change->project, change->branch);
const QString suggestedRespository =
findLocalRepository(change->project, change->branch);
repository = QFileDialog::getExistingDirectory(m_dialog.data(),

4
src/plugins/git/gitorious/gitorious.cpp
View File

@@ -462,7 +462,7 @@ void Gitorious::listProjectsReply(int hostIndex, int page, const QByteArray &dat
}
if (!errorMessage.isEmpty()) {
emitError(tr("Error parsing reply from '%1': %2").arg(hostName(hostIndex), errorMessage));
emitError(tr("Error parsing reply from \"%1\": %2").arg(hostName(hostIndex), errorMessage));
if (projects.empty())
m_hosts[hostIndex].state = GitoriousHost::Error;
}
@@ -507,7 +507,7 @@ void Gitorious::slotReplyFinished()
} // switch protocol
} else {
const QString msg = tr("Request failed for '%1': %2").arg(m_hosts.at(hostIndex).hostName, reply->errorString());
const QString msg = tr("Request failed for \"%1\": %2").arg(m_hosts.at(hostIndex).hostName, reply->errorString());
emitError(msg);
}
reply->deleteLater();

2
src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp
View File

@@ -53,7 +53,7 @@ GitoriousProjectWizardPage::GitoriousProjectWizardPage(const GitoriousHostWizard
static inline QString msgChooseProject(const QString &h)
{
return GitoriousProjectWizardPage::tr("Choose a project from '%1'").arg((h));
return GitoriousProjectWizardPage::tr("Choose a project from \"%1\"").arg((h));
}
QString GitoriousProjectWizardPage::selectedHostName() const

2
src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp
View File

@@ -151,7 +151,7 @@ void GitoriousRepositoryWizardPage::initializePage()
ui->filterLineEdit->clear();
// fill model
const QSharedPointer<GitoriousProject> proj = m_projectPage->project();
setSubTitle(tr("Choose a repository of the project '%1'.").arg(proj->name));
setSubTitle(tr("Choose a repository of the project \"%1\".").arg(proj->name));
// Create a hierarchical list by repository type, sort by type
QList<GitoriousRepository> repositories = proj->repositories;
QStandardItem *firstEntry = 0;

2
src/plugins/git/gitsettings.cpp
View File

@@ -87,7 +87,7 @@ QString GitSettings::gitBinaryPath(bool *ok, QString *errorMessage) const
*ok = false;
if (errorMessage)
*errorMessage = QCoreApplication::translate("Git::Internal::GitSettings",
"The binary '%1' could not be located in the path '%2'")
"The binary \"%1\" could not be located in the path \"%2\"")
.arg(stringValue(binaryPathKey), stringValue(pathKey));
}
return binPath;

2
src/plugins/git/mergetool.cpp
View File

@@ -190,7 +190,7 @@ void MergeTool::chooseAction()
msgBox.setWindowTitle(tr("Merge Conflict"));
msgBox.setIcon(QMessageBox::Question);
msgBox.setStandardButtons(QMessageBox::Abort);
msgBox.setText(tr("%1 merge conflict for '%2'\nLocal: %3\nRemote: %4")
msgBox.setText(tr("%1 merge conflict for \"%2\"\nLocal: %3\nRemote: %4")
.arg(mergeTypeName())
.arg(m_fileName)
.arg(stateName(m_localState, m_localInfo))

4
src/plugins/git/settingspage.cpp
View File

@@ -50,12 +50,12 @@ SettingsPageWidget::SettingsPageWidget(QWidget *parent) :
if (Utils::HostOsInfo::isWindowsHost()) {
const QByteArray currentHome = qgetenv("HOME");
const QString toolTip
= tr("Set the environment variable HOME to '%1'\n(%2).\n"
= tr("Set the environment variable HOME to \"%1\"\n(%2).\n"
"This causes msysgit to look for the SSH-keys in that location\n"
"instead of its installation directory when run outside git bash.").
arg(QDir::homePath(),
currentHome.isEmpty() ? tr("not currently set") :
tr("currently set to '%1'").arg(QString::fromLocal8Bit(currentHome)));
tr("currently set to \"%1\"").arg(QString::fromLocal8Bit(currentHome)));
m_ui.winHomeCheckBox->setToolTip(toolTip);
} else {
m_ui.winHomeCheckBox->setVisible(false);