84d37f912c02653641b58d52a320754c4e889fd9
| blob | 84d37f912c02653641b58d52a320754c4e889fd9 |
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 \r
42 /////////////////////////////////////////////////////////////////////////////\r
43 //\r
44 // Dialog\r
45 //\r
46 \r
47 IDD_ABOUT DIALOGEX 0, 0, 333, 249\r
48 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
49 CAPTION "About TortoiseGitMerge"\r
50 FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
51 BEGIN\r
52 CONTROL "Author:\t\t\t\tStefan Kueng",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,14,68,309,8\r
53 LTEXT "Icons/Design/Code:\t\tLuebbe Onken",IDC_STATIC,14,80,306,8\r
54 DEFPUSHBUTTON "OK",IDOK,276,228,50,14\r
55 GROUPBOX "Version",IDC_VERSIONBOX,7,123,319,99\r
56 EDITTEXT IDC_VERSIONABOUT,14,134,304,85,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER\r
57 LTEXT "Visit our website",IDC_WEBLINK,14,95,312,8\r
58 LTEXT "and support the developers",IDC_SUPPORTLINK,14,105,312,8\r
59 END\r
60 \r
61 IDD_DIFFLOCATOR DIALOGEX 0, 0, 20, 314\r
62 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU\r
63 FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
64 BEGIN\r
65 END\r
66 \r
67 IDD_LINEDIFF DIALOGEX 0, 0, 428, 23\r
68 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN\r
69 FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
70 BEGIN\r
71 END\r
72 \r
73 \r
74 /////////////////////////////////////////////////////////////////////////////\r
75 //\r
76 // DESIGNINFO\r
77 //\r
78 \r
79 #ifdef APSTUDIO_INVOKED\r
80 GUIDELINES DESIGNINFO\r
81 BEGIN\r
82 IDD_DIFFLOCATOR, DIALOG\r
83 BEGIN\r
84 LEFTMARGIN, 3\r
85 RIGHTMARGIN, 13\r
86 BOTTOMMARGIN, 202\r
87 END\r
88 \r
89 IDD_LINEDIFF, DIALOG\r
90 BEGIN\r
91 RIGHTMARGIN, 427\r
92 END\r
93 END\r
94 #endif // APSTUDIO_INVOKED\r
95 \r
96 \r
97 /////////////////////////////////////////////////////////////////////////////\r
98 //\r
99 // Bitmap\r
100 //\r
101 \r
102 IDB_LOGOFLIPPED BITMAP "tortoisemerge_logoflipped.bmp"\r
103 IDB_TTF_BMP BITMAP "ttf_glyph.bmp"\r
104 \r
105 /////////////////////////////////////////////////////////////////////////////\r
106 //\r
107 // AVI\r
108 //\r
109 \r
110 IDR_DOWNLOAD AVI "download.avi"\r
111 \r
112 /////////////////////////////////////////////////////////////////////////////\r
113 //\r
114 // Cursor\r
115 //\r
116 \r
117 IDC_MARGINCURSOR CURSOR "Margin.cur"\r
118 \r
119 /////////////////////////////////////////////////////////////////////////////\r
120 //\r
121 // PNG\r
122 //\r
123 \r
124 IDB_RIBBONLARGE PNG "ribbon\\ribbonlarge.png"\r
125 IDB_RIBBONSMALL PNG "ribbon\\ribbonsmall.png"\r
126 IDB_LOGO PNG "ribbon\\TortoiseMerge.png"\r
127 #endif // Neutral resources\r
128 /////////////////////////////////////////////////////////////////////////////\r
129 \r
130 \r
131 /////////////////////////////////////////////////////////////////////////////\r
132 // English (United States) resources\r
133 \r
134 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r
135 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US\r
136 #pragma code_page(1252)\r
137 \r
138 /////////////////////////////////////////////////////////////////////////////\r
139 //\r
140 // Dialog\r
141 //\r
142 \r
143 IDD_FILEPATCHES DIALOGEX 0, 0, 133, 221\r
144 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME\r
145 EXSTYLE WS_EX_TOOLWINDOW\r
146 CAPTION "File patches"\r
147 FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
148 BEGIN\r
149 CONTROL "",IDC_FILELIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | WS_TABSTOP,0,0,131,184\r
150 PUSHBUTTON "Patch &selected item",IDC_PATCHSELECTEDBUTTON,0,189,132,14,WS_DISABLED\r
151 PUSHBUTTON "Patch &all items",IDC_PATCHALLBUTTON,0,206,132,14\r
152 END\r
153 \r
154 IDD_OPENDLG DIALOGEX 0, 0, 325, 209\r
155 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
156 EXSTYLE WS_EX_CONTEXTHELP\r
157 CAPTION "TortoiseGitMerge"\r
158 FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
159 BEGIN\r
160 CONTROL "&Merging",IDC_MERGERADIO,"Button",BS_AUTORADIOBUTTON | WS_GROUP,14,18,75,10\r
161 CONTROL "&Apply unified diff",IDC_APPLYRADIO,"Button",BS_AUTORADIOBUTTON,96,18,152,10\r
162 LTEXT "Base file:",IDC_STATIC,14,48,82,8\r
163 EDITTEXT IDC_BASEFILEEDIT,96,45,152,14,ES_AUTOHSCROLL\r
164 PUSHBUTTON "&Browse...",IDC_BASEFILEBROWSE,260,46,50,14\r
165 LTEXT "Their file:",IDC_STATIC,14,69,82,8\r
166 EDITTEXT IDC_THEIRFILEEDIT,96,66,152,14,ES_AUTOHSCROLL\r
167 PUSHBUTTON "B&rowse...",IDC_THEIRFILEBROWSE,260,67,50,14\r
168 LTEXT "My file:",IDC_STATIC,14,91,82,8\r
169 EDITTEXT IDC_YOURFILEEDIT,96,88,152,14,ES_AUTOHSCROLL\r
170 PUSHBUTTON "Br&owse...",IDC_YOURFILEBROWSE,260,89,50,14\r
171 CONTROL "Use Unified Diff from &clipboard",IDC_PATCHFROMCLIPBOARD,\r
172 "Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,14,129,234,10\r
173 LTEXT "Diff file:",IDC_STATIC,14,145,82,8\r
174 EDITTEXT IDC_DIFFFILEEDIT,96,142,152,14,ES_AUTOHSCROLL\r
175 PUSHBUTTON "&Browse...",IDC_DIFFFILEBROWSE,260,142,50,14\r
176 LTEXT "Directory:",IDC_STATIC,14,164,82,8\r
177 EDITTEXT IDC_DIRECTORYEDIT,96,162,152,14,ES_AUTOHSCROLL\r
178 PUSHBUTTON "B&rowse...",IDC_DIRECTORYBROWSE,260,163,50,14\r
179 DEFPUSHBUTTON "OK",IDOK,7,188,50,14\r
180 PUSHBUTTON "Cancel",IDCANCEL,127,188,50,14\r
181 PUSHBUTTON "Help",IDHELP,268,188,50,14\r
182 LTEXT "",IDC_VERSIONSTRING,7,7,311,8,SS_CENTERIMAGE\r
183 GROUPBOX "Merging",IDC_MERGEGROUP,7,34,311,77\r
184 GROUPBOX "Apply unified diff",IDC_UNIDIFFGROUP,7,117,311,66\r
185 END\r
186 \r
187 IDD_SETMAINPAGE DIALOGEX 0, 0, 265, 250\r
188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION\r
189 CAPTION "General"\r
190 FONT 8, "MS Shell Dlg", 0, 0, 0x0\r
191 BEGIN\r
192 CONTROL "&Backup original file",IDC_BACKUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,10,236,10\r
193 CONTROL "&Jump to first difference when loading",IDC_FIRSTDIFFONLOAD,\r
194 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,21,236,10\r
195 CONTROL "J&ump to first conflict when loading",IDC_FIRSTCONFLICTONLOAD,\r
196 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,26,33,225,10\r
197 CONTROL "Default to UTF-8 encoding",IDC_UTF8DEFAULT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,236,10\r
198 CONTROL "Use &one-pane view as default for 2-file diff",IDC_ONEPANE,\r
199 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,56,236,10\r
200 CONTROL "Show linenumber&s",IDC_LINENUMBERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,67,236,10\r
201 CONTROL "Add new files automatically to Git",IDC_AUTOADD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,79,236,10\r
202 LTEXT "&Tab size:",IDC_STATIC,15,118,54,8\r
203 EDITTEXT IDC_TABSIZE,80,115,41,14,ES_AUTOHSCROLL | ES_NUMBER\r
204 LTEXT "&Font:",IDC_STATIC,15,135,52,8\r
205 COMBOBOX IDC_FONTNAMES,80,133,122,90,CBS_DROPDOWNLIST | CBS_OWNERDRAWVARIABLE | CBS_SORT | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
206 COMBOBOX IDC_FONTSIZES,211,133,40,47,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP\r
207 LTEXT "&Max line length for inline diffs",IDC_STATIC,15,172,173,8\r
208 EDITTEXT IDC_MAXINLINE,211,170,40,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER\r
209 CONTROL "Ignore line &endings (recommended)",IDC_IGNORELF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,185,237,10\r
210 CONTROL "Ignore case cha&nges",IDC_CASEINSENSITIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,196,236,10\r
211 GROUPBOX "Misc",IDC_MISCGROUP,7,0,251,151\r
212 GROUPBOX "Diffing",IDC_DIFFGROUP,7,161,251,82\r
213 END\r
214 \r
215 IDD_SETCOLORPAGE DIALOGEX 0, 0, 265, 257\r
216 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION\r
217 CAPTION "Colors"\r
218 FONT 8, "MS Shell Dlg", 0, 0, 0x0\r
219 BEGIN\r
220 GROUPBOX "Line differences",IDC_STATIC,7,7,251,161\r
221 LTEXT "Normal",IDC_STATIC,15,16,113,8,0,WS_EX_RIGHT\r
222 PUSHBUTTON "",IDC_BKNORMAL,152,14,50,14\r
223 LTEXT "Added",IDC_STATIC,15,32,113,8,0,WS_EX_RIGHT\r
224 PUSHBUTTON "",IDC_BKADDED,152,30,50,14\r
225 LTEXT "Removed",IDC_STATIC,15,49,113,8,0,WS_EX_RIGHT\r
226 PUSHBUTTON "",IDC_BKREMOVED,152,47,50,14\r
227 LTEXT "Modified",IDC_STATIC,15,66,113,8,0,WS_EX_RIGHT\r
228 PUSHBUTTON "",IDC_BKMODIFIED,152,64,50,14\r
229 LTEXT "Conflicted",IDC_STATIC,15,83,113,8,0,WS_EX_RIGHT\r
230 PUSHBUTTON "",IDC_BKCONFLICTED,152,81,50,14\r
231 LTEXT "Conflict resolved",IDC_STATIC,15,100,113,8,0,WS_EX_RIGHT\r
232 PUSHBUTTON "",IDC_BKCONFLICTRESOLVED,152,98,50,14\r
233 LTEXT "Empty",IDC_STATIC,15,116,113,8,0,WS_EX_RIGHT\r
234 PUSHBUTTON "",IDC_BKEMPTY,152,114,50,14\r
235 LTEXT "Moved from",IDC_STATIC,15,133,113,8,0,WS_EX_RIGHT\r
236 PUSHBUTTON "",IDC_BKMOVEDFROM,152,131,50,14\r
237 LTEXT "Moved to",IDC_STATIC,15,150,113,8,0,WS_EX_RIGHT\r
238 PUSHBUTTON "",IDC_BKMOVEDTO,152,148,50,14\r
239 GROUPBOX "Inline differences",IDC_STATIC,7,171,251,43\r
240 LTEXT "Added",IDC_STATIC,15,181,113,8,0,WS_EX_RIGHT\r
241 PUSHBUTTON "",IDC_BKWHITESPACES,152,179,50,14\r
242 LTEXT "Removed",IDC_STATIC,15,197,113,8,0,WS_EX_RIGHT\r
243 PUSHBUTTON "",IDC_BKWHITESPACEDIFF,152,195,50,14\r
244 GROUPBOX "Misc",IDC_STATIC,7,217,251,33\r
245 RTEXT "Whitespaces",IDC_STATIC,15,232,113,8\r
246 PUSHBUTTON "",IDC_FGWHITESPACES,152,228,50,14\r
247 END\r
248 \r
249 IDD_PATCH_FILE_OPEN_CUSTOM DIALOGEX 0, 0, 122, 28\r
250 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_SYSMENU\r
251 FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
252 BEGIN\r
253 PUSHBUTTON "Open from clipboard",IDC_PATCH_TO_CLIPBOARD,7,7,108,14\r
254 END\r
255 \r
256 IDD_FIND DIALOGEX 0, 0, 311, 73\r
257 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
258 CAPTION "Find"\r
259 FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
260 BEGIN\r
261 LTEXT "Search for:",IDC_STATIC,7,10,79,8\r
262 CONTROL "",IDC_FINDCOMBO,"ComboBoxEx32",CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP,90,7,154,95\r
263 CONTROL "Match &case",IDC_MATCHCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,26,200,10\r
264 CONTROL "&Limit search to modified lines",IDC_LIMITTODIFFS,\r
265 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,41,200,10\r
266 CONTROL "&Whole word",IDC_WHOLEWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,56,200,10\r
267 DEFPUSHBUTTON "&Find",IDOK,248,7,56,14,WS_DISABLED\r
268 PUSHBUTTON "Cancel",IDCANCEL,248,28,56,14\r
269 END\r
270 \r
271 \r
272 /////////////////////////////////////////////////////////////////////////////\r
273 //\r
274 // DESIGNINFO\r
275 //\r
276 \r
277 #ifdef APSTUDIO_INVOKED\r
278 GUIDELINES DESIGNINFO\r
279 BEGIN\r
280 IDD_FILEPATCHES, DIALOG\r
281 BEGIN\r
282 BOTTOMMARGIN, 220\r
283 END\r
284 \r
285 IDD_OPENDLG, DIALOG\r
286 BEGIN\r
287 LEFTMARGIN, 7\r
288 RIGHTMARGIN, 318\r
289 VERTGUIDE, 14\r
290 VERTGUIDE, 96\r
291 VERTGUIDE, 248\r
292 VERTGUIDE, 310\r
293 TOPMARGIN, 7\r
294 BOTTOMMARGIN, 202\r
295 END\r
296 \r
297 IDD_SETMAINPAGE, DIALOG\r
298 BEGIN\r
299 LEFTMARGIN, 7\r
300 RIGHTMARGIN, 258\r
301 VERTGUIDE, 7\r
302 VERTGUIDE, 15\r
303 VERTGUIDE, 80\r
304 VERTGUIDE, 188\r
305 VERTGUIDE, 211\r
306 VERTGUIDE, 251\r
307 TOPMARGIN, 7\r
308 BOTTOMMARGIN, 243\r
309 END\r
310 \r
311 IDD_SETCOLORPAGE, DIALOG\r
312 BEGIN\r
313 LEFTMARGIN, 7\r
314 RIGHTMARGIN, 258\r
315 VERTGUIDE, 15\r
316 VERTGUIDE, 128\r
317 VERTGUIDE, 152\r
318 TOPMARGIN, 7\r
319 BOTTOMMARGIN, 250\r
320 END\r
321 \r
322 IDD_PATCH_FILE_OPEN_CUSTOM, DIALOG\r
323 BEGIN\r
324 LEFTMARGIN, 7\r
325 RIGHTMARGIN, 87\r
326 TOPMARGIN, 7\r
327 BOTTOMMARGIN, 21\r
328 END\r
329 \r
330 IDD_FIND, DIALOG\r
331 BEGIN\r
332 LEFTMARGIN, 7\r
333 RIGHTMARGIN, 304\r
334 VERTGUIDE, 86\r
335 VERTGUIDE, 90\r
336 VERTGUIDE, 244\r
337 VERTGUIDE, 248\r
338 TOPMARGIN, 7\r
339 BOTTOMMARGIN, 66\r
340 END\r
341 END\r
342 #endif // APSTUDIO_INVOKED\r
343 \r
344 \r
345 /////////////////////////////////////////////////////////////////////////////\r
346 //\r
347 // Accelerator\r
348 //\r
349 \r
350 IDR_MAINFRAME ACCELERATORS\r
351 BEGIN\r
352 "Q", ID_APP_EXIT, VIRTKEY, CONTROL, NOINVERT\r
353 VK_ESCAPE, ID_APP_EXIT, VIRTKEY, NOINVERT\r
354 "W", ID_APP_EXIT, VIRTKEY, CONTROL, NOINVERT\r
355 VK_DOWN, ID_CARET_DOWN, VIRTKEY, NOINVERT\r
356 VK_DOWN, ID_CARET_DOWN, VIRTKEY, SHIFT, NOINVERT\r
357 VK_LEFT, ID_CARET_LEFT, VIRTKEY, NOINVERT\r
358 VK_LEFT, ID_CARET_LEFT, VIRTKEY, SHIFT, NOINVERT\r
359 VK_RIGHT, ID_CARET_RIGHT, VIRTKEY, NOINVERT\r
360 VK_RIGHT, ID_CARET_RIGHT, VIRTKEY, SHIFT, NOINVERT\r
361 VK_UP, ID_CARET_UP, VIRTKEY, NOINVERT\r
362 VK_UP, ID_CARET_UP, VIRTKEY, SHIFT, NOINVERT\r
363 VK_LEFT, ID_CARET_WORDLEFT, VIRTKEY, CONTROL, NOINVERT\r
364 VK_LEFT, ID_CARET_WORDLEFT, VIRTKEY, SHIFT, CONTROL, NOINVERT\r
365 VK_RIGHT, ID_CARET_WORDRIGHT, VIRTKEY, CONTROL, NOINVERT\r
366 VK_RIGHT, ID_CARET_WORDRIGHT, VIRTKEY, SHIFT, CONTROL, NOINVERT\r
367 VK_F1, ID_CONTEXT_HELP, VIRTKEY, SHIFT, NOINVERT\r
368 "C", ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT\r
369 VK_INSERT, ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT\r
370 VK_DELETE, ID_EDIT_CUT, VIRTKEY, SHIFT, NOINVERT\r
371 "X", ID_EDIT_CUT, VIRTKEY, CONTROL, NOINVERT\r
372 "F", ID_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT\r
373 VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT\r
374 VK_F3, ID_EDIT_FINDNEXTSTART, VIRTKEY, CONTROL, NOINVERT\r
375 VK_F3, ID_EDIT_FINDPREV, VIRTKEY, SHIFT, NOINVERT\r
376 VK_F3, ID_EDIT_FINDPREVSTART, VIRTKEY, SHIFT, CONTROL, NOINVERT\r
377 "G", ID_EDIT_GOTOLINE, VIRTKEY, CONTROL, NOINVERT\r
378 "V", ID_EDIT_PASTE, VIRTKEY, CONTROL, NOINVERT\r
379 VK_INSERT, ID_EDIT_PASTE, VIRTKEY, SHIFT, NOINVERT\r
380 VK_INSERT, ID_EDIT_PASTE, VIRTKEY, SHIFT, NOINVERT\r
381 "A", ID_EDIT_SELECTALL, VIRTKEY, CONTROL, NOINVERT\r
382 VK_BACK, ID_EDIT_UNDO, VIRTKEY, ALT, NOINVERT\r
383 "Z", ID_EDIT_UNDO, VIRTKEY, CONTROL, NOINVERT\r
384 VK_F12, ID_EDIT_USELEFTBLOCK, VIRTKEY, NOINVERT\r
385 VK_RIGHT, ID_EDIT_USELEFTBLOCK, VIRTKEY, ALT, NOINVERT\r
386 VK_F10, ID_EDIT_USEMINETHENTHEIRBLOCK, VIRTKEY, SHIFT, CONTROL, NOINVERT\r
387 VK_F10, ID_EDIT_USEMYBLOCK, VIRTKEY, CONTROL, NOINVERT\r
388 VK_F12, ID_EDIT_USEMYBLOCK, VIRTKEY, SHIFT, NOINVERT\r
389 VK_F9, ID_EDIT_USETHEIRBLOCK, VIRTKEY, CONTROL, NOINVERT\r
390 VK_F9, ID_EDIT_USETHEIRTHENMYBLOCK, VIRTKEY, SHIFT, CONTROL, NOINVERT\r
391 "O", ID_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT\r
392 "R", ID_FILE_RELOAD, VIRTKEY, CONTROL, NOINVERT\r
393 VK_F5, ID_FILE_RELOAD, VIRTKEY, NOINVERT\r
394 "S", ID_FILE_SAVE, VIRTKEY, CONTROL, NOINVERT\r
395 "S", ID_FILE_SAVE_AS, VIRTKEY, SHIFT, CONTROL, NOINVERT\r
396 VK_F1, ID_HELP, VIRTKEY, NOINVERT\r
397 VK_F8, ID_NAVIGATE_NEXTCONFLICT, VIRTKEY, NOINVERT\r
398 VK_DOWN, ID_NAVIGATE_NEXTDIFFERENCE, VIRTKEY, CONTROL, NOINVERT\r
399 VK_DOWN, ID_NAVIGATE_NEXTDIFFERENCE, VIRTKEY, ALT, NOINVERT\r
400 VK_F11, ID_NAVIGATE_NEXTDIFFERENCE, VIRTKEY, NOINVERT\r
401 VK_F7, ID_NAVIGATE_NEXTDIFFERENCE, VIRTKEY, NOINVERT\r
402 VK_RIGHT, ID_NAVIGATE_NEXTINLINEDIFF, VIRTKEY, CONTROL, ALT, NOINVERT\r
403 VK_LEFT, ID_NAVIGATE_PREVINLINEDIFF, VIRTKEY, CONTROL, ALT, NOINVERT\r
404 VK_F8, ID_NAVIGATE_PREVIOUSCONFLICT, VIRTKEY, SHIFT, NOINVERT\r
405 VK_F11, ID_NAVIGATE_PREVIOUSDIFFERENCE, VIRTKEY, CONTROL, NOINVERT\r
406 VK_F11, ID_NAVIGATE_PREVIOUSDIFFERENCE, VIRTKEY, SHIFT, NOINVERT\r
407 VK_F7, ID_NAVIGATE_PREVIOUSDIFFERENCE, VIRTKEY, SHIFT, NOINVERT\r
408 VK_UP, ID_NAVIGATE_PREVIOUSDIFFERENCE, VIRTKEY, CONTROL, NOINVERT\r
409 VK_UP, ID_NAVIGATE_PREVIOUSDIFFERENCE, VIRTKEY, ALT, NOINVERT\r
410 VK_F6, ID_NEXT_PANE, VIRTKEY, NOINVERT\r
411 VK_F6, ID_PREV_PANE, VIRTKEY, SHIFT, NOINVERT\r
412 "L", ID_VIEW_COLLAPSED, VIRTKEY, CONTROL, NOINVERT\r
413 "D", ID_VIEW_ONEWAYDIFF, VIRTKEY, CONTROL, NOINVERT\r
414 "U", ID_VIEW_SWITCHLEFT, VIRTKEY, CONTROL, NOINVERT\r
415 "T", ID_VIEW_WHITESPACES, VIRTKEY, CONTROL, NOINVERT\r
416 "P", ID_VIEW_WRAPLONGLINES, VIRTKEY, CONTROL, NOINVERT\r
417 END\r
418 \r
419 \r
420 /////////////////////////////////////////////////////////////////////////////\r
421 //\r
422 // Ribbon\r
423 //\r
424 \r
425 IDR_RIBBON RT_RIBBON_XML "ribbon.mfcribbon-ms"\r
426 \r
427 \r
428 /////////////////////////////////////////////////////////////////////////////\r
429 //\r
430 // Menu\r
431 //\r
432 \r
433 IDR_MAINFRAME MENU\r
434 BEGIN\r
435 MENUITEM "&File", 0\r
436 END\r
437 \r
438 \r
439 /////////////////////////////////////////////////////////////////////////////\r
440 //\r
441 // String Table\r
442 //\r
443 \r
444 STRINGTABLE\r
445 BEGIN\r
446 IDR_MAINFRAME "TortoiseGitMerge"\r
447 IDS_TITLE_REJECTEDHUNKS "Rejected patch hunks for '%s'"\r
448 IDS_ERR_PATCH_FILENAMENOTUNIQUE \r
449 "TortoiseGitMerge cannot process this patch file. The filename ""%s"" appears more than once."\r
450 IDS_ERR_MAINFRAME_FILECONFLICTNOVERSION \r
451 "The patch does not apply cleanly to %s and no version information is given.\nPatching is not possible!"\r
452 END\r
453 \r
454 STRINGTABLE\r
455 BEGIN\r
456 AFX_IDS_APP_TITLE "TortoiseGitMerge"\r
457 AFX_IDS_IDLEMESSAGE "For Help, press F1. Scroll horizontally with Ctrl-Scrollwheel"\r
458 AFX_IDS_HELPMODEMESSAGE "Select an object on which to get Help"\r
459 END\r
460 \r
461 STRINGTABLE\r
462 BEGIN\r
463 ID_INDICATOR_CAPS "CAP"\r
464 ID_INDICATOR_NUM "NUM"\r
465 END\r
466 \r
467 STRINGTABLE\r
468 BEGIN\r
469 ID_APP_ABOUT "Display program information, version number and copyright\nAbout"\r
470 ID_APP_EXIT "Quit the application; prompts to save documents\nExit"\r
471 ID_HELP_INDEX "Opens Help\nHelp Topics"\r
472 ID_HELP_FINDER "List Help topics\nHelp Topics"\r
473 ID_HELP_USING "Display instructions about how to use help\nHelp"\r
474 ID_CONTEXT_HELP "Display help for clicked on buttons, menus and windows\nHelp"\r
475 ID_HELP "Display help for current task or command\nHelp"\r
476 END\r
477 \r
478 STRINGTABLE\r
479 BEGIN\r
480 ID_NEXT_PANE "Switch to the next window pane\nNext Pane"\r
481 ID_PREV_PANE "Switch back to the previous window pane\nPrevious Pane"\r
482 END\r
483 \r
484 STRINGTABLE\r
485 BEGIN\r
486 ID_WINDOW_SPLIT "Split the active window into panes\nSplit"\r
487 END\r
488 \r
489 STRINGTABLE\r
490 BEGIN\r
491 ID_EDIT_CLEAR "Erase the selection\nErase"\r
492 ID_EDIT_CLEAR_ALL "Erase everything\nErase All"\r
493 ID_EDIT_COPY "Copy the selection and put it on the Clipboard\nCopy"\r
494 ID_EDIT_CUT "Cut the selection and put it on the Clipboard\nCut"\r
495 ID_EDIT_FIND "Find the specified text\nFind"\r
496 ID_EDIT_PASTE "Insert Clipboard contents\nPaste"\r
497 ID_EDIT_REPEAT "Repeat the last action\nRepeat"\r
498 ID_EDIT_REPLACE "Replace specific text with different text\nReplace"\r
499 ID_EDIT_SELECT_ALL "Select the entire document\nSelect All"\r
500 ID_EDIT_UNDO "Undo the last modifications\nUndo"\r
501 ID_EDIT_REDO "Redo the previously undone action\nRedo"\r
502 END\r
503 \r
504 STRINGTABLE\r
505 BEGIN\r
506 ID_VIEW_TOOLBAR "Show or hide the toolbar\nToggle ToolBar"\r
507 ID_VIEW_STATUS_BAR "Show or hide the status bar\nToggle StatusBar"\r
508 END\r
509 \r
510 STRINGTABLE\r
511 BEGIN\r
512 AFX_IDS_SCSIZE "Change the window size"\r
513 AFX_IDS_SCMOVE "Change the window position"\r
514 AFX_IDS_SCMINIMIZE "Reduce the window to an icon"\r
515 AFX_IDS_SCMAXIMIZE "Enlarge the window to full size"\r
516 AFX_IDS_SCNEXTWINDOW "Switch to the next document window"\r
517 AFX_IDS_SCPREVWINDOW "Switch to the previous document window"\r
518 AFX_IDS_SCCLOSE "Close the active window and prompts to save the documents"\r
519 END\r
520 \r
521 STRINGTABLE\r
522 BEGIN\r
523 AFX_IDS_SCRESTORE "Restore the window to normal size"\r
524 AFX_IDS_SCTASKLIST "Activate Task List"\r
525 END\r
526 \r
527 STRINGTABLE\r
528 BEGIN\r
529 IDS_SELECTFILE "Select File..."\r
530 IDS_SELECTDIFFFILE "Select patch file..."\r
531 END\r
532 \r
533 STRINGTABLE\r
534 BEGIN\r
535 ID_VIEW_WHITESPACES "Show special characters for whitespaces and newlines\nShow Whitespaces"\r
536 ID_VIEW_ONEWAYDIFF "Switch between single and double pane view\nSwitch between single and double pane view"\r
537 ID_NAVIGATE_NEXTDIFFERENCE "Go to the next difference\nNext difference"\r
538 ID_NAVIGATE_PREVIOUSDIFFERENCE \r
539 "Go to the previous difference\nPrevious difference"\r
540 ID_VIEW_OPTIONS "Adjust the settings\nSettings"\r
541 END\r
542 \r
543 STRINGTABLE\r
544 BEGIN\r
545 IDS_ERR_PATCH_NOINDEX "The line 'Index: ' was not found!\nEither this is not a diff file or the diff is empty."\r
546 IDS_ERR_PATCH_NOEQUATIONCHARLINE \r
547 "The line '====' was expected in line %d !"\r
548 IDS_ERR_PATCH_NOREMOVEFILELINE \r
549 "The line indicating the old file was expected in line %d !"\r
550 IDS_ERR_PATCH_NOADDFILELINE \r
551 "The line indicating the new file was expected in line %d !"\r
552 IDS_ERR_PATCH_RENAMINGNOTSUPPORTED \r
553 "The old file does not match the new file.\nRenaming of files is not (yet) supported!"\r
554 IDS_ERR_PATCH_CHUNKSTARTNOTFOUND \r
555 "The chunk start '@@' was expected in line %d !"\r
556 IDS_ERR_PATCH_UNKOWNLINETYPE "An unknown line type was found in line %d !"\r
557 IDS_ERR_PATCH_CHUNKMISMATCH \r
558 "The chunk size did not match the number of added/removed lines!"\r
559 END\r
560 \r
561 STRINGTABLE\r
562 BEGIN\r
563 IDS_ERR_PATCH_INVALIDPATCHFILE "The file %s does not exist!"\r
564 IDS_ERR_PATCH_FILENOTINPATCH \r
565 "The file %s was not found in the patch file!"\r
566 IDS_ERR_PATCH_DOESNOTMATCH \r
567 "The patch seems outdated! The file line\n%s\nand the patchline\n%s\ndo not match!"\r
568 IDS_ERR_PATCH_FILESAVE "Could not save the file %s!"\r
569 END\r
570 \r
571 STRINGTABLE\r
572 BEGIN\r
573 IDS_ERR_MAINFRAME_FILEVERSIONNOTFOUND \r
574 "Could not retrieve revision %s of the file %s.\nPatching is not possible!"\r
575 IDS_ERR_MAINFRAME_FILEHASCONFLICTS \r
576 "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
577 END\r
578 \r
579 STRINGTABLE\r
580 BEGIN\r
581 ID_INDICATOR_LEFTVIEW " "\r
582 ID_INDICATOR_RIGHTVIEW " "\r
583 ID_INDICATOR_BOTTOMVIEW " "\r
584 END\r
585 \r
586 STRINGTABLE\r
587 BEGIN\r
588 IDS_STATUSBAR_REMOVEDLINES "- %d"\r
589 IDS_STATUSBAR_ADDEDLINES "+ %d"\r
590 IDS_STATUSBAR_CONFLICTEDLINES "! %d"\r
591 IDS_STATUSBAR_LEFTVIEW "Left View: "\r
592 IDS_STATUSBAR_RIGHTVIEW "Right View: "\r
593 IDS_STATUSBAR_CONFLICTS "Conflicts: %d"\r
594 END\r
595 \r
596 STRINGTABLE\r
597 BEGIN\r
598 IDS_VIEWCONTEXTMENU_USETHISBLOCK "Use th&is text block"\r
599 IDS_VIEWCONTEXTMENU_USETHEIRBLOCK "Use text block from '&theirs'"\r
600 IDS_VIEWCONTEXTMENU_USEYOURBLOCK "Use text block from '&mine'"\r
601 IDS_VIEWCONTEXTMENU_USETHEIRANDYOURBLOCK \r
602 "Use text block from 't&heirs' before 'mine'"\r
603 IDS_VIEWCONTEXTMENU_USEYOURANDTHEIRBLOCK \r
604 "Use text block from 'm&ine' before 'theirs'"\r
605 IDS_VIEWCONTEXTMENU_USETHISFILE "Use this &whole file"\r
606 IDS_VIEWCONTEXTMENU_USEOTHERBLOCK "Use &other text block"\r
607 IDS_VIEWCONTEXTMENU_USEOTHERFILE "Use whole other &file"\r
608 IDS_VIEWCONTEXTMENU_USEBOTHTHISFIRST \r
609 "Use both text blocks (this one first)"\r
610 IDS_VIEWCONTEXTMENU_USEBOTHTHISLAST "Use both text blocks (this one last)"\r
611 END\r
612 \r
613 STRINGTABLE\r
614 BEGIN\r
615 IDS_SAVEASTITLE "Save as..."\r
616 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
617 IDS_OPENDIFFFILETITLE "Apply Patch..."\r
618 IDS_GETVERSIONOFFILETITLE "Fetching file..."\r
619 IDS_GETVERSIONOFFILE "Fetching revision %s of file:"\r
620 IDS_WARNMODIFIEDLOOSECHANGES \r
621 "There are unsaved modifications!\nDo you want to save your changes?"\r
622 IDS_ASKFORSAVE "Do you want to save your changes?"\r
623 IDS_WARNMODIFIEDLOOSECHANGESOPTIONS \r
624 "Do you want to reload the documents to reflect the settings changes?\nNote: you will lose all changes you've made!"\r
625 END\r
626 \r
627 STRINGTABLE\r
628 BEGIN\r
629 IDS_ERR_DIFF_DIFF "The diffing engine aborted because of an error:\n%s"\r
630 IDS_ERR_DIFF_NEWLINES "Cannot show diff because of inconsistent newlines in the file."\r
631 END\r
632 \r
633 STRINGTABLE\r
634 BEGIN\r
635 IDS_ERR_FILE_OPEN "Could not open the file\n%s"\r
636 IDS_ERR_FILE_BINARY "The file\n%s\nis not a valid text file!"\r
637 IDS_ERR_FILE_NOTAFILE "%s\nis a directory, not a file!\nTortoiseGitMerge can't diff directories."\r
638 IDS_ERR_FILE_TOOBIG "The file is too big"\r
639 END\r
640 \r
641 STRINGTABLE\r
642 BEGIN\r
643 ID_FILE_OPEN "Open files for diff or to apply a patch\nOpen files"\r
644 ID_FILE_SAVE "Save the modified file\nSave file"\r
645 ID_FILE_SAVE_AS "Save the modified file\nSave file"\r
646 END\r
647 \r
648 STRINGTABLE\r
649 BEGIN\r
650 IDS_ABOUTVERSION "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\nlibsvn_diff %d.%d.%d, %s\r\napr %d.%d.%d\r\napr-utils %d.%d.%d"\r
651 IDS_ABOUTVERSIONBOX "TortoiseGitMerge %d.%d.%d.%d - %s, %s"\r
652 IDS_SETTINGSTITLE "Settings"\r
653 END\r
654 \r
655 STRINGTABLE\r
656 BEGIN\r
657 IDS_COMMONFILEFILTER "All Files (*.*)|*.*||"\r
658 IDS_PATCHFILEFILTER "Patchfiles (*.diff, *.patch)|*.diff;*.patch|All Files (*.*)|*.*||"\r
659 END\r
660 \r
661 STRINGTABLE\r
662 BEGIN\r
663 IDS_PATCH_ALL "Patch all files"\r
664 IDS_PATCH_TITLE "File patches"\r
665 IDS_DIFF_TITLE "File diffs"\r
666 IDS_PATCH_SELECTED "Patch selected files"\r
667 IDS_PATCH_PREVIEW "Preview patched file"\r
668 IDS_PATCH_ITEMTT "%s\nCould not be cleanly patched."\r
669 IDS_PATCH_COPYFROMCLIPBOARD "Open from clipboard"\r
670 END\r
671 \r
672 STRINGTABLE\r
673 BEGIN\r
674 ID_FILE_RELOAD "Reloads the opened files and reverts all changes.\nReload"\r
675 END\r
676 \r
677 STRINGTABLE\r
678 BEGIN\r
679 ID_NAVIGATE_PREVIOUSCONFLICT \r
680 "Go to the previous conflict\nPrevious conflict"\r
681 ID_NAVIGATE_NEXTCONFLICT "Go to the next conflict\nNext conflict"\r
682 ID_EDIT_MARKASRESOLVED "Marks a file as resolved in Git\nMark as resolved"\r
683 ID_VIEW_SWITCHLEFT "Switch the contents of the left and right view\nSwitch left and right view"\r
684 END\r
685 \r
686 STRINGTABLE\r
687 BEGIN\r
688 ID_VIEW_SHOWFILELIST "Hide/Show the patch file list\nHides or shows the patch file list"\r
689 ID_EDIT_USETHEIRBLOCK "Use text block from 'theirs'\nUse 'theirs' text block"\r
690 ID_EDIT_USEMYBLOCK "Use text block from 'mine'\nUse 'mine' text block"\r
691 ID_EDIT_USETHEIRTHENMYBLOCK \r
692 "Use text block from 'theirs' before 'mine'\nUse 'theirs' text block then 'mine'"\r
693 ID_EDIT_USEMINETHENTHEIRBLOCK \r
694 "Use text block from 'mine' before 'theirs'\nUse 'mine' text block then 'theirs'"\r
695 ID_VIEW_INLINEDIFFWORD "Show Inline-Diff word by word\nInline diff word-wise"\r
696 ID_EDIT_CREATEUNIFIEDDIFFFILE \r
697 "Creates a patch file from the differences of the two files\nCreate patch file"\r
698 END\r
699 \r
700 STRINGTABLE\r
701 BEGIN\r
702 IDS_WARNBETTERPATCHPATHFOUND \r
703 "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
704 IDS_NOTFOUNDVIEWTITLEINDICATOR "(not found)"\r
705 IDS_WARNABSOLUTEPATHFOUND \r
706 "The path\n%s\nin the patchfile does not exist.\nTortoiseGitMerge found the relative path\n%s\nwhich seems to match the directory you're applying the patch.\n\nDo you want to use the suggested path? Answering 'no' will quit TortoiseGitMerge."\r
707 IDS_WARNABSOLUTEPATHNOTFOUND \r
708 "The path\n%s\nin the patchfile does not exist.\nTortoiseGitMerge tried to apply the patch by stripping prefixes but no matching path could be found."\r
709 IDS_DELETEWHENEMPTY "The file \n%s\nis empty.\nDo you want to remove the file?"\r
710 IDS_EMPTYLINETT "(no line number)"\r
711 IDS_WARNMODIFIEDOUTSIDELOOSECHANGES \r
712 "Some file(s) have been changed outside TortoiseGitMerge.\nWould you like to reload and lose your changes?"\r
713 IDS_WARNMODIFIEDOUTSIDE "Some file(s) have been changed outside TortoiseGitMerge.\nDo you want to load the changes?"\r
714 END\r
715 \r
716 STRINGTABLE\r
717 BEGIN\r
718 IDS_VIEWTITLE_THEIRS "Theirs"\r
719 IDS_VIEWTITLE_MERGED "Merged"\r
720 IDS_VIEWTITLE_MINE "Mine"\r
721 END\r
722 \r
723 STRINGTABLE\r
724 BEGIN\r
725 IDS_COLOURPICKER_CUSTOMTEXT "More colors..."\r
726 IDS_COLOURPICKER_DEFAULTTEXT "Automatic"\r
727 END\r
728 \r
729 STRINGTABLE\r
730 BEGIN\r
731 IDS_VIEWSCROLLTIPTEXT "Line: %*ld"\r
732 END\r
733 \r
734 STRINGTABLE\r
735 BEGIN\r
736 IDS_EDIT_COPY "&Copy"\r
737 IDS_EDIT_CUT "C&ut"\r
738 IDS_EDIT_PASTE "&Paste"\r
739 END\r
740 \r
741 STRINGTABLE\r
742 BEGIN\r
743 IDC_STYLEBUTTON "Change the style of the application\nChange Style"\r
744 ID_VIEW_APPLOOK_WIN7 "Windows 7"\r
745 ID_VIEW_APPLOOK_VS_2008 "Visual Studio 2008"\r
746 ID_VIEW_APPLOOK_WIN_2000 "Windows 2000"\r
747 ID_VIEW_APPLOOK_OFF_XP "Office XP"\r
748 ID_VIEW_APPLOOK_WIN_XP "Windows XP"\r
749 ID_VIEW_APPLOOK_OFF_2003 "Office 2003"\r
750 ID_VIEW_APPLOOK_VS_2005 "Visual Studio 2005"\r
751 ID_OFFICE2007 "Office 2007 colors"\r
752 ID_VIEW_APPLOOK_OFF_2007_BLUE "Blue Style"\r
753 ID_VIEW_APPLOOK_OFF_2007_BLACK "Black Style"\r
754 ID_VIEW_APPLOOK_OFF_2007_SILVER "Silver Style"\r
755 ID_VIEW_APPLOOK_OFF_2007_AQUA "Aqua Style"\r
756 END\r
757 \r
758 STRINGTABLE\r
759 BEGIN\r
760 ID_VIEW_LINEDIFFBAR "Show or hide the line diff bar\nToggle LineDiffBar"\r
761 ID_VIEW_LOCATORBAR "Show or hide the locator bar\nToggle LocatorBar"\r
762 ID_EDIT_USELEFTBLOCK "Use text block from the left view\nUse left block"\r
763 ID_EDIT_USELEFTFILE "Use all content from the left view\nUse left file"\r
764 ID_EDIT_USEBLOCKFROMLEFTBEFORERIGHT \r
765 "Use block from left view before block from right view\nUse block from left before right"\r
766 ID_EDIT_USEBLOCKFROMRIGHTBEFORELEFT \r
767 "Use block from right view before block from left view\nUse block from right before left"\r
768 END\r
769 \r
770 STRINGTABLE\r
771 BEGIN\r
772 IDS_PATCH_SEARCHPATHTITLE "Searching for better path to apply patch..."\r
773 IDS_PATCH_SEARCHPATHLINE1 "scanning path:"\r
774 IDS_PATCH_PROGTITLE "Patching"\r
775 IDS_PATCH_PATHINGFILE "Patching file '%s'"\r
776 END\r
777 \r
778 STRINGTABLE\r
779 BEGIN\r
780 ID_VIEW_COLLAPSED "Collapse unchanged sections\nCollapse"\r
781 ID_VIEW_COMPAREWHITESPACES \r
782 "Compares all whitespaces when diffing\nCompare whitespaces"\r
783 ID_VIEW_IGNOREWHITESPACECHANGES \r
784 "Ignores changes in whitespaces when diffing\nIgnore whitespace changes"\r
785 ID_VIEW_IGNOREALLWHITESPACECHANGES \r
786 "Ignores all whitespace changes when diffing\nIgnore all whitespace changes"\r
787 ID_NAVIGATE_NEXTINLINEDIFF \r
788 "Go to the previous inline difference\nPrevious inline difference"\r
789 ID_NAVIGATE_PREVINLINEDIFF \r
790 "Go to the next inline difference\nNext inline difference"\r
791 END\r
792 \r
793 STRINGTABLE\r
794 BEGIN\r
795 ID_VIEW_MOVEDBLOCKS "Detect and highlight moved blocks"\r
796 ID_VIEW_WRAPLONGLINES "Wrap long lines at the right border of the view\nWrap long lines"\r
797 ID_VIEW_INLINEDIFF "Show Inline-Diff\nInline diff"\r
798 ID_EDIT_GOTOLINE "Navigate to a specific line in the view\nGoto Line"\r
799 END\r
800 \r
801 STRINGTABLE\r
802 BEGIN\r
803 IDS_ERR_THREADSTARTFAILED "Could not start thread!"\r
804 END\r
805 \r
806 STRINGTABLE\r
807 BEGIN\r
808 IDS_APPNAME "TortoiseGitMerge"\r
809 END\r
810 \r
811 STRINGTABLE\r
812 BEGIN\r
813 IDS_ERR_DIFFVIEWSTART "Could not start diff viewer!\n%s"\r
814 IDS_ERR_PATCHPATHS "Both the path to the patch file and the target path must be absolute paths!"\r
815 END\r
816 \r
817 STRINGTABLE\r
818 BEGIN\r
819 IDS_UTILS_SELECTTEXTVIEWER "Select text editor application"\r
820 END\r
821 \r
822 STRINGTABLE\r
823 BEGIN\r
824 IDS_ERR_TEXTVIEWSTART "Could not start text viewer!\n%s"\r
825 END\r
826 \r
827 STRINGTABLE\r
828 BEGIN\r
829 IDS_MOVED_FROM_TT "Line moved from line %ld"\r
830 IDS_MOVED_TO_TT "Line moved to line %ld"\r
831 END\r
832 \r
833 STRINGTABLE\r
834 BEGIN\r
835 IDS_GOTOLINE "&Line number (%d - %d)"\r
836 IDS_GOTO_OUTOFRANGE "The line number must be in between %d and %d"\r
837 END\r
838 \r
839 STRINGTABLE\r
840 BEGIN\r
841 ID_LOGOBUTTON "TortoiseGitMerge"\r
842 END\r
843 \r
844 STRINGTABLE\r
845 BEGIN\r
846 ID_APPLOOK "Changes the style of the application"\r
847 END\r
848 \r
849 STRINGTABLE\r
850 BEGIN\r
851 ID_USEBLOCKS "Click to see commands to move blocks of text\nUse text blocks"\r
852 END\r
853 \r
854 STRINGTABLE\r
855 BEGIN\r
856 IDS_MSGBOX_OK "&OK"\r
857 IDS_MSGBOX_CANCEL "&Cancel"\r
858 IDS_MSGBOX_IGNORE "Ignore"\r
859 IDS_MSGBOX_RETRY "Retry"\r
860 IDS_MSGBOX_ABORT "Abort"\r
861 IDS_MSGBOX_HELP "&Help"\r
862 IDS_MSGBOX_YES "Yes"\r
863 END\r
864 \r
865 STRINGTABLE\r
866 BEGIN\r
867 IDS_MSGBOX_NO "No"\r
868 IDS_MSGBOX_CONTINUE "Continue"\r
869 IDS_MSGBOX_DONOTASKAGAIN "Don't ask me again"\r
870 IDS_MSGBOX_DONOTTELLAGAIN "Don't tell me again"\r
871 IDS_MSGBOX_DONOTSHOWAGAIN "Don't show this message again"\r
872 IDS_MSGBOX_YESTOALL "Yes to all"\r
873 IDS_MSGBOX_NOTOALL "No to all"\r
874 IDS_MSGBOX_TRYAGAIN "Try again"\r
875 IDS_MSGBOX_REPORT "Report"\r
876 IDS_MSGBOX_IGNOREALL "Ignore all"\r
877 IDS_MSGBOX_SKIP "Skip"\r
878 IDS_MSGBOX_SKIPALL "Skip all"\r
879 END\r
880 \r
881 STRINGTABLE\r
882 BEGIN\r
883 IDS_MARKASRESOLVED "Do you want to mark the file\n%s\nas resolved?"\r
884 END\r
885 \r
886 #endif // English (United States) resources\r
887 /////////////////////////////////////////////////////////////////////////////\r
888 \r
889 \r
890 /////////////////////////////////////////////////////////////////////////////\r
891 // German (Switzerland) resources\r
892 \r
893 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DES)\r
894 LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_SWISS\r
895 #pragma code_page(1252)\r
896 \r
897 /////////////////////////////////////////////////////////////////////////////\r
898 //\r
899 // Dialog\r
900 //\r
901 \r
902 IDD_GOTO DIALOGEX 0, 0, 175, 69\r
903 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
904 CAPTION "Go To Line"\r
905 FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
906 BEGIN\r
907 DEFPUSHBUTTON "OK",IDOK,59,48,50,14\r
908 PUSHBUTTON "Cancel",IDCANCEL,118,48,50,14\r
909 LTEXT "&Line number",IDC_LINELABEL,7,7,161,8\r
910 EDITTEXT IDC_NUMBER,7,20,161,14,ES_AUTOHSCROLL | ES_NUMBER\r
911 END\r
912 \r
913 \r
914 /////////////////////////////////////////////////////////////////////////////\r
915 //\r
916 // DESIGNINFO\r
917 //\r
918 \r
919 #ifdef APSTUDIO_INVOKED\r
920 GUIDELINES DESIGNINFO\r
921 BEGIN\r
922 IDD_GOTO, DIALOG\r
923 BEGIN\r
924 LEFTMARGIN, 7\r
925 RIGHTMARGIN, 168\r
926 TOPMARGIN, 7\r
927 BOTTOMMARGIN, 62\r
928 END\r
929 END\r
930 #endif // APSTUDIO_INVOKED\r
931 \r
932 \r
933 #ifdef APSTUDIO_INVOKED\r
934 /////////////////////////////////////////////////////////////////////////////\r
935 //\r
936 // TEXTINCLUDE\r
937 //\r
938 \r
939 1 TEXTINCLUDE \r
940 BEGIN\r
941 "..\\TortoiseMerge\\resource.h\0"\r
942 END\r
943 \r
944 2 TEXTINCLUDE \r
945 BEGIN\r
946 "#include <afxres.h>\r\n"\r
947 "\0"\r
948 END\r
949 \r
950 3 TEXTINCLUDE \r
951 BEGIN\r
952 "#define _AFX_NO_SPLITTER_RESOURCES\r\n"\r
953 "#define _AFX_NO_OLE_RESOURCES\r\n"\r
954 "#define _AFX_NO_TRACKER_RESOURCES\r\n"\r
955 "#define _AFX_NO_PROPERTY_RESOURCES\r\n"\r
956 "\r\n"\r
957 "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"\r
958 "LANGUAGE 9, 1\r\n"\r
959 "#pragma code_page(1252)\r\n"\r
960 "#include ""TortoiseMerge.rc2"" // non-Microsoft Visual C++ edited resources\r\n"\r
961 "#include <afxres.rc> // Standard components\r\n"\r
962 "#include <afxprint.rc> // printing/print preview resources\r\n"\r
963 "#include <afxribbon.rc> // ribbon and control bar resources\r\n"\r
964 "#include <afxolecl.rc> // OLE container resources\r\n"\r
965 "#endif\r\n"\r
966 "\0"\r
967 END\r
968 \r
969 #endif // APSTUDIO_INVOKED\r
970 \r
971 #endif // German (Switzerland) resources\r
972 /////////////////////////////////////////////////////////////////////////////\r
973 \r
974 \r
975 \r
976 #ifndef APSTUDIO_INVOKED\r
977 /////////////////////////////////////////////////////////////////////////////\r
978 //\r
979 // Generated from the TEXTINCLUDE 3 resource.\r
980 //\r
981 #define _AFX_NO_SPLITTER_RESOURCES\r
982 #define _AFX_NO_OLE_RESOURCES\r
983 #define _AFX_NO_TRACKER_RESOURCES\r
984 #define _AFX_NO_PROPERTY_RESOURCES\r
985 \r
986 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r
987 LANGUAGE 9, 1\r
988 #pragma code_page(1252)\r
989 #include "TortoiseMerge.rc2" // non-Microsoft Visual C++ edited resources\r
990 #include <afxres.rc> // Standard components\r
991 #include <afxprint.rc> // printing/print preview resources\r
992 #include <afxribbon.rc> // ribbon and control bar resources\r
993 #include <afxolecl.rc> // OLE container resources\r
994 #endif\r
995 \r
996 /////////////////////////////////////////////////////////////////////////////\r
997 #endif // not APSTUDIO_INVOKED\r
998 \r