| blob | e6555e1eeb3a03da6c4fa57fb26e7c10ea0bc2c5 |
1 // Microsoft Visual C++ generated resource script.\r
2 //\r
3 #include "..\TortoiseMerge\resource.h"\r
4 \r
5 #define APSTUDIO_READONLY_SYMBOLS\r
6 /////////////////////////////////////////////////////////////////////////////\r
7 //\r
8 // Generated from the TEXTINCLUDE 2 resource.\r
9 //\r
10 #include "afxres.h"\r
11 \r
12 /////////////////////////////////////////////////////////////////////////////\r
13 #undef APSTUDIO_READONLY_SYMBOLS\r
14 \r
15 /////////////////////////////////////////////////////////////////////////////\r
16 // Neutral resources\r
17 \r
18 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)\r
19 #ifdef _WIN32\r
20 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL\r
21 #endif //_WIN32\r
22 \r
23 /////////////////////////////////////////////////////////////////////////////\r
24 //\r
25 // Icon\r
26 //\r
27 \r
28 // Icon with lowest ID value placed first to ensure application icon\r
29 // remains consistent on all systems.\r
30 IDR_MAINFRAME ICON "TortoiseMerge.ico"\r
31 IDI_REMOVEDLINE ICON "lineremoved.ico"\r
32 IDI_ADDEDLINE ICON "lineadded.ico"\r
33 IDI_CONFLICTEDLINE ICON "lineconflicted.ico"\r
34 IDI_WHITESPACELINE ICON "linewhitespace.ico"\r
35 IDI_EQUALLINE ICON "lineequal.ico"\r
36 IDI_LINEENDINGCR ICON "LineEndingCR.ico"\r
37 IDI_LINEENDINGCRLF ICON "LineEndingCRLF.ico"\r
38 IDI_LINEENDINGLF ICON "LineEndingLF.ico"\r
39 IDI_CONFLICTEDIGNOREDLINE ICON "lineconflictedignored.ico"\r
40 IDI_LINEEDITED ICON "lineedited.ico"\r
41 \r
42 /////////////////////////////////////////////////////////////////////////////\r
43 //\r
44 // Dialog\r
45 //\r
46 \r
47 IDD_ABOUT DIALOGEX 0, 0, 333, 249\r
48 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
49 CAPTION "About TortoiseMerge"\r
50 FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
51 BEGIN\r
52 CONTROL "Author: Stefan Kueng",IDC_STATIC,\r
53 "Static",SS_LEFTNOWORDWRAP | WS_GROUP,14,68,141,8\r
54 LTEXT "Icons/Design/Code: Luebbe Onken",IDC_STATIC,14,80,144,8\r
55 DEFPUSHBUTTON "OK",IDOK,276,228,50,14\r
56 GROUPBOX "Version",IDC_VERSIONBOX,7,123,319,99\r
57 EDITTEXT IDC_VERSIONABOUT,14,134,304,85,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER\r
58 LTEXT "Visit our website",IDC_WEBLINK,14,95,312,8\r
59 LTEXT "and support the developers",IDC_SUPPORTLINK,14,105,312,8\r
60 END\r
61 \r
62 IDD_DIFFLOCATOR DIALOGEX 0, 0, 20, 314\r
63 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU\r
64 FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
65 BEGIN\r
66 END\r
67 \r
68 IDD_LINEDIFF DIALOGEX 0, 0, 428, 23\r
69 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN\r
70 FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
71 BEGIN\r
72 END\r
73 \r
74 IDD_FILEPATCHES DIALOGEX 0, 0, 132, 206\r
75 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME\r
76 EXSTYLE WS_EX_TOOLWINDOW\r
77 CAPTION "File patches"\r
78 FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
79 BEGIN\r
80 CONTROL "",IDC_FILELIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | WS_TABSTOP,0,0,131,206\r
81 END\r
82 \r
83 \r
84 /////////////////////////////////////////////////////////////////////////////\r
85 //\r
86 // DESIGNINFO\r
87 //\r
88 \r
89 #ifdef APSTUDIO_INVOKED\r
90 GUIDELINES DESIGNINFO \r
91 BEGIN\r
92 IDD_DIFFLOCATOR, DIALOG\r
93 BEGIN\r
94 LEFTMARGIN, 3\r
95 RIGHTMARGIN, 13\r
96 BOTTOMMARGIN, 202\r
97 END\r
98 \r
99 IDD_LINEDIFF, DIALOG\r
100 BEGIN\r
101 RIGHTMARGIN, 427\r
102 END\r
103 \r
104 IDD_FILEPATCHES, DIALOG\r
105 BEGIN\r
106 LEFTMARGIN, 7\r
107 RIGHTMARGIN, 125\r
108 TOPMARGIN, 7\r
109 BOTTOMMARGIN, 199\r
110 END\r
111 END\r
112 #endif // APSTUDIO_INVOKED\r
113 \r
114 \r
115 /////////////////////////////////////////////////////////////////////////////\r
116 //\r
117 // Bitmap\r
118 //\r
119 \r
120 IDB_LOGOFLIPPED BITMAP "tortoisemerge_logoflipped.bmp"\r
121 IDB_TTF_BMP BITMAP "ttf_glyph.bmp"\r
122 \r
123 /////////////////////////////////////////////////////////////////////////////\r
124 //\r
125 // AVI\r
126 //\r
127 \r
128 IDR_DOWNLOAD AVI "download.avi"\r
129 #endif // Neutral resources\r
130 /////////////////////////////////////////////////////////////////////////////\r
131 \r
132 \r
133 /////////////////////////////////////////////////////////////////////////////\r
134 // English (U.S.) resources\r
135 \r
136 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r
137 #ifdef _WIN32\r
138 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US\r
139 #endif //_WIN32\r
140 \r
141 /////////////////////////////////////////////////////////////////////////////\r
142 //\r
143 // Dialog\r
144 //\r
145 \r
146 IDD_OPENDLG DIALOGEX 0, 0, 325, 209\r
147 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
148 EXSTYLE WS_EX_CONTEXTHELP\r
149 CAPTION "TortoiseMerge"\r
150 FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
151 BEGIN\r
152 CONTROL "&Merging",IDC_MERGERADIO,"Button",BS_AUTORADIOBUTTON | WS_GROUP,14,18,75,10\r
153 CONTROL "&Apply unified diff",IDC_APPLYRADIO,"Button",BS_AUTORADIOBUTTON,96,18,152,10\r
154 EDITTEXT IDC_BASEFILEEDIT,96,45,152,14,ES_AUTOHSCROLL\r
155 PUSHBUTTON "&Browse...",IDC_BASEFILEBROWSE,260,46,50,14\r
156 EDITTEXT IDC_THEIRFILEEDIT,96,66,152,14,ES_AUTOHSCROLL\r
157 PUSHBUTTON "B&rowse...",IDC_THEIRFILEBROWSE,260,67,50,14\r
158 EDITTEXT IDC_YOURFILEEDIT,96,88,152,14,ES_AUTOHSCROLL\r
159 PUSHBUTTON "Br&owse...",IDC_YOURFILEBROWSE,260,89,50,14\r
160 CONTROL "Use Unified Diff from &clipboard",IDC_PATCHFROMCLIPBOARD,\r
161 "Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,14,129,234,10\r
162 EDITTEXT IDC_DIFFFILEEDIT,96,142,152,14,ES_AUTOHSCROLL\r
163 PUSHBUTTON "&Browse...",IDC_DIFFFILEBROWSE,260,142,50,14\r
164 EDITTEXT IDC_DIRECTORYEDIT,96,162,152,14,ES_AUTOHSCROLL\r
165 PUSHBUTTON "B&rowse...",IDC_DIRECTORYBROWSE,260,163,50,14\r
166 DEFPUSHBUTTON "OK",IDOK,7,188,50,14\r
167 PUSHBUTTON "Cancel",IDCANCEL,127,188,50,14\r
168 PUSHBUTTON "Help",IDC_HELPBUTTON,268,188,50,14\r
169 LTEXT "Base file:",IDC_STATIC,14,48,82,8\r
170 LTEXT "Their file:",IDC_STATIC,14,69,82,8\r
171 LTEXT "My file:",IDC_STATIC,14,91,82,8\r
172 LTEXT "",IDC_VERSIONSTRING,7,7,311,8,SS_CENTERIMAGE\r
173 GROUPBOX "Merging",IDC_STATIC,7,34,311,77\r
174 GROUPBOX "Apply unified diff",IDC_STATIC,7,117,311,66\r
175 LTEXT "Diff file:",IDC_STATIC,14,145,82,8\r
176 LTEXT "Directory:",IDC_STATIC,14,164,82,8\r
177 END\r
178 \r
179 IDD_SETMAINPAGE DIALOGEX 0, 0, 265, 223\r
180 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION\r
181 CAPTION "General"\r
182 FONT 8, "MS Shell Dlg", 0, 0, 0x0\r
183 BEGIN\r
184 CONTROL "&Backup original file",IDC_BACKUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,10,236,10\r
185 CONTROL "&Jump to first difference when loading",IDC_FIRSTDIFFONLOAD,\r
186 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,21,236,10\r
187 CONTROL "Use &one-pane view as default for 2-file diff",IDC_ONEPANE,\r
188 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,43,236,10\r
189 CONTROL "Show linenumber&s",IDC_LINENUMBERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,54,236,10\r
190 CONTROL "Use stri&keout for removed lines",IDC_STRIKEOUT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,65,236,10\r
191 LTEXT "&Tab size:",IDC_STATIC,15,86,54,8\r
192 EDITTEXT IDC_TABSIZE,80,83,41,14,ES_AUTOHSCROLL | ES_NUMBER\r
193 LTEXT "&Font:",IDC_STATIC,15,103,52,8\r
194 COMBOBOX IDC_FONTNAMES,80,101,122,90,CBS_DROPDOWNLIST | CBS_OWNERDRAWVARIABLE | CBS_SORT | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
195 COMBOBOX IDC_FONTSIZES,211,101,40,47,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP\r
196 CONTROL "Ignore line &endings (recommended)",IDC_IGNORELF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,138,237,10\r
197 CONTROL "Ignore &case changes",IDC_CASEINSENSITIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,149,236,10\r
198 CONTROL "Color co&de in-line changes",IDC_USEBDIFF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,161,236,10\r
199 CONTROL "&Compare whitespaces",IDC_WSCOMPARE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,15,180,236,10\r
200 CONTROL "&Ignore whitespace changes",IDC_WSIGNORECHANGED,"Button",BS_AUTORADIOBUTTON,15,191,236,10\r
201 CONTROL "Ignore &all whitespaces",IDC_WSIGNOREALL,"Button",BS_AUTORADIOBUTTON,15,202,236,10\r
202 GROUPBOX "Misc",IDC_MISCGROUP,7,0,251,124\r
203 GROUPBOX "Diffing",IDC_DIFFGROUP,7,130,251,86\r
204 CONTROL "Default to UTF-8 encoding",IDC_UTF8DEFAULT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,236,10\r
205 END\r
206 \r
207 IDD_SETCOLORPAGE DIALOGEX 0, 0, 265, 223\r
208 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION\r
209 CAPTION "Colors"\r
210 FONT 8, "MS Shell Dlg", 0, 0, 0x0\r
211 BEGIN\r
212 GROUPBOX "Line differences",IDC_STATIC,7,7,251,127\r
213 LTEXT "Normal",IDC_STATIC,15,16,113,8,0,WS_EX_RIGHT\r
214 PUSHBUTTON "",IDC_BKNORMAL,152,14,50,14\r
215 LTEXT "Added",IDC_STATIC,15,32,113,8,0,WS_EX_RIGHT\r
216 PUSHBUTTON "",IDC_BKADDED,152,30,50,14\r
217 LTEXT "Removed",IDC_STATIC,15,49,113,8,0,WS_EX_RIGHT\r
218 PUSHBUTTON "",IDC_BKREMOVED,152,47,50,14\r
219 LTEXT "Modified",IDC_STATIC,15,66,113,8,0,WS_EX_RIGHT\r
220 PUSHBUTTON "",IDC_BKMODIFIED,152,64,50,14\r
221 LTEXT "Conflicted",IDC_STATIC,15,83,113,8,0,WS_EX_RIGHT\r
222 PUSHBUTTON "",IDC_BKCONFLICTED,152,81,50,14\r
223 LTEXT "Empty",IDC_STATIC,15,116,113,8,0,WS_EX_RIGHT\r
224 PUSHBUTTON "",IDC_BKEMPTY,152,114,50,14\r
225 GROUPBOX "Inline differences",IDC_STATIC,7,137,251,43\r
226 LTEXT "Added",IDC_STATIC,15,147,113,8,0,WS_EX_RIGHT\r
227 PUSHBUTTON "",IDC_BKWHITESPACES,152,145,50,14\r
228 LTEXT "Removed",IDC_STATIC,15,163,113,8,0,WS_EX_RIGHT\r
229 PUSHBUTTON "",IDC_BKWHITESPACEDIFF,152,161,50,14\r
230 LTEXT "Conflict resolved",IDC_STATIC,15,100,113,8,0,WS_EX_RIGHT\r
231 PUSHBUTTON "",IDC_BKCONFLICTRESOLVED,152,98,50,14\r
232 GROUPBOX "Misc",IDC_STATIC,7,183,251,33\r
233 RTEXT "Whitespaces",IDC_STATIC,15,198,113,8\r
234 PUSHBUTTON "",IDC_FGWHITESPACES,152,194,50,14\r
235 END\r
236 \r
237 IDD_PATCH_FILE_OPEN_CUSTOM DIALOGEX 0, 0, 122, 28\r
238 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_SYSMENU\r
239 FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
240 BEGIN\r
241 PUSHBUTTON "Open from clipboard",IDC_PATCH_TO_CLIPBOARD,7,7,108,14\r
242 END\r
243 \r
244 IDD_FIND DIALOGEX 0, 0, 311, 73\r
245 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
246 CAPTION "Find"\r
247 FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
248 BEGIN\r
249 DEFPUSHBUTTON "&Find",IDOK,248,7,56,14,WS_DISABLED\r
250 PUSHBUTTON "Cancel",IDCANCEL,248,28,56,14\r
251 CONTROL "",IDC_FINDCOMBO,"ComboBoxEx32",CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP,90,7,154,95\r
252 LTEXT "Search for:",IDC_STATIC,7,10,79,8\r
253 CONTROL "Match &case",IDC_MATCHCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,26,200,10\r
254 CONTROL "&Limit search to modified lines",IDC_LIMITTODIFFS,\r
255 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,41,200,10\r
256 CONTROL "&Whole word",IDC_WHOLEWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,56,200,10\r
257 END\r
258 \r
259 \r
260 /////////////////////////////////////////////////////////////////////////////\r
261 //\r
262 // DESIGNINFO\r
263 //\r
264 \r
265 #ifdef APSTUDIO_INVOKED\r
266 GUIDELINES DESIGNINFO \r
267 BEGIN\r
268 IDD_OPENDLG, DIALOG\r
269 BEGIN\r
270 LEFTMARGIN, 7\r
271 RIGHTMARGIN, 318\r
272 VERTGUIDE, 14\r
273 VERTGUIDE, 96\r
274 VERTGUIDE, 248\r
275 VERTGUIDE, 310\r
276 TOPMARGIN, 7\r
277 BOTTOMMARGIN, 202\r
278 END\r
279 \r
280 IDD_SETMAINPAGE, DIALOG\r
281 BEGIN\r
282 LEFTMARGIN, 7\r
283 RIGHTMARGIN, 258\r
284 VERTGUIDE, 7\r
285 VERTGUIDE, 15\r
286 VERTGUIDE, 80\r
287 VERTGUIDE, 251\r
288 TOPMARGIN, 7\r
289 BOTTOMMARGIN, 216\r
290 END\r
291 \r
292 IDD_SETCOLORPAGE, DIALOG\r
293 BEGIN\r
294 LEFTMARGIN, 7\r
295 RIGHTMARGIN, 258\r
296 VERTGUIDE, 15\r
297 VERTGUIDE, 128\r
298 VERTGUIDE, 152\r
299 TOPMARGIN, 7\r
300 BOTTOMMARGIN, 216\r
301 END\r
302 \r
303 IDD_PATCH_FILE_OPEN_CUSTOM, DIALOG\r
304 BEGIN\r
305 LEFTMARGIN, 7\r
306 RIGHTMARGIN, 87\r
307 TOPMARGIN, 7\r
308 BOTTOMMARGIN, 21\r
309 END\r
310 \r
311 IDD_FIND, DIALOG\r
312 BEGIN\r
313 LEFTMARGIN, 7\r
314 RIGHTMARGIN, 304\r
315 VERTGUIDE, 86\r
316 VERTGUIDE, 90\r
317 VERTGUIDE, 244\r
318 VERTGUIDE, 248\r
319 TOPMARGIN, 7\r
320 BOTTOMMARGIN, 66\r
321 END\r
322 END\r
323 #endif // APSTUDIO_INVOKED\r
324 \r
325 \r
326 /////////////////////////////////////////////////////////////////////////////\r
327 //\r
328 // Bitmap\r
329 //\r
330 \r
331 IDR_MAINFRAME BITMAP "Toolbar.bmp"\r
332 \r
333 /////////////////////////////////////////////////////////////////////////////\r
334 //\r
335 // Toolbar\r
336 //\r
337 \r
338 IDR_MAINFRAME TOOLBAR 16, 16\r
339 BEGIN\r
340 BUTTON ID_FILE_OPEN\r
341 BUTTON ID_FILE_SAVE\r
342 SEPARATOR\r
343 BUTTON ID_FILE_RELOAD\r
344 BUTTON ID_EDIT_UNDO\r
345 SEPARATOR\r
346 BUTTON ID_NAVIGATE_PREVIOUSDIFFERENCE\r
347 BUTTON ID_NAVIGATE_NEXTDIFFERENCE\r
348 BUTTON ID_NAVIGATE_PREVIOUSCONFLICT\r
349 BUTTON ID_NAVIGATE_NEXTCONFLICT\r
350 SEPARATOR\r
351 BUTTON ID_EDIT_USETHEIRBLOCK\r
352 BUTTON ID_EDIT_USEMYBLOCK\r
353 BUTTON ID_EDIT_USETHEIRTHENMYBLOCK\r
354 BUTTON ID_EDIT_USEMINETHENTHEIRBLOCK\r
355 SEPARATOR\r
356 BUTTON ID_EDIT_MARKASRESOLVED\r
357 SEPARATOR\r
358 BUTTON ID_VIEW_WHITESPACES\r
359 BUTTON ID_VIEW_INLINEDIFFWORD\r
360 BUTTON ID_VIEW_ONEWAYDIFF\r
361 BUTTON ID_VIEW_SWITCHLEFT\r
362 SEPARATOR\r
363 BUTTON ID_VIEW_SHOWFILELIST\r
364 SEPARATOR\r
365 BUTTON ID_VIEW_OPTIONS\r
366 SEPARATOR\r
367 BUTTON ID_HELP\r
368 END\r
369 \r
370 \r
371 /////////////////////////////////////////////////////////////////////////////\r
372 //\r
373 // Menu\r
374 //\r
375 \r
376 IDR_MAINFRAME MENU \r
377 BEGIN\r
378 POPUP "&File"\r
379 BEGIN\r
380 MENUITEM "&Open", ID_FILE_OPEN\r
381 MENUITEM "&Save", ID_FILE_SAVE\r
382 MENUITEM "Save &As...", ID_FILE_SAVE_AS\r
383 MENUITEM SEPARATOR\r
384 MENUITEM "Reload", ID_FILE_RELOAD\r
385 MENUITEM SEPARATOR\r
386 MENUITEM "E&xit", ID_APP_EXIT\r
387 END\r
388 POPUP "&Edit"\r
389 BEGIN\r
390 MENUITEM "&Undo", ID_EDIT_UNDO\r
391 MENUITEM SEPARATOR\r
392 MENUITEM "&Copy", ID_EDIT_COPY\r
393 MENUITEM SEPARATOR\r
394 MENUITEM "Use &left block", ID_EDIT_USELEFTBLOCK\r
395 MENUITEM "Use left file", ID_EDIT_USELEFTFILE\r
396 MENUITEM "Use block from left before right", ID_EDIT_USEBLOCKFROMLEFTBEFORERIGHT\r
397 MENUITEM "Use block from right before left", ID_EDIT_USEBLOCKFROMRIGHTBEFORELEFT\r
398 MENUITEM SEPARATOR\r
399 MENUITEM "Use text block from ""&theirs""", ID_EDIT_USETHEIRBLOCK\r
400 MENUITEM "Use text block from ""&mine""", ID_EDIT_USEMYBLOCK\r
401 MENUITEM "Use text block from ""t&heirs"" before ""mine""", ID_EDIT_USETHEIRTHENMYBLOCK\r
402 MENUITEM "Use text block from ""m&ine"" before ""theirs""", ID_EDIT_USEMINETHENTHEIRBLOCK\r
403 MENUITEM SEPARATOR\r
404 MENUITEM "&Find", ID_EDIT_FIND\r
405 MENUITEM "Mark as &resolved", ID_EDIT_MARKASRESOLVED\r
406 MENUITEM SEPARATOR\r
407 MENUITEM "Create unified diff file", ID_EDIT_CREATEUNIFIEDDIFFFILE\r
408 END\r
409 POPUP "&Navigate"\r
410 BEGIN\r
411 MENUITEM "&Next Difference", ID_NAVIGATE_NEXTDIFFERENCE\r
412 MENUITEM "&Previous Difference", ID_NAVIGATE_PREVIOUSDIFFERENCE\r
413 MENUITEM "N&ext Conflict", ID_NAVIGATE_NEXTCONFLICT\r
414 MENUITEM "P&revious Conflict", ID_NAVIGATE_PREVIOUSCONFLICT\r
415 END\r
416 POPUP "&View"\r
417 BEGIN\r
418 MENUITEM "&Toolbar", ID_VIEW_TOOLBAR\r
419 MENUITEM "&Status Bar", ID_VIEW_STATUS_BAR\r
420 MENUITEM "Line diff bar", ID_VIEW_LINEDIFFBAR, CHECKED\r
421 MENUITEM "Locator Bar", ID_VIEW_LOCATORBAR\r
422 MENUITEM SEPARATOR\r
423 MENUITEM "&Inline diff word-wise", ID_VIEW_INLINEDIFFWORD\r
424 MENUITEM "&Whitespaces", ID_VIEW_WHITESPACES\r
425 MENUITEM "Single/&double-pane view", ID_VIEW_ONEWAYDIFF\r
426 MENUITEM "Switch Left<->Right", ID_VIEW_SWITCHLEFT\r
427 MENUITEM SEPARATOR\r
428 MENUITEM "S&ettings", ID_VIEW_OPTIONS\r
429 MENUITEM SEPARATOR\r
430 MENUITEM "Show File List", ID_VIEW_SHOWFILELIST\r
431 MENUITEM SEPARATOR\r
432 POPUP "&Application Look"\r
433 BEGIN\r
434 MENUITEM "Windows &2000", 32844\r
435 MENUITEM "Office &XP", 32845\r
436 MENUITEM "&Windows XP", 32846\r
437 MENUITEM "Office 200&3", 32847\r
438 MENUITEM "Visual Studio.NET 200&5", 32848\r
439 POPUP "Office 200&7"\r
440 BEGIN\r
441 MENUITEM "&Blue Style", 32849\r
442 MENUITEM "B&lack Style", 32850\r
443 MENUITEM "&Silver Style", 32851\r
444 MENUITEM "&Aqua Style", 32852\r
445 END\r
446 END\r
447 END\r
448 POPUP "&Help"\r
449 BEGIN\r
450 MENUITEM "&Help Topics", ID_HELP\r
451 MENUITEM SEPARATOR\r
452 MENUITEM "&About TortoiseMerge...", ID_APP_ABOUT\r
453 END\r
454 END\r
455 \r
456 \r
457 /////////////////////////////////////////////////////////////////////////////\r
458 //\r
459 // Accelerator\r
460 //\r
461 \r
462 IDR_MAINFRAME ACCELERATORS \r
463 BEGIN\r
464 "Q", ID_APP_EXIT, VIRTKEY, CONTROL, NOINVERT\r
465 VK_ESCAPE, ID_APP_EXIT, VIRTKEY, NOINVERT\r
466 VK_DOWN, ID_CARET_DOWN, VIRTKEY, NOINVERT\r
467 VK_DOWN, ID_CARET_DOWN, VIRTKEY, SHIFT, NOINVERT\r
468 VK_LEFT, ID_CARET_LEFT, VIRTKEY, NOINVERT\r
469 VK_LEFT, ID_CARET_LEFT, VIRTKEY, SHIFT, NOINVERT\r
470 VK_RIGHT, ID_CARET_RIGHT, VIRTKEY, NOINVERT\r
471 VK_RIGHT, ID_CARET_RIGHT, VIRTKEY, SHIFT, NOINVERT\r
472 VK_UP, ID_CARET_UP, VIRTKEY, NOINVERT\r
473 VK_UP, ID_CARET_UP, VIRTKEY, SHIFT, NOINVERT\r
474 VK_LEFT, ID_CARET_WORDLEFT, VIRTKEY, CONTROL, NOINVERT\r
475 VK_LEFT, ID_CARET_WORDLEFT, VIRTKEY, SHIFT, CONTROL, NOINVERT\r
476 VK_RIGHT, ID_CARET_WORDRIGHT, VIRTKEY, CONTROL, NOINVERT\r
477 VK_RIGHT, ID_CARET_WORDRIGHT, VIRTKEY, SHIFT, CONTROL, NOINVERT\r
478 VK_F1, ID_CONTEXT_HELP, VIRTKEY, SHIFT, NOINVERT\r
479 "C", ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT\r
480 "X", ID_EDIT_CUT, VIRTKEY, CONTROL, NOINVERT\r
481 "F", ID_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT\r
482 VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT\r
483 VK_F3, ID_EDIT_FINDPREV, VIRTKEY, SHIFT, NOINVERT\r
484 "V", ID_EDIT_PASTE, VIRTKEY, CONTROL, NOINVERT\r
485 VK_INSERT, ID_EDIT_PASTE, VIRTKEY, SHIFT, NOINVERT\r
486 VK_BACK, ID_EDIT_UNDO, VIRTKEY, ALT, NOINVERT\r
487 "Z", ID_EDIT_UNDO, VIRTKEY, CONTROL, NOINVERT\r
488 VK_RIGHT, ID_EDIT_USELEFTBLOCK, VIRTKEY, ALT, NOINVERT\r
489 VK_F10, ID_EDIT_USEMINETHENTHEIRBLOCK, VIRTKEY, SHIFT, CONTROL, NOINVERT\r
490 VK_F10, ID_EDIT_USEMYBLOCK, VIRTKEY, CONTROL, NOINVERT\r
491 VK_F9, ID_EDIT_USETHEIRBLOCK, VIRTKEY, CONTROL, NOINVERT\r
492 VK_F9, ID_EDIT_USETHEIRTHENMYBLOCK, VIRTKEY, SHIFT, CONTROL, NOINVERT\r
493 "O", ID_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT\r
494 "R", ID_FILE_RELOAD, VIRTKEY, CONTROL, NOINVERT\r
495 VK_F5, ID_FILE_RELOAD, VIRTKEY, NOINVERT\r
496 "S", ID_FILE_SAVE, VIRTKEY, CONTROL, NOINVERT\r
497 "S", ID_FILE_SAVE_AS, VIRTKEY, SHIFT, CONTROL, NOINVERT\r
498 VK_F1, ID_HELP, VIRTKEY, NOINVERT\r
499 VK_F8, ID_NAVIGATE_NEXTCONFLICT, VIRTKEY, NOINVERT\r
500 VK_DOWN, ID_NAVIGATE_NEXTDIFFERENCE, VIRTKEY, CONTROL, NOINVERT\r
501 VK_F11, ID_NAVIGATE_NEXTDIFFERENCE, VIRTKEY, NOINVERT\r
502 VK_F7, ID_NAVIGATE_NEXTDIFFERENCE, VIRTKEY, NOINVERT\r
503 VK_F8, ID_NAVIGATE_PREVIOUSCONFLICT, VIRTKEY, SHIFT, NOINVERT\r
504 VK_F11, ID_NAVIGATE_PREVIOUSDIFFERENCE, VIRTKEY, CONTROL, NOINVERT\r
505 VK_F11, ID_NAVIGATE_PREVIOUSDIFFERENCE, VIRTKEY, SHIFT, NOINVERT\r
506 VK_F7, ID_NAVIGATE_PREVIOUSDIFFERENCE, VIRTKEY, SHIFT, NOINVERT\r
507 VK_UP, ID_NAVIGATE_PREVIOUSDIFFERENCE, VIRTKEY, CONTROL, NOINVERT\r
508 VK_F6, ID_NEXT_PANE, VIRTKEY, NOINVERT\r
509 VK_F6, ID_PREV_PANE, VIRTKEY, SHIFT, NOINVERT\r
510 "D", ID_VIEW_ONEWAYDIFF, VIRTKEY, CONTROL, NOINVERT\r
511 "T", ID_VIEW_WHITESPACES, VIRTKEY, CONTROL, NOINVERT\r
512 VK_INSERT, IDS_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT\r
513 VK_DELETE, IDS_EDIT_CUT, VIRTKEY, SHIFT, NOINVERT\r
514 VK_INSERT, IDS_EDIT_PASTE, VIRTKEY, SHIFT, NOINVERT\r
515 END\r
516 \r
517 \r
518 /////////////////////////////////////////////////////////////////////////////\r
519 //\r
520 // String Table\r
521 //\r
522 \r
523 STRINGTABLE \r
524 BEGIN\r
525 IDR_MAINFRAME "TortoiseMerge"\r
526 END\r
527 \r
528 STRINGTABLE \r
529 BEGIN\r
530 AFX_IDS_APP_TITLE "TortoiseMerge"\r
531 AFX_IDS_IDLEMESSAGE "For Help, press F1. Scroll horizontally with Ctrl-Scrollwheel"\r
532 AFX_IDS_HELPMODEMESSAGE "Select an object on which to get Help"\r
533 END\r
534 \r
535 STRINGTABLE \r
536 BEGIN\r
537 ID_INDICATOR_EXT "EXT"\r
538 ID_INDICATOR_CAPS "CAP"\r
539 ID_INDICATOR_NUM "NUM"\r
540 ID_INDICATOR_SCRL "SCRL"\r
541 ID_INDICATOR_OVR "OVR"\r
542 ID_INDICATOR_REC "REC"\r
543 END\r
544 \r
545 STRINGTABLE \r
546 BEGIN\r
547 ID_APP_ABOUT "Display program information, version number and copyright\nAbout"\r
548 ID_APP_EXIT "Quit the application; prompts to save documents\nExit"\r
549 ID_HELP_INDEX "Opens Help\nHelp Topics"\r
550 ID_HELP_FINDER "List Help topics\nHelp Topics"\r
551 ID_HELP_USING "Display instructions about how to use help\nHelp"\r
552 ID_CONTEXT_HELP "Display help for clicked on buttons, menus and windows\nHelp"\r
553 ID_HELP "Display help for current task or command\nHelp"\r
554 END\r
555 \r
556 STRINGTABLE \r
557 BEGIN\r
558 ID_NEXT_PANE "Switch to the next window pane\nNext Pane"\r
559 ID_PREV_PANE "Switch back to the previous window pane\nPrevious Pane"\r
560 END\r
561 \r
562 STRINGTABLE \r
563 BEGIN\r
564 ID_WINDOW_SPLIT "Split the active window into panes\nSplit"\r
565 END\r
566 \r
567 STRINGTABLE \r
568 BEGIN\r
569 ID_EDIT_CLEAR "Erase the selection\nErase"\r
570 ID_EDIT_CLEAR_ALL "Erase everything\nErase All"\r
571 ID_EDIT_COPY "Copy the selection and put it on the Clipboard\nCopy"\r
572 ID_EDIT_CUT "Cut the selection and put it on the Clipboard\nCut"\r
573 ID_EDIT_FIND "Find the specified text\nFind"\r
574 ID_EDIT_PASTE "Insert Clipboard contents\nPaste"\r
575 ID_EDIT_REPEAT "Repeat the last action\nRepeat"\r
576 ID_EDIT_REPLACE "Replace specific text with different text\nReplace"\r
577 ID_EDIT_SELECT_ALL "Select the entire document\nSelect All"\r
578 ID_EDIT_UNDO "Undo the last action\nUndo"\r
579 ID_EDIT_REDO "Redo the previously undone action\nRedo"\r
580 END\r
581 \r
582 STRINGTABLE \r
583 BEGIN\r
584 ID_VIEW_TOOLBAR "Show or hide the toolbar\nToggle ToolBar"\r
585 ID_VIEW_STATUS_BAR "Show or hide the status bar\nToggle StatusBar"\r
586 END\r
587 \r
588 STRINGTABLE \r
589 BEGIN\r
590 AFX_IDS_SCSIZE "Change the window size"\r
591 AFX_IDS_SCMOVE "Change the window position"\r
592 AFX_IDS_SCMINIMIZE "Reduce the window to an icon"\r
593 AFX_IDS_SCMAXIMIZE "Enlarge the window to full size"\r
594 AFX_IDS_SCNEXTWINDOW "Switch to the next document window"\r
595 AFX_IDS_SCPREVWINDOW "Switch to the previous document window"\r
596 AFX_IDS_SCCLOSE "Close the active window and prompts to save the documents"\r
597 END\r
598 \r
599 STRINGTABLE \r
600 BEGIN\r
601 AFX_IDS_SCRESTORE "Restore the window to normal size"\r
602 AFX_IDS_SCTASKLIST "Activate Task List"\r
603 END\r
604 \r
605 STRINGTABLE \r
606 BEGIN\r
607 IDS_SELECTFILE "Select File..."\r
608 END\r
609 \r
610 STRINGTABLE \r
611 BEGIN\r
612 ID_VIEW_WHITESPACES "Show special characters for whitespaces\nShow Whitespaces"\r
613 ID_VIEW_ONEWAYDIFF "Switch between single and double pane view\nSwitch between single and double pane view"\r
614 ID_NAVIGATE_NEXTDIFFERENCE "Go to the next difference\nNext difference"\r
615 ID_NAVIGATE_PREVIOUSDIFFERENCE \r
616 "Go to the previous difference\nPrevious difference"\r
617 ID_VIEW_OPTIONS "Adjust the settings\nSettings"\r
618 END\r
619 \r
620 STRINGTABLE \r
621 BEGIN\r
622 IDS_ERR_PATCH_NOINDEX "The line 'Index: ' was not found!\nEither this is not a diff file or the diff is empty."\r
623 IDS_ERR_PATCH_NOEQUATIONCHARLINE \r
624 "The line '====' was expected in line %d !"\r
625 IDS_ERR_PATCH_NOREMOVEFILELINE \r
626 "The line indicating the old file was expected in line %d !"\r
627 IDS_ERR_PATCH_NOADDFILELINE \r
628 "The line indicating the new file was expected in line %d !"\r
629 IDS_ERR_PATCH_RENAMINGNOTSUPPORTED \r
630 "The old file does not match the new file.\nRenaming of files is not (yet) supported!"\r
631 IDS_ERR_PATCH_CHUNKSTARTNOTFOUND \r
632 "The chunk start '@@' was expected in line %d !"\r
633 IDS_ERR_PATCH_UNKOWNLINETYPE "An unknown line type was found in line %d !"\r
634 IDS_ERR_PATCH_CHUNKMISMATCH \r
635 "The chunk size did not match the number of added/removed lines!"\r
636 END\r
637 \r
638 STRINGTABLE \r
639 BEGIN\r
640 IDS_ERR_PATCH_INVALIDPATCHFILE "The file %s does not exist!"\r
641 IDS_ERR_PATCH_FILENOTINPATCH \r
642 "The file %s was not found in the patch file!"\r
643 IDS_ERR_PATCH_DOESNOTMATCH \r
644 "The patch seems outdated! The file line\n%s\nand the patchline\n%s\ndo not match!"\r
645 IDS_ERR_PATCH_FILESAVE "Could not save the file %s!"\r
646 END\r
647 \r
648 STRINGTABLE \r
649 BEGIN\r
650 IDS_ERR_MAINFRAME_FILEVERSIONNOTFOUND \r
651 "Could not retrieve revision %s of the file %s.\nPatching is not possible!"\r
652 IDS_ERR_MAINFRAME_FILEHASCONFLICTS \r
653 "There are still unresolved conflicts in line %d!\nYou should resolve those conflicts first before saving.\nDo you want to save the file with the conflicts still there?\nIf you click YES, then you have to manually resolve the conflicts in another editor!"\r
654 END\r
655 \r
656 STRINGTABLE \r
657 BEGIN\r
658 ID_INDICATOR_LEFTVIEW " "\r
659 ID_INDICATOR_RIGHTVIEW " "\r
660 ID_INDICATOR_BOTTOMVIEW " "\r
661 END\r
662 \r
663 STRINGTABLE \r
664 BEGIN\r
665 IDS_STATUSBAR_REMOVEDLINES "- %d"\r
666 IDS_STATUSBAR_ADDEDLINES "+ %d"\r
667 IDS_STATUSBAR_CONFLICTEDLINES "! %d"\r
668 IDS_STATUSBAR_LEFTVIEW "Left View: "\r
669 IDS_STATUSBAR_RIGHTVIEW "Right View: "\r
670 IDS_STATUSBAR_CONFLICTS "Conflicts: %d"\r
671 END\r
672 \r
673 STRINGTABLE \r
674 BEGIN\r
675 IDS_VIEWCONTEXTMENU_USETHISBLOCK "Use th&is text block"\r
676 IDS_VIEWCONTEXTMENU_USETHEIRBLOCK "Use text block from '&theirs'"\r
677 IDS_VIEWCONTEXTMENU_USEYOURBLOCK "Use text block from '&mine'"\r
678 IDS_VIEWCONTEXTMENU_USETHEIRANDYOURBLOCK \r
679 "Use text block from 't&heirs' before 'mine"\r
680 IDS_VIEWCONTEXTMENU_USEYOURANDTHEIRBLOCK \r
681 "Use text block from 'm&ine' before 'theirs'"\r
682 IDS_VIEWCONTEXTMENU_USETHISFILE "Use this &whole file"\r
683 IDS_VIEWCONTEXTMENU_USEOTHERBLOCK "Use &other text block"\r
684 IDS_VIEWCONTEXTMENU_USEOTHERFILE "Use whole other &file"\r
685 IDS_VIEWCONTEXTMENU_USEBOTHTHISFIRST \r
686 "Use both text blocks (this one first)"\r
687 IDS_VIEWCONTEXTMENU_USEBOTHTHISLAST "Use both text blocks (this one last)"\r
688 END\r
689 \r
690 STRINGTABLE \r
691 BEGIN\r
692 IDS_SAVEASTITLE "Save as..."\r
693 IDS_COMMANDLINEHELP "Valid command line options are:\n/base:<path to base file>\n/theirs:<path to their file>\n/mine:<path to your file>\n/merged:<path to resulting merged file>\n/diff:<path to unified diff file>\n/patchpath:<path to folder>"\r
694 IDS_OPENDIFFFILETITLE "Select diff file..."\r
695 IDS_GETVERSIONOFFILETITLE "Fetching file..."\r
696 IDS_GETVERSIONOFFILE "Fetching revision %s of file:"\r
697 IDS_WARNMODIFIEDLOOSECHANGES \r
698 "There are unsaved modifications!\nDo you want to save your changes?"\r
699 IDS_ASKFORSAVE "Do you want to save your changes?"\r
700 IDS_WARNMODIFIEDLOOSECHANGESOPTIONS \r
701 "Do you want to reload the documents to reflect the settings changes?\nNote: you will lose all changes you've made!"\r
702 END\r
703 \r
704 STRINGTABLE \r
705 BEGIN\r
706 IDS_ERR_DIFF_DIFF "The diffing engine aborted because of an error:\n%s"\r
707 IDS_ERR_DIFF_NEWLINES "Cannot show diff because of inconsistent newlines in the file."\r
708 END\r
709 \r
710 STRINGTABLE \r
711 BEGIN\r
712 IDS_ERR_FILE_OPEN "Could not open the file\n%s"\r
713 IDS_ERR_FILE_BINARY "The file\n%s\nis not a valid text file!\nNote that UTF32 files are treated as binary too."\r
714 IDS_ERR_FILE_NOTAFILE "%s\nis a directory, not a file!\nTortoiseMerge can't diff directories."\r
715 IDS_ERR_FILE_TOOBIG "The file is too big"\r
716 END\r
717 \r
718 STRINGTABLE \r
719 BEGIN\r
720 ID_FILE_OPEN "Open file"\r
721 ID_FILE_SAVE "Save the modified file\nSave file"\r
722 ID_FILE_SAVE_AS "Save the modified file\nSave file"\r
723 END\r
724 \r
725 STRINGTABLE \r
726 BEGIN\r
727 IDS_ABOUTVERSION "TortoiseMerge %d.%d.%d, Build %d - %s, %s\r\nlibsvn_diff %d.%d.%d, %s\r\napr %d.%d.%d\r\napr-utils %d.%d.%d"\r
728 IDS_ABOUTVERSIONBOX "TortoiseMerge %d.%d.%d, Build %d - %s, %s"\r
729 IDS_SETTINGSTITLE "Settings"\r
730 END\r
731 \r
732 STRINGTABLE \r
733 BEGIN\r
734 IDS_COMMONFILEFILTER "All Files (*.*)|*.*||"\r
735 IDS_PATCHFILEFILTER "Patchfiles (*.diff, *.patch)|*.diff;*.patch|All (*.*)|*.*||"\r
736 END\r
737 \r
738 STRINGTABLE \r
739 BEGIN\r
740 IDS_PATCH_ALL "Patch all"\r
741 IDS_PATCH_TITLE "File patches"\r
742 IDS_DIFF_TITLE "File diffs"\r
743 IDS_PATCH_SELECTED "Patch selected"\r
744 IDS_PATCH_PREVIEW "Preview patched file"\r
745 IDS_PATCH_REVIEW "Review Patch"\r
746 END\r
747 \r
748 STRINGTABLE \r
749 BEGIN\r
750 ID_FILE_RELOAD "Reloads the opened files and reverts all changes.\nReload"\r
751 END\r
752 \r
753 STRINGTABLE \r
754 BEGIN\r
755 ID_NAVIGATE_PREVIOUSCONFLICT \r
756 "Go to the previous conflict\nPrevious conflict"\r
757 ID_NAVIGATE_NEXTCONFLICT "Go to the next conflict\nNext conflict"\r
758 ID_EDIT_MARKASRESOLVED "Marks a file as resolved in Subversion\nMark as resolved"\r
759 ID_VIEW_SWITCHLEFT "Switch the contents of the left and right view\nSwitch left and right view"\r
760 END\r
761 \r
762 STRINGTABLE \r
763 BEGIN\r
764 ID_VIEW_SHOWFILELIST "Hide/Show the patch file list\nHides or shows the patch file list"\r
765 ID_EDIT_USETHEIRBLOCK "Use text block from 'theirs'\nUse 'theirs' text block"\r
766 ID_EDIT_USEMYBLOCK "Use text block from 'mine'\nUse 'mine' text block"\r
767 ID_EDIT_USETHEIRTHENMYBLOCK \r
768 "Use text block from 'theirs' before 'mine'\nUse 'theirs' text block then 'mine'"\r
769 ID_EDIT_USEMINETHENTHEIRBLOCK \r
770 "Use text block from 'mine' before 'theirs'\nUse 'mine' text block then 'theirs'"\r
771 ID_VIEW_INLINEDIFFWORD "Show Inline-Diff word by word\nInline diff word-wise"\r
772 ID_EDIT_CREATEUNIFIEDDIFFFILE \r
773 "Creates a patch file from the differences of the two files\nCreate patch file"\r
774 END\r
775 \r
776 STRINGTABLE \r
777 BEGIN\r
778 IDS_WARNBETTERPATCHPATHFOUND \r
779 "The path\n<i>%s</i>\nseems not to match the paths in the patchfile.\nBut TortoiseMerge found the path\n<i>%s</i>\nmatches it better. Do you want to use the suggested path instead?"\r
780 IDS_NOTFOUNDVIEWTITLEINDICATOR "(not found)"\r
781 IDS_WARNABSOLUTEPATHFOUND \r
782 "The path\n<i>%s</i>\nin the patchfile does not exist.\nTortoiseMerge found the relative path\n<i>%s</i>\nwhich seems to match the directory you're applying the patch.\n\nDo you want to use the suggested path? Answering 'no' will quit TortoiseMerge."\r
783 IDS_WARNABSOLUTEPATHNOTFOUND \r
784 "The path\n<i>%s</i>\nin the patchfile does not exist.\nTortoiseMerge tried to apply the patch by stripping prefixes but no matching path could be found."\r
785 IDS_DELETEWHENEMPTY "The file \n%s\nis empty.\nDo you want to remove the file?"\r
786 IDS_EMPTYLINETT "(no line number)"\r
787 END\r
788 \r
789 STRINGTABLE \r
790 BEGIN\r
791 IDS_VIEWTITLE_THEIRS "Theirs"\r
792 IDS_VIEWTITLE_MERGED "Merged"\r
793 IDS_VIEWTITLE_MINE "Mine"\r
794 END\r
795 \r
796 STRINGTABLE \r
797 BEGIN\r
798 IDS_COLOURPICKER_CUSTOMTEXT "More colors..."\r
799 IDS_COLOURPICKER_DEFAULTTEXT "Automatic"\r
800 END\r
801 \r
802 STRINGTABLE \r
803 BEGIN\r
804 IDS_VIEWSCROLLTIPTEXT "Line: %*ld"\r
805 END\r
806 \r
807 STRINGTABLE \r
808 BEGIN\r
809 IDS_EDIT_COPY "&Copy"\r
810 IDS_EDIT_CUT "C&ut"\r
811 IDS_EDIT_PASTE "&Paste"\r
812 END\r
813 \r
814 STRINGTABLE \r
815 BEGIN\r
816 ID_VIEW_LINEDIFFBAR "Show or hide the line diff bar\nToggle LineDiffBar"\r
817 ID_VIEW_LOCATORBAR "Show or hide the locator bar\nToggle LocatorBar"\r
818 ID_EDIT_USELEFTBLOCK "Use text block from the left view\nUse left block"\r
819 ID_EDIT_USELEFTFILE "Use all content from the left view\nUse left file"\r
820 ID_EDIT_USEBLOCKFROMLEFTBEFORERIGHT \r
821 "Use block from left view before block from right view\nUse block from left before right"\r
822 ID_EDIT_USEBLOCKFROMRIGHTBEFORELEFT \r
823 "Use block from right view before block from left view\nUse block from right before left"\r
824 END\r
825 \r
826 #endif // English (U.S.) resources\r
827 /////////////////////////////////////////////////////////////////////////////\r
828 \r
829 \r
830 /////////////////////////////////////////////////////////////////////////////\r
831 // German (Switzerland) resources\r
832 \r
833 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DES)\r
834 #ifdef _WIN32\r
835 LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_SWISS\r
836 #endif //_WIN32\r
837 \r
838 #ifdef APSTUDIO_INVOKED\r
839 /////////////////////////////////////////////////////////////////////////////\r
840 //\r
841 // TEXTINCLUDE\r
842 //\r
843 \r
844 1 TEXTINCLUDE \r
845 BEGIN\r
846 "..\\TortoiseMerge\\resource.h\0"\r
847 END\r
848 \r
849 2 TEXTINCLUDE \r
850 BEGIN\r
851 "#include ""afxres.h""\r\n"\r
852 "\0"\r
853 END\r
854 \r
855 3 TEXTINCLUDE \r
856 BEGIN\r
857 "#define _AFX_NO_SPLITTER_RESOURCES\r\n"\r
858 "#define _AFX_NO_OLE_RESOURCES\r\n"\r
859 "#define _AFX_NO_TRACKER_RESOURCES\r\n"\r
860 "#define _AFX_NO_PROPERTY_RESOURCES\r\n"\r
861 "\r\n"\r
862 "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"\r
863 "LANGUAGE 9, 1\r\n"\r
864 "#pragma code_page(1252)\r\n"\r
865 "#include ""TortoiseMerge.rc2"" // non-Microsoft Visual C++ edited resources\r\n"\r
866 "#include ""afxres.rc"" // Standard components\r\n"\r
867 "#include ""afxprint.rc"" // printing/print preview resources\r\n"\r
868 "#include ""afxribbon.rc"" // ribbon and control bar resources\r\n"\r
869 "#include ""afxolecl.rc"" // OLE container resources\r\n"\r
870 "#endif\r\n"\r
871 "\0"\r
872 END\r
873 \r
874 #endif // APSTUDIO_INVOKED\r
875 \r
876 #endif // German (Switzerland) resources\r
877 /////////////////////////////////////////////////////////////////////////////\r
878 \r
879 \r
880 \r
881 #ifndef APSTUDIO_INVOKED\r
882 /////////////////////////////////////////////////////////////////////////////\r
883 //\r
884 // Generated from the TEXTINCLUDE 3 resource.\r
885 //\r
886 #define _AFX_NO_SPLITTER_RESOURCES\r
887 #define _AFX_NO_OLE_RESOURCES\r
888 #define _AFX_NO_TRACKER_RESOURCES\r
889 #define _AFX_NO_PROPERTY_RESOURCES\r
890 \r
891 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r
892 LANGUAGE 9, 1\r
893 #pragma code_page(1252)\r
894 #include "TortoiseMerge.rc2" // non-Microsoft Visual C++ edited resources\r
895 #include "afxres.rc" // Standard components\r
896 #include "afxprint.rc" // printing/print preview resources\r
897 #include "afxribbon.rc" // ribbon and control bar resources\r
898 #include "afxolecl.rc" // OLE container resources\r
899 #endif\r
900 \r
901 /////////////////////////////////////////////////////////////////////////////\r
902 #endif // not APSTUDIO_INVOKED\r
903 \r