| blob | 0cbddc4da0c5c188e5289fd90d049804eb8e6c8e |
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 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL\r
20 #pragma code_page(1252)\r
21 \r
22 /////////////////////////////////////////////////////////////////////////////\r
23 //\r
24 // Icon\r
25 //\r
26 \r
27 // Icon with lowest ID value placed first to ensure application icon\r
28 // remains consistent on all systems.\r
29 IDR_MAINFRAME ICON "TortoiseMerge.ico"\r
30 IDI_REMOVEDLINE ICON "lineremoved.ico"\r
31 IDI_ADDEDLINE ICON "lineadded.ico"\r
32 IDI_CONFLICTEDLINE ICON "lineconflicted.ico"\r
33 IDI_WHITESPACELINE ICON "linewhitespace.ico"\r
34 IDI_EQUALLINE ICON "lineequal.ico"\r
35 IDI_LINEENDINGCR ICON "LineEndingCR.ico"\r
36 IDI_LINEENDINGCRLF ICON "LineEndingCRLF.ico"\r
37 IDI_LINEENDINGLF ICON "LineEndingLF.ico"\r
38 IDI_CONFLICTEDIGNOREDLINE ICON "lineconflictedignored.ico"\r
39 IDI_LINEEDITED ICON "lineedited.ico"\r
40 IDI_MOVEDLINE ICON "moved.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 \r
74 /////////////////////////////////////////////////////////////////////////////\r
75 //\r
76 // DESIGNINFO\r
77 //\r
78 \r
79 #ifdef APSTUDIO_INVOKED\r
80 GUIDELINES DESIGNINFO\r
81 BEGIN\r
82 IDD_DIFFLOCATOR, DIALOG\r
83 BEGIN\r
84 LEFTMARGIN, 3\r
85 RIGHTMARGIN, 13\r
86 BOTTOMMARGIN, 202\r
87 END\r
88 \r
89 IDD_LINEDIFF, DIALOG\r
90 BEGIN\r
91 RIGHTMARGIN, 427\r
92 END\r
93 END\r
94 #endif // APSTUDIO_INVOKED\r
95 \r
96 \r
97 /////////////////////////////////////////////////////////////////////////////\r
98 //\r
99 // Bitmap\r
100 //\r
101 \r
102 IDB_LOGOFLIPPED BITMAP "tortoisemerge_logoflipped.bmp"\r
103 IDB_TTF_BMP BITMAP "ttf_glyph.bmp"\r
104 \r
105 /////////////////////////////////////////////////////////////////////////////\r
106 //\r
107 // AVI\r
108 //\r
109 \r
110 IDR_DOWNLOAD AVI "download.avi"\r
111 \r
112 /////////////////////////////////////////////////////////////////////////////\r
113 //\r
114 // Cursor\r
115 //\r
116 \r
117 IDC_MARGINCURSOR CURSOR "Margin.cur"\r
118 \r
119 /////////////////////////////////////////////////////////////////////////////\r
120 //\r
121 // PNG\r
122 //\r
123 \r
124 IDB_RIBBONLARGE PNG "ribbon\\ribbonlarge.png"\r
125 IDB_RIBBONSMALL PNG "ribbon\\ribbonsmall.png"\r
126 IDB_LOGO PNG "ribbon\\TortoiseMerge.png"\r
127 #endif // Neutral resources\r
128 /////////////////////////////////////////////////////////////////////////////\r
129 \r
130 \r
131 /////////////////////////////////////////////////////////////////////////////\r
132 // English (United States) resources\r
133 \r
134 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r
135 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US\r
136 #pragma code_page(1252)\r
137 \r
138 /////////////////////////////////////////////////////////////////////////////\r
139 //\r
140 // Dialog\r
141 //\r
142 \r
143 IDD_FILEPATCHES DIALOGEX 0, 0, 133, 221\r
144 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME\r
145 EXSTYLE WS_EX_TOOLWINDOW\r
146 CAPTION "File patches"\r
147 FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
148 BEGIN\r
149 CONTROL "",IDC_FILELIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | WS_TABSTOP,0,0,131,184\r
150 PUSHBUTTON "Patch &selected item",IDC_PATCHSELECTEDBUTTON,0,189,132,14,WS_DISABLED\r
151 PUSHBUTTON "Patch &all items",IDC_PATCHALLBUTTON,0,206,132,14\r
152 END\r
153 \r
154 IDD_OPENDLG DIALOGEX 0, 0, 325, 209\r
155 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
156 EXSTYLE WS_EX_CONTEXTHELP\r
157 CAPTION "TortoiseGitMerge"\r
158 FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
159 BEGIN\r
160 CONTROL "&Merging",IDC_MERGERADIO,"Button",BS_AUTORADIOBUTTON | WS_GROUP,14,18,75,10\r
161 CONTROL "&Apply unified diff",IDC_APPLYRADIO,"Button",BS_AUTORADIOBUTTON,96,18,152,10\r
162 LTEXT "Base file:",IDC_STATIC,14,48,82,8\r
163 EDITTEXT IDC_BASEFILEEDIT,96,45,152,14,ES_AUTOHSCROLL\r
164 PUSHBUTTON "&Browse...",IDC_BASEFILEBROWSE,260,46,50,14\r
165 LTEXT "Their file:",IDC_STATIC,14,69,82,8\r
166 EDITTEXT IDC_THEIRFILEEDIT,96,66,152,14,ES_AUTOHSCROLL\r
167 PUSHBUTTON "B&rowse...",IDC_THEIRFILEBROWSE,260,67,50,14\r
168 LTEXT "My file:",IDC_STATIC,14,91,82,8\r
169 EDITTEXT IDC_YOURFILEEDIT,96,88,152,14,ES_AUTOHSCROLL\r
170 PUSHBUTTON "Br&owse...",IDC_YOURFILEBROWSE,260,89,50,14\r
171 CONTROL "Use Unified Diff from &clipboard",IDC_PATCHFROMCLIPBOARD,\r
172 "Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,14,129,234,10\r
173 LTEXT "Diff file:",IDC_STATIC,14,145,82,8\r
174 EDITTEXT IDC_DIFFFILEEDIT,96,142,152,14,ES_AUTOHSCROLL\r
175 PUSHBUTTON "&Browse...",IDC_DIFFFILEBROWSE,260,142,50,14\r
176 LTEXT "Directory:",IDC_STATIC,14,164,82,8\r
177 EDITTEXT IDC_DIRECTORYEDIT,96,162,152,14,ES_AUTOHSCROLL\r
178 PUSHBUTTON "B&rowse...",IDC_DIRECTORYBROWSE,260,163,50,14\r
179 DEFPUSHBUTTON "OK",IDOK,7,188,50,14\r
180 PUSHBUTTON "Cancel",IDCANCEL,127,188,50,14\r
181 PUSHBUTTON "Help",IDHELP,268,188,50,14\r
182 LTEXT "",IDC_VERSIONSTRING,7,7,311,8,SS_CENTERIMAGE\r
183 GROUPBOX "Merging",IDC_MERGEGROUP,7,34,311,77\r
184 GROUPBOX "Apply unified diff",IDC_UNIDIFFGROUP,7,117,311,66\r
185 END\r
186 \r
187 IDD_SETMAINPAGE DIALOGEX 0, 0, 265, 250\r
188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION\r
189 CAPTION "General"\r
190 FONT 8, "MS Shell Dlg", 0, 0, 0x0\r
191 BEGIN\r
192 CONTROL "&Backup original file",IDC_BACKUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,10,236,10\r
193 CONTROL "&Jump to first difference when loading",IDC_FIRSTDIFFONLOAD,\r
194 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,21,236,10\r
195 CONTROL "J&ump to first conflict when loading",IDC_FIRSTCONFLICTONLOAD,\r
196 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,26,33,225,10\r
197 CONTROL "Default to UTF-8 encoding",IDC_UTF8DEFAULT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,236,10\r
198 CONTROL "Use &one-pane view as default for 2-file diff",IDC_ONEPANE,\r
199 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,56,236,10\r
200 CONTROL "Show linenumber&s",IDC_LINENUMBERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,67,236,10\r
201 CONTROL "Add new files automatically to Git",IDC_AUTOADD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,79,236,10\r
202 CONTROL "Use Ribbons",IDC_USERIBBONS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,90,236,10\r
203 LTEXT "&Tab size:",IDC_STATIC,15,118,54,8\r
204 EDITTEXT IDC_TABSIZE,80,115,41,14,ES_AUTOHSCROLL | ES_NUMBER\r
205 LTEXT "&Font:",IDC_STATIC,15,135,52,8\r
206 COMBOBOX IDC_FONTNAMES,80,133,122,90,CBS_DROPDOWNLIST | CBS_OWNERDRAWVARIABLE | CBS_SORT | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
207 COMBOBOX IDC_FONTSIZES,211,133,40,47,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP\r
208 LTEXT "&Max line length for inline diffs",IDC_STATIC,15,172,173,8\r
209 EDITTEXT IDC_MAXINLINE,211,170,40,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER\r
210 CONTROL "Ignore line &endings (recommended)",IDC_IGNORELF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,185,237,10\r
211 CONTROL "Ignore case cha&nges",IDC_CASEINSENSITIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,196,236,10\r
212 GROUPBOX "Misc",IDC_MISCGROUP,7,0,251,151\r
213 GROUPBOX "Diffing",IDC_DIFFGROUP,7,161,251,82\r
214 END\r
215 \r
216 IDD_SETCOLORPAGE DIALOGEX 0, 0, 265, 257\r
217 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION\r
218 CAPTION "Colors"\r
219 FONT 8, "MS Shell Dlg", 0, 0, 0x0\r
220 BEGIN\r
221 GROUPBOX "Line differences",IDC_STATIC,7,7,251,161\r
222 LTEXT "Normal",IDC_STATIC,15,16,113,8,0,WS_EX_RIGHT\r
223 PUSHBUTTON "",IDC_BKNORMAL,152,14,50,14\r
224 LTEXT "Added",IDC_STATIC,15,32,113,8,0,WS_EX_RIGHT\r
225 PUSHBUTTON "",IDC_BKADDED,152,30,50,14\r
226 LTEXT "Removed",IDC_STATIC,15,49,113,8,0,WS_EX_RIGHT\r
227 PUSHBUTTON "",IDC_BKREMOVED,152,47,50,14\r
228 LTEXT "Modified",IDC_STATIC,15,66,113,8,0,WS_EX_RIGHT\r
229 PUSHBUTTON "",IDC_BKMODIFIED,152,64,50,14\r
230 LTEXT "Conflicted",IDC_STATIC,15,83,113,8,0,WS_EX_RIGHT\r
231 PUSHBUTTON "",IDC_BKCONFLICTED,152,81,50,14\r
232 LTEXT "Conflict resolved",IDC_STATIC,15,100,113,8,0,WS_EX_RIGHT\r
233 PUSHBUTTON "",IDC_BKCONFLICTRESOLVED,152,98,50,14\r
234 LTEXT "Empty",IDC_STATIC,15,116,113,8,0,WS_EX_RIGHT\r
235 PUSHBUTTON "",IDC_BKEMPTY,152,114,50,14\r
236 LTEXT "Moved from",IDC_STATIC,15,133,113,8,0,WS_EX_RIGHT\r
237 PUSHBUTTON "",IDC_BKMOVEDFROM,152,131,50,14\r
238 LTEXT "Moved to",IDC_STATIC,15,150,113,8,0,WS_EX_RIGHT\r
239 PUSHBUTTON "",IDC_BKMOVEDTO,152,148,50,14\r
240 GROUPBOX "Inline differences",IDC_STATIC,7,171,251,43\r
241 LTEXT "Added",IDC_STATIC,15,181,113,8,0,WS_EX_RIGHT\r
242 PUSHBUTTON "",IDC_BKWHITESPACES,152,179,50,14\r
243 LTEXT "Removed",IDC_STATIC,15,197,113,8,0,WS_EX_RIGHT\r
244 PUSHBUTTON "",IDC_BKWHITESPACEDIFF,152,195,50,14\r
245 GROUPBOX "Misc",IDC_STATIC,7,217,251,33\r
246 RTEXT "Whitespaces",IDC_STATIC,15,232,113,8\r
247 PUSHBUTTON "",IDC_FGWHITESPACES,152,228,50,14\r
248 END\r
249 \r
250 IDD_PATCH_FILE_OPEN_CUSTOM DIALOGEX 0, 0, 122, 28\r
251 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_SYSMENU\r
252 FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
253 BEGIN\r
254 PUSHBUTTON "Open from clipboard",IDC_PATCH_TO_CLIPBOARD,7,7,108,14\r
255 END\r
256 \r
257 IDD_FIND DIALOGEX 0, 0, 311, 73\r
258 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
259 CAPTION "Find"\r
260 FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
261 BEGIN\r
262 LTEXT "Search for:",IDC_STATIC,7,10,79,8\r
263 CONTROL "",IDC_FINDCOMBO,"ComboBoxEx32",CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP,90,7,154,95\r
264 CONTROL "Match &case",IDC_MATCHCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,26,200,10\r
265 CONTROL "&Limit search to modified lines",IDC_LIMITTODIFFS,\r
266 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,41,200,10\r
267 CONTROL "&Whole word",IDC_WHOLEWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,56,200,10\r
268 DEFPUSHBUTTON "&Find",IDOK,248,7,56,14,WS_DISABLED\r
269 PUSHBUTTON "Cancel",IDCANCEL,248,28,56,14\r
270 END\r
271 \r
272 \r
273 /////////////////////////////////////////////////////////////////////////////\r
274 //\r
275 // DESIGNINFO\r
276 //\r
277 \r
278 #ifdef APSTUDIO_INVOKED\r
279 GUIDELINES DESIGNINFO\r
280 BEGIN\r
281 IDD_FILEPATCHES, DIALOG\r
282 BEGIN\r
283 BOTTOMMARGIN, 220\r
284 END\r
285 \r
286 IDD_OPENDLG, DIALOG\r
287 BEGIN\r
288 LEFTMARGIN, 7\r
289 RIGHTMARGIN, 318\r
290 VERTGUIDE, 14\r
291 VERTGUIDE, 96\r
292 VERTGUIDE, 248\r
293 VERTGUIDE, 310\r
294 TOPMARGIN, 7\r
295 BOTTOMMARGIN, 202\r
296 END\r
297 \r
298 IDD_SETMAINPAGE, DIALOG\r
299 BEGIN\r
300 LEFTMARGIN, 7\r
301 RIGHTMARGIN, 258\r
302 VERTGUIDE, 7\r
303 VERTGUIDE, 15\r
304 VERTGUIDE, 80\r
305 VERTGUIDE, 188\r
306 VERTGUIDE, 211\r
307 VERTGUIDE, 251\r
308 TOPMARGIN, 7\r
309 BOTTOMMARGIN, 243\r
310 END\r
311 \r
312 IDD_SETCOLORPAGE, DIALOG\r
313 BEGIN\r
314 LEFTMARGIN, 7\r
315 RIGHTMARGIN, 258\r
316 VERTGUIDE, 15\r
317 VERTGUIDE, 128\r
318 VERTGUIDE, 152\r
319 TOPMARGIN, 7\r
320 BOTTOMMARGIN, 250\r
321 END\r
322 \r
323 IDD_PATCH_FILE_OPEN_CUSTOM, DIALOG\r
324 BEGIN\r
325 LEFTMARGIN, 7\r
326 RIGHTMARGIN, 87\r
327 TOPMARGIN, 7\r
328 BOTTOMMARGIN, 21\r
329 END\r
330 \r
331 IDD_FIND, DIALOG\r
332 BEGIN\r
333 LEFTMARGIN, 7\r
334 RIGHTMARGIN, 304\r
335 VERTGUIDE, 86\r
336 VERTGUIDE, 90\r
337 VERTGUIDE, 244\r
338 VERTGUIDE, 248\r
339 TOPMARGIN, 7\r
340 BOTTOMMARGIN, 66\r
341 END\r
342 END\r
343 #endif // APSTUDIO_INVOKED\r
344 \r
345 \r
346 /////////////////////////////////////////////////////////////////////////////\r
347 //\r
348 // Bitmap\r
349 //\r
350 \r
351 IDR_MAINFRAME BITMAP "Toolbar.bmp"\r
352 \r
353 /////////////////////////////////////////////////////////////////////////////\r
354 //\r
355 // Toolbar\r
356 //\r
357 \r
358 IDR_MAINFRAME TOOLBAR 16, 16\r
359 BEGIN\r
360 BUTTON ID_FILE_OPEN\r
361 BUTTON ID_FILE_SAVE\r
362 SEPARATOR\r
363 BUTTON ID_FILE_RELOAD\r
364 BUTTON ID_EDIT_UNDO\r
365 SEPARATOR\r
366 BUTTON ID_NAVIGATE_PREVIOUSDIFFERENCE\r
367 BUTTON ID_NAVIGATE_NEXTDIFFERENCE\r
368 BUTTON ID_NAVIGATE_PREVIOUSCONFLICT\r
369 BUTTON ID_NAVIGATE_NEXTCONFLICT\r
370 SEPARATOR\r
371 BUTTON ID_EDIT_USELEFTBLOCK\r
372 SEPARATOR\r
373 BUTTON ID_EDIT_USETHEIRBLOCK\r
374 BUTTON ID_EDIT_USEMYBLOCK\r
375 BUTTON ID_EDIT_USETHEIRTHENMYBLOCK\r
376 BUTTON ID_EDIT_USEMINETHENTHEIRBLOCK\r
377 SEPARATOR\r
378 BUTTON ID_EDIT_MARKASRESOLVED\r
379 SEPARATOR\r
380 BUTTON ID_VIEW_WHITESPACES\r
381 BUTTON ID_VIEW_WRAPLONGLINES\r
382 SEPARATOR\r
383 BUTTON ID_VIEW_INLINEDIFF\r
384 BUTTON ID_VIEW_INLINEDIFFWORD\r
385 BUTTON ID_VIEW_COMPAREWHITESPACES\r
386 BUTTON ID_VIEW_IGNOREWHITESPACECHANGES\r
387 BUTTON ID_VIEW_IGNOREALLWHITESPACECHANGES\r
388 SEPARATOR\r
389 BUTTON ID_VIEW_ONEWAYDIFF\r
390 BUTTON ID_VIEW_SWITCHLEFT\r
391 BUTTON ID_VIEW_COLLAPSED\r
392 BUTTON ID_VIEW_SHOWFILELIST\r
393 SEPARATOR\r
394 BUTTON ID_VIEW_OPTIONS\r
395 SEPARATOR\r
396 BUTTON ID_HELP\r
397 END\r
398 \r
399 \r
400 /////////////////////////////////////////////////////////////////////////////\r
401 //\r
402 // Menu\r
403 //\r
404 \r
405 IDR_MAINFRAME MENU\r
406 BEGIN\r
407 POPUP "&File"\r
408 BEGIN\r
409 MENUITEM "Open", ID_FILE_OPEN\r
410 MENUITEM "Save", ID_FILE_SAVE\r
411 MENUITEM "Save &as...", ID_FILE_SAVE_AS\r
412 MENUITEM SEPARATOR\r
413 MENUITEM "Reload", ID_FILE_RELOAD\r
414 MENUITEM "&Enable edit", ID_EDIT_ENABLE\r
415 MENUITEM SEPARATOR\r
416 MENUITEM "E&xit", ID_APP_EXIT\r
417 END\r
418 POPUP "&Edit"\r
419 BEGIN\r
420 MENUITEM "&Undo", ID_EDIT_UNDO\r
421 MENUITEM SEPARATOR\r
422 MENUITEM "&Copy", ID_EDIT_COPY\r
423 MENUITEM "&Paste", ID_EDIT_PASTE\r
424 MENUITEM SEPARATOR\r
425 MENUITEM "Use left block", ID_EDIT_USELEFTBLOCK\r
426 MENUITEM "Use left file", ID_EDIT_USELEFTFILE\r
427 MENUITEM "Use block from left before right", ID_EDIT_USEBLOCKFROMLEFTBEFORERIGHT\r
428 MENUITEM "Use block from right before left", ID_EDIT_USEBLOCKFROMRIGHTBEFORELEFT\r
429 MENUITEM SEPARATOR\r
430 MENUITEM "Use 'theirs' text block", ID_EDIT_USETHEIRBLOCK\r
431 MENUITEM "Use 'mine' text block", ID_EDIT_USEMYBLOCK\r
432 MENUITEM "Use 'theirs' text block then 'mine'", ID_EDIT_USETHEIRTHENMYBLOCK\r
433 MENUITEM "Use 'mine' text block then 'theirs'", ID_EDIT_USEMINETHENTHEIRBLOCK\r
434 MENUITEM SEPARATOR\r
435 MENUITEM "Find", ID_EDIT_FIND\r
436 MENUITEM "Goto Line", ID_EDIT_GOTOLINE\r
437 MENUITEM "Mark as resolved", ID_EDIT_MARKASRESOLVED\r
438 MENUITEM SEPARATOR\r
439 MENUITEM "Create patch file", ID_EDIT_CREATEUNIFIEDDIFFFILE\r
440 END\r
441 POPUP "&Navigate"\r
442 BEGIN\r
443 MENUITEM "Next difference", ID_NAVIGATE_NEXTDIFFERENCE\r
444 MENUITEM "Previous difference", ID_NAVIGATE_PREVIOUSDIFFERENCE\r
445 MENUITEM "Next conflict", ID_NAVIGATE_NEXTCONFLICT\r
446 MENUITEM "Previous conflict", ID_NAVIGATE_PREVIOUSCONFLICT\r
447 MENUITEM "Next inline difference", ID_NAVIGATE_NEXTINLINEDIFF\r
448 MENUITEM "Previous inline difference", ID_NAVIGATE_PREVINLINEDIFF\r
449 END\r
450 POPUP "&View"\r
451 BEGIN\r
452 MENUITEM "&Toolbar", ID_VIEW_TOOLBAR\r
453 MENUITEM "&Status Bar", ID_VIEW_STATUS_BAR\r
454 MENUITEM "Line diff bar", ID_VIEW_LINEDIFFBAR, CHECKED\r
455 MENUITEM "Locator Bar", ID_VIEW_LOCATORBAR\r
456 MENUITEM SEPARATOR\r
457 MENUITEM "Wrap long lines", ID_VIEW_WRAPLONGLINES\r
458 MENUITEM "&Moved blocks", ID_VIEW_MOVEDBLOCKS\r
459 MENUITEM "Inline diff", ID_VIEW_INLINEDIFF\r
460 MENUITEM "Inline diff word-wise", ID_VIEW_INLINEDIFFWORD\r
461 MENUITEM "Compare whitespaces", ID_VIEW_COMPAREWHITESPACES\r
462 MENUITEM "Ignore whitespace changes", ID_VIEW_IGNOREWHITESPACECHANGES\r
463 MENUITEM "Ignore all whitespace changes", ID_VIEW_IGNOREALLWHITESPACECHANGES\r
464 MENUITEM SEPARATOR\r
465 MENUITEM "Show Whitespaces", ID_VIEW_WHITESPACES\r
466 MENUITEM "Switch between single and double pane view", ID_VIEW_ONEWAYDIFF\r
467 MENUITEM "Switch left and right view", ID_VIEW_SWITCHLEFT\r
468 MENUITEM "Collapse", ID_VIEW_COLLAPSED\r
469 MENUITEM SEPARATOR\r
470 MENUITEM "Settings", ID_VIEW_OPTIONS\r
471 MENUITEM SEPARATOR\r
472 MENUITEM "Hide/Show the patch file list", ID_VIEW_SHOWFILELIST\r
473 MENUITEM SEPARATOR\r
474 POPUP "Style"\r
475 BEGIN\r
476 MENUITEM "Windows 2000", ID_VIEW_APPLOOK_WIN_2000\r
477 MENUITEM "Office XP", ID_VIEW_APPLOOK_OFF_XP\r
478 MENUITEM "Windows XP", ID_VIEW_APPLOOK_WIN_XP\r
479 MENUITEM "Office 2003", ID_VIEW_APPLOOK_OFF_2003\r
480 MENUITEM "Visual Studio 2005", ID_VIEW_APPLOOK_VS_2005\r
481 MENUITEM "Visual Studio 2008", ID_VIEW_APPLOOK_VS_2008\r
482 MENUITEM "Windows 7", ID_VIEW_APPLOOK_WIN7\r
483 POPUP "Office 2007 colors"\r
484 BEGIN\r
485 MENUITEM "Blue Style", ID_VIEW_APPLOOK_OFF_2007_BLUE\r
486 MENUITEM "Black Style", ID_VIEW_APPLOOK_OFF_2007_BLACK\r
487 MENUITEM "Silver Style", ID_VIEW_APPLOOK_OFF_2007_SILVER\r
488 MENUITEM "Aqua Style", ID_VIEW_APPLOOK_OFF_2007_AQUA\r
489 END\r
490 END\r
491 END\r
492 POPUP "&Help"\r
493 BEGIN\r
494 MENUITEM "&Help Topics", ID_HELP\r
495 MENUITEM SEPARATOR\r
496 MENUITEM "&About TortoiseGitMerge...", ID_APP_ABOUT\r
497 END\r
498 END\r
499 \r
500 \r
501 /////////////////////////////////////////////////////////////////////////////\r
502 //\r
503 // Accelerator\r
504 //\r
505 \r
506 IDR_MAINFRAME ACCELERATORS\r
507 BEGIN\r
508 "Q", ID_APP_EXIT, VIRTKEY, CONTROL, NOINVERT\r
509 VK_ESCAPE, ID_APP_EXIT, VIRTKEY, NOINVERT\r
510 "W", ID_APP_EXIT, VIRTKEY, CONTROL, NOINVERT\r
511 VK_DOWN, ID_CARET_DOWN, VIRTKEY, NOINVERT\r
512 VK_DOWN, ID_CARET_DOWN, VIRTKEY, SHIFT, NOINVERT\r
513 VK_LEFT, ID_CARET_LEFT, VIRTKEY, NOINVERT\r
514 VK_LEFT, ID_CARET_LEFT, VIRTKEY, SHIFT, NOINVERT\r
515 VK_RIGHT, ID_CARET_RIGHT, VIRTKEY, NOINVERT\r
516 VK_RIGHT, ID_CARET_RIGHT, VIRTKEY, SHIFT, NOINVERT\r
517 VK_UP, ID_CARET_UP, VIRTKEY, NOINVERT\r
518 VK_UP, ID_CARET_UP, VIRTKEY, SHIFT, NOINVERT\r
519 VK_LEFT, ID_CARET_WORDLEFT, VIRTKEY, CONTROL, NOINVERT\r
520 VK_LEFT, ID_CARET_WORDLEFT, VIRTKEY, SHIFT, CONTROL, NOINVERT\r
521 VK_RIGHT, ID_CARET_WORDRIGHT, VIRTKEY, CONTROL, NOINVERT\r
522 VK_RIGHT, ID_CARET_WORDRIGHT, VIRTKEY, SHIFT, CONTROL, NOINVERT\r
523 VK_F1, ID_CONTEXT_HELP, VIRTKEY, SHIFT, NOINVERT\r
524 "C", ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT\r
525 VK_INSERT, ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT\r
526 VK_DELETE, ID_EDIT_CUT, VIRTKEY, SHIFT, NOINVERT\r
527 "X", ID_EDIT_CUT, VIRTKEY, CONTROL, NOINVERT\r
528 "F", ID_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT\r
529 VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT\r
530 VK_F3, ID_EDIT_FINDNEXTSTART, VIRTKEY, CONTROL, NOINVERT\r
531 VK_F3, ID_EDIT_FINDPREV, VIRTKEY, SHIFT, NOINVERT\r
532 VK_F3, ID_EDIT_FINDPREVSTART, VIRTKEY, SHIFT, CONTROL, NOINVERT\r
533 "G", ID_EDIT_GOTOLINE, VIRTKEY, CONTROL, NOINVERT\r
534 "V", ID_EDIT_PASTE, VIRTKEY, CONTROL, NOINVERT\r
535 VK_INSERT, ID_EDIT_PASTE, VIRTKEY, SHIFT, NOINVERT\r
536 VK_INSERT, ID_EDIT_PASTE, VIRTKEY, SHIFT, NOINVERT\r
537 "A", ID_EDIT_SELECTALL, VIRTKEY, CONTROL, NOINVERT\r
538 VK_BACK, ID_EDIT_UNDO, VIRTKEY, ALT, NOINVERT\r
539 "Z", ID_EDIT_UNDO, VIRTKEY, CONTROL, NOINVERT\r
540 VK_F12, ID_EDIT_USELEFTBLOCK, VIRTKEY, NOINVERT\r
541 VK_RIGHT, ID_EDIT_USELEFTBLOCK, VIRTKEY, ALT, NOINVERT\r
542 VK_F10, ID_EDIT_USEMINETHENTHEIRBLOCK, VIRTKEY, SHIFT, CONTROL, NOINVERT\r
543 VK_F10, ID_EDIT_USEMYBLOCK, VIRTKEY, CONTROL, NOINVERT\r
544 VK_F12, ID_EDIT_USEMYBLOCK, VIRTKEY, SHIFT, NOINVERT\r
545 VK_F9, ID_EDIT_USETHEIRBLOCK, VIRTKEY, CONTROL, NOINVERT\r
546 VK_F9, ID_EDIT_USETHEIRTHENMYBLOCK, VIRTKEY, SHIFT, CONTROL, NOINVERT\r
547 "O", ID_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT\r
548 "R", ID_FILE_RELOAD, VIRTKEY, CONTROL, NOINVERT\r
549 VK_F5, ID_FILE_RELOAD, VIRTKEY, NOINVERT\r
550 "S", ID_FILE_SAVE, VIRTKEY, CONTROL, NOINVERT\r
551 "S", ID_FILE_SAVE_AS, VIRTKEY, SHIFT, CONTROL, NOINVERT\r
552 VK_F1, ID_HELP, VIRTKEY, NOINVERT\r
553 VK_F8, ID_NAVIGATE_NEXTCONFLICT, VIRTKEY, NOINVERT\r
554 VK_DOWN, ID_NAVIGATE_NEXTDIFFERENCE, VIRTKEY, CONTROL, NOINVERT\r
555 VK_DOWN, ID_NAVIGATE_NEXTDIFFERENCE, VIRTKEY, ALT, NOINVERT\r
556 VK_F11, ID_NAVIGATE_NEXTDIFFERENCE, VIRTKEY, NOINVERT\r
557 VK_F7, ID_NAVIGATE_NEXTDIFFERENCE, VIRTKEY, NOINVERT\r
558 VK_RIGHT, ID_NAVIGATE_NEXTINLINEDIFF, VIRTKEY, CONTROL, ALT, NOINVERT\r
559 VK_LEFT, ID_NAVIGATE_PREVINLINEDIFF, VIRTKEY, CONTROL, ALT, NOINVERT\r
560 VK_F8, ID_NAVIGATE_PREVIOUSCONFLICT, VIRTKEY, SHIFT, NOINVERT\r
561 VK_F11, ID_NAVIGATE_PREVIOUSDIFFERENCE, VIRTKEY, CONTROL, NOINVERT\r
562 VK_F11, ID_NAVIGATE_PREVIOUSDIFFERENCE, VIRTKEY, SHIFT, NOINVERT\r
563 VK_F7, ID_NAVIGATE_PREVIOUSDIFFERENCE, VIRTKEY, SHIFT, NOINVERT\r
564 VK_UP, ID_NAVIGATE_PREVIOUSDIFFERENCE, VIRTKEY, CONTROL, NOINVERT\r
565 VK_UP, ID_NAVIGATE_PREVIOUSDIFFERENCE, VIRTKEY, ALT, NOINVERT\r
566 VK_F6, ID_NEXT_PANE, VIRTKEY, NOINVERT\r
567 VK_F6, ID_PREV_PANE, VIRTKEY, SHIFT, NOINVERT\r
568 "L", ID_VIEW_COLLAPSED, VIRTKEY, CONTROL, NOINVERT\r
569 "D", ID_VIEW_ONEWAYDIFF, VIRTKEY, CONTROL, NOINVERT\r
570 "U", ID_VIEW_SWITCHLEFT, VIRTKEY, CONTROL, NOINVERT\r
571 "T", ID_VIEW_WHITESPACES, VIRTKEY, CONTROL, NOINVERT\r
572 "P", ID_VIEW_WRAPLONGLINES, VIRTKEY, CONTROL, NOINVERT\r
573 "E", ID_EDIT_ENABLE, VIRTKEY, CONTROL, NOINVERT\r
574 END\r
575 \r
576 \r
577 /////////////////////////////////////////////////////////////////////////////\r
578 //\r
579 // Ribbon\r
580 //\r
581 \r
582 IDR_RIBBON RT_RIBBON_XML "ribbon.mfcribbon-ms"\r
583 \r
584 \r
585 /////////////////////////////////////////////////////////////////////////////\r
586 //\r
587 // String Table\r
588 //\r
589 \r
590 STRINGTABLE\r
591 BEGIN\r
592 IDR_MAINFRAME "TortoiseGitMerge"\r
593 IDS_TITLE_REJECTEDHUNKS "Rejected patch hunks for '%s'"\r
594 IDS_ERR_PATCH_FILENAMENOTUNIQUE \r
595 "TortoiseGitMerge cannot process this patch file. The filename ""%s"" appears more than once."\r
596 IDS_ERR_MAINFRAME_FILECONFLICTNOVERSION \r
597 "The patch does not apply cleanly to %s and no version information is given.\nPatching is not possible!"\r
598 END\r
599 \r
600 STRINGTABLE\r
601 BEGIN\r
602 AFX_IDS_APP_TITLE "TortoiseGitMerge"\r
603 AFX_IDS_IDLEMESSAGE "For Help, press F1. Scroll horizontally with Ctrl-Scrollwheel"\r
604 AFX_IDS_HELPMODEMESSAGE "Select an object on which to get Help"\r
605 END\r
606 \r
607 STRINGTABLE\r
608 BEGIN\r
609 ID_INDICATOR_CAPS "CAP"\r
610 ID_INDICATOR_NUM "NUM"\r
611 END\r
612 \r
613 STRINGTABLE\r
614 BEGIN\r
615 ID_APP_ABOUT "Display program information, version number and copyright\nAbout"\r
616 ID_APP_EXIT "Quit the application; prompts to save documents\nExit"\r
617 ID_HELP_INDEX "Opens Help\nHelp Topics"\r
618 ID_HELP_FINDER "List Help topics\nHelp Topics"\r
619 ID_HELP_USING "Display instructions about how to use help\nHelp"\r
620 ID_CONTEXT_HELP "Display help for clicked on buttons, menus and windows\nHelp"\r
621 ID_HELP "Display help for current task or command\nHelp"\r
622 END\r
623 \r
624 STRINGTABLE\r
625 BEGIN\r
626 ID_NEXT_PANE "Switch to the next window pane\nNext Pane"\r
627 ID_PREV_PANE "Switch back to the previous window pane\nPrevious Pane"\r
628 END\r
629 \r
630 STRINGTABLE\r
631 BEGIN\r
632 ID_WINDOW_SPLIT "Split the active window into panes\nSplit"\r
633 END\r
634 \r
635 STRINGTABLE\r
636 BEGIN\r
637 ID_EDIT_CLEAR "Erase the selection\nErase"\r
638 ID_EDIT_CLEAR_ALL "Erase everything\nErase All"\r
639 ID_EDIT_COPY "Copy the selection and put it on the Clipboard\nCopy"\r
640 ID_EDIT_CUT "Cut the selection and put it on the Clipboard\nCut"\r
641 ID_EDIT_FIND "Find the specified text\nFind"\r
642 ID_EDIT_PASTE "Insert Clipboard contents\nPaste"\r
643 ID_EDIT_REPEAT "Repeat the last action\nRepeat"\r
644 ID_EDIT_REPLACE "Replace specific text with different text\nReplace"\r
645 ID_EDIT_SELECT_ALL "Select the entire document\nSelect All"\r
646 ID_EDIT_UNDO "Undo the last modifications\nUndo"\r
647 ID_EDIT_REDO "Redo the previously undone action\nRedo"\r
648 END\r
649 \r
650 STRINGTABLE\r
651 BEGIN\r
652 ID_VIEW_TOOLBAR "Show or hide the toolbar\nToggle ToolBar"\r
653 ID_VIEW_STATUS_BAR "Show or hide the status bar\nToggle StatusBar"\r
654 END\r
655 \r
656 STRINGTABLE\r
657 BEGIN\r
658 AFX_IDS_SCSIZE "Change the window size"\r
659 AFX_IDS_SCMOVE "Change the window position"\r
660 AFX_IDS_SCMINIMIZE "Reduce the window to an icon"\r
661 AFX_IDS_SCMAXIMIZE "Enlarge the window to full size"\r
662 AFX_IDS_SCNEXTWINDOW "Switch to the next document window"\r
663 AFX_IDS_SCPREVWINDOW "Switch to the previous document window"\r
664 AFX_IDS_SCCLOSE "Close the active window and prompts to save the documents"\r
665 END\r
666 \r
667 STRINGTABLE\r
668 BEGIN\r
669 AFX_IDS_SCRESTORE "Restore the window to normal size"\r
670 AFX_IDS_SCTASKLIST "Activate Task List"\r
671 END\r
672 \r
673 STRINGTABLE\r
674 BEGIN\r
675 IDS_SELECTFILE "Select File..."\r
676 IDS_SELECTDIFFFILE "Select patch file..."\r
677 END\r
678 \r
679 STRINGTABLE\r
680 BEGIN\r
681 ID_VIEW_WHITESPACES "Show special characters for whitespaces and newlines\nShow Whitespaces"\r
682 ID_VIEW_ONEWAYDIFF "Switch between single and double pane view\nSwitch between single and double pane view"\r
683 ID_NAVIGATE_NEXTDIFFERENCE "Go to the next difference\nNext difference"\r
684 ID_NAVIGATE_PREVIOUSDIFFERENCE \r
685 "Go to the previous difference\nPrevious difference"\r
686 ID_VIEW_OPTIONS "Adjust the settings\nSettings"\r
687 END\r
688 \r
689 STRINGTABLE\r
690 BEGIN\r
691 IDS_ERR_PATCH_NOINDEX "The line 'Index: ' was not found!\nEither this is not a diff file or the diff is empty."\r
692 IDS_ERR_PATCH_NOEQUATIONCHARLINE \r
693 "The line '====' was expected in line %d !"\r
694 IDS_ERR_PATCH_NOREMOVEFILELINE \r
695 "The line indicating the old file was expected in line %d !"\r
696 IDS_ERR_PATCH_NOADDFILELINE \r
697 "The line indicating the new file was expected in line %d !"\r
698 IDS_ERR_PATCH_RENAMINGNOTSUPPORTED \r
699 "The old file does not match the new file.\nRenaming of files is not (yet) supported!"\r
700 IDS_ERR_PATCH_CHUNKSTARTNOTFOUND \r
701 "The chunk start '@@' was expected in line %d !"\r
702 IDS_ERR_PATCH_UNKOWNLINETYPE "An unknown line type was found in line %d !"\r
703 IDS_ERR_PATCH_CHUNKMISMATCH \r
704 "The chunk size did not match the number of added/removed lines!"\r
705 END\r
706 \r
707 STRINGTABLE\r
708 BEGIN\r
709 IDS_ERR_PATCH_INVALIDPATCHFILE "The file %s does not exist!"\r
710 IDS_ERR_PATCH_FILENOTINPATCH \r
711 "The file %s was not found in the patch file!"\r
712 IDS_ERR_PATCH_DOESNOTMATCH \r
713 "The patch seems outdated! The file line\n%s\nand the patchline\n%s\ndo not match!"\r
714 IDS_ERR_PATCH_FILESAVE "Could not save the file %s!"\r
715 END\r
716 \r
717 STRINGTABLE\r
718 BEGIN\r
719 IDS_ERR_MAINFRAME_FILEVERSIONNOTFOUND \r
720 "Could not retrieve revision %s of the file %s.\nPatching is not possible!"\r
721 IDS_ERR_MAINFRAME_FILEHASCONFLICTS \r
722 "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
723 END\r
724 \r
725 STRINGTABLE\r
726 BEGIN\r
727 ID_INDICATOR_LEFTVIEW " "\r
728 ID_INDICATOR_RIGHTVIEW " "\r
729 ID_INDICATOR_BOTTOMVIEW " "\r
730 END\r
731 \r
732 STRINGTABLE\r
733 BEGIN\r
734 IDS_STATUSBAR_REMOVEDLINES "- %d"\r
735 IDS_STATUSBAR_ADDEDLINES "+ %d"\r
736 IDS_STATUSBAR_CONFLICTEDLINES "! %d"\r
737 IDS_STATUSBAR_LEFTVIEW "Left View: "\r
738 IDS_STATUSBAR_RIGHTVIEW "Right View: "\r
739 IDS_STATUSBAR_CONFLICTS "Conflicts: %d"\r
740 END\r
741 \r
742 STRINGTABLE\r
743 BEGIN\r
744 IDS_VIEWCONTEXTMENU_USETHISBLOCK "Use th&is text block"\r
745 IDS_VIEWCONTEXTMENU_USETHEIRBLOCK "Use text block from '&theirs'"\r
746 IDS_VIEWCONTEXTMENU_USEYOURBLOCK "Use text block from '&mine'"\r
747 IDS_VIEWCONTEXTMENU_USETHEIRANDYOURBLOCK \r
748 "Use text block from 't&heirs' before 'mine'"\r
749 IDS_VIEWCONTEXTMENU_USEYOURANDTHEIRBLOCK \r
750 "Use text block from 'm&ine' before 'theirs'"\r
751 IDS_VIEWCONTEXTMENU_USETHISFILE "Use this &whole file"\r
752 IDS_VIEWCONTEXTMENU_USEOTHERBLOCK "Use &other text block"\r
753 IDS_VIEWCONTEXTMENU_USEOTHERFILE "Use whole other &file"\r
754 IDS_VIEWCONTEXTMENU_USEBOTHTHISFIRST \r
755 "Use both text blocks (this one first)"\r
756 IDS_VIEWCONTEXTMENU_USEBOTHTHISLAST "Use both text blocks (this one last)"\r
757 END\r
758 \r
759 STRINGTABLE\r
760 BEGIN\r
761 IDS_SAVEASTITLE "Save as..."\r
762 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
763 IDS_OPENDIFFFILETITLE "Apply Patch..."\r
764 IDS_GETVERSIONOFFILETITLE "Fetching file..."\r
765 IDS_GETVERSIONOFFILE "Fetching revision %s of file:"\r
766 IDS_WARNMODIFIEDLOOSECHANGES \r
767 "There are unsaved modifications!\nDo you want to save your changes?"\r
768 IDS_ASKFORSAVE "Do you want to save your changes?"\r
769 IDS_WARNMODIFIEDLOOSECHANGESOPTIONS \r
770 "Do you want to reload the documents to reflect the settings changes?\nNote: you will lose all changes you've made!"\r
771 END\r
772 \r
773 STRINGTABLE\r
774 BEGIN\r
775 IDS_ERR_DIFF_DIFF "The diffing engine aborted because of an error:\n%s"\r
776 IDS_ERR_DIFF_NEWLINES "Cannot show diff because of inconsistent newlines in the file."\r
777 END\r
778 \r
779 STRINGTABLE\r
780 BEGIN\r
781 IDS_ERR_FILE_OPEN "Could not open the file\n%s"\r
782 IDS_ERR_FILE_BINARY "The file\n%s\nis not a valid text file!"\r
783 IDS_ERR_FILE_NOTAFILE "%s\nis a directory, not a file!\nTortoiseGitMerge can't diff directories."\r
784 IDS_ERR_FILE_TOOBIG "The file is too big"\r
785 END\r
786 \r
787 STRINGTABLE\r
788 BEGIN\r
789 ID_FILE_OPEN "Open files for diff or to apply a patch\nOpen files"\r
790 ID_FILE_SAVE "Save the modified file\nSave file"\r
791 ID_FILE_SAVE_AS "Save the modified file\nSave file"\r
792 END\r
793 \r
794 STRINGTABLE\r
795 BEGIN\r
796 IDS_ABOUTVERSION "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\nlibsvn_diff %d.%d.%d, %s\r\napr %d.%d.%d\r\napr-utils %d.%d.%d"\r
797 IDS_ABOUTVERSIONBOX "TortoiseGitMerge %d.%d.%d.%d - %s, %s"\r
798 IDS_SETTINGSTITLE "Settings"\r
799 END\r
800 \r
801 STRINGTABLE\r
802 BEGIN\r
803 IDS_COMMONFILEFILTER "All Files (*.*)|*.*||"\r
804 IDS_PATCHFILEFILTER "Patchfiles (*.diff, *.patch)|*.diff;*.patch|All Files (*.*)|*.*||"\r
805 END\r
806 \r
807 STRINGTABLE\r
808 BEGIN\r
809 IDS_PATCH_ALL "Patch all files"\r
810 IDS_PATCH_TITLE "File patches"\r
811 IDS_DIFF_TITLE "File diffs"\r
812 IDS_PATCH_SELECTED "Patch selected files"\r
813 IDS_PATCH_PREVIEW "Preview patched file"\r
814 IDS_PATCH_ITEMTT "%s\nCould not be cleanly patched."\r
815 IDS_PATCH_COPYFROMCLIPBOARD "Open from clipboard"\r
816 END\r
817 \r
818 STRINGTABLE\r
819 BEGIN\r
820 ID_FILE_RELOAD "Reloads the opened files and reverts all changes.\nReload"\r
821 END\r
822 \r
823 STRINGTABLE\r
824 BEGIN\r
825 ID_NAVIGATE_PREVIOUSCONFLICT \r
826 "Go to the previous conflict\nPrevious conflict"\r
827 ID_NAVIGATE_NEXTCONFLICT "Go to the next conflict\nNext conflict"\r
828 ID_EDIT_MARKASRESOLVED "Marks a file as resolved in Git\nMark as resolved"\r
829 ID_VIEW_SWITCHLEFT "Switch the contents of the left and right view\nSwitch left and right view"\r
830 END\r
831 \r
832 STRINGTABLE\r
833 BEGIN\r
834 ID_VIEW_SHOWFILELIST "Hide/Show the patch file list\nHides or shows the patch file list"\r
835 ID_EDIT_USETHEIRBLOCK "Use text block from 'theirs'\nUse 'theirs' text block"\r
836 ID_EDIT_USEMYBLOCK "Use text block from 'mine'\nUse 'mine' text block"\r
837 ID_EDIT_USETHEIRTHENMYBLOCK \r
838 "Use text block from 'theirs' before 'mine'\nUse 'theirs' text block then 'mine'"\r
839 ID_EDIT_USEMINETHENTHEIRBLOCK \r
840 "Use text block from 'mine' before 'theirs'\nUse 'mine' text block then 'theirs'"\r
841 ID_VIEW_INLINEDIFFWORD "Show Inline-Diff word by word\nInline diff word-wise"\r
842 ID_EDIT_CREATEUNIFIEDDIFFFILE \r
843 "Creates a patch file from the differences of the two files\nCreate patch file"\r
844 END\r
845 \r
846 STRINGTABLE\r
847 BEGIN\r
848 IDS_WARNBETTERPATCHPATHFOUND \r
849 "The path\n%s\nseems not to match the paths in the patchfile.\nBut TortoiseGitMerge found the path\n%s\nmatches it better. Do you want to use the suggested path instead?"\r
850 IDS_NOTFOUNDVIEWTITLEINDICATOR "(not found)"\r
851 IDS_WARNABSOLUTEPATHFOUND \r
852 "The path\n%s\nin the patchfile does not exist.\nTortoiseGitMerge found the relative path\n%s\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
853 IDS_WARNABSOLUTEPATHNOTFOUND \r
854 "The path\n%s\nin the patchfile does not exist.\nTortoiseGitMerge tried to apply the patch by stripping prefixes but no matching path could be found."\r
855 IDS_DELETEWHENEMPTY "The file \n%s\nis empty.\nDo you want to remove the file?"\r
856 IDS_EMPTYLINETT "(no line number)"\r
857 IDS_WARNMODIFIEDOUTSIDELOOSECHANGES \r
858 "Some file(s) have been changed outside TortoiseGitMerge.\nWould you like to reload and lose your changes?"\r
859 IDS_WARNMODIFIEDOUTSIDE "Some file(s) have been changed outside TortoiseGitMerge.\nDo you want to load the changes?"\r
860 END\r
861 \r
862 STRINGTABLE\r
863 BEGIN\r
864 IDS_VIEWTITLE_THEIRS "Theirs"\r
865 IDS_VIEWTITLE_MERGED "Merged"\r
866 IDS_VIEWTITLE_MINE "Mine"\r
867 END\r
868 \r
869 STRINGTABLE\r
870 BEGIN\r
871 IDS_COLOURPICKER_CUSTOMTEXT "More colors..."\r
872 IDS_COLOURPICKER_DEFAULTTEXT "Automatic"\r
873 END\r
874 \r
875 STRINGTABLE\r
876 BEGIN\r
877 IDS_VIEWSCROLLTIPTEXT "Line: %*ld"\r
878 END\r
879 \r
880 STRINGTABLE\r
881 BEGIN\r
882 IDS_EDIT_COPY "&Copy"\r
883 IDS_EDIT_CUT "C&ut"\r
884 IDS_EDIT_PASTE "&Paste"\r
885 END\r
886 \r
887 STRINGTABLE\r
888 BEGIN\r
889 IDC_STYLEBUTTON "Change the style of the application\nChange Style"\r
890 ID_VIEW_APPLOOK_WIN7 "Windows 7"\r
891 ID_VIEW_APPLOOK_VS_2008 "Visual Studio 2008"\r
892 ID_VIEW_APPLOOK_WIN_2000 "Windows 2000"\r
893 ID_VIEW_APPLOOK_OFF_XP "Office XP"\r
894 ID_VIEW_APPLOOK_WIN_XP "Windows XP"\r
895 ID_VIEW_APPLOOK_OFF_2003 "Office 2003"\r
896 ID_VIEW_APPLOOK_VS_2005 "Visual Studio 2005"\r
897 ID_OFFICE2007 "Office 2007 colors"\r
898 ID_VIEW_APPLOOK_OFF_2007_BLUE "Blue Style"\r
899 ID_VIEW_APPLOOK_OFF_2007_BLACK "Black Style"\r
900 ID_VIEW_APPLOOK_OFF_2007_SILVER "Silver Style"\r
901 ID_VIEW_APPLOOK_OFF_2007_AQUA "Aqua Style"\r
902 END\r
903 \r
904 STRINGTABLE\r
905 BEGIN\r
906 ID_VIEW_LINEDIFFBAR "Show or hide the line diff bar\nToggle LineDiffBar"\r
907 ID_VIEW_LOCATORBAR "Show or hide the locator bar\nToggle LocatorBar"\r
908 ID_EDIT_USELEFTBLOCK "Use text block from the left view\nUse left block"\r
909 ID_EDIT_USELEFTFILE "Use all content from the left view\nUse left file"\r
910 ID_EDIT_USEBLOCKFROMLEFTBEFORERIGHT \r
911 "Use block from left view before block from right view\nUse block from left before right"\r
912 ID_EDIT_USEBLOCKFROMRIGHTBEFORELEFT \r
913 "Use block from right view before block from left view\nUse block from right before left"\r
914 END\r
915 \r
916 STRINGTABLE\r
917 BEGIN\r
918 IDS_PATCH_SEARCHPATHTITLE "Searching for better path to apply patch..."\r
919 IDS_PATCH_SEARCHPATHLINE1 "scanning path:"\r
920 IDS_PATCH_PROGTITLE "Patching"\r
921 IDS_PATCH_PATHINGFILE "Patching file '%s'"\r
922 END\r
923 \r
924 STRINGTABLE\r
925 BEGIN\r
926 ID_VIEW_COLLAPSED "Collapse unchanged sections\nCollapse"\r
927 ID_VIEW_COMPAREWHITESPACES \r
928 "Compares all whitespaces when diffing\nCompare whitespaces"\r
929 ID_VIEW_IGNOREWHITESPACECHANGES \r
930 "Ignores changes in whitespaces when diffing\nIgnore whitespace changes"\r
931 ID_VIEW_IGNOREALLWHITESPACECHANGES \r
932 "Ignores all whitespace changes when diffing\nIgnore all whitespace changes"\r
933 ID_NAVIGATE_NEXTINLINEDIFF \r
934 "Go to the previous inline difference\nPrevious inline difference"\r
935 ID_NAVIGATE_PREVINLINEDIFF \r
936 "Go to the next inline difference\nNext inline difference"\r
937 END\r
938 \r
939 STRINGTABLE\r
940 BEGIN\r
941 ID_VIEW_MOVEDBLOCKS "Detect and highlight moved blocks"\r
942 ID_VIEW_WRAPLONGLINES "Wrap long lines at the right border of the view\nWrap long lines"\r
943 ID_VIEW_INLINEDIFF "Show Inline-Diff\nInline diff"\r
944 ID_EDIT_GOTOLINE "Navigate to a specific line in the view\nGoto Line"\r
945 END\r
946 \r
947 STRINGTABLE\r
948 BEGIN\r
949 IDS_ERR_THREADSTARTFAILED "Could not start thread!"\r
950 END\r
951 \r
952 STRINGTABLE\r
953 BEGIN\r
954 IDS_APPNAME "TortoiseGitMerge"\r
955 END\r
956 \r
957 STRINGTABLE\r
958 BEGIN\r
959 IDS_ERR_DIFFVIEWSTART "Could not start diff viewer!\n%s"\r
960 IDS_ERR_PATCHPATHS "Both the path to the patch file and the target path must be absolute paths!"\r
961 END\r
962 \r
963 STRINGTABLE\r
964 BEGIN\r
965 IDS_UTILS_SELECTTEXTVIEWER "Select text editor application"\r
966 END\r
967 \r
968 STRINGTABLE\r
969 BEGIN\r
970 IDS_ERR_TEXTVIEWSTART "Could not start text viewer!\n%s"\r
971 END\r
972 \r
973 STRINGTABLE\r
974 BEGIN\r
975 IDS_MOVED_FROM_TT "Line moved from line %ld"\r
976 IDS_MOVED_TO_TT "Line moved to line %ld"\r
977 END\r
978 \r
979 STRINGTABLE\r
980 BEGIN\r
981 IDS_GOTOLINE "&Line number (%d - %d)"\r
982 IDS_GOTO_OUTOFRANGE "The line number must be in between %d and %d"\r
983 END\r
984 \r
985 STRINGTABLE\r
986 BEGIN\r
987 ID_LOGOBUTTON "TortoiseGitMerge"\r
988 END\r
989 \r
990 STRINGTABLE\r
991 BEGIN\r
992 ID_APPLOOK "Changes the style of the application"\r
993 END\r
994 \r
995 STRINGTABLE\r
996 BEGIN\r
997 ID_USEBLOCKS "Click to see commands to move blocks of text\nUse text blocks"\r
998 END\r
999 \r
1000 STRINGTABLE\r
1001 BEGIN\r
1002 IDS_MSGBOX_OK "&OK"\r
1003 IDS_MSGBOX_CANCEL "&Cancel"\r
1004 IDS_MSGBOX_IGNORE "Ignore"\r
1005 IDS_MSGBOX_RETRY "Retry"\r
1006 IDS_MSGBOX_ABORT "Abort"\r
1007 IDS_MSGBOX_HELP "&Help"\r
1008 IDS_MSGBOX_YES "Yes"\r
1009 END\r
1010 \r
1011 STRINGTABLE\r
1012 BEGIN\r
1013 IDS_MSGBOX_NO "No"\r
1014 IDS_MSGBOX_CONTINUE "Continue"\r
1015 IDS_MSGBOX_DONOTASKAGAIN "Don't ask me again"\r
1016 IDS_MSGBOX_DONOTTELLAGAIN "Don't tell me again"\r
1017 IDS_MSGBOX_DONOTSHOWAGAIN "Don't show this message again"\r
1018 IDS_MSGBOX_YESTOALL "Yes to all"\r
1019 IDS_MSGBOX_NOTOALL "No to all"\r
1020 IDS_MSGBOX_TRYAGAIN "Try again"\r
1021 IDS_MSGBOX_REPORT "Report"\r
1022 IDS_MSGBOX_IGNOREALL "Ignore all"\r
1023 IDS_MSGBOX_SKIP "Skip"\r
1024 IDS_MSGBOX_SKIPALL "Skip all"\r
1025 END\r
1026 \r
1027 STRINGTABLE\r
1028 BEGIN\r
1029 IDS_MARKASRESOLVED "Do you want to mark the file\n%s\nas resolved?"\r
1030 END\r
1031 \r
1032 STRINGTABLE\r
1033 BEGIN\r
1034 ID_EDIT_ENABLE "Allow Editing for this view\nAllow Edit"\r
1035 END\r
1036 \r
1037 #endif // English (United States) resources\r
1038 /////////////////////////////////////////////////////////////////////////////\r
1039 \r
1040 \r
1041 /////////////////////////////////////////////////////////////////////////////\r
1042 // German (Switzerland) resources\r
1043 \r
1044 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DES)\r
1045 LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_SWISS\r
1046 #pragma code_page(1252)\r
1047 \r
1048 /////////////////////////////////////////////////////////////////////////////\r
1049 //\r
1050 // Dialog\r
1051 //\r
1052 \r
1053 IDD_GOTO DIALOGEX 0, 0, 175, 69\r
1054 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
1055 CAPTION "Go To Line"\r
1056 FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
1057 BEGIN\r
1058 DEFPUSHBUTTON "OK",IDOK,59,48,50,14\r
1059 PUSHBUTTON "Cancel",IDCANCEL,118,48,50,14\r
1060 LTEXT "&Line number",IDC_LINELABEL,7,7,161,8\r
1061 EDITTEXT IDC_NUMBER,7,20,161,14,ES_AUTOHSCROLL | ES_NUMBER\r
1062 END\r
1063 \r
1064 \r
1065 /////////////////////////////////////////////////////////////////////////////\r
1066 //\r
1067 // DESIGNINFO\r
1068 //\r
1069 \r
1070 #ifdef APSTUDIO_INVOKED\r
1071 GUIDELINES DESIGNINFO\r
1072 BEGIN\r
1073 IDD_GOTO, DIALOG\r
1074 BEGIN\r
1075 LEFTMARGIN, 7\r
1076 RIGHTMARGIN, 168\r
1077 TOPMARGIN, 7\r
1078 BOTTOMMARGIN, 62\r
1079 END\r
1080 END\r
1081 #endif // APSTUDIO_INVOKED\r
1082 \r
1083 \r
1084 #ifdef APSTUDIO_INVOKED\r
1085 /////////////////////////////////////////////////////////////////////////////\r
1086 //\r
1087 // TEXTINCLUDE\r
1088 //\r
1089 \r
1090 1 TEXTINCLUDE \r
1091 BEGIN\r
1092 "..\\TortoiseMerge\\resource.h\0"\r
1093 END\r
1094 \r
1095 2 TEXTINCLUDE \r
1096 BEGIN\r
1097 "#include <afxres.h>\r\n"\r
1098 "\0"\r
1099 END\r
1100 \r
1101 3 TEXTINCLUDE \r
1102 BEGIN\r
1103 "#define _AFX_NO_SPLITTER_RESOURCES\r\n"\r
1104 "#define _AFX_NO_OLE_RESOURCES\r\n"\r
1105 "#define _AFX_NO_TRACKER_RESOURCES\r\n"\r
1106 "#define _AFX_NO_PROPERTY_RESOURCES\r\n"\r
1107 "\r\n"\r
1108 "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"\r
1109 "LANGUAGE 9, 1\r\n"\r
1110 "#pragma code_page(1252)\r\n"\r
1111 "#include ""TortoiseMerge.rc2"" // non-Microsoft Visual C++ edited resources\r\n"\r
1112 "#include <afxres.rc> // Standard components\r\n"\r
1113 "#include <afxprint.rc> // printing/print preview resources\r\n"\r
1114 "#include <afxribbon.rc> // ribbon and control bar resources\r\n"\r
1115 "#include <afxolecl.rc> // OLE container resources\r\n"\r
1116 "#endif\r\n"\r
1117 "\0"\r
1118 END\r
1119 \r
1120 #endif // APSTUDIO_INVOKED\r
1121 \r
1122 #endif // German (Switzerland) resources\r
1123 /////////////////////////////////////////////////////////////////////////////\r
1124 \r
1125 \r
1126 \r
1127 #ifndef APSTUDIO_INVOKED\r
1128 /////////////////////////////////////////////////////////////////////////////\r
1129 //\r
1130 // Generated from the TEXTINCLUDE 3 resource.\r
1131 //\r
1132 #define _AFX_NO_SPLITTER_RESOURCES\r
1133 #define _AFX_NO_OLE_RESOURCES\r
1134 #define _AFX_NO_TRACKER_RESOURCES\r
1135 #define _AFX_NO_PROPERTY_RESOURCES\r
1136 \r
1137 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r
1138 LANGUAGE 9, 1\r
1139 #pragma code_page(1252)\r
1140 #include "TortoiseMerge.rc2" // non-Microsoft Visual C++ edited resources\r
1141 #include <afxres.rc> // Standard components\r
1142 #include <afxprint.rc> // printing/print preview resources\r
1143 #include <afxribbon.rc> // ribbon and control bar resources\r
1144 #include <afxolecl.rc> // OLE container resources\r
1145 #endif\r
1146 \r
1147 /////////////////////////////////////////////////////////////////////////////\r
1148 #endif // not APSTUDIO_INVOKED\r
1149 \r