From 81a69f3e42c7e6f15740883f3495dc17abedf2f7 Mon Sep 17 00:00:00 2001
From: Leena Miettinen <riitta-leena.miettinen@digia.com>
Date: Fri, 8 Feb 2013 15:55:28 +0100
Subject: [PATCH] UI text: fix Git messages
Fix capitalization and punctualization of Git messages.
Change-Id: I76de86dc87727b17eca6d0deabc530f889fa284e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
src/plugins/git/changeselectiondialog.cpp | 6 +++---
src/plugins/git/gitclient.cpp | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/plugins/git/changeselectiondialog.cpp b/src/plugins/git/changeselectiondialog.cpp
index d818c964b59..4b9da9448e3 100644
--- a/src/plugins/git/changeselectiondialog.cpp
+++ b/src/plugins/git/changeselectiondialog.cpp
@@ -103,7 +103,7 @@ void ChangeSelectionDialog::selectWorkingDirectory()
m_ui.workingDirectoryEdit->setText(location);
else // Did not find a repo
QMessageBox::critical(this, tr("Error"),
- tr("Selected directory is not a Git repository"));
+ tr("Selected directory is not a Git repository."));
}
//! Set commit message in details
@@ -112,7 +112,7 @@ void ChangeSelectionDialog::setDetails(int exitCode)
if (exitCode == 0)
m_ui.detailsText->setPlainText(QString::fromUtf8(m_process->readAllStandardOutput()));
else
- m_ui.detailsText->setPlainText(tr("Error: unknown reference"));
+ m_ui.detailsText->setPlainText(tr("Error: Unknown reference"));
}
void ChangeSelectionDialog::recalculateDetails(const QString &ref)
@@ -135,7 +135,7 @@ void ChangeSelectionDialog::recalculateDetails(const QString &ref)
m_process->start(m_gitBinaryPath, args);
m_process->closeWriteChannel();
if (!m_process->waitForStarted())
- m_ui.detailsText->setPlainText(tr("Error: could not start git"));
+ m_ui.detailsText->setPlainText(tr("Error: Could not start Git."));
else
m_ui.detailsText->setPlainText(tr("Fetching commit data..."));
}
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 8f2cb5706e7..730854ab179 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -2147,7 +2147,7 @@ void GitClient::synchronousAbortCommand(const QString &workingDir, const QString
void GitClient::handleMergeConflicts(const QString &workingDir, const QString &abortCommand)
{
- QMessageBox mergeOrAbort(QMessageBox::Question, tr("Conflicts detected"),
+ QMessageBox mergeOrAbort(QMessageBox::Question, tr("Conflicts Detected"),
tr("Conflicts detected"), QMessageBox::Ignore | QMessageBox::Abort);
mergeOrAbort.addButton(tr("Run Merge Tool"), QMessageBox::ActionRole);
switch (mergeOrAbort.exec()) {
--
GitLab