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