// TEXTINCLUDE
//
-1 TEXTINCLUDE DISCARDABLE
+1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END
-2 TEXTINCLUDE DISCARDABLE
+2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
-3 TEXTINCLUDE DISCARDABLE
+3 TEXTINCLUDE DISCARDABLE
BEGIN
"#define _AFX_NO_OLE_RESOURCES\r\n"
"#define _AFX_NO_TRACKER_RESOURCES\r\n"
// Menu
//
-IDR_POPUP_DIFFVIEW MENU DISCARDABLE
+IDR_POPUP_DIFFVIEW MENU DISCARDABLE
BEGIN
POPUP "_POPUP_"
BEGIN
MENUITEM "Copy to other side", ID_POPUP_COPYTOOTHERSIDE
MENUITEM "Copy from other side", ID_POPUP_COPYFROMOTHERSIDE
MENUITEM SEPARATOR
- MENUITEM "Copy all diffs to other side...",
+ MENUITEM "Copy all diffs to other side...",
ID_POPUP_COPYALLDIFFSTOOTHERSIDE
- MENUITEM "Copy all diffs from other side...",
+ MENUITEM "Copy all diffs from other side...",
ID_POPUP_COPYALLDIFFSFROMOTHERSIDE
MENUITEM SEPARATOR
END
END
-IDR_MAINFRAME MENU PRELOAD DISCARDABLE
+IDR_MAINFRAME MENU PRELOAD DISCARDABLE
BEGIN
POPUP "&File"
BEGIN
END
END
-IDR_POPUP_DIRVIEW MENU DISCARDABLE
+IDR_POPUP_DIRVIEW MENU DISCARDABLE
BEGIN
POPUP "_POPUP_"
BEGIN
// Accelerator
//
-IDR_MAINFRAME ACCELERATORS PRELOAD MOVEABLE PURE
+IDR_MAINFRAME ACCELERATORS PRELOAD MOVEABLE PURE
BEGIN
"C", ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT
"N", ID_FILE_NEW, VIRTKEY, CONTROL, NOINVERT
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
LTEXT "&Left:",IDC_STATIC,38,24,15,8
- COMBOBOX IDC_LEFT_COMBO,56,22,182,94,CBS_DROPDOWN |
+ COMBOBOX IDC_LEFT_COMBO,56,22,182,94,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP,
WS_EX_ACCEPTFILES
PUSHBUTTON "&Browse...",IDC_LEFT_BUTTON,241,22,38,12
LTEXT "&Right:",IDC_STATIC,33,40,20,8
- COMBOBOX IDC_RIGHT_COMBO,56,38,182,95,CBS_DROPDOWN |
+ COMBOBOX IDC_RIGHT_COMBO,56,38,182,95,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP,
WS_EX_ACCEPTFILES
PUSHBUTTON "Bro&wse...",IDC_RIGHT_BUTTON,241,38,38,12
LTEXT "E&xtensions:",IDC_STATIC,16,56,37,8
- COMBOBOX IDC_EXT_COMBO,56,54,151,95,CBS_DROPDOWN |
+ COMBOBOX IDC_EXT_COMBO,56,54,151,95,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
- CONTROL "Re&cursive",IDC_RECURS_CHECK,"Button",BS_AUTOCHECKBOX |
+ CONTROL "Re&cursive",IDC_RECURS_CHECK,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,35,77,48,10
DEFPUSHBUTTON "OK",IDOK,295,11,50,14
PUSHBUTTON "Cancel",IDCANCEL,295,28,50,14
PUSHBUTTON "Cancel",IDCANCEL,173,121,50,14
PUSHBUTTON "Save As...",IDSAVEAS,103,121,50,14
LTEXT "Project:",IDC_STATIC,9,61,25,8
- COMBOBOX IDC_PROJECT_COMBO,36,58,215,114,CBS_DROPDOWN |
+ COMBOBOX IDC_PROJECT_COMBO,36,58,215,114,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
LTEXT "User:",IDC_STATIC,13,80,18,8
EDITTEXT IDC_USER,36,78,58,14,ES_AUTOHSCROLL
LTEXT "&Path to cleartool.exe:",IDC_VSS_L1,16,42,68,8
EDITTEXT IDC_PATH_EDIT,85,40,116,12,ES_AUTOHSCROLL
PUSHBUTTON "&Browse...",IDC_BROWSE_BUTTON,206,40,42,12
- COMBOBOX IDC_VER_SYS,85,20,157,41,CBS_DROPDOWNLIST | WS_VSCROLL |
+ COMBOBOX IDC_VER_SYS,85,20,157,41,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
LTEXT "&Versioning System",IDC_STATIC,16,22,60,10
END
IDD_PROPPAGE_LARGE DIALOGEX 0, 0, 235, 156
STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "General"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
GROUPBOX "Settings",IDC_STATIC,7,7,221,94
CONTROL "&Backup original file",IDC_BACKUP_CHECK,"Button",
BEGIN
PUSHBUTTON "OK",IDOK,154,16,52,14
PUSHBUTTON "Cancel",IDCANCEL,154,33,52,14
- LISTBOX IDC_LANGUAGE_LIST,5,16,141,89,LBS_NOINTEGRALHEIGHT |
+ LISTBOX IDC_LANGUAGE_LIST,5,16,141,89,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_TABSTOP
LTEXT "Available languages:",IDC_STATIC,7,7,66,8
END
DEFPUSHBUTTON "CheckOut",IDOK,35,90,50,14
PUSHBUTTON "Cancel",IDCANCEL,194,90,50,14
PUSHBUTTON "Save As...",IDSAVEAS,114,90,50,14
- EDITTEXT IDC_COMMENTS,18,21,243,56,ES_MULTILINE | ES_AUTOVSCROLL |
+ EDITTEXT IDC_COMMENTS,18,21,243,56,ES_MULTILINE | ES_AUTOVSCROLL |
ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL
LTEXT "Comments",IDC_STATIC,18,7,34,10
END
7,221,15
LTEXT "Regular Expressions (one per line):",IDC_STATIC,7,28,
221,8
- EDITTEXT IDC_EDITPATTERN,7,39,221,96,ES_MULTILINE |
+ EDITTEXT IDC_EDITPATTERN,7,39,221,96,ES_MULTILINE |
ES_AUTOHSCROLL | ES_WANTRETURN
END
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
LTEXT "Difference:",IDC_STATIC,15,18,36,8
- CONTROL "Dif",IDC_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW |
- WS_TABSTOP,83,15,17,14,WS_EX_TRANSPARENT |
+ CONTROL "Dif",IDC_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW |
+ WS_TABSTOP,83,15,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
LTEXT "Selected Difference:",IDC_STATIC,14,36,66,8
- CONTROL "Dif",IDC_SEL_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW |
- WS_TABSTOP,83,33,17,14,WS_EX_TRANSPARENT |
+ CONTROL "Dif",IDC_SEL_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW |
+ WS_TABSTOP,83,33,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
END
FONT 8, "MS Sans Serif"
BEGIN
DEFPUSHBUTTON "OK",IDOK,106,136,50,14
- EDITTEXT IDC_EDIT1,7,7,264,123,ES_MULTILINE | ES_READONLY |
+ EDITTEXT IDC_EDIT1,7,7,264,123,ES_MULTILINE | ES_READONLY |
WS_VSCROLL
END
//
#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE
+GUIDELINES DESIGNINFO DISCARDABLE
BEGIN
IDD_ABOUTBOX, DIALOG
BEGIN
IDD_PROP_VSS DLGINIT
BEGIN
IDC_VER_SYS, 0x403, 5, 0
-0x6f4e, 0x656e, "\000"
+0x6f4e, 0x656e, "\000"
IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x6c28, 0x7365, 0x2073, 0x6874, 0x6e61, 0x3520, 0x302e, 0x0029,
+0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
+0x6c28, 0x7365, 0x2073, 0x6874, 0x6e61, 0x3520, 0x302e, 0x0029,
IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x3528, 0x302e, 0x6120, 0x646e, 0x6120, 0x6f62, 0x6576, 0x0029,
+0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
+0x3528, 0x302e, 0x6120, 0x646e, 0x6120, 0x6f62, 0x6576, 0x0029,
IDC_VER_SYS, 0x403, 19, 0
-0x6152, 0x6974, 0x6e6f, 0x6c61, 0x4320, 0x656c, 0x7261, 0x6143, 0x6573,
-"\000"
+0x6152, 0x6974, 0x6e6f, 0x6c61, 0x4320, 0x656c, 0x7261, 0x6143, 0x6573,
+"\000"
0
END
// String Table
//
-STRINGTABLE PRELOAD DISCARDABLE
+STRINGTABLE PRELOAD DISCARDABLE
BEGIN
IDR_MAINFRAME "WinMerge"
IDR_MERGETYPE "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
IDS_WINMERGE_THIS_DIRECTORY "WinMerge this directory"
END
-STRINGTABLE PRELOAD DISCARDABLE
+STRINGTABLE PRELOAD DISCARDABLE
BEGIN
IDS_VERSION_FMT "Version %1"
IDS_ALLFILES "All Files (*.*)|*.*||"
IDS_CANT_COMPARE_FILES "Unable to compare files"
END
-STRINGTABLE PRELOAD DISCARDABLE
+STRINGTABLE PRELOAD DISCARDABLE
BEGIN
AFX_IDS_APP_TITLE "WinMerge"
AFX_IDS_IDLEMESSAGE "Ready"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
ID_INDICATOR_EXT "EXT"
ID_INDICATOR_CAPS "CAP"
ID_INDICATOR_REC "REC"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
ID_FILE_NEW "Create a new document\nNew"
ID_FILE_OPEN "Open an existing document\nOpen (Ctrl+O)"
ID_FILE_PRINT_PREVIEW "Display full pages\nPrint Preview"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
ID_APP_ABOUT "Display program information, version number and copyright\nAbout"
ID_APP_EXIT "Quit the application; prompts to save documents\nExit"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
ID_FILE_MRU_FILE1 "Open this document"
ID_FILE_MRU_FILE2 "Open this document"
ID_FILE_MRU_FILE16 "Open this document"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
ID_NEXT_PANE "Switch to the next window pane\nNext Pane"
ID_PREV_PANE "Switch back to the previous window pane\nPrevious Pane"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
ID_WINDOW_NEW "Open another window for the active document\nNew Window"
ID_WINDOW_ARRANGE "Arrange icons at the bottom of the window\nArrange Icons"
ID_WINDOW_SPLIT "Split the active window into panes\nSplit"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
ID_EDIT_CLEAR "Erase the selection\nErase"
ID_EDIT_CLEAR_ALL "Erase everything\nErase All"
ID_EDIT_REDO "Redo the previously undone action\nRedo"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
ID_VIEW_TOOLBAR "Show or hide the toolbar\nToggle ToolBar"
ID_VIEW_STATUS_BAR "Show or hide the status bar\nToggle StatusBar"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
AFX_IDS_SCSIZE "Change the window size"
AFX_IDS_SCMOVE "Change the window position"
AFX_IDS_SCCLOSE "Close the active window and prompts to save the documents"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
AFX_IDS_SCRESTORE "Restore the window to normal size"
AFX_IDS_SCTASKLIST "Activate Task List"
AFX_IDS_MDICHILD "Activate this window"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
AFX_IDS_PREVIEW_CLOSE "Close print preview mode\nCancel Preview"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
ID_L2R "Copy the selected text to the right file\nCopy Right (Alt Right)"
ID_R2L "Copy the selected text to the left file\nCopy Left (Alt Left)"
ID_OPTIONS_SHOWDIFFERENT "Displays files that have differences"
ID_PREVDIFF "Scroll to the previous difference\nPrev Diff (Alt Up)"
ID_NEXTDIFF "Scroll to the next difference\nNext Diff (Alt Down)"
- ID_OPTIONS_BACKUPORIGINALFILE
+ ID_OPTIONS_BACKUPORIGINALFILE
"Save a copy of the original as *.bak\nBackup"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
- ID_OPTIONS_SCROLLTOFIRSTDIFFERENCE
+ ID_OPTIONS_SCROLLTOFIRSTDIFFERENCE
"Automatically scrolls to the first difference\nScroll First"
ID_OPTIONS_IGNOREWHITESPACE "Disregards whitespace when comparing files"
ID_HIDE_BACKUP_FILES "Hides files with extension BAK"
ID_DIR_COPY_FILE_TO_LEFT "Copy selected file to named directory"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
ID_DIR_COPY_FILE_TO_RIGHT "Copy selected file to named directory"
ID_VIEW_LANGUAGE "Select the current user interfacce language\nLanguage"
ID_DIR_DEL_RIGHT "Delete selected item on right"
ID_DIFFSTATUS "placeholder for status count"
ID_OPTIONS_SHOWUNIQUELEFT "Displays files that exist in only on left side"
- ID_OPTIONS_SHOWUNIQUERIGHT
+ ID_OPTIONS_SHOWUNIQUERIGHT
"Displays files that exist in only on right side"
ID_DIR_DEL_BOTH "Delete selected item(s) on both sides"
ID_DIR_OPEN_LEFT "Open left file"
ID_DIR_OPEN_RIGHT "Open right file"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_SAVE_AS_TITLE "Save As"
- IDS_SELECT_FILES_OR_FOLDERS
+ IDS_SELECT_FILES_OR_FOLDERS
"Your selections must be either both files or both folders"
- IDS_BACKUP_FAILED_PROMPT
+ IDS_BACKUP_FAILED_PROMPT
"Unable to backup original file.\nContinue anyway?"
IDS_OPTIONS_TITLE "Options"
IDS_OPEN_TITLE "Open"
IDS_NOPROJECT "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_AFRIKAANS "Afrikaans"
IDS_ALBANIAN "Albanian"
IDS_ARABIC_JORDAN "Arabic (Jordan)"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_ARABIC_LEBANON "Arabic (Lebanon)"
IDS_ARABIC_KUWAIT "Arabic (Kuwait)"
IDS_CHINESE_SINGAPORE "Chinese (Singapore)"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_CHINESE_MACAU "Chinese (Macau SAR)"
IDS_CROATIAN "Croatian"
IDS_ENGLISH_BELIZE "English (Belize)"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_ENGLISH_TRINIDAD "English (Trinidad)"
IDS_ENGLISH_ZIMBABWE "English (Zimbabwe)"
IDS_GERMAN_SWISS "Deutsch (Schweiz)"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_GERMAN_AUSTRIAN "Deutsch (Österreich)"
IDS_GERMAN_LUXEMBOURG "Deutsch (Luxemburg)"
IDS_KOREAN_JOHAB "Korean (Johab)"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_LATVIAN "Latvian"
IDS_LITHUANIAN "Lithuanian"
IDS_SINDHI "Sindhi"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_SLOVAK "Slovak"
IDS_SLOVENIAN "Slovensko"
IDS_SPANISH_URUGUAY "Español (Uruguay)"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_SPANISH_PARAGUAY "Español (Paraguay)"
IDS_SPANISH_BOLIVIA "Español (Bolivia)"
IDS_URDU_INDIA "Urdu (India)"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_UZBEK_LATIN "Uzbek (Latin)"
IDS_UZBEK_CYRILLIC "Uzbek (Cyrillic)"
IDS_VIETNAMESE "Vietnamese"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_FILENAME_HEADER "Filename"
IDS_DIR_HEADER "Directory"
IDS_CC_CMD "&Path to cleartool.exe :"
IDS_VSS_CMD "&Path to SS.EXE :"
IDS_VSS_RUN_ERROR "Error executing versioning system command."
- IDS_DIFF_OPEN_NO_SET_PROPS
+ IDS_DIFF_OPEN_NO_SET_PROPS
"Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted."
IDS_LTIME_HEADER "Left Date"
IDS_RTIME_HEADER "Right Date"
IDS_EXTENSION_HEADER "Extension"
- IDS_CONFIRM_DELETE_ITEMS
+ IDS_CONFIRM_DELETE_ITEMS
"Are you sure you want to delete %1 of %2 selected item(s) ?"
IDS_DEL_LEFT_FMT "Delete left side %1 of %2 selected item(s)"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_DEL_RIGHT_FMT "Delete right side %1 of %2 selected item(s)"
IDS_DELETE_FILE_FAILED "Delete file %1 failed: %2"
IDS_BIN_FILES_SAME "Binary files are identical"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
ID_DIR_OPEN_RIGHT_WITH "Open right file with..."
ID_OPTIONS_SHOWBINARIES "Displays binary files"
ID_REFRESH "Refresh display\nRefresh (F5)"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_FILESAVE_FAILED "Saving %1 failed. Would you like to save the file under a different name?"
IDS_ERROR_FILE_NOT_FOUND "File not found: %1"
IDS_ERROR_INCOMPARABLE "Select two existing directories or files to compare"
- IDS_STATUS_RESCANNING "Rescanning"
+ IDS_STATUS_RESCANNING "Scanning files..."
IDS_STATUS_OPENING_SELECTION "Opening selection"
IDS_STATUS_COPYL2R "Copying Left to Right"
IDS_STATUS_COPYR2L "Copying Right to Left"