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

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)
{
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()) {