Mercurial > hg > easyhg

comparison src/filestatuswidget.cpp @ 599:538b6ae5c272

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Tue, 24 Apr 2012 16:56:29 +0100
parents abfef4acceca
children 6f90bb52eee6
comparison
equal deleted inserted replaced
598:5bf32465213c 599:538b6ae5c272
77 m_descriptions[FileStates::Added] = tr("These files will be added to version control next time you commit them."); 77 m_descriptions[FileStates::Added] = tr("These files will be added to version control next time you commit them.");
78 m_descriptions[FileStates::Removed] = tr("These files will be removed from version control next time you commit them.<br>" 78 m_descriptions[FileStates::Removed] = tr("These files will be removed from version control next time you commit them.<br>"
79 "They will not be deleted from the local folder."); 79 "They will not be deleted from the local folder.");
80 m_descriptions[FileStates::Missing] = tr("These files are recorded in the version control, but absent from your working folder.<br>" 80 m_descriptions[FileStates::Missing] = tr("These files are recorded in the version control, but absent from your working folder.<br>"
81 "If you intended to delete them, select them and use Remove to tell the version control system about it.<br>" 81 "If you intended to delete them, select them and use Remove to tell the version control system about it.<br>"
82 "If you deleted them by accident, select them and use Revert to restore their previous contents."); 82 "If you deleted them by accident, right-click them and use Revert to restore their previous contents.");
83 m_descriptions[FileStates::InConflict] = tr("These files are unresolved following an incomplete merge.<br>Use Merge to try to resolve the merge again."); 83 m_descriptions[FileStates::InConflict] = tr("These files are unresolved following an incomplete merge.<br>Use Merge to try to resolve the merge again.");
84 m_descriptions[FileStates::Unknown] = tr("These files are in your working folder but are not under version control.<br>" 84 m_descriptions[FileStates::Unknown] = tr("These files are in your working folder but are not under version control.<br>"
85 // "Select a file and use Add to place it under version control or Ignore to remove it from this list."); 85 // "Select a file and use Add to place it under version control or Ignore to remove it from this list.");
86 "Select a file and use Add to place it under version control."); 86 "Select a file and use Add to place it under version control.");
87 m_descriptions[FileStates::Ignored] = tr("These files have names that match entries in the working folder's .hgignore file,<br>" 87 m_descriptions[FileStates::Ignored] = tr("These files have names that match entries in the working folder's .hgignore file,<br>"