| blob | 1ff23f201dd9b1ed8a0bb3802a2ca3b62c7aab03 |
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_CAPS "CAP"\r
458 ID_INDICATOR_NUM "NUM"\r
459 END\r
460 \r
461 STRINGTABLE\r
462 BEGIN\r
463 ID_APP_ABOUT "Display program information, version number and copyright\nAbout"\r
464 ID_APP_EXIT "Quit the application; prompts to save documents\nExit"\r
465 ID_HELP_INDEX "Opens Help\nHelp Topics"\r
466 ID_HELP_FINDER "List Help topics\nHelp Topics"\r
467 ID_HELP_USING "Display instructions about how to use help\nHelp"\r
468 ID_CONTEXT_HELP "Display help for clicked on buttons, menus and windows\nHelp"\r
469 ID_HELP "Display help for current task or command\nHelp"\r
470 END\r
471 \r
472 STRINGTABLE\r
473 BEGIN\r
474 ID_NEXT_PANE "Switch to the next window pane\nNext Pane"\r
475 ID_PREV_PANE "Switch back to the previous window pane\nPrevious Pane"\r
476 END\r
477 \r
478 STRINGTABLE\r
479 BEGIN\r
480 ID_WINDOW_SPLIT "Split the active window into panes\nSplit"\r
481 END\r
482 \r
483 STRINGTABLE\r
484 BEGIN\r
485 ID_EDIT_CLEAR "Erase the selection\nErase"\r
486 ID_EDIT_CLEAR_ALL "Erase everything\nErase All"\r
487 ID_EDIT_COPY "Copy the selection and put it on the Clipboard\nCopy"\r
488 ID_EDIT_CUT "Cut the selection and put it on the Clipboard\nCut"\r
489 ID_EDIT_FIND "Find the specified text\nFind"\r
490 ID_EDIT_PASTE "Insert Clipboard contents\nPaste"\r
491 ID_EDIT_REPEAT "Repeat the last action\nRepeat"\r
492 ID_EDIT_REPLACE "Replace specific text with different text\nReplace"\r
493 ID_EDIT_SELECT_ALL "Select the entire document\nSelect All"\r
494 ID_EDIT_UNDO "Undo the last modifications\nUndo"\r
495 ID_EDIT_REDO "Redo the previously undone action\nRedo"\r
496 END\r
497 \r
498 STRINGTABLE\r
499 BEGIN\r
500 ID_VIEW_TOOLBAR "Show or hide the toolbar\nToggle ToolBar"\r
501 ID_VIEW_STATUS_BAR "Show or hide the status bar\nToggle StatusBar"\r
502 END\r
503 \r
504 STRINGTABLE\r
505 BEGIN\r
506 AFX_IDS_SCSIZE "Change the window size"\r
507 AFX_IDS_SCMOVE "Change the window position"\r
508 AFX_IDS_SCMINIMIZE "Reduce the window to an icon"\r
509 AFX_IDS_SCMAXIMIZE "Enlarge the window to full size"\r
510 AFX_IDS_SCNEXTWINDOW "Switch to the next document window"\r
511 AFX_IDS_SCPREVWINDOW "Switch to the previous document window"\r
512 AFX_IDS_SCCLOSE "Close the active window and prompts to save the documents"\r
513 END\r
514 \r
515 STRINGTABLE\r
516 BEGIN\r
517 AFX_IDS_SCRESTORE "Restore the window to normal size"\r
518 AFX_IDS_SCTASKLIST "Activate Task List"\r
519 END\r
520 \r
521 STRINGTABLE\r
522 BEGIN\r
523 IDS_SELECTFILE "Select File..."\r
524 IDS_SELECTDIFFFILE "Select patch file..."\r
525 END\r
526 \r
527 STRINGTABLE\r
528 BEGIN\r
529 ID_VIEW_WHITESPACES "Show special characters for whitespaces and newlines\nShow Whitespaces"\r
530 ID_VIEW_ONEWAYDIFF "Switch between single and double pane view\nSwitch between single and double pane view"\r
531 ID_NAVIGATE_NEXTDIFFERENCE "Go to the next difference\nNext difference"\r
532 ID_NAVIGATE_PREVIOUSDIFFERENCE \r
533 "Go to the previous difference\nPrevious difference"\r
534 ID_VIEW_OPTIONS "Adjust the settings\nSettings"\r
535 END\r
536 \r
537 STRINGTABLE\r
538 BEGIN\r
539 IDS_ERR_PATCH_NOINDEX "The line 'Index: ' was not found!\nEither this is not a diff file or the diff is empty."\r
540 IDS_ERR_PATCH_NOEQUATIONCHARLINE \r
541 "The line '====' was expected in line %d !"\r
542 IDS_ERR_PATCH_NOREMOVEFILELINE \r
543 "The line indicating the old file was expected in line %d !"\r
544 IDS_ERR_PATCH_NOADDFILELINE \r
545 "The line indicating the new file was expected in line %d !"\r
546 IDS_ERR_PATCH_RENAMINGNOTSUPPORTED \r
547 "The old file does not match the new file.\nRenaming of files is not (yet) supported!"\r
548 IDS_ERR_PATCH_CHUNKSTARTNOTFOUND \r
549 "The chunk start '@@' was expected in line %d !"\r
550 IDS_ERR_PATCH_UNKOWNLINETYPE "An unknown line type was found in line %d !"\r
551 IDS_ERR_PATCH_CHUNKMISMATCH \r
552 "The chunk size did not match the number of added/removed lines!"\r
553 END\r
554 \r
555 STRINGTABLE\r
556 BEGIN\r
557 IDS_ERR_PATCH_INVALIDPATCHFILE "The file %s does not exist!"\r
558 IDS_ERR_PATCH_FILENOTINPATCH \r
559 "The file %s was not found in the patch file!"\r
560 IDS_ERR_PATCH_DOESNOTMATCH \r
561 "The patch seems outdated! The file line\n%s\nand the patchline\n%s\ndo not match!"\r
562 IDS_ERR_PATCH_FILESAVE "Could not save the file %s!"\r
563 END\r
564 \r
565 STRINGTABLE\r
566 BEGIN\r
567 IDS_ERR_MAINFRAME_FILEVERSIONNOTFOUND \r
568 "Could not retrieve revision %s of the file %s.\nPatching is not possible!"\r
569 IDS_ERR_MAINFRAME_FILEHASCONFLICTS \r
570 "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
571 END\r
572 \r
573 STRINGTABLE\r
574 BEGIN\r
575 ID_INDICATOR_LEFTVIEW " "\r
576 ID_INDICATOR_RIGHTVIEW " "\r
577 ID_INDICATOR_BOTTOMVIEW " "\r
578 END\r
579 \r
580 STRINGTABLE\r
581 BEGIN\r
582 IDS_STATUSBAR_REMOVEDLINES "- %d"\r
583 IDS_STATUSBAR_ADDEDLINES "+ %d"\r
584 IDS_STATUSBAR_CONFLICTEDLINES "! %d"\r
585 IDS_STATUSBAR_LEFTVIEW "Left View: "\r
586 IDS_STATUSBAR_RIGHTVIEW "Right View: "\r
587 IDS_STATUSBAR_CONFLICTS "Conflicts: %d"\r
588 END\r
589 \r
590 STRINGTABLE\r
591 BEGIN\r
592 IDS_VIEWCONTEXTMENU_USETHISBLOCK "Use th&is text block"\r
593 IDS_VIEWCONTEXTMENU_USETHEIRBLOCK "Use text block from '&theirs'"\r
594 IDS_VIEWCONTEXTMENU_USEYOURBLOCK "Use text block from '&mine'"\r
595 IDS_VIEWCONTEXTMENU_USETHEIRANDYOURBLOCK \r
596 "Use text block from 't&heirs' before 'mine'"\r
597 IDS_VIEWCONTEXTMENU_USEYOURANDTHEIRBLOCK \r
598 "Use text block from 'm&ine' before 'theirs'"\r
599 IDS_VIEWCONTEXTMENU_USETHISFILE "Use this &whole file"\r
600 IDS_VIEWCONTEXTMENU_USEOTHERBLOCK "Use &other text block"\r
601 IDS_VIEWCONTEXTMENU_USEOTHERFILE "Use whole other &file"\r
602 IDS_VIEWCONTEXTMENU_USEBOTHTHISFIRST \r
603 "Use both text blocks (this one first)"\r
604 IDS_VIEWCONTEXTMENU_USEBOTHTHISLAST "Use both text blocks (this one last)"\r
605 END\r
606 \r
607 STRINGTABLE\r
608 BEGIN\r
609 IDS_SAVEASTITLE "Save as..."\r
610 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
611 IDS_OPENDIFFFILETITLE "Apply Patch..."\r
612 IDS_GETVERSIONOFFILETITLE "Fetching file..."\r
613 IDS_GETVERSIONOFFILE "Fetching revision %s of file:"\r
614 IDS_WARNMODIFIEDLOOSECHANGES \r
615 "There are unsaved modifications!\nDo you want to save your changes?"\r
616 IDS_ASKFORSAVE "Do you want to save your changes?"\r
617 IDS_WARNMODIFIEDLOOSECHANGESOPTIONS \r
618 "Do you want to reload the documents to reflect the settings changes?\nNote: you will lose all changes you've made!"\r
619 END\r
620 \r
621 STRINGTABLE\r
622 BEGIN\r
623 IDS_ERR_DIFF_DIFF "The diffing engine aborted because of an error:\n%s"\r
624 IDS_ERR_DIFF_NEWLINES "Cannot show diff because of inconsistent newlines in the file."\r
625 END\r
626 \r
627 STRINGTABLE\r
628 BEGIN\r
629 IDS_ERR_FILE_OPEN "Could not open the file\n%s"\r
630 IDS_ERR_FILE_BINARY "The file\n%s\nis not a valid text file!"\r
631 IDS_ERR_FILE_NOTAFILE "%s\nis a directory, not a file!\nTortoiseGitMerge can't diff directories."\r
632 IDS_ERR_FILE_TOOBIG "The file is too big"\r
633 END\r
634 \r
635 STRINGTABLE\r
636 BEGIN\r
637 ID_FILE_OPEN "Open files for diff or to apply a patch\nOpen files"\r
638 ID_FILE_SAVE "Save the modified file\nSave file"\r
639 ID_FILE_SAVE_AS "Save the modified file\nSave file"\r
640 END\r
641 \r
642 STRINGTABLE\r
643 BEGIN\r
644 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
645 IDS_ABOUTVERSIONBOX "TortoiseGitMerge %d.%d.%d.%d - %s, %s"\r
646 IDS_SETTINGSTITLE "Settings"\r
647 END\r
648 \r
649 STRINGTABLE\r
650 BEGIN\r
651 IDS_COMMONFILEFILTER "All Files (*.*)|*.*||"\r
652 IDS_PATCHFILEFILTER "Patchfiles (*.diff, *.patch)|*.diff;*.patch|All Files (*.*)|*.*||"\r
653 END\r
654 \r
655 STRINGTABLE\r
656 BEGIN\r
657 IDS_PATCH_ALL "Patch all files"\r
658 IDS_PATCH_TITLE "File patches"\r
659 IDS_DIFF_TITLE "File diffs"\r
660 IDS_PATCH_SELECTED "Patch selected files"\r
661 IDS_PATCH_PREVIEW "Preview patched file"\r
662 IDS_PATCH_ITEMTT "%s\nCould not be cleanly patched."\r
663 IDS_PATCH_COPYFROMCLIPBOARD "Open from clipboard"\r
664 END\r
665 \r
666 STRINGTABLE\r
667 BEGIN\r
668 ID_FILE_RELOAD "Reloads the opened files and reverts all changes.\nReload"\r
669 END\r
670 \r
671 STRINGTABLE\r
672 BEGIN\r
673 ID_NAVIGATE_PREVIOUSCONFLICT \r
674 "Go to the previous conflict\nPrevious conflict"\r
675 ID_NAVIGATE_NEXTCONFLICT "Go to the next conflict\nNext conflict"\r
676 ID_EDIT_MARKASRESOLVED "Marks a file as resolved in Git\nMark as resolved"\r
677 ID_VIEW_SWITCHLEFT "Switch the contents of the left and right view\nSwitch left and right view"\r
678 END\r
679 \r
680 STRINGTABLE\r
681 BEGIN\r
682 ID_VIEW_SHOWFILELIST "Hide/Show the patch file list\nHides or shows the patch file list"\r
683 ID_EDIT_USETHEIRBLOCK "Use text block from 'theirs'\nUse 'theirs' text block"\r
684 ID_EDIT_USEMYBLOCK "Use text block from 'mine'\nUse 'mine' text block"\r
685 ID_EDIT_USETHEIRTHENMYBLOCK \r
686 "Use text block from 'theirs' before 'mine'\nUse 'theirs' text block then 'mine'"\r
687 ID_EDIT_USEMINETHENTHEIRBLOCK \r
688 "Use text block from 'mine' before 'theirs'\nUse 'mine' text block then 'theirs'"\r
689 ID_VIEW_INLINEDIFFWORD "Show Inline-Diff word by word\nInline diff word-wise"\r
690 ID_EDIT_CREATEUNIFIEDDIFFFILE \r
691 "Creates a patch file from the differences of the two files\nCreate patch file"\r
692 END\r
693 \r
694 STRINGTABLE\r
695 BEGIN\r
696 IDS_WARNBETTERPATCHPATHFOUND \r
697 "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
698 IDS_NOTFOUNDVIEWTITLEINDICATOR "(not found)"\r
699 IDS_WARNABSOLUTEPATHFOUND \r
700 "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
701 IDS_WARNABSOLUTEPATHNOTFOUND \r
702 "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
703 IDS_DELETEWHENEMPTY "The file \n%s\nis empty.\nDo you want to remove the file?"\r
704 IDS_EMPTYLINETT "(no line number)"\r
705 IDS_WARNMODIFIEDOUTSIDELOOSECHANGES \r
706 "Some file(s) have been changed outside TortoiseGitMerge.\nWould you like to reload and lose your changes?"\r
707 IDS_WARNMODIFIEDOUTSIDE "Some file(s) have been changed outside TortoiseGitMerge.\nDo you want to load the changes?"\r
708 END\r
709 \r
710 STRINGTABLE\r
711 BEGIN\r
712 IDS_VIEWTITLE_THEIRS "Theirs"\r
713 IDS_VIEWTITLE_MERGED "Merged"\r
714 IDS_VIEWTITLE_MINE "Mine"\r
715 END\r
716 \r
717 STRINGTABLE\r
718 BEGIN\r
719 IDS_COLOURPICKER_CUSTOMTEXT "More colors..."\r
720 IDS_COLOURPICKER_DEFAULTTEXT "Automatic"\r
721 END\r
722 \r
723 STRINGTABLE\r
724 BEGIN\r
725 IDS_VIEWSCROLLTIPTEXT "Line: %*ld"\r
726 END\r
727 \r
728 STRINGTABLE\r
729 BEGIN\r
730 IDS_EDIT_COPY "&Copy"\r
731 IDS_EDIT_CUT "C&ut"\r
732 IDS_EDIT_PASTE "&Paste"\r
733 END\r
734 \r
735 STRINGTABLE\r
736 BEGIN\r
737 IDC_STYLEBUTTON "Change the style of the application\nChange Style"\r
738 ID_VIEW_APPLOOK_WIN7 "Windows 7"\r
739 ID_VIEW_APPLOOK_VS_2008 "Visual Studio 2008"\r
740 ID_VIEW_APPLOOK_WIN_2000 "Windows 2000"\r
741 ID_VIEW_APPLOOK_OFF_XP "Office XP"\r
742 ID_VIEW_APPLOOK_WIN_XP "Windows XP"\r
743 ID_VIEW_APPLOOK_OFF_2003 "Office 2003"\r
744 ID_VIEW_APPLOOK_VS_2005 "Visual Studio 2005"\r
745 ID_OFFICE2007 "Office 2007 colors"\r
746 ID_VIEW_APPLOOK_OFF_2007_BLUE "Blue Style"\r
747 ID_VIEW_APPLOOK_OFF_2007_BLACK "Black Style"\r
748 ID_VIEW_APPLOOK_OFF_2007_SILVER "Silver Style"\r
749 ID_VIEW_APPLOOK_OFF_2007_AQUA "Aqua Style"\r
750 END\r
751 \r
752 STRINGTABLE\r
753 BEGIN\r
754 ID_VIEW_LINEDIFFBAR "Show or hide the line diff bar\nToggle LineDiffBar"\r
755 ID_VIEW_LOCATORBAR "Show or hide the locator bar\nToggle LocatorBar"\r
756 ID_EDIT_USELEFTBLOCK "Use text block from the left view\nUse left block"\r
757 ID_EDIT_USELEFTFILE "Use all content from the left view\nUse left file"\r
758 ID_EDIT_USEBLOCKFROMLEFTBEFORERIGHT \r
759 "Use block from left view before block from right view\nUse block from left before right"\r
760 ID_EDIT_USEBLOCKFROMRIGHTBEFORELEFT \r
761 "Use block from right view before block from left view\nUse block from right before left"\r
762 END\r
763 \r
764 STRINGTABLE\r
765 BEGIN\r
766 IDS_PATCH_SEARCHPATHTITLE "Searching for better path to apply patch..."\r
767 IDS_PATCH_SEARCHPATHLINE1 "scanning path:"\r
768 IDS_PATCH_PROGTITLE "Patching"\r
769 IDS_PATCH_PATHINGFILE "Patching file '%s'"\r
770 END\r
771 \r
772 STRINGTABLE\r
773 BEGIN\r
774 ID_VIEW_COLLAPSED "Collapse unchanged sections\nCollapse"\r
775 ID_VIEW_COMPAREWHITESPACES \r
776 "Compares all whitespaces when diffing\nCompare whitespaces"\r
777 ID_VIEW_IGNOREWHITESPACECHANGES \r
778 "Ignores changes in whitespaces when diffing\nIgnore whitespace changes"\r
779 ID_VIEW_IGNOREALLWHITESPACECHANGES \r
780 "Ignores all whitespace changes when diffing\nIgnore all whitespace changes"\r
781 ID_NAVIGATE_NEXTINLINEDIFF \r
782 "Go to the previous inline difference\nPrevious inline difference"\r
783 ID_NAVIGATE_PREVINLINEDIFF \r
784 "Go to the next inline difference\nNext inline difference"\r
785 END\r
786 \r
787 STRINGTABLE\r
788 BEGIN\r
789 ID_VIEW_MOVEDBLOCKS "Detect and highlight moved blocks"\r
790 ID_VIEW_WRAPLONGLINES "Wrap long lines at the right border of the view\nWrap long lines"\r
791 ID_VIEW_INLINEDIFF "Show Inline-Diff\nInline diff"\r
792 ID_EDIT_GOTOLINE "Navigate to a specific line in the view\nGoto Line"\r
793 END\r
794 \r
795 STRINGTABLE\r
796 BEGIN\r
797 IDS_ERR_THREADSTARTFAILED "Could not start thread!"\r
798 END\r
799 \r
800 STRINGTABLE\r
801 BEGIN\r
802 IDS_APPNAME "TortoiseGitMerge"\r
803 END\r
804 \r
805 STRINGTABLE\r
806 BEGIN\r
807 IDS_ERR_DIFFVIEWSTART "Could not start diff viewer!\n%s"\r
808 IDS_ERR_PATCHPATHS "Both the path to the patch file and the target path must be absolute paths!"\r
809 END\r
810 \r
811 STRINGTABLE\r
812 BEGIN\r
813 IDS_UTILS_SELECTTEXTVIEWER "Select text editor application"\r
814 END\r
815 \r
816 STRINGTABLE\r
817 BEGIN\r
818 IDS_ERR_TEXTVIEWSTART "Could not start text viewer!\n%s"\r
819 END\r
820 \r
821 STRINGTABLE\r
822 BEGIN\r
823 IDS_PROPMODS "(properties only)"\r
824 IDS_PROPANDCONTENTMODS "(props and content)"\r
825 IDS_MOVED_FROM_TT "Line moved from line %ld"\r
826 IDS_MOVED_TO_TT "Line moved to line %ld"\r
827 END\r
828 \r
829 STRINGTABLE\r
830 BEGIN\r
831 IDS_GOTOLINE "&Line number (%d - %d)"\r
832 IDS_GOTO_OUTOFRANGE "The line number must be in between %d and %d"\r
833 END\r
834 \r
835 STRINGTABLE\r
836 BEGIN\r
837 ID_LOGOBUTTON "TortoiseGitMerge"\r
838 END\r
839 \r
840 STRINGTABLE\r
841 BEGIN\r
842 ID_APPLOOK "Changes the style of the application"\r
843 END\r
844 \r
845 STRINGTABLE\r
846 BEGIN\r
847 ID_USEBLOCKS "Click to see commands to move blocks of text\nUse text blocks"\r
848 END\r
849 \r
850 STRINGTABLE\r
851 BEGIN\r
852 IDS_MSGBOX_OK "&OK"\r
853 IDS_MSGBOX_CANCEL "&Cancel"\r
854 IDS_MSGBOX_IGNORE "Ignore"\r
855 IDS_MSGBOX_RETRY "Retry"\r
856 IDS_MSGBOX_ABORT "Abort"\r
857 IDS_MSGBOX_HELP "&Help"\r
858 IDS_MSGBOX_YES "Yes"\r
859 END\r
860 \r
861 STRINGTABLE\r
862 BEGIN\r
863 IDS_MSGBOX_NO "No"\r
864 IDS_MSGBOX_CONTINUE "Continue"\r
865 IDS_MSGBOX_DONOTASKAGAIN "Don't ask me again"\r
866 IDS_MSGBOX_DONOTTELLAGAIN "Don't tell me again"\r
867 IDS_MSGBOX_DONOTSHOWAGAIN "Don't show this message again"\r
868 IDS_MSGBOX_YESTOALL "Yes to all"\r
869 IDS_MSGBOX_NOTOALL "No to all"\r
870 IDS_MSGBOX_TRYAGAIN "Try again"\r
871 IDS_MSGBOX_REPORT "Report"\r
872 IDS_MSGBOX_IGNOREALL "Ignore all"\r
873 IDS_MSGBOX_SKIP "Skip"\r
874 IDS_MSGBOX_SKIPALL "Skip all"\r
875 END\r
876 \r
877 STRINGTABLE\r
878 BEGIN\r
879 IDS_MARKASRESOLVED "Do you want to mark the file\n%s\nas resolved?"\r
880 END\r
881 \r
882 #endif // English (United States) resources\r
883 /////////////////////////////////////////////////////////////////////////////\r
884 \r
885 \r
886 /////////////////////////////////////////////////////////////////////////////\r
887 // German (Switzerland) resources\r
888 \r
889 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DES)\r
890 LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_SWISS\r
891 \r
892 /////////////////////////////////////////////////////////////////////////////\r
893 //\r
894 // Dialog\r
895 //\r
896 \r
897 IDD_GOTO DIALOGEX 0, 0, 175, 69\r
898 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
899 CAPTION "Go To Line"\r
900 FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
901 BEGIN\r
902 DEFPUSHBUTTON "OK",IDOK,59,48,50,14\r
903 PUSHBUTTON "Cancel",IDCANCEL,118,48,50,14\r
904 LTEXT "&Line number",IDC_LINELABEL,7,7,161,8\r
905 EDITTEXT IDC_NUMBER,7,20,161,14,ES_AUTOHSCROLL | ES_NUMBER\r
906 END\r
907 \r
908 \r
909 /////////////////////////////////////////////////////////////////////////////\r
910 //\r
911 // DESIGNINFO\r
912 //\r
913 \r
914 #ifdef APSTUDIO_INVOKED\r
915 GUIDELINES DESIGNINFO\r
916 BEGIN\r
917 IDD_GOTO, DIALOG\r
918 BEGIN\r
919 LEFTMARGIN, 7\r
920 RIGHTMARGIN, 168\r
921 TOPMARGIN, 7\r
922 BOTTOMMARGIN, 62\r
923 END\r
924 END\r
925 #endif // APSTUDIO_INVOKED\r
926 \r
927 \r
928 #ifdef APSTUDIO_INVOKED\r
929 /////////////////////////////////////////////////////////////////////////////\r
930 //\r
931 // TEXTINCLUDE\r
932 //\r
933 \r
934 1 TEXTINCLUDE \r
935 BEGIN\r
936 "..\\TortoiseMerge\\resource.h\0"\r
937 END\r
938 \r
939 2 TEXTINCLUDE \r
940 BEGIN\r
941 "#include ""afxres.h""\r\n"\r
942 "\0"\r
943 END\r
944 \r
945 3 TEXTINCLUDE \r
946 BEGIN\r
947 "#define _AFX_NO_SPLITTER_RESOURCES\r\n"\r
948 "#define _AFX_NO_OLE_RESOURCES\r\n"\r
949 "#define _AFX_NO_TRACKER_RESOURCES\r\n"\r
950 "#define _AFX_NO_PROPERTY_RESOURCES\r\n"\r
951 "\r\n"\r
952 "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"\r
953 "LANGUAGE 9, 1\r\n"\r
954 "#pragma code_page(1252)\r\n"\r
955 "#include ""TortoiseMerge.rc2"" // non-Microsoft Visual C++ edited resources\r\n"\r
956 "#include ""afxres.rc"" // Standard components\r\n"\r
957 "#include ""afxprint.rc"" // printing/print preview resources\r\n"\r
958 "#include ""afxribbon.rc"" // ribbon and control bar resources\r\n"\r
959 "#include ""afxolecl.rc"" // OLE container resources\r\n"\r
960 "#endif\r\n"\r
961 "\0"\r
962 END\r
963 \r
964 #endif // APSTUDIO_INVOKED\r
965 \r
966 #endif // German (Switzerland) resources\r
967 /////////////////////////////////////////////////////////////////////////////\r
968 \r
969 \r
970 \r
971 #ifndef APSTUDIO_INVOKED\r
972 /////////////////////////////////////////////////////////////////////////////\r
973 //\r
974 // Generated from the TEXTINCLUDE 3 resource.\r
975 //\r
976 #define _AFX_NO_SPLITTER_RESOURCES\r
977 #define _AFX_NO_OLE_RESOURCES\r
978 #define _AFX_NO_TRACKER_RESOURCES\r
979 #define _AFX_NO_PROPERTY_RESOURCES\r
980 \r
981 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r
982 LANGUAGE 9, 1\r
983 #pragma code_page(1252)\r
984 #include "TortoiseMerge.rc2" // non-Microsoft Visual C++ edited resources\r
985 #include "afxres.rc" // Standard components\r
986 #include "afxprint.rc" // printing/print preview resources\r
987 #include "afxribbon.rc" // ribbon and control bar resources\r
988 #include "afxolecl.rc" // OLE container resources\r
989 #endif\r
990 \r
991 /////////////////////////////////////////////////////////////////////////////\r
992 #endif // not APSTUDIO_INVOKED\r
993 \r