diff --git a/src/plugins/git/changeselectiondialog.cpp b/src/plugins/git/changeselectiondialog.cpp index d818c964b59b61921278df991d36d4453182644e..4b9da9448e3206d361fdcdf51b63e782081c3ca5 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 8f2cb5706e7a1ddd767430e8fc6c734dc8483c45..730854ab17914974a1b5b7f70a0235fcd09bd945 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()) {