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