comparison mainwindow.cpp @ 322:913d213dd427

Remove message about updating to bring changes into the working copy: it isn't always true (e.g. if you have to do a merge next)
author Chris Cannam
date Wed, 02 Mar 2011 16:29:17 +0000
parents 124a3ea9fafb
children ef977e7482cd
comparison
equal deleted inserted replaced
321:dff8ec43c86d 322:913d213dd427
1665 QString head; 1665 QString head;
1666 QString report; 1666 QString report;
1667 int n = extractChangeCount(output); 1667 int n = extractChangeCount(output);
1668 if (n > 0) { 1668 if (n > 0) {
1669 head = tr("Pulled %n changeset(s)", "", n); 1669 head = tr("Pulled %n changeset(s)", "", n);
1670 report = tr("The new changes will be highlighted in the history.<br>Use Update to bring these changes into your working copy."); 1670 report = tr("New changes will be highlighted in yellow in the history.");
1671 } else if (n == 0) { 1671 } else if (n == 0) {
1672 head = tr("No changes to pull"); 1672 head = tr("No changes to pull");
1673 report = tr("Your local repository already contains all changes found in the remote repository."); 1673 report = tr("Your local repository already contains all changes found in the remote repository.");
1674 } else { 1674 } else {
1675 head = tr("Pull complete"); 1675 head = tr("Pull complete");