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

Use double quotes instead of single quotes as per our guidelines.

Browse Source 
Change-Id: Ib608bb49e26781aef1914085a5d801fcdcd5eb56
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
This commit is contained in:
Christian Kandeler
2014-04-17 14:09:47 +02:00
parent c20f40e12e
commit eccc1198d6
123 changed files with 293 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -190,7 +190,7 @@ void MergeTool::chooseAction()
msgBox.setWindowTitle(tr("Merge Conflict"));
msgBox.setIcon(QMessageBox::Question);
msgBox.setStandardButtons(QMessageBox::Abort);
msgBox.setText(tr("%1 merge conflict for '%2'\nLocal: %3\nRemote: %4")
msgBox.setText(tr("%1 merge conflict for \"%2\"\nLocal: %3\nRemote: %4")
.arg(mergeTypeName())
.arg(m_fileName)
.arg(stateName(m_localState, m_localInfo))