# HG changeset patch
# User Jari Korhonen <jtkorhonen@gmail.com>
# Date 1276943152 -10800
# Node ID 4c42d3f5065d9f94dea562097f284581800759dc
# Parent  46260ce88b710b1aa87e821ceefad69b82ca6067
Updated merge retry success messagebox.

diff -r 46260ce88b71 -r 4c42d3f5065d mainwindow.cpp
--- a/mainwindow.cpp	Sat Jun 19 13:10:06 2010 +0300
+++ b/mainwindow.cpp	Sat Jun 19 13:25:52 2010 +0300
@@ -971,7 +971,7 @@
                         break;
 
                     case ACT_RETRY_MERGE:
-                        QMessageBox::information(this, "Merge retry", runner -> getStdOut());
+                        QMessageBox::information(this, tr("Merge retry"), tr("Merge retry successful."));
                         shouldHgStat = true;
                         justMerged = true;
                         break;