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

UI text: fix Git messages

Browse Source 
Fix capitalization and punctualization of Git messages.

Change-Id: I76de86dc87727b17eca6d0deabc530f889fa284e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Leena Miettinen
2013-02-08 15:55:28 +01:00
committed by Orgad Shaneh
parent cf1099628f
commit 81a69f3e42
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,7 +103,7 @@ void ChangeSelectionDialog::selectWorkingDirectory()
m_ui.workingDirectoryEdit->setText(location); m_ui.workingDirectoryEdit->setText(location);
else // Did not find a repo else // Did not find a repo
QMessageBox::critical(this, tr("Error"), 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 //! Set commit message in details
@@ -112,7 +112,7 @@ void ChangeSelectionDialog::setDetails(int exitCode)
if (exitCode == 0) if (exitCode == 0)
m_ui.detailsText->setPlainText(QString::fromUtf8(m_process->readAllStandardOutput())); m_ui.detailsText->setPlainText(QString::fromUtf8(m_process->readAllStandardOutput()));
else else
m_ui.detailsText->setPlainText(tr("Error: unknown reference")); m_ui.detailsText->setPlainText(tr("Error: Unknown reference"));
} }
void ChangeSelectionDialog::recalculateDetails(const QString &ref) void ChangeSelectionDialog::recalculateDetails(const QString &ref)
@@ -135,7 +135,7 @@ void ChangeSelectionDialog::recalculateDetails(const QString &ref)
m_process->start(m_gitBinaryPath, args); m_process->start(m_gitBinaryPath, args);
m_process->closeWriteChannel(); m_process->closeWriteChannel();
if (!m_process->waitForStarted()) 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 else
m_ui.detailsText->setPlainText(tr("Fetching commit data...")); m_ui.detailsText->setPlainText(tr("Fetching commit data..."));
} }

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

@@ -2147,7 +2147,7 @@ void GitClient::synchronousAbortCommand(const QString &workingDir, const QString
void GitClient::handleMergeConflicts(const QString &workingDir, const QString &abortCommand) 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); tr("Conflicts detected"), QMessageBox::Ignore | QMessageBox::Abort);
mergeOrAbort.addButton(tr("Run Merge Tool"), QMessageBox::ActionRole); mergeOrAbort.addButton(tr("Run Merge Tool"), QMessageBox::ActionRole);
switch (mergeOrAbort.exec()) { switch (mergeOrAbort.exec()) {