Mercurial > hg > easyhg
comparison src/filestatuswidget.cpp @ 482:c6ea3eb00635
Fix #229
author | Chris Cannam |
---|---|
date | Tue, 16 Aug 2011 17:13:35 +0100 |
parents | 653e9694a694 |
children | 896b7903e8f2 |
comparison
equal
deleted
inserted
replaced
481:212093882e4a | 482:c6ea3eb00635 |
---|---|
77 m_descriptions[FileStates::Removed] = tr("These files will be removed from version control next time you commit them.<br>" | 77 m_descriptions[FileStates::Removed] = tr("These files will be removed from version control next time you commit them.<br>" |
78 "They will not be deleted from the local folder."); | 78 "They will not be deleted from the local folder."); |
79 m_descriptions[FileStates::Missing] = tr("These files are recorded in the version control, but absent from your working folder.<br>" | 79 m_descriptions[FileStates::Missing] = tr("These files are recorded in the version control, but absent from your working folder.<br>" |
80 "If you intended to delete them, select them and use Remove to tell the version control system about it.<br>" | 80 "If you intended to delete them, select them and use Remove to tell the version control system about it.<br>" |
81 "If you deleted them by accident, select them and use Revert to restore their previous contents."); | 81 "If you deleted them by accident, select them and use Revert to restore their previous contents."); |
82 m_descriptions[FileStates::InConflict] = tr("These files are unresolved following an incomplete merge.<br>Select a file and use Merge to try to resolve the merge again."); | 82 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::Unknown] = tr("These files are in your working folder but are not under version control.<br>" | 83 m_descriptions[FileStates::Unknown] = tr("These files are in your working folder but are not under version control.<br>" |
84 // "Select a file and use Add to place it under version control or Ignore to remove it from this list."); | 84 // "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."); | 85 "Select a file and use Add to place it under version control."); |
86 m_descriptions[FileStates::Ignored] = tr("These files have names that match entries in the working folder's .hgignore file,<br>" | 86 m_descriptions[FileStates::Ignored] = tr("These files have names that match entries in the working folder's .hgignore file,<br>" |
87 "and so will be ignored by the version control system."); | 87 "and so will be ignored by the version control system."); |