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