Mercurial > hg > easyhg-kdiff3
comparison kdiff3/src/kdiff3_shell.rc @ 51:c59d5a3a8ff3
0.9.80
author | joachim99 |
---|---|
date | Tue, 09 Dec 2003 20:29:43 +0000 |
parents | 86d21651c8db |
children | 8af4bb9d9a5a |
comparison
equal
deleted
inserted
replaced
50:8c9752066f09 | 51:c59d5a3a8ff3 |
---|---|
1 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> | 1 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> |
2 <kpartgui name="kdiff3_shell" version="0.9.70"> | 2 <kpartgui name="kdiff3_shell" version="9"> |
3 <MenuBar> | 3 <MenuBar> |
4 <Menu name="file"><text>&File</text> | 4 <Menu name="file"><text>&File</text> |
5 <Action name="file_reload"/> | 5 <Action name="file_reload"/> |
6 </Menu> | 6 </Menu> |
7 <Menu name="directory"><text>&Directory</text> | 7 <Menu name="directory"><text>&Directory</text> |
8 <Action name="dir_start_operation"/> | 8 <Action name="dir_start_operation"/> |
9 <Action name="dir_run_operation_for_current_item"/> | |
9 <Action name="dir_compare_current"/> | 10 <Action name="dir_compare_current"/> |
10 <Action name="dir_rescan"/> | 11 <Action name="dir_rescan"/> |
11 <Action name="dir_fold_all"/> | 12 <Action name="dir_fold_all"/> |
12 <Action name="dir_unfold_all"/> | 13 <Action name="dir_unfold_all"/> |
13 <Action name="dir_choose_a_everywhere"/> | 14 <Action name="dir_choose_a_everywhere"/> |
14 <Action name="dir_choose_b_everywhere"/> | 15 <Action name="dir_choose_b_everywhere"/> |
15 <Action name="dir_choose_c_everywhere"/> | 16 <Action name="dir_choose_c_everywhere"/> |
16 <Action name="dir_autochoose_everywhere"/> | 17 <Action name="dir_autochoose_everywhere"/> |
17 <Action name="dir_nothing_everywhere"/> | 18 <Action name="dir_nothing_everywhere"/> |
19 <Menu name="dir_current_merge_menu"><text>Current Item Merge Operation</text> | |
20 <Action name="dir_current_do_nothing"/> | |
21 <Action name="dir_current_choose_a"/> | |
22 <Action name="dir_current_choose_b"/> | |
23 <Action name="dir_current_choose_c"/> | |
24 <Action name="dir_current_merge"/> | |
25 <Action name="dir_current_delete"/> | |
26 </Menu> | |
27 <Menu name="dir_current_sync_menu"><text>Current Item Sync Operation</text> | |
28 <Action name="dir_current_sync_do_nothing"/> | |
29 <Action name="dir_current_sync_copy_a_to_b"/> | |
30 <Action name="dir_current_sync_copy_b_to_a"/> | |
31 <Action name="dir_current_sync_delete_a"/> | |
32 <Action name="dir_current_sync_delete_b"/> | |
33 <Action name="dir_current_sync_delete_a_and_b"/> | |
34 <Action name="dir_current_sync_merge_to_a"/> | |
35 <Action name="dir_current_sync_merge_to_b"/> | |
36 <Action name="dir_current_sync_merge_to_a_and_b"/> | |
37 </Menu> | |
18 </Menu> | 38 </Menu> |
19 <Menu name="movement"><text>&Movement</text> | 39 <Menu name="movement"><text>&Movement</text> |
20 <Action name="go_current"/> | 40 <Action name="go_current"/> |
21 <Action name="go_top"/> | 41 <Action name="go_top"/> |
22 <Action name="go_bottom"/> | 42 <Action name="go_bottom"/> |
34 <Action name="merge_choose_c"/> | 54 <Action name="merge_choose_c"/> |
35 <Action name="merge_autoadvance"/> | 55 <Action name="merge_autoadvance"/> |
36 <Action name="merge_choose_a_everywhere"/> | 56 <Action name="merge_choose_a_everywhere"/> |
37 <Action name="merge_choose_b_everywhere"/> | 57 <Action name="merge_choose_b_everywhere"/> |
38 <Action name="merge_choose_c_everywhere"/> | 58 <Action name="merge_choose_c_everywhere"/> |
59 <Action name="merge_choose_a_for_unsolved_conflicts"/> | |
60 <Action name="merge_choose_b_for_unsolved_conflicts"/> | |
61 <Action name="merge_choose_c_for_unsolved_conflicts"/> | |
62 <Action name="merge_choose_a_for_unsolved_whitespace_conflicts"/> | |
63 <Action name="merge_choose_b_for_unsolved_whitespace_conflicts"/> | |
64 <Action name="merge_choose_c_for_unsolved_whitespace_conflicts"/> | |
39 <Action name="merge_autosolve"/> | 65 <Action name="merge_autosolve"/> |
40 <Action name="merge_autounsolve"/> | 66 <Action name="merge_autounsolve"/> |
41 <Action name="merge_showwhitespace"/> | |
42 <Action name="merge_showlinenumbers"/> | 67 <Action name="merge_showlinenumbers"/> |
68 <Action name="merge_show_whitespace_characters"/> | |
69 <Action name="merge_show_whitespace"/> | |
43 </Menu> | 70 </Menu> |
44 <Menu name="window"><text>&Window</text> | 71 <Menu name="window"><text>&Window</text> |
45 <Action name="win_focus_prev"/> | 72 <Action name="win_focus_prev"/> |
46 <Action name="win_focus_next"/> | 73 <Action name="win_focus_next"/> |
47 <Action name="win_show_a"/> | 74 <Action name="win_show_a"/> |
65 <Action name="go_next_unsolved_conflict"/> | 92 <Action name="go_next_unsolved_conflict"/> |
66 <Action name="merge_choose_a"/> | 93 <Action name="merge_choose_a"/> |
67 <Action name="merge_choose_b"/> | 94 <Action name="merge_choose_b"/> |
68 <Action name="merge_choose_c"/> | 95 <Action name="merge_choose_c"/> |
69 <Action name="merge_autoadvance"/> | 96 <Action name="merge_autoadvance"/> |
70 <Action name="merge_showwhitespace"/> | 97 <Action name="merge_show_whitespace_characters"/> |
71 <Action name="merge_showlinenumbers"/> | 98 <Action name="merge_showlinenumbers"/> |
72 </ToolBar> | 99 </ToolBar> |
73 </kpartgui> | 100 </kpartgui> |