Mercurial > hg > easyhg

comparison filestatuswidget.cpp @ 328:ea62eb083ed4 filelist_right_button_menu

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge fixes: primarily, handle failed merges better
author Chris Cannam
date Fri, 11 Mar 2011 18:08:22 +0000
parents 6e1fdda1dff2
children acfe9390d5c6
comparison
equal deleted inserted replaced
327:f166f70c64f9 328:ea62eb083ed4
58 m_simpleLabels[FileStates::Ignored] = tr("Ignored:"); 58 m_simpleLabels[FileStates::Ignored] = tr("Ignored:");
59 59
60 m_actionLabels[FileStates::Annotate] = tr("Show annotated version"); 60 m_actionLabels[FileStates::Annotate] = tr("Show annotated version");
61 m_actionLabels[FileStates::Diff] = tr("Diff to parent"); 61 m_actionLabels[FileStates::Diff] = tr("Diff to parent");
62 m_actionLabels[FileStates::Commit] = tr("Commit..."); 62 m_actionLabels[FileStates::Commit] = tr("Commit...");
63 m_actionLabels[FileStates::Revert] = tr("Revert to last commit"); 63 m_actionLabels[FileStates::Revert] = tr("Revert to last committed state");
64 m_actionLabels[FileStates::Add] = tr("Add to version control"); 64 m_actionLabels[FileStates::Add] = tr("Add to version control");
65 m_actionLabels[FileStates::Remove] = tr("Remove from version control"); 65 m_actionLabels[FileStates::Remove] = tr("Remove from version control");
66 m_actionLabels[FileStates::RedoMerge] = tr("Redo merge"); 66 m_actionLabels[FileStates::RedoMerge] = tr("Redo merge");
67 m_actionLabels[FileStates::MarkResolved] = tr("Mark resolved"); 67 m_actionLabels[FileStates::MarkResolved] = tr("Mark conflict as resolved");
68 m_actionLabels[FileStates::Ignore] = tr("Ignore"); 68 m_actionLabels[FileStates::Ignore] = tr("Ignore");
69 m_actionLabels[FileStates::UnIgnore] = tr("Stop ignoring"); 69 m_actionLabels[FileStates::UnIgnore] = tr("Stop ignoring");
70 70
71 m_descriptions[FileStates::Clean] = tr("You have not changed these files."); 71 m_descriptions[FileStates::Clean] = tr("You have not changed these files.");
72 m_descriptions[FileStates::Modified] = tr("You have changed these files since you last committed them."); 72 m_descriptions[FileStates::Modified] = tr("You have changed these files since you last committed them.");