diff --git a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp index ba0d8ccd72b..e86b2b6b57b 100644 --- a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp +++ b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp @@ -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; } diff --git a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.ui b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.ui index d0c496aba0d..03561d0176a 100644 --- a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.ui +++ b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.ui @@ -43,12 +43,12 @@ - Make Writeable + Make Writable - Open With VCS + Open with VCS @@ -58,7 +58,7 @@ - File Name + Filename diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.cpp b/src/plugins/coreplugin/progressmanager/progressmanager.cpp index f5e401b05f1..330737ca0ca 100644 --- a/src/plugins/coreplugin/progressmanager/progressmanager.cpp +++ b/src/plugins/coreplugin/progressmanager/progressmanager.cpp @@ -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 diff --git a/src/plugins/git/branchdialog.cpp b/src/plugins/git/branchdialog.cpp index 2d157d7e70c..721322fa3af 100644 --- a/src/plugins/git/branchdialog.cpp +++ b/src/plugins/git/branchdialog.cpp @@ -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; } diff --git a/src/plugins/git/changeselectiondialog.cpp b/src/plugins/git/changeselectiondialog.cpp index 48a0fdec18c..24473c03a22 100644 --- a/src/plugins/git/changeselectiondialog.cpp +++ b/src/plugins/git/changeselectiondialog.cpp @@ -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); diff --git a/src/plugins/git/gerrit/gerritplugin.cpp b/src/plugins/git/gerrit/gerritplugin.cpp index 9462068e7d5..01b969c0445 100644 --- a/src/plugins/git/gerrit/gerritplugin.cpp +++ b/src/plugins/git/gerrit/gerritplugin.cpp @@ -530,8 +530,8 @@ void GerritPlugin::fetch(const QSharedPointer &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, diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 94344779cda..0942a744fb7 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -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; diff --git a/src/plugins/git/settingspage.ui b/src/plugins/git/settingspage.ui index 881ae3570a4..c72a4c3eb1d 100644 --- a/src/plugins/git/settingspage.ui +++ b/src/plugins/git/settingspage.ui @@ -133,7 +133,7 @@ - Show Tags in Branches Dialog + Show tags in Branches dialog @@ -169,7 +169,7 @@ - Repository browser + Repository Browser