// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDR_MAINFRAME ICON DISCARDABLE "res\\Merge.ico"
-IDR_MERGETYPE ICON DISCARDABLE "res\\MergeDoc.ico"
+IDR_MAINFRAME ICON "res\\Merge.ico"
+IDR_MERGETYPE ICON "res\\MergeDoc.ico"
/////////////////////////////////////////////////////////////////////////////
//
END
END
-IDR_MAINFRAME MENU PRELOAD DISCARDABLE
+IDR_MAINFRAME MENU
BEGIN
POPUP "&Súbor"
BEGIN
END
END
-IDR_POPUP_DIRVIEW MENU DISCARDABLE
+IDR_POPUP_DIRVIEW MENU
BEGIN
POPUP "_ITEM_POPUP_"
BEGIN
END
END
-IDR_POPUP_EDITOR_HEADERBAR MENU DISCARDABLE
+IDR_POPUP_EDITOR_HEADERBAR MENU
BEGIN
POPUP "_POPUP_"
BEGIN
// Accelerator
//
-IDR_MAINFRAME ACCELERATORS PRELOAD MOVEABLE PURE
+IDR_MAINFRAME ACCELERATORS
BEGIN
"A", ID_EDIT_SELECT_ALL, VIRTKEY, CONTROL, NOINVERT
"C", ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT
IDD_ABOUTBOX DIALOGEX 0, 0, 223, 134
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "O programe"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
ICON IDR_MAINFRAME,IDC_STATIC,24,14,20,20
LTEXT "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX
BS_AUTOCHECKBOX | WS_TABSTOP,125,115,118,12
END
-IDD_PROP_VSS DIALOG DISCARDABLE 0, 0, 259, 157
+IDD_PROP_VSS DIALOG 0, 0, 259, 157
STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Systém verzií"
FONT 8, "MS Sans Serif"
59,157,8
END
-IDD_LANGUAGE_SELECT DIALOG DISCARDABLE 0, 0, 213, 111
+IDD_LANGUAGE_SELECT DIALOG 0, 0, 213, 111
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Jazyk"
FONT 8, "MS Sans Serif"
LTEXT "Dostupné jazyky:",IDC_STATIC,7,7,66,8
END
-IDD_EDIT_FIND DIALOG FIXED IMPURE 30, 73, 236, 68
+IDD_EDIT_FIND DIALOG 30, 73, 236, 68
STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Nájdi"
FONT 8, "MS Shell Dlg"
GROUPBOX "Smer h¾adania",IDC_STATIC,107,26,68,38,WS_GROUP
END
-IDD_EDIT_REPLACE DIALOG FIXED IMPURE 36, 44, 230, 103
+IDD_EDIT_REPLACE DIALOG 36, 44, 230, 103
STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Nahraï"
FONT 8, "MS Shell Dlg"
BS_AUTOCHECKBOX | WS_TABSTOP,5,88,84,12
END
-IDD_CLEARCASE DIALOG DISCARDABLE 0, 0, 279, 111
+IDD_CLEARCASE DIALOG 0, 0, 279, 111
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Rational Clearcase"
FONT 8, "MS Sans Serif"
LTEXT "Comments",IDC_STATIC,18,7,34,10
END
-IDD_PROPPAGE_FILTER DIALOG DISCARDABLE 0, 0, 235, 156
+IDD_PROPPAGE_FILTER DIALOG 0, 0, 235, 156
STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Filter"
FONT 8, "MS Sans Serif"
PUSHBUTTON "Defaults",IDC_COLORDEFAULTS_BTN,151,90,50,14
END
-IDD_OUTPUT DIALOG DISCARDABLE 0, 0, 278, 157
+IDD_OUTPUT DIALOG 0, 0, 278, 157
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Dialog"
FONT 8, "MS Sans Serif"
WS_VSCROLL
END
-IDD_PROPPAGE_REGISTRY DIALOG DISCARDABLE 0, 0, 235, 156
+IDD_PROPPAGE_REGISTRY DIALOG 0, 0, 235, 156
STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "System"
FONT 8, "MS Sans Serif"
WS_TABSTOP,WS_EX_STATICEDGE
END
-IDD_DIRCOLS DIALOG DISCARDABLE 0, 0, 283, 143
+IDD_DIRCOLS DIALOG 0, 0, 283, 143
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Display Columns"
FONT 8, "MS Sans Serif"
PUSHBUTTON "Cancel",IDCANCEL,226,122,50,14
END
-IDD_SELECTUNPACKER DIALOG DISCARDABLE 0, 0, 293, 126
+IDD_SELECTUNPACKER DIALOG 0, 0, 293, 126
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Select Unpacker"
FONT 8, "MS Sans Serif"
DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,327,17,83,14
END
-IDD_WMGOTO DIALOG DISCARDABLE 0, 0, 189, 70
+IDD_WMGOTO DIALOG 0, 0, 189, 70
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Go To"
FONT 8, "MS Sans Serif"
IDD_PROPPAGE_COMPARE DIALOGEX 0, 0, 235, 156
STYLE WS_CHILD | WS_CAPTION
CAPTION "Compare"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
GROUPBOX "Whitespace",IDC_STATIC,7,7,221,50
CONTROL "Porovnáva\9d &prázdne miesto",IDC_WHITESPACE,"Button",
IDD_PROPPAGE_EDITOR DIALOGEX 0, 0, 247, 156
STYLE WS_CHILD | WS_CAPTION
CAPTION "Editor"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
CONTROL "Hilighting syntaxe",IDC_HILITE_CHECK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,7,215,10
// Toolbar
//
-IDR_MAINFRAME TOOLBAR DISCARDABLE 16, 15
+IDR_MAINFRAME TOOLBAR 16, 15
BEGIN
BUTTON ID_FILE_NEW
BUTTON ID_FILE_OPEN
// String Table
//
-STRINGTABLE PRELOAD DISCARDABLE
+STRINGTABLE
BEGIN
AFX_IDS_APP_TITLE "WinMerge"
AFX_IDS_IDLEMESSAGE "Pripravený"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE
BEGIN
ID_INDICATOR_EXT "EXT"
ID_INDICATOR_CAPS "CAP"
END
// ID_FILE_NEW SYNCHRO
-STRINGTABLE DISCARDABLE
+STRINGTABLE
BEGIN
ID_FILE_NEW "Create empty documents\nNew Documents (Ctrl+N)"
ID_FILE_OPEN "Otvori\9d existujúci dokument\nOtvor"
END
// ID_APP_ABOUT SYNCHRO
-STRINGTABLE DISCARDABLE
+STRINGTABLE
BEGIN
ID_APP_ABOUT "Zobrazi\9d informácie o programe\nO programe"
ID_APP_EXIT "Ukonèi\9d program s otázkou na ulo\9eenie súborov\nKoniec"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE
BEGIN
ID_FILE_MRU_FILE1 "Otvori\9d dokument"
ID_FILE_MRU_FILE2 "Otvori\9d dokument"
END
// ID_NEXT_PANE SYNCHRO
-STRINGTABLE DISCARDABLE
+STRINGTABLE
BEGIN
ID_NEXT_PANE "Peepnú\9d na ïal\9aie okno\nÏal\9aie okno"
ID_PREV_PANE "Prepnú\9d na predchádzajúce okno\nPredchádzajúce okno"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE
BEGIN
ID_WINDOW_NEW "Otvori\9d ïal\9aie okno s aktuálnym dokumentom\nNové okno"
ID_WINDOW_ARRANGE "Uspoiada\9d ikony na spodnom okraji okna\nUsporiadaj ikony"
END
// ID_EDIT_CLEAR SYNCHRO
-STRINGTABLE DISCARDABLE
+STRINGTABLE
BEGIN
ID_EDIT_CLEAR "Vymaza\9d výber\nZmaza\9d"
ID_EDIT_CLEAR_ALL "Zmaza\9d v\9aetko\nZmaza\9d v\9aetko"
ID_EDIT_REDO "Obnovi\9d poslednú odvolanú akciu\nRedo"
END
-STRINGTABLE DISCARDABLE
+// ID_VIEW_TOOLBAR SYNCHRO
+STRINGTABLE
BEGIN
ID_VIEW_TOOLBAR "Zobrazi\9d alebo skry\9d panel nástrojov\nPanel nástrojov"
ID_VIEW_STATUS_BAR "Zobrazi\9d nebo skry\9d stavový riadok\nStavový riadok"
END
-STRINGTABLE DISCARDABLE
+// AFX_IDS_SCSIZE SYNCHRO
+STRINGTABLE
BEGIN
AFX_IDS_SCSIZE "Zmeni\9d ve¾kos\9d okna"
AFX_IDS_SCMOVE "Zmeni\9d pozíciu okna"
AFX_IDS_SCCLOSE "Zatvori\9d aktívne okno s mo\9enos\9dou ulo\9eenia dokumentov"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE
BEGIN
AFX_IDS_SCRESTORE "Obnovi\9d okná"
AFX_IDS_SCTASKLIST "Aktivova\9d zoznam úloh"
AFX_IDS_MDICHILD "Aktivova\9d toto okno"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE
BEGIN
AFX_IDS_PREVIEW_CLOSE "Zatvori\9d náh¾ad tlaèe\nZru\9a náh¾ad"
END
-STRINGTABLE PRELOAD DISCARDABLE
+STRINGTABLE
BEGIN
IDR_MAINFRAME "WinMerge"
IDR_MERGETYPE "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
IDS_ELAPSED_TIME "Elapsed time: %ld ms"
END
-STRINGTABLE PRELOAD DISCARDABLE
+// IDS_VERSION_FMT SYNCHRO
+STRINGTABLE
BEGIN
IDS_VERSION_FMT "Verzia %1 - Slovenský preklad"
IDS_ALLFILES "V\9aetky súbory (*.*)|*.*||"
END
// IDS_SAVE_AS_TITLE SYNCHRO
-STRINGTABLE DISCARDABLE
+STRINGTABLE
BEGIN
IDS_SAVE_AS_TITLE "Ulo\9ei\9d jako"
IDS_SELECT_FILES_OR_FOLDERS "Musíte zvoli\9d buï súbory alebo len adresáre."
END
// IDS_COLHDR_FILENAME SYNCHRO
-STRINGTABLE DISCARDABLE
+STRINGTABLE
BEGIN
IDS_COLHDR_FILENAME "Meno súboru"
IDS_COLHDR_DIR "Adresár"
IDS_DEL_LEFT_FMT "Left (%1)"
END
-STRINGTABLE DISCARDABLE
+// IDS_DEL_RIGHT_FMT SYNCHRO
+STRINGTABLE
BEGIN
IDS_DEL_RIGHT_FMT "Zma\9e %1 z %2 vybraných polo\9eiek z pravej strany"
IDS_DELETE_FILE_FAILED "Mazanie súboru %1 zlyhalo: %2"
IDS_BIN_FILES_SAME "Binárne súbory sú identické"
END
-// ID_EOL_TO_DOS SYNCHRO
-STRINGTABLE DISCARDABLE
+STRINGTABLE
BEGIN
IDS_FILESAVE_FAILED "Zápis %1 neúspe\9aný. Chce\9a ulo\9ei\9d súbor pod iným menom?"
IDS_ERROR_FILE_NOT_FOUND "Súbor nenájdený: %1"
IDS_COLHDR_RVERSION "Right File Version"
END
-STRINGTABLE DISCARDABLE
+// IDS_LEFTONLY SYNCHRO
+STRINGTABLE
BEGIN
IDS_LEFTONLY "Left Only"
IDS_RIGHTONLY "Right Only"
IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2"
END
-STRINGTABLE DISCARDABLE
+// IDS_PRIVATEBUILD_FMT SYNCHRO
+STRINGTABLE
BEGIN
IDS_PRIVATEBUILD_FMT "Private Build: %1"
IDS_FILEWRITE_ERROR "Could not write to file %1."
IDS_QUICKHELP "Syntax : WinMerge [/r] [/e] [/ul] [/ur] [/ub] [/dl leftdesc] [/dr rightdesc] leftpath rightpath [outputpath]\n\nwhere:\n /? or -? displays this help\n /r or -r tells winmerge to compare directories recursively\n /e or -e allows WinMerge to be closed with a single esc keypress\n /ul or -ul tells winmerge to not add left path to MRU\n /ur or -ur tells winmerge to not add right path to MRU\n /ub or -ub tells winmerge to not add both paths to MRU\n /dl or -dl adds a description for left side shown instead of directory/filename\n /dr or -dr adds a description for right side shown instead of directory/filename\n leftpath is the directory or filename to open on the left side\n rightpath is the directory or filename to open on the right side\n outputpath is an optional output directory where you want merged files to be \n saved\n \n Note: leftpath and rightpath both has to be files or both has to be \n directories\n"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE
BEGIN
IDS_LINEDIFF_NODIFF "No difference"
IDS_LINEDIFF_NODIFF_CAPTION "Line difference"
IDS_DIRSEL_TAG "Directory Selection"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE
BEGIN
IDS_COPY_LEFT_TO "Left to... (%1)"
IDS_COPY_LEFT_TO2 "Left to... (%1 of %2)"
IDS_DIFFERENT "Different"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE
BEGIN
IDC_STATIC_TITLE_LEFT "Right click on the path to copy"
IDC_STATIC_TITLE_RIGHT "Right click on the path to copy"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE
BEGIN
IDC_MIXED_EOL "Preserve original EOL chars"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE
BEGIN
IDC_COMPARISON_STOP "Stop"
IDC_COMPARISON_CLOSE "Press any key"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE
BEGIN
IDS_NUM_REPLACED "Nahradených %1 re\9dazcov (strings)."
IDS_EDIT_TEXT_NOT_FOUND "Nemô\9eem nájs\9d re\9dazec ""%s"""
IDS_CANNOT_EXECUTE_FILE "Cannot execute %1"
END
+// IDS_MESSAGEBOX_OK SYNCHRO
STRINGTABLE
BEGIN
IDS_MESSAGEBOX_OK "&Ok"
IDS_MESSAGEBOX_DONT_ASK_AGAIN "Don't ask this &question again."
END
-STRINGTABLE DISCARDABLE
+// ID_L2R SYNCHRO
+STRINGTABLE
BEGIN
ID_L2R "Zkopírova\9d vybraný text do súboru vpravo\nKopíruj vpravo (->)"
ID_R2L "Skopírova\9d vybraný text do súboru v¾avo\nKopíruj v¾avo (<-)"
ID_OPTIONS_BACKUPORIGINALFILE "Ulo\9ei\9d zálo\9enú kópiu súboru\nBackup"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE
BEGIN
ID_OPTIONS_SCROLLTOFIRSTDIFFERENCE
"Automaticky prejde na prvý rozdiel\nScroll First"
ID_DIR_COPY_RIGHT_TO_LEFT "Kopírova\9d vybrané súbory do iného adresára"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE
BEGIN
ID_DIR_COPY_LEFT_TO_RIGHT "Kopírova\9d vybrané súbory do iného adresára"
ID_VIEW_LANGUAGE "Zvoli\9d jazyk u\9eivate¾ského rozhrania\nJazyk"
ID_DIR_OPEN_RIGHT "Otvor pravý súbor"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE
BEGIN
ID_DIR_OPEN_RIGHT_WITH "Otvor pravý súbor s..."
ID_OPTIONS_SHOWBINARIES "Zobrazuje binárne súbory"
ID_FILE_RIGHT_READONLY "Change right file/dir read-only status"
END
-STRINGTABLE DISCARDABLE
+// ID_EOL_TO_DOS SYNCHRO
+STRINGTABLE
BEGIN
ID_EOL_TO_DOS "Convert EOL to DOS mode"
ID_EOL_TO_UNIX "Convert EOL to UNIX mode"
ID_L2RNEXT "Copy difference to right and advance to next\nCopy Right and Advance (Ctrl+Alt+Right)"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE
BEGIN
ID_MULTIPLE_RIGHT "Copy differences from the selected text in left panel to the right file"
ID_MULTIPLE_LEFT "Copy differences from the selected text in right panel to the left file"
ID_EDIT_WMGOTO "Go to line or difference\nGo to (Ctrl+G)"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE
BEGIN
ID_NO_EDIT_SCRIPTS "< Empty >"
ID_RELOAD_PLUGINS "&Unload all plugins and reload them (for developpers)"
// TEXTINCLUDE
//
-1 TEXTINCLUDE DISCARDABLE
+1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
-2 TEXTINCLUDE DISCARDABLE
+2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
-3 TEXTINCLUDE DISCARDABLE
+3 TEXTINCLUDE
BEGIN
"#define _AFX_NO_OLE_RESOURCES\r\n"
"#define _AFX_NO_TRACKER_RESOURCES\r\n"
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDR_MAINFRAME ICON DISCARDABLE "res\\Merge.ico"
-IDR_MERGETYPE ICON DISCARDABLE "res\\MergeDoc.ico"
+IDR_MAINFRAME ICON "res\\Merge.ico"
+IDR_MERGETYPE ICON "res\\MergeDoc.ico"
/////////////////////////////////////////////////////////////////////////////
//
IDD_ABOUTBOX DIALOGEX 0, 0, 223, 134
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Om WinMerge"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
ICON IDR_MAINFRAME,IDC_STATIC,24,14,20,20
LTEXT "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX
DEFPUSHBUTTON "Avbryt",IDC_COMPARISON_STOP,327,17,83,14
END
-IDD_WMGOTO DIALOG DISCARDABLE 0, 0, 189, 70
+IDD_WMGOTO DIALOG 0, 0, 189, 70
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Gå till"
FONT 8, "MS Sans Serif"
IDD_PROPPAGE_COMPARE DIALOGEX 0, 0, 235, 156
STYLE WS_CHILD | WS_CAPTION
CAPTION "Jämför"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
GROUPBOX "Mellanslag",IDC_STATIC,7,7,221,50
CONTROL "Jämför &mellanslag",IDC_WHITESPACE,"Button",
IDD_PROPPAGE_EDITOR DIALOGEX 0, 0, 259, 156
STYLE WS_CHILD | WS_CAPTION
CAPTION "Editor"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
CONTROL "Framhäv syntaxen",IDC_HILITE_CHECK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,7,215,10
// Toolbar
//
-IDR_MAINFRAME TOOLBAR DISCARDABLE 16, 15
+IDR_MAINFRAME TOOLBAR 16, 15
BEGIN
BUTTON ID_FILE_NEW
BUTTON ID_FILE_OPEN
AFX_IDS_PREVIEW_CLOSE "Aktiverar det här fönstret"
END
-STRINGTABLE PRELOAD DISCARDABLE
+STRINGTABLE
BEGIN
IDR_MAINFRAME "WinMerge"
IDR_MERGETYPE "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
IDC_STATIC_TITLE_RIGHT "Högerklicka på sökvägen för att kopiera"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDC_MIXED_EOL "Tillåt blandade EOL-typer"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE
BEGIN
IDC_COMPARISON_STOP "Stopp"
IDC_COMPARISON_CLOSE "Tryck en tangent"