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