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