[meld] Put 'All' back in merge strings to distinguish from rest of menu

[Kai Willadsen <kaiw src gnome org>]

commit 3187e157123eef0f51738c912ae0e271441c24b6
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat May 4 06:01:37 2013 +1000

    Put 'All' back in merge strings to distinguish from rest of menu

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