diff kdiff3/src/kdiff3_shell.rc @ 51:c59d5a3a8ff3

0.9.80

--- a/kdiff3/src/kdiff3_shell.rc	Fri Oct 17 16:54:25 2003 +0000
+++ b/kdiff3/src/kdiff3_shell.rc	Tue Dec 09 20:29:43 2003 +0000
@@ -1,11 +1,12 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="kdiff3_shell" version="0.9.70">
+<kpartgui name="kdiff3_shell" version="9">
 <MenuBar>
   <Menu name="file"><text>&amp;File</text>
     <Action name="file_reload"/>
   </Menu>
   <Menu name="directory"><text>&amp;Directory</text>
     <Action name="dir_start_operation"/>
+    <Action name="dir_run_operation_for_current_item"/>
     <Action name="dir_compare_current"/>
     <Action name="dir_rescan"/>
     <Action name="dir_fold_all"/>
@@ -15,6 +16,25 @@
     <Action name="dir_choose_c_everywhere"/>
     <Action name="dir_autochoose_everywhere"/>
     <Action name="dir_nothing_everywhere"/>
+    <Menu name="dir_current_merge_menu"><text>Current Item Merge Operation</text>
+       <Action name="dir_current_do_nothing"/>
+       <Action name="dir_current_choose_a"/>
+       <Action name="dir_current_choose_b"/>
+       <Action name="dir_current_choose_c"/>
+       <Action name="dir_current_merge"/>
+       <Action name="dir_current_delete"/>
+    </Menu>
+    <Menu name="dir_current_sync_menu"><text>Current Item Sync Operation</text>
+       <Action name="dir_current_sync_do_nothing"/>
+       <Action name="dir_current_sync_copy_a_to_b"/>
+       <Action name="dir_current_sync_copy_b_to_a"/>
+       <Action name="dir_current_sync_delete_a"/>
+       <Action name="dir_current_sync_delete_b"/>
+       <Action name="dir_current_sync_delete_a_and_b"/>
+       <Action name="dir_current_sync_merge_to_a"/>
+       <Action name="dir_current_sync_merge_to_b"/>
+       <Action name="dir_current_sync_merge_to_a_and_b"/>
+    </Menu>
   </Menu>
   <Menu name="movement"><text>&amp;Movement</text>
     <Action name="go_current"/>
@@ -36,10 +56,17 @@
     <Action name="merge_choose_a_everywhere"/>
     <Action name="merge_choose_b_everywhere"/>
     <Action name="merge_choose_c_everywhere"/>
+    <Action name="merge_choose_a_for_unsolved_conflicts"/>
+    <Action name="merge_choose_b_for_unsolved_conflicts"/>
+    <Action name="merge_choose_c_for_unsolved_conflicts"/>
+    <Action name="merge_choose_a_for_unsolved_whitespace_conflicts"/>
+    <Action name="merge_choose_b_for_unsolved_whitespace_conflicts"/>
+    <Action name="merge_choose_c_for_unsolved_whitespace_conflicts"/>
     <Action name="merge_autosolve"/>
     <Action name="merge_autounsolve"/>
-    <Action name="merge_showwhitespace"/>
     <Action name="merge_showlinenumbers"/>
+    <Action name="merge_show_whitespace_characters"/>
+    <Action name="merge_show_whitespace"/>
   </Menu>
   <Menu name="window"><text>&amp;Window</text>
     <Action name="win_focus_prev"/>
@@ -67,7 +94,7 @@
   <Action name="merge_choose_b"/>
   <Action name="merge_choose_c"/>
   <Action name="merge_autoadvance"/>
-  <Action name="merge_showwhitespace"/>
+  <Action name="merge_show_whitespace_characters"/>
   <Action name="merge_showlinenumbers"/>
 </ToolBar>
 </kpartgui>