From 84679827aefb8a178b939ab465b87ae76ce7e745 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Mon, 22 Oct 2018 13:58:57 +0200 Subject: [PATCH] Git: Move HTML out of translated string MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ib386531b45ddfcc087472602b5a8019796c7ec03 Reviewed-by: André Hartmann Reviewed-by: Orgad Shaneh --- src/plugins/git/mergetool.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/plugins/git/mergetool.cpp b/src/plugins/git/mergetool.cpp index 8a224f09a7d..f0f03e4ffc2 100644 --- a/src/plugins/git/mergetool.cpp +++ b/src/plugins/git/mergetool.cpp @@ -238,9 +238,10 @@ void MergeTool::readData() } else if (m_line.startsWith("Hit return")) { QMessageBox::warning( Core::ICore::dialogParent(), tr("Merge Tool"), - tr("

Merge tool is not configured.

\n" - "

Run git config --global merge.tool <tool> to configure it, " - "then try again

")); + QString("

%1

\n

%2

").arg( + tr("Merge tool is not configured."), + tr("Run git config --global merge.tool <tool> " + "to configure it, then try again."))); m_process->kill(); } else if (m_line.endsWith('\n')) { // Skip unidentified lines