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

UI text: fix VCS related strings

Browse Source 
Fix capitalization and punctuation and a typo.

Change-Id: Ie974594878aad6dec558516b2d31b202e8c732d4
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
This commit is contained in:
Leena Miettinen
2013-05-14 16:13:29 +02:00
parent 1f62d7c90d
commit bc9bb4b93c
8 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
}

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

@@ -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);

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

@@ -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,

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

@@ -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;

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

@@ -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>