[meld] Make merge command strings more consistent (bgo#699057)

[Kai Willadsen <kaiw src gnome org>]

commit 01b305de5c9677d7e3ec51cbd088e45205f44d0a
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Thu May 2 07:27:19 2013 +1000

    Make merge command strings more consistent (bgo#699057)

 meld/filediff.py |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index 7ff0e8a..f9507a5 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -268,13 +268,13 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
             ("Delete", gtk.STOCK_DELETE, _("Delete"), "<Alt>Delete",
                 _("Delete change"),
                 self.delete_change),
-            ("MergeFromLeft", None, _("Merge All Changes from Left"), None,
+            ("MergeFromLeft", None, _("Merge from Left"), None,
                 _("Merge all non-conflicting changes from the left"),
                 lambda x: self.pull_all_non_conflicting_changes(-1)),
-            ("MergeFromRight", None, _("Merge All Changes from Right"), None,
+            ("MergeFromRight", None, _("Merge from Right"), None,
                 _("Merge all non-conflicting changes from the right"),
                 lambda x: self.pull_all_non_conflicting_changes(1)),
-            ("MergeAll", None, _("Merge All Non-conflicting"), None,
+            ("MergeAll", None, _("Merge All"), None,
                 _("Merge all non-conflicting changes from left and right "
                   "panes"),
                 lambda x: self.merge_all_non_conflicting_changes()),