Mercurial > hg > easyhg

diff 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
line wrap: on
line diff
--- a/filestatuswidget.cpp	Fri Mar 11 17:42:12 2011 +0000
+++ b/filestatuswidget.cpp	Fri Mar 11 18:08:22 2011 +0000
@@ -60,11 +60,11 @@
     m_actionLabels[FileStates::Annotate] = tr("Show annotated version");
     m_actionLabels[FileStates::Diff] = tr("Diff to parent");
     m_actionLabels[FileStates::Commit] = tr("Commit...");
-    m_actionLabels[FileStates::Revert] = tr("Revert to last commit");
+    m_actionLabels[FileStates::Revert] = tr("Revert to last committed state");
     m_actionLabels[FileStates::Add] = tr("Add to version control");
     m_actionLabels[FileStates::Remove] = tr("Remove from version control");
     m_actionLabels[FileStates::RedoMerge] = tr("Redo merge");
-    m_actionLabels[FileStates::MarkResolved] = tr("Mark resolved");
+    m_actionLabels[FileStates::MarkResolved] = tr("Mark conflict as resolved");
     m_actionLabels[FileStates::Ignore] = tr("Ignore");
     m_actionLabels[FileStates::UnIgnore] = tr("Stop ignoring");