[meld] Rename new change actions to better describe their function

[Kai Willadsen <kaiw src gnome org>]

commit fb6ca3a74f491e4f501778146dfa571317d116b0
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Jun 19 08:23:47 2010 +1000

    Rename new change actions to better describe their function
    
    "Pull all non-conflicting from left/right "isn't the best description,
    as this will actually 'pull' deletions; Meld's other 'pull' actions
    won't do this. As these actions are closer to merges than anything
    else, this commit renames the new actions to: "Merge all changes from
    left", "Merge all changes from right", and "Merge all changes".

 data/ui/filediff-ui.xml |    6 +++---
 meld/filediff.py        |   12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/data/ui/filediff-ui.xml b/data/ui/filediff-ui.xml
index 0327b5d..2e12ef1 100644
--- a/data/ui/filediff-ui.xml
+++ b/data/ui/filediff-ui.xml
@@ -16,9 +16,9 @@
         <menuitem action="PullRight"/>
         <menuitem action="Delete"/>
         <separator/>
-        <menuitem action="PullNonConflictingLeft"/>
-        <menuitem action="PullNonConflictingRight"/>
-        <menuitem action="MergeNonConflicting"/>
+        <menuitem action="MergeFromLeft"/>
+        <menuitem action="MergeFromRight"/>
+        <menuitem action="MergeAll"/>
       </placeholder>
     </menu>
   </menubar>
diff --git a/meld/filediff.py b/meld/filediff.py
index dfd6c11..6ace2d5 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -186,9 +186,9 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
             ("Delete",    gtk.STOCK_DELETE,     _("Delete"),     "<Alt>Delete", _("Delete change"), self.delete_change),
             ("CopyAllLeft",       gtk.STOCK_GOTO_FIRST, _("Copy To Left"),  None, _("Copy all changes from right pane to left pane"), lambda x: self.copy_selected(-1)),
             ("CopyAllRight",      gtk.STOCK_GOTO_LAST,  _("Copy To Right"), None, _("Copy all changes from left pane to right pane"), lambda x: self.copy_selected(1)),
-            ("PullNonConflictingLeft",   None, _("Pull all non-conflicting from left"),  None, _("Pull all non-conflicting changes from right pane to left pane"), lambda x: self.pull_all_non_conflicting_changes(-1)),
-            ("PullNonConflictingRight",  None,  _("Pull all non-conflicting from right"), None, _("Pull all non-conflicting changes from left pane to right pane"), lambda x: self.pull_all_non_conflicting_changes(1)),
-            ("MergeNonConflicting",      None,  _("Merge all non-conflicting"), None, _("Merge all non-conflicting changes from left and right pane"), lambda x: self.merge_all_non_conflicting_changes()),
+            ("MergeFromLeft",  None, _("Merge all changes 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, _("Merge all non-conflicting changes from the right"), lambda x: self.pull_all_non_conflicting_changes(1)),
+            ("MergeAll",       None, _("Merge all non-conflicting"),    None, _("Merge all non-conflicting changes from left and right panes"), lambda x: self.merge_all_non_conflicting_changes()),
         )
 
         self.ui_file = paths.ui_dir("filediff-ui.xml")
@@ -820,13 +820,13 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
         pane = self._get_focused_pane()
         editable = self.textview[pane].get_editable()
         mergeable = self.linediffer.has_mergeable_changes(pane)
-        self.actiongroup.get_action("PullNonConflictingLeft").set_sensitive(mergeable[0] and editable)
-        self.actiongroup.get_action("PullNonConflictingRight").set_sensitive(mergeable[1] and editable)
+        self.actiongroup.get_action("MergeFromLeft").set_sensitive(mergeable[0] and editable)
+        self.actiongroup.get_action("MergeFromRight").set_sensitive(mergeable[1] and editable)
         if self.num_panes == 3 and self.textview[1].get_editable():
             mergeable = self.linediffer.has_mergeable_changes(1)
         else:
             mergeable = (False, False)
-        self.actiongroup.get_action("MergeNonConflicting").set_sensitive(mergeable[0] or mergeable[1])
+        self.actiongroup.get_action("MergeAll").set_sensitive(mergeable[0] or mergeable[1])
 
     def on_diffs_changed(self, linediffer):
         self._set_merge_action_sensitivity()