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