Mercurial > hg > easyhg
changeset 304:031dddcd967f status_outside_tabs
Merge from the default branch
| author | Chris Cannam |
|---|---|
| date | Tue, 22 Feb 2011 15:57:09 +0000 |
| parents | 3bb6b63420ad (current diff) bb4702918ba6 (diff) |
| children | b280a2dc0512 |
| files | mainwindow.cpp |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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;