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