Mercurial > hg > easyhg

comparison src/filestatuswidget.cpp @ 421:653e9694a694 ignore

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use regexes for anchored filenames (i.e. "this file only" and directory); report outcome of ignore to user
author Chris Cannam
date Fri, 17 Jun 2011 11:07:30 +0100
parents 2a19d5706673
children c6ea3eb00635
comparison
equal deleted inserted replaced
420:50920723dd16 421:653e9694a694
66 m_actionLabels[FileStates::Add] = tr("Add to version control"); 66 m_actionLabels[FileStates::Add] = tr("Add to version control");
67 m_actionLabels[FileStates::Remove] = tr("Remove from version control"); 67 m_actionLabels[FileStates::Remove] = tr("Remove from version control");
68 m_actionLabels[FileStates::RedoMerge] = tr("Redo merge"); 68 m_actionLabels[FileStates::RedoMerge] = tr("Redo merge");
69 m_actionLabels[FileStates::MarkResolved] = tr("Mark conflict as resolved"); 69 m_actionLabels[FileStates::MarkResolved] = tr("Mark conflict as resolved");
70 m_actionLabels[FileStates::Ignore] = tr("Ignore..."); 70 m_actionLabels[FileStates::Ignore] = tr("Ignore...");
71 m_actionLabels[FileStates::UnIgnore] = tr("Stop ignoring..."); 71 // Unignore is too difficult in fact, so we just offer to edit the hgignore
72 m_actionLabels[FileStates::UnIgnore] = tr("Edit .hgignore File");
72 73
73 m_descriptions[FileStates::Clean] = tr("You have not changed these files."); 74 m_descriptions[FileStates::Clean] = tr("You have not changed these files.");
74 m_descriptions[FileStates::Modified] = tr("You have changed these files since you last committed them."); 75 m_descriptions[FileStates::Modified] = tr("You have changed these files since you last committed them.");
75 m_descriptions[FileStates::Added] = tr("These files will be added to version control next time you commit them."); 76 m_descriptions[FileStates::Added] = tr("These files will be added to version control next time you commit them.");
76 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>"