| blob | 8cca97acf0bf3f245959261a21b553e8f02083c4 |
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 | 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 MENUITEM SEPARATOR\r
543 POPUP "Regex Filter"\r
544 BEGIN\r
545 MENUITEM "Configure Filter Regexes", ID_REGEXFILTER\r
546 END\r
547 MENUITEM "Ignore Comments", ID_VIEW_IGNORECOMMENTS\r
548 END\r
549 POPUP "&Navigate"\r
550 BEGIN\r
551 MENUITEM "Next difference", ID_NAVIGATE_NEXTDIFFERENCE\r
552 MENUITEM "Previous difference", ID_NAVIGATE_PREVIOUSDIFFERENCE\r
553 MENUITEM "Next conflict", ID_NAVIGATE_NEXTCONFLICT\r
554 MENUITEM "Previous conflict", ID_NAVIGATE_PREVIOUSCONFLICT\r
555 MENUITEM "Next inline difference", ID_NAVIGATE_NEXTINLINEDIFF\r
556 MENUITEM "Previous inline difference", ID_NAVIGATE_PREVINLINEDIFF\r
557 END\r
558 POPUP "&View"\r
559 BEGIN\r
560 MENUITEM "&Toolbar", ID_VIEW_TOOLBAR\r
561 MENUITEM "&Status Bar", ID_VIEW_STATUS_BAR\r
562 MENUITEM "Line diff bar", ID_VIEW_LINEDIFFBAR, CHECKED\r
563 MENUITEM "Locator Bar", ID_VIEW_LOCATORBAR\r
564 MENUITEM SEPARATOR\r
565 MENUITEM "Wrap long lines", ID_VIEW_WRAPLONGLINES\r
566 MENUITEM "&Moved blocks", ID_VIEW_MOVEDBLOCKS\r
567 MENUITEM "Inline diff", ID_VIEW_INLINEDIFF\r
568 MENUITEM "Inline diff word-wise", ID_VIEW_INLINEDIFFWORD\r
569 MENUITEM "Compare whitespaces", ID_VIEW_COMPAREWHITESPACES\r
570 MENUITEM "Ignore whitespace changes", ID_VIEW_IGNOREWHITESPACECHANGES\r
571 MENUITEM "Ignore all whitespace changes", ID_VIEW_IGNOREALLWHITESPACECHANGES\r
572 MENUITEM "Ignore Comments", ID_VIEW_IGNORECOMMENTS\r
573 MENUITEM SEPARATOR\r
574 MENUITEM "Show Whitespaces", ID_VIEW_WHITESPACES\r
575 MENUITEM "Switch between single and double pane view", ID_VIEW_ONEWAYDIFF\r
576 MENUITEM "Switch left and right view", ID_VIEW_SWITCHLEFT\r
577 MENUITEM "Collapse", ID_VIEW_COLLAPSED\r
578 MENUITEM SEPARATOR\r
579 MENUITEM "Settings", ID_VIEW_OPTIONS\r
580 MENUITEM SEPARATOR\r
581 MENUITEM "Hide/Show the patch file list", ID_VIEW_SHOWFILELIST\r
582 MENUITEM SEPARATOR\r
583 POPUP "Style"\r
584 BEGIN\r
585 MENUITEM "Windows 2000", ID_VIEW_APPLOOK_WIN_2000\r
586 MENUITEM "Office XP", ID_VIEW_APPLOOK_OFF_XP\r
587 MENUITEM "Windows XP", ID_VIEW_APPLOOK_WIN_XP\r
588 MENUITEM "Office 2003", ID_VIEW_APPLOOK_OFF_2003\r
589 MENUITEM "Visual Studio 2005", ID_VIEW_APPLOOK_VS_2005\r
590 MENUITEM "Visual Studio 2008", ID_VIEW_APPLOOK_VS_2008\r
591 MENUITEM "Windows 7", ID_VIEW_APPLOOK_WIN7\r
592 POPUP "Office 2007 colors"\r
593 BEGIN\r
594 MENUITEM "Blue Style", ID_VIEW_APPLOOK_OFF_2007_BLUE\r
595 MENUITEM "Black Style", ID_VIEW_APPLOOK_OFF_2007_BLACK\r
596 MENUITEM "Silver Style", ID_VIEW_APPLOOK_OFF_2007_SILVER\r
597 MENUITEM "Aqua Style", ID_VIEW_APPLOOK_OFF_2007_AQUA\r
598 END\r
599 END\r
600 END\r
601 POPUP "&Help"\r
602 BEGIN\r
603 MENUITEM "&Help Topics", ID_HELP\r
604 MENUITEM SEPARATOR\r
605 MENUITEM "&About TortoiseGitMerge...", ID_APP_ABOUT\r
606 END\r
607 END\r
608 \r
609 \r
610 /////////////////////////////////////////////////////////////////////////////\r
611 //\r
612 // Accelerator\r
613 //\r
614 \r
615 IDR_MAINFRAME ACCELERATORS\r
616 BEGIN\r
617 "Q", ID_APP_EXIT, VIRTKEY, CONTROL, NOINVERT\r
618 VK_ESCAPE, ID_APP_EXIT, VIRTKEY, NOINVERT\r
619 "W", ID_APP_EXIT, VIRTKEY, CONTROL, NOINVERT\r
620 VK_DOWN, ID_CARET_DOWN, VIRTKEY, NOINVERT\r
621 VK_DOWN, ID_CARET_DOWN, VIRTKEY, SHIFT, NOINVERT\r
622 VK_LEFT, ID_CARET_LEFT, VIRTKEY, NOINVERT\r
623 VK_LEFT, ID_CARET_LEFT, VIRTKEY, SHIFT, NOINVERT\r
624 VK_RIGHT, ID_CARET_RIGHT, VIRTKEY, NOINVERT\r
625 VK_RIGHT, ID_CARET_RIGHT, VIRTKEY, SHIFT, NOINVERT\r
626 VK_UP, ID_CARET_UP, VIRTKEY, NOINVERT\r
627 VK_UP, ID_CARET_UP, VIRTKEY, SHIFT, NOINVERT\r
628 VK_LEFT, ID_CARET_WORDLEFT, VIRTKEY, CONTROL, NOINVERT\r
629 VK_LEFT, ID_CARET_WORDLEFT, VIRTKEY, SHIFT, CONTROL, NOINVERT\r
630 VK_RIGHT, ID_CARET_WORDRIGHT, VIRTKEY, CONTROL, NOINVERT\r
631 VK_RIGHT, ID_CARET_WORDRIGHT, VIRTKEY, SHIFT, CONTROL, NOINVERT\r
632 VK_F1, ID_CONTEXT_HELP, VIRTKEY, SHIFT, NOINVERT\r
633 "C", ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT\r
634 VK_INSERT, ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT\r
635 VK_DELETE, ID_EDIT_CUT, VIRTKEY, SHIFT, NOINVERT\r
636 "X", ID_EDIT_CUT, VIRTKEY, CONTROL, NOINVERT\r
637 "F", ID_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT\r
638 VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT\r
639 VK_F3, ID_EDIT_FINDNEXTSTART, VIRTKEY, CONTROL, NOINVERT\r
640 VK_F3, ID_EDIT_FINDPREV, VIRTKEY, SHIFT, NOINVERT\r
641 VK_F3, ID_EDIT_FINDPREVSTART, VIRTKEY, SHIFT, CONTROL, NOINVERT\r
642 "G", ID_EDIT_GOTOLINE, VIRTKEY, CONTROL, NOINVERT\r
643 "V", ID_EDIT_PASTE, VIRTKEY, CONTROL, NOINVERT\r
644 VK_INSERT, ID_EDIT_PASTE, VIRTKEY, SHIFT, NOINVERT\r
645 VK_INSERT, ID_EDIT_PASTE, VIRTKEY, SHIFT, NOINVERT\r
646 "A", ID_EDIT_SELECTALL, VIRTKEY, CONTROL, NOINVERT\r
647 VK_BACK, ID_EDIT_UNDO, VIRTKEY, ALT, NOINVERT\r
648 "Z", ID_EDIT_UNDO, VIRTKEY, CONTROL, NOINVERT\r
649 VK_F12, ID_EDIT_USELEFTBLOCK, VIRTKEY, NOINVERT\r
650 VK_RIGHT, ID_EDIT_USELEFTBLOCK, VIRTKEY, ALT, NOINVERT\r
651 VK_F10, ID_EDIT_USEMINETHENTHEIRBLOCK, VIRTKEY, SHIFT, CONTROL, NOINVERT\r
652 VK_F10, ID_EDIT_USEMYBLOCK, VIRTKEY, CONTROL, NOINVERT\r
653 VK_F12, ID_EDIT_USEMYBLOCK, VIRTKEY, SHIFT, NOINVERT\r
654 VK_F9, ID_EDIT_USETHEIRBLOCK, VIRTKEY, CONTROL, NOINVERT\r
655 VK_F9, ID_EDIT_USETHEIRTHENMYBLOCK, VIRTKEY, SHIFT, CONTROL, NOINVERT\r
656 "O", ID_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT\r
657 "R", ID_FILE_RELOAD, VIRTKEY, CONTROL, NOINVERT\r
658 VK_F5, ID_FILE_RELOAD, VIRTKEY, NOINVERT\r
659 "S", ID_FILE_SAVE, VIRTKEY, CONTROL, NOINVERT\r
660 "S", ID_FILE_SAVE_AS, VIRTKEY, SHIFT, CONTROL, NOINVERT\r
661 VK_F1, ID_HELP, VIRTKEY, NOINVERT\r
662 VK_F8, ID_NAVIGATE_NEXTCONFLICT, VIRTKEY, NOINVERT\r
663 VK_DOWN, ID_NAVIGATE_NEXTDIFFERENCE, VIRTKEY, CONTROL, NOINVERT\r
664 VK_DOWN, ID_NAVIGATE_NEXTDIFFERENCE, VIRTKEY, ALT, NOINVERT\r
665 VK_F11, ID_NAVIGATE_NEXTDIFFERENCE, VIRTKEY, NOINVERT\r
666 VK_F7, ID_NAVIGATE_NEXTDIFFERENCE, VIRTKEY, NOINVERT\r
667 VK_RIGHT, ID_NAVIGATE_NEXTINLINEDIFF, VIRTKEY, CONTROL, ALT, NOINVERT\r
668 VK_LEFT, ID_NAVIGATE_PREVINLINEDIFF, VIRTKEY, CONTROL, ALT, NOINVERT\r
669 VK_F8, ID_NAVIGATE_PREVIOUSCONFLICT, VIRTKEY, SHIFT, NOINVERT\r
670 VK_F11, ID_NAVIGATE_PREVIOUSDIFFERENCE, VIRTKEY, CONTROL, NOINVERT\r
671 VK_F11, ID_NAVIGATE_PREVIOUSDIFFERENCE, VIRTKEY, SHIFT, NOINVERT\r
672 VK_F7, ID_NAVIGATE_PREVIOUSDIFFERENCE, VIRTKEY, SHIFT, NOINVERT\r
673 VK_UP, ID_NAVIGATE_PREVIOUSDIFFERENCE, VIRTKEY, CONTROL, NOINVERT\r
674 VK_UP, ID_NAVIGATE_PREVIOUSDIFFERENCE, VIRTKEY, ALT, NOINVERT\r
675 VK_F6, ID_NEXT_PANE, VIRTKEY, NOINVERT\r
676 VK_F6, ID_PREV_PANE, VIRTKEY, SHIFT, NOINVERT\r
677 "L", ID_VIEW_COLLAPSED, VIRTKEY, CONTROL, NOINVERT\r
678 "D", ID_VIEW_ONEWAYDIFF, VIRTKEY, CONTROL, NOINVERT\r
679 "U", ID_VIEW_SWITCHLEFT, VIRTKEY, CONTROL, NOINVERT\r
680 "T", ID_VIEW_WHITESPACES, VIRTKEY, CONTROL, NOINVERT\r
681 "P", ID_VIEW_WRAPLONGLINES, VIRTKEY, CONTROL, NOINVERT\r
682 "E", ID_EDIT_ENABLE, VIRTKEY, CONTROL, NOINVERT\r
683 END\r
684 \r
685 \r
686 /////////////////////////////////////////////////////////////////////////////\r
687 //\r
688 // Ribbon\r
689 //\r
690 \r
691 IDR_RIBBON RT_RIBBON_XML "ribbon.mfcribbon-ms"\r
692 \r
693 \r
694 /////////////////////////////////////////////////////////////////////////////\r
695 //\r
696 // CONFIG\r
697 //\r
698 \r
699 IDR_REGEXFILTERINI CONFIG "RegexFilter.ini"\r
700 IDR_IGNORECOMMENTSTXT CONFIG "ignorecomments.txt"\r
701 \r
702 /////////////////////////////////////////////////////////////////////////////\r
703 //\r
704 // String Table\r
705 //\r
706 \r
707 STRINGTABLE\r
708 BEGIN\r
709 IDR_MAINFRAME "TortoiseGitMerge"\r
710 IDS_TITLE_REJECTEDHUNKS "Rejected patch hunks for '%s'"\r
711 IDS_CONFIGUREREGEXES "Configure Filter Regexes"\r
712 IDS_ASKFORSAVE_MARKEDBLOCKS "Marked Blocks"\r
713 IDS_WARNMARKEDBLOCKS "You have marked changed blocks. How should those blocks be saved?"\r
714 IDS_MARKEDBLOCKSSAVEINCLUDE \r
715 "Save and include\nYour changes are saved and the marked blocks are included"\r
716 IDS_MARKEDBLOCKSSAVEEXCLUDE \r
717 "Save and exclude\nYour changes are saved and the original content is used"\r
718 IDS_MARKEDBLCOKSSAVEIGNORE \r
719 "Save and ignore marked blocks\nOnly your manual edits are saved, marked blocks are left as they are"\r
720 IDS_MSGBOX_YES "&Yes"\r
721 IDS_MSGBOX_NO "&No"\r
722 IDS_MSGBOX_CANCEL "Cancel"\r
723 END\r
724 \r
725 STRINGTABLE\r
726 BEGIN\r
727 IDS_PATH "Path"\r
728 IDS_STATE "State"\r
729 IDS_STATE_ERROR "Error"\r
730 IDS_STATE_PATCHED "patched"\r
731 IDS_STATE_CONFLICTS "Conflicted"\r
732 END\r
733 \r
734 STRINGTABLE\r
735 BEGIN\r
736 IDS_ERR_PATCH_FILENAMENOTUNIQUE \r
737 "TortoiseGitMerge cannot process this patch file. The filename ""%s"" appears more than once."\r
738 IDS_ERR_MAINFRAME_FILECONFLICTNOVERSION \r
739 "The patch does not apply cleanly to %s and no version information is given.\nPatching is not possible!"\r
740 IDS_MOVED_FROM_TT "Line moved from line %ld"\r
741 IDS_MOVED_TO_TT "Line moved to line %ld"\r
742 END\r
743 \r
744 STRINGTABLE\r
745 BEGIN\r
746 IDS_ENCODING_COMBO_TOOLTIP \r
747 "Encoding\nConvert to the specified encoding\nHold down the Ctrl key to reload the file with the specified encoding."\r
748 END\r
749 \r
750 STRINGTABLE\r
751 BEGIN\r
752 IDS_FIND_COUNT "Count: %u matches."\r
753 END\r
754 \r
755 STRINGTABLE\r
756 BEGIN\r
757 IDS_FIND_NOTFOUND "Find: Can't find the text ""%s"""\r
758 IDS_FIND_BOTTOMREACHED "Find: First occurrence from the top found. End of document reached."\r
759 IDS_FIND_TOPREACHED "Find: First occurrence from the bottom found. Beginning of document reached."\r
760 IDS_FIND_REPLACED "Replaced %d matches"\r
761 END\r
762 \r
763 STRINGTABLE\r
764 BEGIN\r
765 AFX_IDS_APP_TITLE "TortoiseGitMerge"\r
766 AFX_IDS_IDLEMESSAGE "For Help, press F1. Scroll horizontally with Ctrl-Scrollwheel"\r
767 AFX_IDS_HELPMODEMESSAGE "Select an object on which to get Help"\r
768 END\r
769 \r
770 STRINGTABLE\r
771 BEGIN\r
772 ID_INDICATOR_CAPS "CAP"\r
773 ID_INDICATOR_NUM "NUM"\r
774 END\r
775 \r
776 STRINGTABLE\r
777 BEGIN\r
778 ID_APP_ABOUT "Display program information, version number and copyright\nAbout"\r
779 ID_APP_EXIT "Quit the application; prompts to save documents\nExit"\r
780 ID_HELP_INDEX "Opens Help\nHelp Topics"\r
781 ID_HELP_FINDER "List Help topics\nHelp Topics"\r
782 ID_HELP_USING "Display instructions about how to use help\nHelp"\r
783 ID_CONTEXT_HELP "Display help for clicked on buttons, menus and windows\nHelp"\r
784 ID_HELP "Display help for current task or command\nHelp"\r
785 END\r
786 \r
787 STRINGTABLE\r
788 BEGIN\r
789 ID_NEXT_PANE "Switch to the next window pane\nNext Pane"\r
790 ID_PREV_PANE "Switch back to the previous window pane\nPrevious Pane"\r
791 END\r
792 \r
793 STRINGTABLE\r
794 BEGIN\r
795 ID_WINDOW_SPLIT "Split the active window into panes\nSplit"\r
796 END\r
797 \r
798 STRINGTABLE\r
799 BEGIN\r
800 ID_EDIT_CLEAR "Erase the selection\nErase"\r
801 ID_EDIT_CLEAR_ALL "Erase everything\nErase All"\r
802 ID_EDIT_COPY "Copy the selection and put it on the Clipboard\nCopy"\r
803 ID_EDIT_CUT "Cut the selection and put it on the Clipboard\nCut"\r
804 ID_EDIT_FIND "Find the specified text\nFind"\r
805 ID_EDIT_PASTE "Insert Clipboard contents\nPaste"\r
806 ID_EDIT_REPEAT "Repeat the last action\nRepeat"\r
807 ID_EDIT_REPLACE "Replace specific text with different text\nReplace"\r
808 ID_EDIT_SELECT_ALL "Select the entire document\nSelect All"\r
809 ID_EDIT_UNDO "Undo the last modifications\nUndo"\r
810 ID_EDIT_REDO "Redo the previously undone action\nRedo"\r
811 END\r
812 \r
813 STRINGTABLE\r
814 BEGIN\r
815 ID_VIEW_TOOLBAR "Show or hide the toolbar\nToggle ToolBar"\r
816 ID_VIEW_STATUS_BAR "Show or hide the status bar\nToggle StatusBar"\r
817 END\r
818 \r
819 STRINGTABLE\r
820 BEGIN\r
821 AFX_IDS_SCSIZE "Change the window size"\r
822 AFX_IDS_SCMOVE "Change the window position"\r
823 AFX_IDS_SCMINIMIZE "Reduce the window to an icon"\r
824 AFX_IDS_SCMAXIMIZE "Enlarge the window to full size"\r
825 AFX_IDS_SCNEXTWINDOW "Switch to the next document window"\r
826 AFX_IDS_SCPREVWINDOW "Switch to the previous document window"\r
827 AFX_IDS_SCCLOSE "Close the active window and prompts to save the documents"\r
828 END\r
829 \r
830 STRINGTABLE\r
831 BEGIN\r
832 AFX_IDS_SCRESTORE "Restore the window to normal size"\r
833 AFX_IDS_SCTASKLIST "Activate Task List"\r
834 END\r
835 \r
836 STRINGTABLE\r
837 BEGIN\r
838 IDS_SELECTFILE "Select File..."\r
839 END\r
840 \r
841 STRINGTABLE\r
842 BEGIN\r
843 ID_VIEW_WHITESPACES "Show special characters for whitespaces and newlines\nShow Whitespaces"\r
844 ID_VIEW_ONEWAYDIFF "Switch between single and double pane view\nSwitch between single and double pane view"\r
845 ID_NAVIGATE_NEXTDIFFERENCE "Go to the next difference\nNext difference"\r
846 ID_NAVIGATE_PREVIOUSDIFFERENCE \r
847 "Go to the previous difference\nPrevious difference"\r
848 ID_VIEW_OPTIONS "Adjust the settings\nSettings"\r
849 END\r
850 \r
851 STRINGTABLE\r
852 BEGIN\r
853 IDS_ERR_PATCH_NOADDFILELINE \r
854 "The line indicating the new file was expected in line %d !"\r
855 IDS_ERR_PATCH_UNKOWNLINETYPE "An unknown line type was found in line %d !"\r
856 IDS_ERR_PATCH_CHUNKMISMATCH \r
857 "The chunk size did not match the number of added/removed lines!"\r
858 END\r
859 \r
860 STRINGTABLE\r
861 BEGIN\r
862 IDS_ERR_PATCH_INVALIDPATCHFILE "The file %s does not exist!"\r
863 IDS_ERR_PATCH_FILENOTINPATCH \r
864 "The file %s was not found in the patch file!"\r
865 IDS_ERR_PATCH_DOESNOTMATCH \r
866 "The patch seems outdated! The file line\n%s\nand the patchline\n%s\ndo not match!"\r
867 END\r
868 \r
869 STRINGTABLE\r
870 BEGIN\r
871 IDS_ERR_MAINFRAME_FILEVERSIONNOTFOUND \r
872 "Could not retrieve revision %s of the file %s.\nPatching is not possible!"\r
873 IDS_ERR_MAINFRAME_FILEHASCONFLICTS \r
874 "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
875 END\r
876 \r
877 STRINGTABLE\r
878 BEGIN\r
879 ID_INDICATOR_LEFTVIEW " "\r
880 ID_INDICATOR_RIGHTVIEW " "\r
881 ID_INDICATOR_BOTTOMVIEW " "\r
882 END\r
883 \r
884 STRINGTABLE\r
885 BEGIN\r
886 IDS_STATUSBAR_REMOVEDLINES "- %d"\r
887 IDS_STATUSBAR_ADDEDLINES "+ %d"\r
888 IDS_STATUSBAR_CONFLICTEDLINES "! %d"\r
889 IDS_STATUSBAR_LEFTVIEW "Left View: "\r
890 IDS_STATUSBAR_RIGHTVIEW "Right View: "\r
891 IDS_STATUSBAR_CONFLICTS "Conflicts: %d"\r
892 IDS_STATUSBAR_BOTTOMVIEW "Bottom View:"\r
893 END\r
894 \r
895 STRINGTABLE\r
896 BEGIN\r
897 IDS_VIEWCONTEXTMENU_USETHISBLOCK "Use th&is text block"\r
898 IDS_VIEWCONTEXTMENU_USETHEIRBLOCK "Use text block from '&theirs'"\r
899 IDS_VIEWCONTEXTMENU_USEYOURBLOCK "Use text block from '&mine'"\r
900 IDS_VIEWCONTEXTMENU_USETHEIRANDYOURBLOCK \r
901 "Use text block from 't&heirs' before 'mine'"\r
902 IDS_VIEWCONTEXTMENU_USEYOURANDTHEIRBLOCK \r
903 "Use text block from 'm&ine' before 'theirs'"\r
904 IDS_VIEWCONTEXTMENU_USETHISFILE "Use this &whole file"\r
905 IDS_VIEWCONTEXTMENU_USEOTHERBLOCK "Use &other text block"\r
906 IDS_VIEWCONTEXTMENU_USEOTHERFILE "Use whole other &file"\r
907 IDS_VIEWCONTEXTMENU_USEBOTHTHISFIRST \r
908 "Use both text blocks (this one first)"\r
909 IDS_VIEWCONTEXTMENU_USEBOTHTHISLAST "Use both text blocks (this one last)"\r
910 IDS_VIEWCONTEXTMENU_PREPENDTHIS "Prepend this block to left"\r
911 IDS_VIEWCONTEXTMENU_USETHIS "Use this block on left"\r
912 IDS_VIEWCONTEXTMENU_APPENDTHIS "Append this block to left"\r
913 IDS_VIEWCONTEXTMENU_PREPENDRIGHT "Prepend right block"\r
914 IDS_VIEWCONTEXTMENU_USERIGHT "Use right block"\r
915 IDS_VIEWCONTEXTMENU_APPENDRIGHT "Append right block"\r
916 END\r
917 \r
918 STRINGTABLE\r
919 BEGIN\r
920 IDS_VIEWCONTEXTMENU_EOL "End of Line Style"\r
921 IDS_VIEWCONTEXTMENU_ENCODING "File Encoding"\r
922 IDS_VIEWCONTEXTMENU_MARKBLOCK "Mark this block"\r
923 IDS_VIEWCONTEXTMENU_UNMARKBLOCK "Unmark this block"\r
924 IDS_VIEWCONTEXTMENU_LEAVEONLYMARKEDBLOCKS \r
925 "Leave only marked blocks"\r
926 END\r
927 \r
928 STRINGTABLE\r
929 BEGIN\r
930 IDS_SAVEASTITLE "Save as..."\r
931 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
932 IDS_OPENDIFFFILETITLE "Apply Patch..."\r
933 IDS_GETVERSIONOFFILETITLE "Fetching file..."\r
934 IDS_GETVERSIONOFFILE "Fetching revision %s of file:"\r
935 IDS_WARNMODIFIEDLOOSECHANGES \r
936 "There are unsaved modifications!\nDo you want to save your changes?"\r
937 IDS_WARNMODIFIEDLOOSECHANGESOPTIONS \r
938 "Do you want to reload the documents to reflect the settings changes?\nNote: you will lose all changes you've made!"\r
939 END\r
940 \r
941 STRINGTABLE\r
942 BEGIN\r
943 IDS_ERR_DIFF_DIFF "The diffing engine aborted because of an error:\n%s"\r
944 IDS_ERR_DIFF_NEWLINES "Cannot show diff because of inconsistent newlines in the file."\r
945 END\r
946 \r
947 STRINGTABLE\r
948 BEGIN\r
949 IDS_ERR_FILE_OPEN "Could not open the file\n%s"\r
950 IDS_ERR_FILE_BINARY "The file\n%s\nis not a valid text file!"\r
951 IDS_ERR_FILE_NOTAFILE "%s\nis a directory, not a file!\nTortoiseGitMerge can't diff directories."\r
952 IDS_ERR_FILE_TOOBIG "The file is too big"\r
953 END\r
954 \r
955 STRINGTABLE\r
956 BEGIN\r
957 ID_FILE_OPEN "Open files for diff or to apply a patch\nOpen files"\r
958 ID_FILE_SAVE "Save the modified file\nSave file"\r
959 ID_FILE_SAVE_AS "Save the modified file\nSave file"\r
960 END\r
961 \r
962 STRINGTABLE\r
963 BEGIN\r
964 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
965 IDS_ABOUTVERSIONBOX "TortoiseGitMerge %d.%d.%d.%d - %s, %s"\r
966 IDS_SETTINGSTITLE "Settings"\r
967 END\r
968 \r
969 STRINGTABLE\r
970 BEGIN\r
971 IDS_COMMONFILEFILTER "All Files (*.*)|*.*||"\r
972 IDS_PATCHFILEFILTER "Patchfiles (*.diff, *.patch)|*.diff;*.patch|All Files (*.*)|*.*||"\r
973 END\r
974 \r
975 STRINGTABLE\r
976 BEGIN\r
977 IDS_PATCH_ALL "Patch all files"\r
978 IDS_PATCH_TITLE "File patches"\r
979 IDS_DIFF_TITLE "File diffs"\r
980 IDS_PATCH_SELECTED "Patch selected files"\r
981 IDS_PATCH_PREVIEW "Preview patched file"\r
982 IDS_PATCH_ITEMTT "%s\nCould not be cleanly patched."\r
983 IDS_PATCH_COPYFROMCLIPBOARD "Open from clipboard"\r
984 END\r
985 \r
986 STRINGTABLE\r
987 BEGIN\r
988 ID_FILE_RELOAD "Reloads the opened files and reverts all changes.\nReload"\r
989 END\r
990 \r
991 STRINGTABLE\r
992 BEGIN\r
993 ID_NAVIGATE_PREVIOUSCONFLICT \r
994 "Go to the previous conflict\nPrevious conflict"\r
995 ID_NAVIGATE_NEXTCONFLICT "Go to the next conflict\nNext conflict"\r
996 ID_EDIT_MARKASRESOLVED "Marks a file as resolved in Git\nMark as resolved"\r
997 ID_VIEW_SWITCHLEFT "Switch the contents of the left and right view\nSwitch left and right view"\r
998 END\r
999 \r
1000 STRINGTABLE\r
1001 BEGIN\r
1002 ID_VIEW_SHOWFILELIST "Hide/Show the patch file list\nHides or shows the patch file list"\r
1003 ID_EDIT_USETHEIRBLOCK "Use text block from 'theirs'\nUse 'theirs' text block"\r
1004 ID_EDIT_USEMYBLOCK "Use text block from 'mine'\nUse 'mine' text block"\r
1005 ID_EDIT_USETHEIRTHENMYBLOCK \r
1006 "Use text block from 'theirs' before 'mine'\nUse 'theirs' text block then 'mine'"\r
1007 ID_EDIT_USEMINETHENTHEIRBLOCK \r
1008 "Use text block from 'mine' before 'theirs'\nUse 'mine' text block then 'theirs'"\r
1009 ID_VIEW_INLINEDIFFWORD "Show Inline-Diff word by word\nInline diff word-wise"\r
1010 ID_EDIT_CREATEUNIFIEDDIFFFILE \r
1011 "Creates a patch file from the differences of the two files\nCreate patch file"\r
1012 END\r
1013 \r
1014 STRINGTABLE\r
1015 BEGIN\r
1016 IDS_WARNBETTERPATCHPATHFOUND \r
1017 "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
1018 IDS_NOTFOUNDVIEWTITLEINDICATOR "(not found)"\r
1019 IDS_DELETEWHENEMPTY "The file \n%s\nis empty.\nDo you want to remove the file?"\r
1020 IDS_EMPTYLINETT "(no line number)"\r
1021 IDS_WARNMODIFIEDOUTSIDELOOSECHANGES \r
1022 "Some file(s) have been changed outside TortoiseGitMerge.\nWould you like to reload and lose your changes?"\r
1023 IDS_WARNMODIFIEDOUTSIDE "Some file(s) have been changed outside TortoiseGitMerge.\nDo you want to load the changes?"\r
1024 IDS_WARNBETTERPATCHPATHFOUND_TASK2 \r
1025 "Path found that matches the patch better."\r
1026 IDS_WARNBETTERPATCHPATHFOUND_TASK3 \r
1027 "Use the found path.\nApply the patch to\n%s"\r
1028 IDS_WARNBETTERPATCHPATHFOUND_TASK4 \r
1029 "Use the original path.\nApply the patch to\n%s"\r
1030 IDS_DELETEWHENEMPTY_TASK2 "File is empty."\r
1031 IDS_DELETEWHENEMPTY_TASK3 "Delete\nThe file is removed."\r
1032 IDS_DELETEWHENEMPTY_TASK4 "Cancel\nKeep the empty file."\r
1033 IDS_ASKFORSAVE_TASK2 "Save modifications."\r
1034 IDS_ASKFORSAVE_TASK3 "Save\nThe modifications are saved to\n%s"\r
1035 END\r
1036 \r
1037 STRINGTABLE\r
1038 BEGIN\r
1039 IDS_VIEWTITLE_THEIRS "Theirs"\r
1040 IDS_VIEWTITLE_MERGED "Merged"\r
1041 IDS_VIEWTITLE_MINE "Mine"\r
1042 END\r
1043 \r
1044 STRINGTABLE\r
1045 BEGIN\r
1046 IDS_COLOURPICKER_CUSTOMTEXT "More colors..."\r
1047 IDS_COLOURPICKER_DEFAULTTEXT "Automatic"\r
1048 END\r
1049 \r
1050 STRINGTABLE\r
1051 BEGIN\r
1052 IDS_VIEWSCROLLTIPTEXT "Line: %*ld"\r
1053 END\r
1054 \r
1055 STRINGTABLE\r
1056 BEGIN\r
1057 IDS_EDIT_COPY "&Copy"\r
1058 IDS_EDIT_CUT "C&ut"\r
1059 IDS_EDIT_PASTE "&Paste"\r
1060 IDS_EDIT_TAB2SPACE "Convert tabs to spaces"\r
1061 IDS_EDIT_SPACE2TAB "Convert spaces to tabs"\r
1062 IDS_EDIT_TRIM "Trim right"\r
1063 END\r
1064 \r
1065 STRINGTABLE\r
1066 BEGIN\r
1067 IDC_STYLEBUTTON "Change the style of the application\nChange Style"\r
1068 ID_VIEW_APPLOOK_WIN7 "Windows 7"\r
1069 ID_VIEW_APPLOOK_VS_2008 "Visual Studio 2008"\r
1070 ID_VIEW_APPLOOK_WIN_2000 "Windows 2000"\r
1071 ID_VIEW_APPLOOK_OFF_XP "Office XP"\r
1072 ID_VIEW_APPLOOK_WIN_XP "Windows XP"\r
1073 ID_VIEW_APPLOOK_OFF_2003 "Office 2003"\r
1074 ID_VIEW_APPLOOK_VS_2005 "Visual Studio 2005"\r
1075 ID_OFFICE2007 "Office 2007 colors"\r
1076 ID_VIEW_APPLOOK_OFF_2007_BLUE "Blue Style"\r
1077 ID_VIEW_APPLOOK_OFF_2007_BLACK "Black Style"\r
1078 ID_VIEW_APPLOOK_OFF_2007_SILVER "Silver Style"\r
1079 ID_VIEW_APPLOOK_OFF_2007_AQUA "Aqua Style"\r
1080 END\r
1081 \r
1082 STRINGTABLE\r
1083 BEGIN\r
1084 ID_VIEW_LINEDIFFBAR "Show or hide the line diff bar\nToggle LineDiffBar"\r
1085 ID_VIEW_LOCATORBAR "Show or hide the locator bar\nToggle LocatorBar"\r
1086 ID_EDIT_USELEFTBLOCK "Use text block from the left view\nUse left block"\r
1087 ID_EDIT_USELEFTFILE "Use all content from the left view\nUse left file"\r
1088 ID_EDIT_USEBLOCKFROMLEFTBEFORERIGHT \r
1089 "Use block from left view before block from right view\nUse block from left before right"\r
1090 ID_EDIT_USEBLOCKFROMRIGHTBEFORELEFT \r
1091 "Use block from right view before block from left view\nUse block from right before left"\r
1092 END\r
1093 \r
1094 STRINGTABLE\r
1095 BEGIN\r
1096 IDS_PATCH_SEARCHPATHTITLE "Searching for better path to apply patch..."\r
1097 IDS_PATCH_SEARCHPATHLINE1 "scanning path:"\r
1098 IDS_PATCH_PROGTITLE "Patching"\r
1099 IDS_PATCH_PATHINGFILE "Patching file '%s'"\r
1100 END\r
1101 \r
1102 STRINGTABLE\r
1103 BEGIN\r
1104 ID_VIEW_COLLAPSED "Collapse unchanged sections\nCollapse"\r
1105 ID_VIEW_COMPAREWHITESPACES \r
1106 "Compares all whitespaces when diffing\nCompare whitespaces"\r
1107 ID_VIEW_IGNOREWHITESPACECHANGES \r
1108 "Ignores changes in whitespaces when diffing\nIgnore whitespace changes"\r
1109 ID_VIEW_IGNOREALLWHITESPACECHANGES \r
1110 "Ignores all whitespace changes when diffing\nIgnore all whitespace changes"\r
1111 ID_NAVIGATE_NEXTINLINEDIFF \r
1112 "Go to the next inline difference\nNext inline difference"\r
1113 ID_NAVIGATE_PREVINLINEDIFF \r
1114 "Go to the previous inline difference\nPrevious inline difference"\r
1115 END\r
1116 \r
1117 STRINGTABLE\r
1118 BEGIN\r
1119 ID_VIEW_MOVEDBLOCKS "Detect and highlight moved blocks"\r
1120 ID_VIEW_WRAPLONGLINES "Wrap long lines at the right border of the view\nWrap long lines"\r
1121 ID_VIEW_INLINEDIFF "Show Inline-Diff\nInline diff"\r
1122 ID_EDIT_GOTOLINE "Navigate to a specific line in the view\nGoto Line"\r
1123 END\r
1124 \r
1125 STRINGTABLE\r
1126 BEGIN\r
1127 IDS_APPNAME "TortoiseGitMerge"\r
1128 END\r
1129 \r
1130 STRINGTABLE\r
1131 BEGIN\r
1132 IDS_ERR_PATCHPATHS "Both the path to the patch file and the target path must be absolute paths!"\r
1133 IDS_ERR_ERROR "Error"\r
1134 IDS_ERR_INVALIDREGEX "The regular expression is invalid!\nPlease enter a valid regular expression."\r
1135 END\r
1136 \r
1137 STRINGTABLE\r
1138 BEGIN\r
1139 IDS_ASKFORSAVE_TASK4 "Quit\nExit TortoiseGitMerge without saving the modifications"\r
1140 IDS_ASKFORSAVE_TASK5 "Cancel\nDon't quit TortoiseGitMerge"\r
1141 IDS_ASKFORSAVE_TASK6 "Save as\nYou're asked where to save the file"\r
1142 IDS_ASKFORSAVE_TASK7 "Don't save\nReload the views without saving the modifications"\r
1143 IDS_ASKFORSAVE_TASK8 "Cancel\nDon't switch the views"\r
1144 IDS_WARNMODIFIEDOUTSIDE_TASK2 "Do you want to load the changed files?"\r
1145 IDS_WARNMODIFIEDOUTSIDE_TASK3 \r
1146 "Load changes\nChanges made in TortoiseGitMerge are lost and replaced with the new content."\r
1147 IDS_WARNMODIFIEDOUTSIDE_TASK4 \r
1148 "Load changes\nThe views are updated with the new content."\r
1149 IDS_WARNMODIFIEDOUTSIDE_TASK5 \r
1150 "Ignore changes\nIgnore the outside changes."\r
1151 IDS_ERR_MAINFRAME_FILEHASCONFLICTS_TASK2 "Unresolved conflicts!"\r
1152 IDS_ERR_MAINFRAME_FILEHASCONFLICTS_TASK3 \r
1153 "Save\nSave the file with the conflict markers."\r
1154 IDS_ERR_MAINFRAME_FILEHASCONFLICTS_TASK4 \r
1155 "Cancel\nResolve the conflicts first."\r
1156 IDS_ASKFORSAVE_NOSAVE_OPEN \r
1157 "Don't save\nClose the views without saving the modifications"\r
1158 IDS_ASKFORSAVE_CANCEL_OPEN "Cancel\nStay with current files"\r
1159 IDS_ASKFORSAVE_CANCEL_OPTIONS "Cancel\nStay with current settings"\r
1160 END\r
1161 \r
1162 STRINGTABLE\r
1163 BEGIN\r
1164 IDS_GOTOLINE "&Line number (%d - %d)"\r
1165 IDS_GOTO_OUTOFRANGE "The line number must be in between %d and %d"\r
1166 END\r
1167 \r
1168 STRINGTABLE\r
1169 BEGIN\r
1170 ID_VIEW_IGNORECOMMENTS "Remove all comments before doing the diff so changes inside comments don't show as different"\r
1171 ID_LOGOBUTTON "TortoiseGitMerge"\r
1172 END\r
1173 \r
1174 STRINGTABLE\r
1175 BEGIN\r
1176 ID_APPLOOK "Changes the style of the application"\r
1177 END\r
1178 \r
1179 STRINGTABLE\r
1180 BEGIN\r
1181 ID_USEBLOCKS "Click to see commands to move blocks of text\nUse text blocks"\r
1182 END\r
1183 \r
1184 STRINGTABLE\r
1185 BEGIN\r
1186 IDS_ASKFORSAVE_SAVELEFT "Save Left File\nThe modifications are saved to\n%s"\r
1187 IDS_ASKFORSAVE_SAVELEFTAS \r
1188 "Save Left File as\nYou're asked where to save the left file"\r
1189 IDS_ASKFORSAVE_SAVERIGHT \r
1190 "Save Right File\nThe modifications are saved to\n%s"\r
1191 IDS_ASKFORSAVE_SAVERIGHTAS \r
1192 "Save Right File as\nYou're asked where to save the right file"\r
1193 IDS_ASKFORSAVE_SAVEALL2 "Save all\nBoth Files are saved"\r
1194 IDS_SAVE "Save File"\r
1195 IDS_SAVE_MORE "There are more editable views.\nWhat view do you want to save?"\r
1196 IDS_ASKFORSAVE_SAVEBOTTOMAS \r
1197 "Save Bottom File as\nYou're asked where to save the bottom file"\r
1198 IDS_ASKFORSAVE_NEEDRESOLVE \r
1199 "Keep resolving\nJump to first unresolved conflict"\r
1200 IDS_ASKFORSAVEAS "Save as"\r
1201 IDS_ASKFORSAVEAS_MORE "Select what file you want to save as"\r
1202 IDS_ASKFORSAVEAS_MORECONFLICT \r
1203 "Select what file you want to save as\nNote: There is unresolved conflict!"\r
1204 END\r
1205 \r
1206 STRINGTABLE\r
1207 BEGIN\r
1208 IDS_MARKASRESOLVED "Do you want to mark the file\n%s\nas resolved?"\r
1209 IDS_MARKASRESOLVED_TASK2 "File has no conflicts"\r
1210 IDS_MARKASRESOLVED_TASK3 \r
1211 "Mark as resolved\nThe file status is changed to modified"\r
1212 IDS_MARKASRESOLVED_TASK4 \r
1213 "Leave as conflicted\nThe conflict status of the file is kept"\r
1214 END\r
1215 \r
1216 STRINGTABLE\r
1217 BEGIN\r
1218 ID_EDIT_ENABLE "Allow Editing for this view\nAllow Edit"\r
1219 END\r
1220 \r
1221 STRINGTABLE\r
1222 BEGIN\r
1223 ID_REGEXFILTER "Regex Filter"\r
1224 END\r
1225 \r
1226 STRINGTABLE\r
1227 BEGIN\r
1228 IDS_TEXTIDENTICAL_MAIN "The text is identical, but the files do not match!\r\nThe following differences were found:"\r
1229 IDS_TEXTIDENTICAL_WHITESPACE "Whitespace changes (tabs, spaces)"\r
1230 IDS_TEXTIDENTICAL_ENCODING "Encoding"\r
1231 IDS_TEXTIDENTICAL_EOL "Newlines"\r
1232 END\r
1233 \r
1234 #endif // English (United States) resources\r
1235 /////////////////////////////////////////////////////////////////////////////\r
1236 \r
1237 \r
1238 /////////////////////////////////////////////////////////////////////////////\r
1239 // German (Switzerland) resources\r
1240 \r
1241 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DES)\r
1242 LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_SWISS\r
1243 #pragma code_page(1252)\r
1244 \r
1245 #ifdef APSTUDIO_INVOKED\r
1246 /////////////////////////////////////////////////////////////////////////////\r
1247 //\r
1248 // TEXTINCLUDE\r
1249 //\r
1250 \r
1251 1 TEXTINCLUDE \r
1252 BEGIN\r
1253 "..\\TortoiseMerge\\resource.h\0"\r
1254 END\r
1255 \r
1256 2 TEXTINCLUDE \r
1257 BEGIN\r
1258 "#include <afxres.h>\r\n"\r
1259 "\0"\r
1260 END\r
1261 \r
1262 3 TEXTINCLUDE \r
1263 BEGIN\r
1264 "#define _AFX_NO_SPLITTER_RESOURCES\r\n"\r
1265 "#define _AFX_NO_OLE_RESOURCES\r\n"\r
1266 "#define _AFX_NO_TRACKER_RESOURCES\r\n"\r
1267 "#define _AFX_NO_PROPERTY_RESOURCES\r\n"\r
1268 "\r\n"\r
1269 "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"\r
1270 "LANGUAGE 9, 1\r\n"\r
1271 "#pragma code_page(1252)\r\n"\r
1272 "#include ""TortoiseMerge.rc2"" // non-Microsoft Visual C++ edited resources\r\n"\r
1273 "#include <afxres.rc> // Standard components\r\n"\r
1274 "#include <afxprint.rc> // printing/print preview resources\r\n"\r
1275 "#include <afxribbon.rc> // ribbon and control bar resources\r\n"\r
1276 "#include <afxolecl.rc> // OLE container resources\r\n"\r
1277 "#endif\r\n"\r
1278 "\0"\r
1279 END\r
1280 \r
1281 #endif // APSTUDIO_INVOKED\r
1282 \r
1283 #endif // German (Switzerland) resources\r
1284 /////////////////////////////////////////////////////////////////////////////\r
1285 \r
1286 \r
1287 \r
1288 #ifndef APSTUDIO_INVOKED\r
1289 /////////////////////////////////////////////////////////////////////////////\r
1290 //\r
1291 // Generated from the TEXTINCLUDE 3 resource.\r
1292 //\r
1293 #define _AFX_NO_SPLITTER_RESOURCES\r
1294 #define _AFX_NO_OLE_RESOURCES\r
1295 #define _AFX_NO_TRACKER_RESOURCES\r
1296 #define _AFX_NO_PROPERTY_RESOURCES\r
1297 \r
1298 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r
1299 LANGUAGE 9, 1\r
1300 #pragma code_page(1252)\r
1301 #include "TortoiseMerge.rc2" // non-Microsoft Visual C++ edited resources\r
1302 #include <afxres.rc> // Standard components\r
1303 #include <afxprint.rc> // printing/print preview resources\r
1304 #include <afxribbon.rc> // ribbon and control bar resources\r
1305 #include <afxolecl.rc> // OLE container resources\r
1306 #endif\r
1307 \r
1308 /////////////////////////////////////////////////////////////////////////////\r
1309 #endif // not APSTUDIO_INVOKED\r
1310 \r