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