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