comparison mainwindow.cpp @ 303:bb4702918ba6

And another tweak to pull-successful dialog.
author Chris Cannam
date Tue, 22 Feb 2011 15:55:13 +0000
parents 6dc0a4dc6cf5
children 031dddcd967f 7708149d252a
comparison
equal deleted inserted replaced
302:6dc0a4dc6cf5 303:bb4702918ba6
1615 QString head; 1615 QString head;
1616 QString report; 1616 QString report;
1617 int n = extractChangeCount(output); 1617 int n = extractChangeCount(output);
1618 if (n > 0) { 1618 if (n > 0) {
1619 head = tr("Pulled %n changeset(s)", "", n); 1619 head = tr("Pulled %n changeset(s)", "", n);
1620 report = tr("New changes will be highlighted in the history. Update to bring these changes into your working copy."); 1620 report = tr("The new changes will be highlighted in the history.<br>Use Update to bring these changes into your working copy.");
1621 } else if (n == 0) { 1621 } else if (n == 0) {
1622 head = tr("No changes to pull"); 1622 head = tr("No changes to pull");
1623 report = tr("Your local repository already contains all changes found in the remote repository."); 1623 report = tr("Your local repository already contains all changes found in the remote repository.");
1624 } else { 1624 } else {
1625 head = tr("Pull complete"); 1625 head = tr("Pull complete");