# HG changeset patch
# User Chris Cannam
# Date 1298390229 0
# Node ID 031dddcd967fe823a0f3a3d12e20903c85678ccd
# Parent  3bb6b63420adb332a677c38441f24b28aa4f6ea5# Parent  bb4702918ba6a2304a161b979bccf9f89c8b106d
Merge from the default branch

diff -r 3bb6b63420ad -r 031dddcd967f mainwindow.cpp
--- a/mainwindow.cpp	Tue Feb 22 15:52:22 2011 +0000
+++ b/mainwindow.cpp	Tue Feb 22 15:57:09 2011 +0000
@@ -1619,7 +1619,7 @@
     int n = extractChangeCount(output);
     if (n > 0) {
         head = tr("Pulled %n changeset(s)", "", n);
-        report = tr("New changes will be highlighted in the history. Update to bring these changes into your working copy.");
+        report = tr("The new changes will be highlighted in the history.<br>Use Update to bring these changes into your working copy.");
     } else if (n == 0) {
         head = tr("No changes to pull");
         report = tr("Your local repository already contains all changes found in the remote repository.");
@@ -1987,7 +1987,7 @@
     case ACT_MERGE:
         MoreInformationDialog::information
             (this, tr("Merge"), tr("Merge successful"),
-             tr("The merge succeeded.  Remember to commit the result!"),
+             tr("Remember to test and commit the result before making any further changes."),
              output);
         m_shouldHgStat = true;
         m_justMerged = true;
@@ -1995,7 +1995,7 @@
         
     case ACT_RETRY_MERGE:
         QMessageBox::information(this, tr("Resolved"),
-                                 tr("<qt><h3>Merge resolved</h3><p>Merge resolved successfully.</p>"));
+                                 tr("<qt><h3>Merge resolved</h3><p>Merge resolved successfully.<br>Remember to test and commit the result before making any further changes.</p>"));
         m_shouldHgStat = true;
         m_justMerged = true;
         break;