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