| blob | 650ba89277a331425b030c5ff4eac7c917d4a78a |
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 TortoiseGitMerge"\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 "TortoiseGitMerge"\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 IDD_GOTODLG DIALOGEX 0, 0, 127, 52\r
261 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
262 CAPTION "Go to line"\r
263 FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
264 BEGIN\r
265 LTEXT "Line:",IDC_STATIC,7,10,57,8\r
266 EDITTEXT IDC_LINENUMBER,36,7,84,14,ES_AUTOHSCROLL | ES_NUMBER\r
267 DEFPUSHBUTTON "OK",IDOK,7,31,50,14\r
268 PUSHBUTTON "Cancel",IDCANCEL,70,31,50,14\r
269 END\r
270 \r
271 \r
272 /////////////////////////////////////////////////////////////////////////////\r
273 //\r
274 // DESIGNINFO\r
275 //\r
276 \r
277 #ifdef APSTUDIO_INVOKED\r
278 GUIDELINES DESIGNINFO \r
279 BEGIN\r
280 IDD_OPENDLG, DIALOG\r
281 BEGIN\r
282 LEFTMARGIN, 7\r
283 RIGHTMARGIN, 318\r
284 VERTGUIDE, 14\r
285 VERTGUIDE, 96\r
286 VERTGUIDE, 248\r
287 VERTGUIDE, 310\r
288 TOPMARGIN, 7\r
289 BOTTOMMARGIN, 202\r
290 END\r
291 \r
292 IDD_SETMAINPAGE, DIALOG\r
293 BEGIN\r
294 LEFTMARGIN, 7\r
295 RIGHTMARGIN, 258\r
296 VERTGUIDE, 7\r
297 VERTGUIDE, 15\r
298 VERTGUIDE, 80\r
299 VERTGUIDE, 251\r
300 TOPMARGIN, 7\r
301 BOTTOMMARGIN, 216\r
302 END\r
303 \r
304 IDD_SETCOLORPAGE, DIALOG\r
305 BEGIN\r
306 LEFTMARGIN, 7\r
307 RIGHTMARGIN, 258\r
308 VERTGUIDE, 15\r
309 VERTGUIDE, 128\r
310 VERTGUIDE, 152\r
311 TOPMARGIN, 7\r
312 BOTTOMMARGIN, 216\r
313 END\r
314 \r
315 IDD_PATCH_FILE_OPEN_CUSTOM, DIALOG\r
316 BEGIN\r
317 LEFTMARGIN, 7\r
318 RIGHTMARGIN, 87\r
319 TOPMARGIN, 7\r
320 BOTTOMMARGIN, 21\r
321 END\r
322 \r
323 IDD_FIND, DIALOG\r
324 BEGIN\r
325 LEFTMARGIN, 7\r
326 RIGHTMARGIN, 304\r
327 VERTGUIDE, 86\r
328 VERTGUIDE, 90\r
329 VERTGUIDE, 244\r
330 VERTGUIDE, 248\r
331 TOPMARGIN, 7\r
332 BOTTOMMARGIN, 66\r
333 END\r
334 END\r
335 #endif // APSTUDIO_INVOKED\r
336 \r
337 \r
338 /////////////////////////////////////////////////////////////////////////////\r
339 //\r
340 // Bitmap\r
341 //\r
342 \r
343 IDR_MAINFRAME BITMAP "Toolbar.bmp"\r
344 \r
345 /////////////////////////////////////////////////////////////////////////////\r
346 //\r
347 // Toolbar\r
348 //\r
349 \r
350 IDR_MAINFRAME TOOLBAR 16, 16\r
351 BEGIN\r
352 BUTTON ID_FILE_OPEN\r
353 BUTTON ID_FILE_SAVE\r
354 SEPARATOR\r
355 BUTTON ID_FILE_RELOAD\r
356 BUTTON ID_EDIT_UNDO\r
357 SEPARATOR\r
358 BUTTON ID_NAVIGATE_PREVIOUSDIFFERENCE\r
359 BUTTON ID_NAVIGATE_NEXTDIFFERENCE\r
360 BUTTON ID_NAVIGATE_PREVIOUSCONFLICT\r
361 BUTTON ID_NAVIGATE_NEXTCONFLICT\r
362 SEPARATOR\r
363 BUTTON ID_EDIT_USETHEIRBLOCK\r
364 BUTTON ID_EDIT_USEMYBLOCK\r
365 BUTTON ID_EDIT_USETHEIRTHENMYBLOCK\r
366 BUTTON ID_EDIT_USEMINETHENTHEIRBLOCK\r
367 SEPARATOR\r
368 BUTTON ID_EDIT_MARKASRESOLVED\r
369 SEPARATOR\r
370 BUTTON ID_VIEW_WHITESPACES\r
371 BUTTON ID_VIEW_INLINEDIFFWORD\r
372 BUTTON ID_VIEW_ONEWAYDIFF\r
373 BUTTON ID_VIEW_SWITCHLEFT\r
374 SEPARATOR\r
375 BUTTON ID_VIEW_SHOWFILELIST\r
376 SEPARATOR\r
377 BUTTON ID_VIEW_OPTIONS\r
378 SEPARATOR\r
379 BUTTON ID_HELP\r
380 END\r
381 \r
382 \r
383 /////////////////////////////////////////////////////////////////////////////\r
384 //\r
385 // Menu\r
386 //\r
387 \r
388 IDR_MAINFRAME MENU \r
389 BEGIN\r
390 POPUP "&File"\r
391 BEGIN\r
392 MENUITEM "&Open", ID_FILE_OPEN\r
393 MENUITEM "&Save", ID_FILE_SAVE\r
394 MENUITEM "Save &As...", ID_FILE_SAVE_AS\r
395 MENUITEM SEPARATOR\r
396 MENUITEM "Reload", ID_FILE_RELOAD\r
397 MENUITEM SEPARATOR\r
398 MENUITEM "E&xit", ID_APP_EXIT\r
399 END\r
400 POPUP "&Edit"\r
401 BEGIN\r
402 MENUITEM "&Undo", ID_EDIT_UNDO\r
403 MENUITEM SEPARATOR\r
404 MENUITEM "&Copy", ID_EDIT_COPY\r
405 MENUITEM SEPARATOR\r
406 MENUITEM "Use &left block", ID_EDIT_USELEFTBLOCK\r
407 MENUITEM "Use left file", ID_EDIT_USELEFTFILE\r
408 MENUITEM "Use block from left before right", ID_EDIT_USEBLOCKFROMLEFTBEFORERIGHT\r
409 MENUITEM "Use block from right before left", ID_EDIT_USEBLOCKFROMRIGHTBEFORELEFT\r
410 MENUITEM SEPARATOR\r
411 MENUITEM "Use text block from ""&theirs""", ID_EDIT_USETHEIRBLOCK\r
412 MENUITEM "Use text block from ""&mine""", ID_EDIT_USEMYBLOCK\r
413 MENUITEM "Use text block from ""t&heirs"" before ""mine""", ID_EDIT_USETHEIRTHENMYBLOCK\r
414 MENUITEM "Use text block from ""m&ine"" before ""theirs""", ID_EDIT_USEMINETHENTHEIRBLOCK\r
415 MENUITEM SEPARATOR\r
416 MENUITEM "&Find", ID_EDIT_FIND\r
417 MENUITEM "&Go to", ID_EDIT_GOTO\r
418 MENUITEM "Mark as &resolved", ID_EDIT_MARKASRESOLVED\r
419 MENUITEM SEPARATOR\r
420 MENUITEM "Create unified diff file", ID_EDIT_CREATEUNIFIEDDIFFFILE\r
421 END\r
422 POPUP "&Navigate"\r
423 BEGIN\r
424 MENUITEM "&Next Difference", ID_NAVIGATE_NEXTDIFFERENCE\r
425 MENUITEM "&Previous Difference", ID_NAVIGATE_PREVIOUSDIFFERENCE\r
426 MENUITEM "N&ext Conflict", ID_NAVIGATE_NEXTCONFLICT\r
427 MENUITEM "P&revious Conflict", ID_NAVIGATE_PREVIOUSCONFLICT\r
428 END\r
429 POPUP "&View"\r
430 BEGIN\r
431 MENUITEM "&Toolbar", ID_VIEW_TOOLBAR\r
432 MENUITEM "&Status Bar", ID_VIEW_STATUS_BAR\r
433 MENUITEM "Line diff bar", ID_VIEW_LINEDIFFBAR, CHECKED\r
434 MENUITEM "Locator Bar", ID_VIEW_LOCATORBAR\r
435 MENUITEM SEPARATOR\r
436 MENUITEM "&Inline diff word-wise", ID_VIEW_INLINEDIFFWORD\r
437 MENUITEM "&Whitespaces", ID_VIEW_WHITESPACES\r
438 MENUITEM "Single/&double-pane view", ID_VIEW_ONEWAYDIFF\r
439 MENUITEM "Switch Left<->Right", ID_VIEW_SWITCHLEFT\r
440 MENUITEM SEPARATOR\r
441 MENUITEM "S&ettings", ID_VIEW_OPTIONS\r
442 MENUITEM SEPARATOR\r
443 MENUITEM "Show File List", ID_VIEW_SHOWFILELIST\r
444 MENUITEM SEPARATOR\r
445 POPUP "&Application Look"\r
446 BEGIN\r
447 MENUITEM "Windows &2000", 32844\r
448 MENUITEM "Office &XP", 32845\r
449 MENUITEM "&Windows XP", 32846\r
450 MENUITEM "Office 200&3", 32847\r
451 MENUITEM "Visual Studio.NET 200&5", 32848\r
452 POPUP "Office 200&7"\r
453 BEGIN\r
454 MENUITEM "&Blue Style", 32849\r
455 MENUITEM "B&lack Style", 32850\r
456 MENUITEM "&Silver Style", 32851\r
457 MENUITEM "&Aqua Style", 32852\r
458 END\r
459 END\r
460 END\r
461 POPUP "&Help"\r
462 BEGIN\r
463 MENUITEM "&Help Topics", ID_HELP\r
464 MENUITEM SEPARATOR\r
465 MENUITEM "&About TortoiseGitMerge...", ID_APP_ABOUT\r
466 END\r
467 END\r
468 \r
469 \r
470 /////////////////////////////////////////////////////////////////////////////\r
471 //\r
472 // Accelerator\r
473 //\r
474 \r
475 IDR_MAINFRAME ACCELERATORS \r
476 BEGIN\r
477 "Q", ID_APP_EXIT, VIRTKEY, CONTROL, NOINVERT\r
478 VK_ESCAPE, ID_APP_EXIT, VIRTKEY, NOINVERT\r
479 VK_DOWN, ID_CARET_DOWN, VIRTKEY, NOINVERT\r
480 VK_DOWN, ID_CARET_DOWN, VIRTKEY, SHIFT, NOINVERT\r
481 VK_LEFT, ID_CARET_LEFT, VIRTKEY, NOINVERT\r
482 VK_LEFT, ID_CARET_LEFT, VIRTKEY, SHIFT, NOINVERT\r
483 VK_RIGHT, ID_CARET_RIGHT, VIRTKEY, NOINVERT\r
484 VK_RIGHT, ID_CARET_RIGHT, VIRTKEY, SHIFT, NOINVERT\r
485 VK_UP, ID_CARET_UP, VIRTKEY, NOINVERT\r
486 VK_UP, ID_CARET_UP, VIRTKEY, SHIFT, NOINVERT\r
487 VK_LEFT, ID_CARET_WORDLEFT, VIRTKEY, CONTROL, NOINVERT\r
488 VK_LEFT, ID_CARET_WORDLEFT, VIRTKEY, SHIFT, CONTROL, NOINVERT\r
489 VK_RIGHT, ID_CARET_WORDRIGHT, VIRTKEY, CONTROL, NOINVERT\r
490 VK_RIGHT, ID_CARET_WORDRIGHT, VIRTKEY, SHIFT, CONTROL, NOINVERT\r
491 VK_F1, ID_CONTEXT_HELP, VIRTKEY, SHIFT, NOINVERT\r
492 "C", ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT\r
493 "X", ID_EDIT_CUT, VIRTKEY, CONTROL, NOINVERT\r
494 "F", ID_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT\r
495 VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT\r
496 VK_F3, ID_EDIT_FINDPREV, VIRTKEY, SHIFT, NOINVERT\r
497 "G", ID_EDIT_GOTO, VIRTKEY, CONTROL\r
498 "V", ID_EDIT_PASTE, VIRTKEY, CONTROL, NOINVERT\r
499 VK_INSERT, ID_EDIT_PASTE, VIRTKEY, SHIFT, NOINVERT\r
500 VK_BACK, ID_EDIT_UNDO, VIRTKEY, ALT, NOINVERT\r
501 "Z", ID_EDIT_UNDO, VIRTKEY, CONTROL, NOINVERT\r
502 VK_RIGHT, ID_EDIT_USELEFTBLOCK, VIRTKEY, ALT, NOINVERT\r
503 VK_F10, ID_EDIT_USEMINETHENTHEIRBLOCK, VIRTKEY, SHIFT, CONTROL, NOINVERT\r
504 VK_F10, ID_EDIT_USEMYBLOCK, VIRTKEY, CONTROL, NOINVERT\r
505 VK_F9, ID_EDIT_USETHEIRBLOCK, VIRTKEY, CONTROL, NOINVERT\r
506 VK_F9, ID_EDIT_USETHEIRTHENMYBLOCK, VIRTKEY, SHIFT, CONTROL, NOINVERT\r
507 "O", ID_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT\r
508 "R", ID_FILE_RELOAD, VIRTKEY, CONTROL, NOINVERT\r
509 VK_F5, ID_FILE_RELOAD, VIRTKEY, NOINVERT\r
510 "S", ID_FILE_SAVE, VIRTKEY, CONTROL, NOINVERT\r
511 "S", ID_FILE_SAVE_AS, VIRTKEY, SHIFT, CONTROL, NOINVERT\r
512 VK_F1, ID_HELP, VIRTKEY, NOINVERT\r
513 VK_F8, ID_NAVIGATE_NEXTCONFLICT, VIRTKEY, NOINVERT\r
514 VK_DOWN, ID_NAVIGATE_NEXTDIFFERENCE, VIRTKEY, CONTROL, NOINVERT\r
515 VK_F11, ID_NAVIGATE_NEXTDIFFERENCE, VIRTKEY, NOINVERT\r
516 VK_F7, ID_NAVIGATE_NEXTDIFFERENCE, VIRTKEY, NOINVERT\r
517 VK_F8, ID_NAVIGATE_PREVIOUSCONFLICT, VIRTKEY, SHIFT, NOINVERT\r
518 VK_F11, ID_NAVIGATE_PREVIOUSDIFFERENCE, VIRTKEY, CONTROL, NOINVERT\r
519 VK_F11, ID_NAVIGATE_PREVIOUSDIFFERENCE, VIRTKEY, SHIFT, NOINVERT\r
520 VK_F7, ID_NAVIGATE_PREVIOUSDIFFERENCE, VIRTKEY, SHIFT, NOINVERT\r
521 VK_UP, ID_NAVIGATE_PREVIOUSDIFFERENCE, VIRTKEY, CONTROL, NOINVERT\r
522 VK_F6, ID_NEXT_PANE, VIRTKEY, NOINVERT\r
523 VK_F6, ID_PREV_PANE, VIRTKEY, SHIFT, NOINVERT\r
524 "D", ID_VIEW_ONEWAYDIFF, VIRTKEY, CONTROL, NOINVERT\r
525 "T", ID_VIEW_WHITESPACES, VIRTKEY, CONTROL, NOINVERT\r
526 VK_INSERT, ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT\r
527 VK_DELETE, ID_EDIT_CUT, VIRTKEY, SHIFT, NOINVERT\r
528 VK_INSERT, ID_EDIT_PASTE, VIRTKEY, SHIFT, NOINVERT\r
529 "A", ID_EDIT_SELECTALL, VIRTKEY, CONTROL, NOINVERT\r
530 END\r
531 \r
532 \r
533 /////////////////////////////////////////////////////////////////////////////\r
534 //\r
535 // String Table\r
536 //\r
537 \r
538 STRINGTABLE \r
539 BEGIN\r
540 IDR_MAINFRAME "TortoiseGitMerge"\r
541 END\r
542 \r
543 STRINGTABLE \r
544 BEGIN\r
545 AFX_IDS_APP_TITLE "TortoiseGitMerge"\r
546 AFX_IDS_IDLEMESSAGE "For Help, press F1. Scroll horizontally with Ctrl-Scrollwheel"\r
547 AFX_IDS_HELPMODEMESSAGE "Select an object on which to get Help"\r
548 END\r
549 \r
550 STRINGTABLE \r
551 BEGIN\r
552 ID_INDICATOR_EXT "EXT"\r
553 ID_INDICATOR_CAPS "CAP"\r
554 ID_INDICATOR_NUM "NUM"\r
555 ID_INDICATOR_SCRL "SCRL"\r
556 ID_INDICATOR_OVR "OVR"\r
557 ID_INDICATOR_REC "REC"\r
558 END\r
559 \r
560 STRINGTABLE \r
561 BEGIN\r
562 ID_APP_ABOUT "Display program information, version number and copyright\nAbout"\r
563 ID_APP_EXIT "Quit the application; prompts to save documents\nExit"\r
564 ID_HELP_INDEX "Opens Help\nHelp Topics"\r
565 ID_HELP_FINDER "List Help topics\nHelp Topics"\r
566 ID_HELP_USING "Display instructions about how to use help\nHelp"\r
567 ID_CONTEXT_HELP "Display help for clicked on buttons, menus and windows\nHelp"\r
568 ID_HELP "Display help for current task or command\nHelp"\r
569 END\r
570 \r
571 STRINGTABLE \r
572 BEGIN\r
573 ID_NEXT_PANE "Switch to the next window pane\nNext Pane"\r
574 ID_PREV_PANE "Switch back to the previous window pane\nPrevious Pane"\r
575 END\r
576 \r
577 STRINGTABLE \r
578 BEGIN\r
579 ID_WINDOW_SPLIT "Split the active window into panes\nSplit"\r
580 END\r
581 \r
582 STRINGTABLE \r
583 BEGIN\r
584 ID_EDIT_CLEAR "Erase the selection\nErase"\r
585 ID_EDIT_CLEAR_ALL "Erase everything\nErase All"\r
586 ID_EDIT_COPY "Copy the selection and put it on the Clipboard\nCopy"\r
587 ID_EDIT_CUT "Cut the selection and put it on the Clipboard\nCut"\r
588 ID_EDIT_FIND "Find the specified text\nFind"\r
589 ID_EDIT_PASTE "Insert Clipboard contents\nPaste"\r
590 ID_EDIT_REPEAT "Repeat the last action\nRepeat"\r
591 ID_EDIT_REPLACE "Replace specific text with different text\nReplace"\r
592 ID_EDIT_SELECT_ALL "Select the entire document\nSelect All"\r
593 ID_EDIT_UNDO "Undo the last action\nUndo"\r
594 ID_EDIT_REDO "Redo the previously undone action\nRedo"\r
595 END\r
596 \r
597 STRINGTABLE \r
598 BEGIN\r
599 ID_VIEW_TOOLBAR "Show or hide the toolbar\nToggle ToolBar"\r
600 ID_VIEW_STATUS_BAR "Show or hide the status bar\nToggle StatusBar"\r
601 END\r
602 \r
603 STRINGTABLE \r
604 BEGIN\r
605 AFX_IDS_SCSIZE "Change the window size"\r
606 AFX_IDS_SCMOVE "Change the window position"\r
607 AFX_IDS_SCMINIMIZE "Reduce the window to an icon"\r
608 AFX_IDS_SCMAXIMIZE "Enlarge the window to full size"\r
609 AFX_IDS_SCNEXTWINDOW "Switch to the next document window"\r
610 AFX_IDS_SCPREVWINDOW "Switch to the previous document window"\r
611 AFX_IDS_SCCLOSE "Close the active window and prompts to save the documents"\r
612 END\r
613 \r
614 STRINGTABLE \r
615 BEGIN\r
616 AFX_IDS_SCRESTORE "Restore the window to normal size"\r
617 AFX_IDS_SCTASKLIST "Activate Task List"\r
618 END\r
619 \r
620 STRINGTABLE \r
621 BEGIN\r
622 IDS_SELECTFILE "Select File..."\r
623 END\r
624 \r
625 STRINGTABLE \r
626 BEGIN\r
627 ID_VIEW_WHITESPACES "Show special characters for whitespaces\nShow Whitespaces"\r
628 ID_VIEW_ONEWAYDIFF "Switch between single and double pane view\nSwitch between single and double pane view"\r
629 ID_NAVIGATE_NEXTDIFFERENCE "Go to the next difference\nNext difference"\r
630 ID_NAVIGATE_PREVIOUSDIFFERENCE \r
631 "Go to the previous difference\nPrevious difference"\r
632 ID_VIEW_OPTIONS "Adjust the settings\nSettings"\r
633 END\r
634 \r
635 STRINGTABLE \r
636 BEGIN\r
637 IDS_ERR_PATCH_NOINDEX "The line 'Index: ' was not found!\nEither this is not a diff file or the diff is empty."\r
638 IDS_ERR_PATCH_NOEQUATIONCHARLINE \r
639 "The line '====' was expected in line %d !"\r
640 IDS_ERR_PATCH_NOREMOVEFILELINE \r
641 "The line indicating the old file was expected in line %d !"\r
642 IDS_ERR_PATCH_NOADDFILELINE \r
643 "The line indicating the new file was expected in line %d !"\r
644 IDS_ERR_PATCH_RENAMINGNOTSUPPORTED \r
645 "The old file does not match the new file.\nRenaming of files is not (yet) supported!"\r
646 IDS_ERR_PATCH_CHUNKSTARTNOTFOUND \r
647 "The chunk start '@@' was expected in line %d !"\r
648 IDS_ERR_PATCH_UNKOWNLINETYPE "An unknown line type was found in line %d !"\r
649 IDS_ERR_PATCH_CHUNKMISMATCH \r
650 "The chunk size did not match the number of added/removed lines!"\r
651 END\r
652 \r
653 STRINGTABLE \r
654 BEGIN\r
655 IDS_ERR_PATCH_INVALIDPATCHFILE "The file %s does not exist!"\r
656 IDS_ERR_PATCH_FILENOTINPATCH \r
657 "The file %s was not found in the patch file!"\r
658 IDS_ERR_PATCH_DOESNOTMATCH \r
659 "The patch seems outdated! The file line\n%s\nand the patchline\n%s\ndo not match!"\r
660 IDS_ERR_PATCH_FILESAVE "Could not save the file %s!"\r
661 END\r
662 \r
663 STRINGTABLE \r
664 BEGIN\r
665 IDS_ERR_MAINFRAME_FILEVERSIONNOTFOUND \r
666 "Could not retrieve revision %s of the file %s.\nPatching is not possible!"\r
667 IDS_ERR_MAINFRAME_FILEHASCONFLICTS \r
668 "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
669 END\r
670 \r
671 STRINGTABLE \r
672 BEGIN\r
673 ID_INDICATOR_LEFTVIEW " "\r
674 ID_INDICATOR_RIGHTVIEW " "\r
675 ID_INDICATOR_BOTTOMVIEW " "\r
676 END\r
677 \r
678 STRINGTABLE \r
679 BEGIN\r
680 IDS_STATUSBAR_REMOVEDLINES "- %d"\r
681 IDS_STATUSBAR_ADDEDLINES "+ %d"\r
682 IDS_STATUSBAR_CONFLICTEDLINES "! %d"\r
683 IDS_STATUSBAR_LEFTVIEW "Left View: "\r
684 IDS_STATUSBAR_RIGHTVIEW "Right View: "\r
685 IDS_STATUSBAR_CONFLICTS "Conflicts: %d"\r
686 END\r
687 \r
688 STRINGTABLE \r
689 BEGIN\r
690 IDS_VIEWCONTEXTMENU_USETHISBLOCK "Use th&is text block"\r
691 IDS_VIEWCONTEXTMENU_USETHEIRBLOCK "Use text block from '&theirs'"\r
692 IDS_VIEWCONTEXTMENU_USEYOURBLOCK "Use text block from '&mine'"\r
693 IDS_VIEWCONTEXTMENU_USETHEIRANDYOURBLOCK \r
694 "Use text block from 't&heirs' before 'mine"\r
695 IDS_VIEWCONTEXTMENU_USEYOURANDTHEIRBLOCK \r
696 "Use text block from 'm&ine' before 'theirs'"\r
697 IDS_VIEWCONTEXTMENU_USETHISFILE "Use this &whole file"\r
698 IDS_VIEWCONTEXTMENU_USEOTHERBLOCK "Use &other text block"\r
699 IDS_VIEWCONTEXTMENU_USEOTHERFILE "Use whole other &file"\r
700 IDS_VIEWCONTEXTMENU_USEBOTHTHISFIRST \r
701 "Use both text blocks (this one first)"\r
702 IDS_VIEWCONTEXTMENU_USEBOTHTHISLAST "Use both text blocks (this one last)"\r
703 END\r
704 \r
705 STRINGTABLE \r
706 BEGIN\r
707 IDS_SAVEASTITLE "Save as..."\r
708 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
709 IDS_OPENDIFFFILETITLE "Select diff file..."\r
710 IDS_GETVERSIONOFFILETITLE "Fetching file..."\r
711 IDS_GETVERSIONOFFILE "Fetching revision %s of file:"\r
712 IDS_WARNMODIFIEDLOSECHANGES \r
713 "There are unsaved modifications!\nDo you want to save your changes?"\r
714 IDS_ASKFORSAVE "Do you want to save your changes?"\r
715 IDS_WARNMODIFIEDLOSECHANGESOPTIONS \r
716 "Do you want to reload the documents to reflect the settings changes?\nNote: you will lose all changes you've made!"\r
717 END\r
718 \r
719 STRINGTABLE \r
720 BEGIN\r
721 IDS_ERR_DIFF_DIFF "The diffing engine aborted because of an error:\n%s"\r
722 IDS_ERR_DIFF_NEWLINES "Cannot show diff because of inconsistent newlines in the file."\r
723 END\r
724 \r
725 STRINGTABLE \r
726 BEGIN\r
727 IDS_ERR_FILE_OPEN "Could not open the file\n%s"\r
728 IDS_ERR_FILE_BINARY "The file\n%s\nis not a valid text file!\nNote that UTF32 files are treated as binary too."\r
729 IDS_ERR_FILE_NOTAFILE "%s\nis a directory, not a file!\nTortoiseGitMerge can't diff directories."\r
730 IDS_ERR_FILE_TOOBIG "The file is too big"\r
731 END\r
732 \r
733 STRINGTABLE \r
734 BEGIN\r
735 ID_FILE_OPEN "Open file"\r
736 ID_FILE_SAVE "Save the modified file\nSave file"\r
737 ID_FILE_SAVE_AS "Save the modified file\nSave file"\r
738 END\r
739 \r
740 STRINGTABLE \r
741 BEGIN\r
742 IDS_ABOUTVERSION "TortoiseGitMerge %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
743 IDS_ABOUTVERSIONBOX "TortoiseGitMerge %d.%d.%d, Build %d - %s, %s"\r
744 IDS_SETTINGSTITLE "Settings"\r
745 END\r
746 \r
747 STRINGTABLE \r
748 BEGIN\r
749 IDS_COMMONFILEFILTER "All Files (*.*)|*.*||"\r
750 IDS_PATCHFILEFILTER "Patchfiles (*.diff, *.patch)|*.diff;*.patch|All Files (*.*)|*.*||"\r
751 END\r
752 \r
753 STRINGTABLE \r
754 BEGIN\r
755 IDS_PATCH_ALL "Patch all"\r
756 IDS_PATCH_TITLE "File patches"\r
757 IDS_DIFF_TITLE "File diffs"\r
758 IDS_PATCH_SELECTED "Patch selected"\r
759 IDS_PATCH_PREVIEW "Preview patched file"\r
760 IDS_PATCH_REVIEW "Review Patch"\r
761 END\r
762 \r
763 STRINGTABLE \r
764 BEGIN\r
765 ID_FILE_RELOAD "Reloads the opened files and reverts all changes.\nReload"\r
766 END\r
767 \r
768 STRINGTABLE \r
769 BEGIN\r
770 ID_NAVIGATE_PREVIOUSCONFLICT \r
771 "Go to the previous conflict\nPrevious conflict"\r
772 ID_NAVIGATE_NEXTCONFLICT "Go to the next conflict\nNext conflict"\r
773 ID_EDIT_MARKASRESOLVED "Marks a file as resolved in Git\nMark as resolved"\r
774 ID_VIEW_SWITCHLEFT "Switch the contents of the left and right view\nSwitch left and right view"\r
775 END\r
776 \r
777 STRINGTABLE \r
778 BEGIN\r
779 ID_VIEW_SHOWFILELIST "Hide/Show the patch file list\nHides or shows the patch file list"\r
780 ID_EDIT_USETHEIRBLOCK "Use text block from 'theirs'\nUse 'theirs' text block"\r
781 ID_EDIT_USEMYBLOCK "Use text block from 'mine'\nUse 'mine' text block"\r
782 ID_EDIT_USETHEIRTHENMYBLOCK \r
783 "Use text block from 'theirs' before 'mine'\nUse 'theirs' text block then 'mine'"\r
784 ID_EDIT_USEMINETHENTHEIRBLOCK \r
785 "Use text block from 'mine' before 'theirs'\nUse 'mine' text block then 'theirs'"\r
786 ID_VIEW_INLINEDIFFWORD "Show Inline-Diff word by word\nInline diff word-wise"\r
787 ID_EDIT_CREATEUNIFIEDDIFFFILE \r
788 "Creates a patch file from the differences of the two files\nCreate patch file"\r
789 END\r
790 \r
791 STRINGTABLE \r
792 BEGIN\r
793 IDS_WARNBETTERPATCHPATHFOUND \r
794 "The path\n<i>%s</i>\nseems not to match the paths in the patchfile.\nBut TortoiseGitMerge found the path\n<i>%s</i>\nmatches it better. Do you want to use the suggested path instead?"\r
795 IDS_NOTFOUNDVIEWTITLEINDICATOR "(not found)"\r
796 IDS_WARNABSOLUTEPATHFOUND \r
797 "The path\n<i>%s</i>\nin the patchfile does not exist.\nTortoiseGitMerge 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 TortoiseGitMerge."\r
798 IDS_WARNABSOLUTEPATHNOTFOUND \r
799 "The path\n<i>%s</i>\nin the patchfile does not exist.\nTortoiseGitMerge tried to apply the patch by stripping prefixes but no matching path could be found."\r
800 IDS_DELETEWHENEMPTY "The file \n%s\nis empty.\nDo you want to remove the file?"\r
801 IDS_EMPTYLINETT "(no line number)"\r
802 END\r
803 \r
804 STRINGTABLE \r
805 BEGIN\r
806 IDS_VIEWTITLE_THEIRS "Theirs"\r
807 IDS_VIEWTITLE_MERGED "Merged"\r
808 IDS_VIEWTITLE_MINE "Mine"\r
809 END\r
810 \r
811 STRINGTABLE \r
812 BEGIN\r
813 IDS_COLOURPICKER_CUSTOMTEXT "More colors..."\r
814 IDS_COLOURPICKER_DEFAULTTEXT "Automatic"\r
815 END\r
816 \r
817 STRINGTABLE \r
818 BEGIN\r
819 IDS_VIEWSCROLLTIPTEXT "Line: %*ld"\r
820 END\r
821 \r
822 STRINGTABLE \r
823 BEGIN\r
824 IDS_EDIT_COPY "&Copy"\r
825 IDS_EDIT_CUT "C&ut"\r
826 IDS_EDIT_PASTE "&Paste"\r
827 END\r
828 \r
829 STRINGTABLE \r
830 BEGIN\r
831 ID_VIEW_LINEDIFFBAR "Show or hide the line diff bar\nToggle LineDiffBar"\r
832 ID_VIEW_LOCATORBAR "Show or hide the locator bar\nToggle LocatorBar"\r
833 ID_EDIT_USELEFTBLOCK "Use text block from the left view\nUse left block"\r
834 ID_EDIT_USELEFTFILE "Use all content from the left view\nUse left file"\r
835 ID_EDIT_USEBLOCKFROMLEFTBEFORERIGHT \r
836 "Use block from left view before block from right view\nUse block from left before right"\r
837 ID_EDIT_USEBLOCKFROMRIGHTBEFORELEFT \r
838 "Use block from right view before block from left view\nUse block from right before left"\r
839 END\r
840 \r
841 #endif // English (U.S.) resources\r
842 /////////////////////////////////////////////////////////////////////////////\r
843 \r
844 \r
845 /////////////////////////////////////////////////////////////////////////////\r
846 // German (Switzerland) resources\r
847 \r
848 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DES)\r
849 #ifdef _WIN32\r
850 LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_SWISS\r
851 #endif //_WIN32\r
852 \r
853 #ifdef APSTUDIO_INVOKED\r
854 /////////////////////////////////////////////////////////////////////////////\r
855 //\r
856 // TEXTINCLUDE\r
857 //\r
858 \r
859 1 TEXTINCLUDE \r
860 BEGIN\r
861 "..\\TortoiseMerge\\resource.h\0"\r
862 END\r
863 \r
864 2 TEXTINCLUDE \r
865 BEGIN\r
866 "#include ""afxres.h""\r\n"\r
867 "\0"\r
868 END\r
869 \r
870 3 TEXTINCLUDE \r
871 BEGIN\r
872 "#define _AFX_NO_SPLITTER_RESOURCES\r\n"\r
873 "#define _AFX_NO_OLE_RESOURCES\r\n"\r
874 "#define _AFX_NO_TRACKER_RESOURCES\r\n"\r
875 "#define _AFX_NO_PROPERTY_RESOURCES\r\n"\r
876 "\r\n"\r
877 "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"\r
878 "LANGUAGE 9, 1\r\n"\r
879 "#pragma code_page(1252)\r\n"\r
880 "#include ""TortoiseMerge.rc2"" // non-Microsoft Visual C++ edited resources\r\n"\r
881 "#include ""afxres.rc"" // Standard components\r\n"\r
882 "#include ""afxprint.rc"" // printing/print preview resources\r\n"\r
883 "#include ""afxribbon.rc"" // ribbon and control bar resources\r\n"\r
884 "#include ""afxolecl.rc"" // OLE container resources\r\n"\r
885 "#endif\r\n"\r
886 "\0"\r
887 END\r
888 \r
889 #endif // APSTUDIO_INVOKED\r
890 \r
891 #endif // German (Switzerland) resources\r
892 /////////////////////////////////////////////////////////////////////////////\r
893 \r
894 \r
895 \r
896 #ifndef APSTUDIO_INVOKED\r
897 /////////////////////////////////////////////////////////////////////////////\r
898 //\r
899 // Generated from the TEXTINCLUDE 3 resource.\r
900 //\r
901 #define _AFX_NO_SPLITTER_RESOURCES\r
902 #define _AFX_NO_OLE_RESOURCES\r
903 #define _AFX_NO_TRACKER_RESOURCES\r
904 #define _AFX_NO_PROPERTY_RESOURCES\r
905 \r
906 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r
907 LANGUAGE 9, 1\r
908 #pragma code_page(1252)\r
909 #include "TortoiseMerge.rc2" // non-Microsoft Visual C++ edited resources\r
910 #include "afxres.rc" // Standard components\r
911 #include "afxprint.rc" // printing/print preview resources\r
912 #include "afxribbon.rc" // ribbon and control bar resources\r
913 #include "afxolecl.rc" // OLE container resources\r
914 #endif\r
915 \r
916 /////////////////////////////////////////////////////////////////////////////\r
917 #endif // not APSTUDIO_INVOKED\r
918 \r