comparison filestatuswidget.cpp @ 225:05255f23f2af

* Properly handle the case where the working copy is empty but the repo is not (e.g. just after convert)
author Chris Cannam
date Thu, 06 Jan 2011 11:52:23 +0000
parents 43ecb0dcc44e
children e67bd8abc3e3
comparison
equal deleted inserted replaced
220:5498774b34c8 225:05255f23f2af
95 m_simpleLabels[FileStates::Unknown] = tr("Untracked:"); 95 m_simpleLabels[FileStates::Unknown] = tr("Untracked:");
96 m_simpleLabels[FileStates::Ignored] = tr("Ignored:"); 96 m_simpleLabels[FileStates::Ignored] = tr("Ignored:");
97 97
98 m_descriptions[FileStates::Clean] = tr("You have not changed these files."); 98 m_descriptions[FileStates::Clean] = tr("You have not changed these files.");
99 m_descriptions[FileStates::Modified] = tr("You have changed these files since you last committed them."); 99 m_descriptions[FileStates::Modified] = tr("You have changed these files since you last committed them.");
100 m_descriptions[FileStates::Added] = tr("These files will be added to version control next time you commit."); 100 m_descriptions[FileStates::Added] = tr("These files will be added to version control next time you commit them.");
101 m_descriptions[FileStates::Removed] = tr("These files will be removed from version control next time you commit.<br>" 101 m_descriptions[FileStates::Removed] = tr("These files will be removed from version control next time you commit them.<br>"
102 "They will not be deleted from the local folder."); 102 "They will not be deleted from the local folder.");
103 m_descriptions[FileStates::Missing] = tr("These files are recorded in the version control, but absent from your working folder.<br>" 103 m_descriptions[FileStates::Missing] = tr("These files are recorded in the version control, but absent from your working folder.<br>"
104 "If you intended to delete them, select them and use Remove to tell the version control system about it.<br>" 104 "If you intended to delete them, select them and use Remove to tell the version control system about it.<br>"
105 "If you deleted them by accident, select them and use Revert to restore their previous contents."); 105 "If you deleted them by accident, select them and use Revert to restore their previous contents.");
106 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."); 106 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.");