Commit bc9bb4b9 authored by Leena Miettinen's avatar Leena Miettinen
Browse files

UI text: fix VCS related strings



Fix capitalization and punctuation and a typo.

Change-Id: Ie974594878aad6dec558516b2d31b202e8c732d4
Reviewed-by: default avatarLeena Miettinen <riitta-leena.miettinen@digia.com>
parent 1f62d7c9
......@@ -94,7 +94,7 @@ ReadOnlyFilesDialogPrivate::ReadOnlyFilesDialogPrivate(IDocument *document, bool
, document(document)
, mixedText(ReadOnlyFilesDialog::tr("Mixed"))
, makeWritableText(ReadOnlyFilesDialog::tr("Make Writable"))
, versionControlOpenText(ReadOnlyFilesDialog::tr("Open With VCS"))
, versionControlOpenText(ReadOnlyFilesDialog::tr("Open with VCS"))
, saveAsText(ReadOnlyFilesDialog::tr("Save As"))
{}
......@@ -193,7 +193,7 @@ void ReadOnlyFilesDialog::promptFailWarning(const QStringList &files, ReadOnlyRe
case RO_OpenVCS: {
if (IVersionControl *vc = d->versionControls[file]) {
const QString openText = vc->vcsOpenText().remove(QLatin1Char('&'));
title = tr("Failed To: %1 File").arg(openText);
title = tr("Failed to %1 File").arg(openText);
message = tr("%1 file %2 from version control system %3 failed.\n")
.arg(openText)
.arg(QDir::toNativeSeparators(file))
......@@ -225,7 +225,7 @@ void ReadOnlyFilesDialog::promptFailWarning(const QStringList &files, ReadOnlyRe
break;
}
} else {
title = tr("Could Not Change Permissions On Some Files");
title = tr("Could Not Change Permissions on Some Files");
message = d->failWarning;
message += tr("\nSee details for a complete list of files.");
details = files.join(QLatin1String("\n"));
......@@ -434,8 +434,8 @@ void ReadOnlyFilesDialog::initDialog(const QStringList &fileNames)
ui->setAllLabel->setVisible(false);
ui->verticalLayout->removeItem(ui->setAllLayout);
if (d->useVCS)
ui->msgLabel->setText(tr("The following files are not checked out by now.\n"
"Do you want to check out these files now?"));
ui->msgLabel->setText(tr("The following files are not checked out yet.\n"
"Do you want to check them out now?"));
return;
}
......
......@@ -43,12 +43,12 @@
</property>
<column>
<property name="text">
<string>Make Writeable</string>
<string>Make Writable</string>
</property>
</column>
<column>
<property name="text">
<string>Open With VCS</string>
<string>Open with VCS</string>
</property>
</column>
<column>
......@@ -58,7 +58,7 @@
</column>
<column>
<property name="text">
<string notr="true">File Name</string>
<string notr="true">Filename</string>
</property>
</column>
<column>
......
......@@ -312,7 +312,7 @@ void ProgressManagerPrivate::init()
ExtensionSystem::PluginManager::addObject(m_statusBarWidgetContainer);
m_statusBarWidget->installEventFilter(this);
QAction *toggleProgressView = new QAction(tr("Toggle progress details"), this);
QAction *toggleProgressView = new QAction(tr("Toggle Progress Details"), this);
toggleProgressView->setCheckable(true);
toggleProgressView->setChecked(m_progressViewPinned);
// we have to set an transparent icon to prevent the tool button to show text
......
......@@ -259,8 +259,8 @@ void BranchDialog::rename()
if (branchAddDialog->branchName() == oldBranchName)
return;
if (localNames.contains(branchAddDialog->branchName())) {
QMessageBox::critical(this, tr("Branch exists"),
tr("Local Branch \'%1\' already exists.")
QMessageBox::critical(this, tr("Branch Exists"),
tr("Local branch \'%1\' already exists.")
.arg(branchAddDialog->branchName()));
return;
}
......
......@@ -66,7 +66,7 @@ ChangeSelectionDialog::ChangeSelectionDialog(const QString &workingDirectory, QW
return;
QGridLayout* layout = new QGridLayout(this);
layout->addWidget(new QLabel(tr("Working Directory:"), this), 0, 0 , 1, 1);
layout->addWidget(new QLabel(tr("Working directory:"), this), 0, 0 , 1, 1);
layout->addWidget(m_workingDirEdit, 0, 1, 1, 1);
layout->addWidget(m_selectDirButton, 0, 2, 1, 1);
layout->addWidget(new QLabel(tr("Change:"), this),1, 0, 1, 1);
......
......@@ -530,8 +530,8 @@ void GerritPlugin::fetch(const QSharedPointer<Gerrit::Internal::GerritChange> &c
if (!verifiedRepository) {
QMessageBox::StandardButton answer = QMessageBox::question(
Core::ICore::mainWindow(), tr("Remote not Verified"),
tr("Change host: %1\nand project: %2\n\nwere not verified among remotes"
Core::ICore::mainWindow(), tr("Remote Not Verified"),
tr("Change host %1\nand project %2\n\nwere not verified among remotes"
" in %3. Select different folder?")
.arg(m_parameters->host,
change->project,
......
......@@ -2829,8 +2829,8 @@ bool GitClient::canRebase(const QString &workingDirectory) const
if (QFileInfo(gitDir + QLatin1String("/rebase-apply")).exists()
|| QFileInfo(gitDir + QLatin1String("/rebase-merge")).exists()) {
VcsBase::VcsBaseOutputWindow::instance()->appendError(
tr("Rebase, merge or am is in progress. Please finish "
"or abort it then try again"));
tr("Rebase, merge or am is in progress. Finish "
"or abort it and then try again."));
return false;
}
return true;
......
......@@ -133,7 +133,7 @@
<item row="1" column="3" colspan="2">
<widget class="QCheckBox" name="showTagsCheckBox">
<property name="text">
<string>Show Tags in Branches Dialog</string>
<string>Show tags in Branches dialog</string>
</property>
</widget>
</item>
......@@ -169,7 +169,7 @@
<item>
<widget class="QGroupBox" name="repBrowserGroupBox">
<property name="title">
<string>Repository browser</string>
<string>Repository Browser</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<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