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

Git: Move HTML out of translated string

Browse Source 
Change-Id: Ib386531b45ddfcc087472602b5a8019796c7ec03
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Robert Loehning
2018-10-22 13:58:57 +02:00
parent d68c2e5f68
commit 84679827ae
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -238,9 +238,10 @@ void MergeTool::readData()
} else if (m_line.startsWith("Hit return")) {
QMessageBox::warning(
Core::ICore::dialogParent(), tr("Merge Tool"),
tr("<html><body><p>Merge tool is not configured.</p>\n"
"<p>Run git config --global merge.tool &lt;tool&gt; to configure it, "
"then try again</p></body></html>"));
QString("<html><body><p>%1</p>\n<p>%2</p></body></html>").arg(
tr("Merge tool is not configured."),
tr("Run git config --global merge.tool &lt;tool&gt; "
"to configure it, then try again.")));
m_process->kill();
} else if (m_line.endsWith('\n')) {
// Skip unidentified lines