PATCH: [ 1378174 ] Share Src/res between translations

diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc
index bc15ee8..65a1b54 100644 (file)
--- a/Src/Languages/Brazilian/MergeBrazilian.rc
+++ b/Src/Languages/Brazilian/MergeBrazilian.rc
@@ -67,13 +67,15 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDR_MAINFRAME           ICON                    "res\\Merge.ico"
-IDR_MERGETYPE           ICON                    "res\\MergeDoc.ico"
-IDR_DOC_FOLDERCMP       ICON                    "res\\MergeDir.ico"
-IDI_FOLDER              ICON                    "res\\folder.ico"
-IDI_LFOLDER             ICON                    "res\\lfolder.ico"
-IDI_RFOLDER             ICON                    "res\\rfolder.ico"
-IDI_FOLDERSKIP          ICON                    "res\\folderskip.ico"
+
+// Load shared resources from Src\res
+IDR_MAINFRAME           ICON                    "..\\..\\res\\Merge.ico"
+IDR_MERGETYPE           ICON                    "..\\..\\res\\MergeDoc.ico"
+IDR_DOC_FOLDERCMP       ICON                    "..\\..\\res\\MergeDir.ico"
+IDI_FOLDER              ICON                    "..\\..\\res\\folder.ico"
+IDI_LFOLDER             ICON                    "..\\..\\res\\lfolder.ico"
+IDI_RFOLDER             ICON                    "..\\..\\res\\rfolder.ico"
+IDI_FOLDERSKIP          ICON                    "..\\..\\res\\folderskip.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1602,40 +1604,40 @@ END
 // Bitmap
 //
 
-IDR_MAINFRAME           BITMAP                  "res\\Toolbar.bmp"
-IDB_SPLASH              BITMAP                  "res\\splash1.bmp"
-IDB_EQUAL               BITMAP                  "res\\equal.bmp"
-IDB_NOTEQUAL            BITMAP                  "res\\notequal.bmp"
-IDB_UNKNOWN             BITMAP                  "res\\unknown.bmp"
-IDB_BINARYSAME          BITMAP                  "res\\binary.bmp"
-IDB_LFILE               BITMAP                  "res\\lfile.bmp"
-IDB_RFILE               BITMAP                  "res\\rfile.bmp"
-IDB_BINARYDIFF          BITMAP                  "res\\binarydiff.bmp"
-IDB_FILESKIP            BITMAP                  "res\\fileskip.bmp"
-IDB_EDIT_COPY           BITMAP                  "res\\copy.bmp"
-IDB_EDIT_CUT            BITMAP                  "res\\cut.bmp"
-IDB_EDIT_PASTE          BITMAP                  "res\\paste.bmp"
-IDB_EDIT_SEARCH         BITMAP                  "res\\search.bmp"
-IDB_WINDOW_CASCADE      BITMAP                  "res\\cascade.bmp"
-IDB_WINDOW_HORIZONTAL   BITMAP                  "res\\horizontally.bmp"
-IDB_WINDOW_VERTICAL     BITMAP                  "res\\vertically.bmp"
-IDB_WINDOW_CLOSE        BITMAP                  "res\\close.bmp"
-IDB_WINDOW_CHANGEPANE   BITMAP                  "res\\change_pane.bmp"
-IDB_EDIT_GOTO           BITMAP                  "res\\go_to.bmp"
-IDB_EDIT_REPLACE        BITMAP                  "res\\replace.bmp"
-IDB_VIEW_LANGUAGE       BITMAP                  "res\\language.bmp"
-IDB_VIEW_SELECTFONT     BITMAP                  "res\\select_font.bmp"
-IDB_FILE_EXIT           BITMAP                  "res\\exit.bmp"
-IDB_HELP_CONTENTS       BITMAP                  "res\\help_contents.bmp"
-IDB_ERROR               BITMAP                  "res\\error.bmp"
-IDB_FOLDERUP            BITMAP                  "res\\folderup.bmp"
-IDB_FOLDERUP_DISABLE    BITMAP                  "res\\folderup_disable.bmp"
-IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
-IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
-IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
-IDB_MERGE_DELETE        BITMAP                  "res\\delete.bmp"
-IDB_FILE_PRINT          BITMAP                  "res\\print.bmp"
-IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
+IDR_MAINFRAME           BITMAP                  "..\\..\\res\\Toolbar.bmp"
+IDB_SPLASH              BITMAP                  "..\\..\\res\\splash1.bmp"
+IDB_EQUAL               BITMAP                  "..\\..\\res\\equal.bmp"
+IDB_NOTEQUAL            BITMAP                  "..\\..\\res\\notequal.bmp"
+IDB_UNKNOWN             BITMAP                  "..\\..\\res\\unknown.bmp"
+IDB_BINARYSAME          BITMAP                  "..\\..\\res\\binary.bmp"
+IDB_LFILE               BITMAP                  "..\\..\\res\\lfile.bmp"
+IDB_RFILE               BITMAP                  "..\\..\\res\\rfile.bmp"
+IDB_BINARYDIFF          BITMAP                  "..\\..\\res\\binarydiff.bmp"
+IDB_FILESKIP            BITMAP                  "..\\..\\res\\fileskip.bmp"
+IDB_EDIT_COPY           BITMAP                  "..\\..\\res\\copy.bmp"
+IDB_EDIT_CUT            BITMAP                  "..\\..\\res\\cut.bmp"
+IDB_EDIT_PASTE          BITMAP                  "..\\..\\res\\paste.bmp"
+IDB_EDIT_SEARCH         BITMAP                  "..\\..\\res\\search.bmp"
+IDB_WINDOW_CASCADE      BITMAP                  "..\\..\\res\\cascade.bmp"
+IDB_WINDOW_HORIZONTAL   BITMAP                  "..\\..\\res\\horizontally.bmp"
+IDB_WINDOW_VERTICAL     BITMAP                  "..\\..\\res\\vertically.bmp"
+IDB_WINDOW_CLOSE        BITMAP                  "..\\..\\res\\close.bmp"
+IDB_WINDOW_CHANGEPANE   BITMAP                  "..\\..\\res\\change_pane.bmp"
+IDB_EDIT_GOTO           BITMAP                  "..\\..\\res\\go_to.bmp"
+IDB_EDIT_REPLACE        BITMAP                  "..\\..\\res\\replace.bmp"
+IDB_VIEW_LANGUAGE       BITMAP                  "..\\..\\res\\language.bmp"
+IDB_VIEW_SELECTFONT     BITMAP                  "..\\..\\res\\select_font.bmp"
+IDB_FILE_EXIT           BITMAP                  "..\\..\\res\\exit.bmp"
+IDB_HELP_CONTENTS       BITMAP                  "..\\..\\res\\help_contents.bmp"
+IDB_ERROR               BITMAP                  "..\\..\\res\\error.bmp"
+IDB_FOLDERUP            BITMAP                  "..\\..\\res\\folderup.bmp"
+IDB_FOLDERUP_DISABLE    BITMAP                  "..\\..\\res\\folderup_disable.bmp"
+IDB_EDIT_SELECTALL      BITMAP                  "..\\..\\res\\select_all.bmp"
+IDB_TOOLS_FILTERS       BITMAP                  "..\\..\\res\\filters.bmp"
+IDB_TOOLS_COLUMNS       BITMAP                  "..\\..\\res\\customize_columns.bmp"
+IDB_MERGE_DELETE        BITMAP                  "..\\..\\res\\delete.bmp"
+IDB_FILE_PRINT          BITMAP                  "..\\..\\res\\print.bmp"
+IDB_SIGMA               BITMAP                  "..\\..\\res\\sigma.bmp"
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -1643,8 +1645,8 @@ IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
 // Cursor
 //
 
-IDR_MARGIN_CURSOR       CURSOR                  "res\\mg_cur.cur"
-IDR_MERGEHAND           CURSOR                  "res\\hand.cur"
+IDR_MARGIN_CURSOR       CURSOR                  "..\\..\\res\\mg_cur.cur"
+IDR_MERGEHAND           CURSOR                  "..\\..\\res\\hand.cur"
 
 /////////////////////////////////////////////////////////////////////////////
 //

diff --git a/Src/Languages/Brazilian/res/Merge.ico b/Src/Languages/Brazilian/res/Merge.ico
deleted file mode 100644 (file)
index 6fd5e56..0000000
Binary files a/Src/Languages/Brazilian/res/Merge.ico and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/MergeDir.ico b/Src/Languages/Brazilian/res/MergeDir.ico
deleted file mode 100644 (file)
index 349c926..0000000
Binary files a/Src/Languages/Brazilian/res/MergeDir.ico and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/MergeDoc.ico b/Src/Languages/Brazilian/res/MergeDoc.ico
deleted file mode 100644 (file)
index b2f417b..0000000
Binary files a/Src/Languages/Brazilian/res/MergeDoc.ico and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/Toolbar.bmp b/Src/Languages/Brazilian/res/Toolbar.bmp
deleted file mode 100644 (file)
index 7935cc8..0000000
Binary files a/Src/Languages/Brazilian/res/Toolbar.bmp and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/WinMergeSplash.psd b/Src/Languages/Brazilian/res/WinMergeSplash.psd
deleted file mode 100644 (file)
index fe7df64..0000000
Binary files a/Src/Languages/Brazilian/res/WinMergeSplash.psd and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/binary.bmp b/Src/Languages/Brazilian/res/binary.bmp
deleted file mode 100644 (file)
index 417eb30..0000000
Binary files a/Src/Languages/Brazilian/res/binary.bmp and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/binarydiff.bmp b/Src/Languages/Brazilian/res/binarydiff.bmp
deleted file mode 100644 (file)
index 4e45141..0000000
Binary files a/Src/Languages/Brazilian/res/binarydiff.bmp and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/cascade.bmp b/Src/Languages/Brazilian/res/cascade.bmp
deleted file mode 100644 (file)
index a56622c..0000000
Binary files a/Src/Languages/Brazilian/res/cascade.bmp and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/change_pane.bmp b/Src/Languages/Brazilian/res/change_pane.bmp
deleted file mode 100644 (file)
index 0a2e36a..0000000
Binary files a/Src/Languages/Brazilian/res/change_pane.bmp and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/close.bmp b/Src/Languages/Brazilian/res/close.bmp
deleted file mode 100644 (file)
index 55b5e87..0000000
Binary files a/Src/Languages/Brazilian/res/close.bmp and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/copy.bmp b/Src/Languages/Brazilian/res/copy.bmp
deleted file mode 100644 (file)
index 6565c6f..0000000
Binary files a/Src/Languages/Brazilian/res/copy.bmp and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/customize_columns.bmp b/Src/Languages/Brazilian/res/customize_columns.bmp
deleted file mode 100644 (file)
index 126345a..0000000
Binary files a/Src/Languages/Brazilian/res/customize_columns.bmp and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/cut.bmp b/Src/Languages/Brazilian/res/cut.bmp
deleted file mode 100644 (file)
index 976c5d2..0000000
Binary files a/Src/Languages/Brazilian/res/cut.bmp and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/delete.bmp b/Src/Languages/Brazilian/res/delete.bmp
deleted file mode 100644 (file)
index b70eeb8..0000000
Binary files a/Src/Languages/Brazilian/res/delete.bmp and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/equal.bmp b/Src/Languages/Brazilian/res/equal.bmp
deleted file mode 100644 (file)
index 9761d55..0000000
Binary files a/Src/Languages/Brazilian/res/equal.bmp and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/error.bmp b/Src/Languages/Brazilian/res/error.bmp
deleted file mode 100644 (file)
index f659c1d..0000000
Binary files a/Src/Languages/Brazilian/res/error.bmp and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/exit.bmp b/Src/Languages/Brazilian/res/exit.bmp
deleted file mode 100644 (file)
index 596127a..0000000
Binary files a/Src/Languages/Brazilian/res/exit.bmp and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/fileskip.bmp b/Src/Languages/Brazilian/res/fileskip.bmp
deleted file mode 100644 (file)
index 9e502d9..0000000
Binary files a/Src/Languages/Brazilian/res/fileskip.bmp and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/filters.bmp b/Src/Languages/Brazilian/res/filters.bmp
deleted file mode 100644 (file)
index e7ab693..0000000
Binary files a/Src/Languages/Brazilian/res/filters.bmp and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/folder.ico b/Src/Languages/Brazilian/res/folder.ico
deleted file mode 100644 (file)
index e18bd19..0000000
Binary files a/Src/Languages/Brazilian/res/folder.ico and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/folderskip.ico b/Src/Languages/Brazilian/res/folderskip.ico
deleted file mode 100644 (file)
index 3297496..0000000
Binary files a/Src/Languages/Brazilian/res/folderskip.ico and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/folderup.bmp b/Src/Languages/Brazilian/res/folderup.bmp
deleted file mode 100644 (file)
index 2d15145..0000000
Binary files a/Src/Languages/Brazilian/res/folderup.bmp and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/folderup_disable.bmp b/Src/Languages/Brazilian/res/folderup_disable.bmp
deleted file mode 100644 (file)
index 5829a19..0000000
Binary files a/Src/Languages/Brazilian/res/folderup_disable.bmp and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/go_to.bmp b/Src/Languages/Brazilian/res/go_to.bmp
deleted file mode 100644 (file)
index a6839aa..0000000
Binary files a/Src/Languages/Brazilian/res/go_to.bmp and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/hand.cur b/Src/Languages/Brazilian/res/hand.cur
deleted file mode 100644 (file)
index ed8db8c..0000000
Binary files a/Src/Languages/Brazilian/res/hand.cur and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/help_contents.bmp b/Src/Languages/Brazilian/res/help_contents.bmp
deleted file mode 100644 (file)
index 6662979..0000000
Binary files a/Src/Languages/Brazilian/res/help_contents.bmp and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/horizontally.bmp b/Src/Languages/Brazilian/res/horizontally.bmp
deleted file mode 100644 (file)
index 3c7a732..0000000
Binary files a/Src/Languages/Brazilian/res/horizontally.bmp and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/language.bmp b/Src/Languages/Brazilian/res/language.bmp
deleted file mode 100644 (file)
index 9e92e4d..0000000
Binary files a/Src/Languages/Brazilian/res/language.bmp and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/lfile.bmp b/Src/Languages/Brazilian/res/lfile.bmp
deleted file mode 100755 (executable)
index bb7cf6c..0000000
Binary files a/Src/Languages/Brazilian/res/lfile.bmp and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/lfolder.ico b/Src/Languages/Brazilian/res/lfolder.ico
deleted file mode 100644 (file)
index fc1c797..0000000
Binary files a/Src/Languages/Brazilian/res/lfolder.ico and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/mg_cur.cur b/Src/Languages/Brazilian/res/mg_cur.cur
deleted file mode 100755 (executable)
index 5691efb..0000000
Binary files a/Src/Languages/Brazilian/res/mg_cur.cur and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/notequal.bmp b/Src/Languages/Brazilian/res/notequal.bmp
deleted file mode 100644 (file)
index d747084..0000000
Binary files a/Src/Languages/Brazilian/res/notequal.bmp and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/paste.bmp b/Src/Languages/Brazilian/res/paste.bmp
deleted file mode 100644 (file)
index bcd5227..0000000
Binary files a/Src/Languages/Brazilian/res/paste.bmp and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/print.bmp b/Src/Languages/Brazilian/res/print.bmp
deleted file mode 100644 (file)
index 739ca01..0000000
Binary files a/Src/Languages/Brazilian/res/print.bmp and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/replace.bmp b/Src/Languages/Brazilian/res/replace.bmp
deleted file mode 100644 (file)
index e5586b9..0000000
Binary files a/Src/Languages/Brazilian/res/replace.bmp and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/rfile.bmp b/Src/Languages/Brazilian/res/rfile.bmp
deleted file mode 100755 (executable)
index 1333733..0000000
Binary files a/Src/Languages/Brazilian/res/rfile.bmp and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/rfolder.ico b/Src/Languages/Brazilian/res/rfolder.ico
deleted file mode 100644 (file)
index 444d827..0000000
Binary files a/Src/Languages/Brazilian/res/rfolder.ico and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/search.bmp b/Src/Languages/Brazilian/res/search.bmp
deleted file mode 100644 (file)
index 9d606e5..0000000
Binary files a/Src/Languages/Brazilian/res/search.bmp and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/select_all.bmp b/Src/Languages/Brazilian/res/select_all.bmp
deleted file mode 100644 (file)
index 174e311..0000000
Binary files a/Src/Languages/Brazilian/res/select_all.bmp and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/select_font.bmp b/Src/Languages/Brazilian/res/select_font.bmp
deleted file mode 100644 (file)
index 2609538..0000000
Binary files a/Src/Languages/Brazilian/res/select_font.bmp and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/sigma.bmp b/Src/Languages/Brazilian/res/sigma.bmp
deleted file mode 100644 (file)
index eff4abe..0000000
Binary files a/Src/Languages/Brazilian/res/sigma.bmp and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/splash1.bmp b/Src/Languages/Brazilian/res/splash1.bmp
deleted file mode 100644 (file)
index f041297..0000000
Binary files a/Src/Languages/Brazilian/res/splash1.bmp and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/unknown.bmp b/Src/Languages/Brazilian/res/unknown.bmp
deleted file mode 100644 (file)
index 7f16906..0000000
Binary files a/Src/Languages/Brazilian/res/unknown.bmp and /dev/null differ

diff --git a/Src/Languages/Brazilian/res/vertically.bmp b/Src/Languages/Brazilian/res/vertically.bmp
deleted file mode 100644 (file)
index e57c1b6..0000000
Binary files a/Src/Languages/Brazilian/res/vertically.bmp and /dev/null differ

diff --git a/Src/Languages/Bulgarian/MergeBulgarian.rc b/Src/Languages/Bulgarian/MergeBulgarian.rc
index 02e9900..d25f532 100644 (file)
--- a/Src/Languages/Bulgarian/MergeBulgarian.rc
+++ b/Src/Languages/Bulgarian/MergeBulgarian.rc
@@ -67,13 +67,15 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDR_MAINFRAME           ICON                    "res\\Merge.ico"
-IDR_MERGETYPE           ICON                    "res\\MergeDoc.ico"
-IDR_DOC_FOLDERCMP       ICON                    "res\\MergeDir.ico"
-IDI_FOLDER              ICON                    "res\\folder.ico"
-IDI_LFOLDER             ICON                    "res\\lfolder.ico"
-IDI_RFOLDER             ICON                    "res\\rfolder.ico"
-IDI_FOLDERSKIP          ICON                    "res\\folderskip.ico"
+
+// Load shared resources from Src\res
+IDR_MAINFRAME           ICON                    "..\\..\\res\\Merge.ico"
+IDR_MERGETYPE           ICON                    "..\\..\\res\\MergeDoc.ico"
+IDR_DOC_FOLDERCMP       ICON                    "..\\..\\res\\MergeDir.ico"
+IDI_FOLDER              ICON                    "..\\..\\res\\folder.ico"
+IDI_LFOLDER             ICON                    "..\\..\\res\\lfolder.ico"
+IDI_RFOLDER             ICON                    "..\\..\\res\\rfolder.ico"
+IDI_FOLDERSKIP          ICON                    "..\\..\\res\\folderskip.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1501,40 +1503,40 @@ END
 // Bitmap
 //
 
-IDR_MAINFRAME           BITMAP                  "res\\Toolbar.bmp"
-IDB_SPLASH              BITMAP                  "res\\splash1.bmp"
-IDB_EQUAL               BITMAP                  "res\\equal.bmp"
-IDB_NOTEQUAL            BITMAP                  "res\\notequal.bmp"
-IDB_UNKNOWN             BITMAP                  "res\\unknown.bmp"
-IDB_BINARYSAME          BITMAP                  "res\\binary.bmp"
-IDB_LFILE               BITMAP                  "res\\lfile.bmp"
-IDB_RFILE               BITMAP                  "res\\rfile.bmp"
-IDB_BINARYDIFF          BITMAP                  "res\\binarydiff.bmp"
-IDB_FILESKIP            BITMAP                  "res\\fileskip.bmp"
-IDB_EDIT_COPY           BITMAP                  "res\\copy.bmp"
-IDB_EDIT_CUT            BITMAP                  "res\\cut.bmp"
-IDB_EDIT_PASTE          BITMAP                  "res\\paste.bmp"
-IDB_EDIT_SEARCH         BITMAP                  "res\\search.bmp"
-IDB_WINDOW_CASCADE      BITMAP                  "res\\cascade.bmp"
-IDB_WINDOW_HORIZONTAL   BITMAP                  "res\\horizontally.bmp"
-IDB_WINDOW_VERTICAL     BITMAP                  "res\\vertically.bmp"
-IDB_WINDOW_CLOSE        BITMAP                  "res\\close.bmp"
-IDB_WINDOW_CHANGEPANE   BITMAP                  "res\\change_pane.bmp"
-IDB_EDIT_GOTO           BITMAP                  "res\\go_to.bmp"
-IDB_EDIT_REPLACE        BITMAP                  "res\\replace.bmp"
-IDB_VIEW_LANGUAGE       BITMAP                  "res\\language.bmp"
-IDB_VIEW_SELECTFONT     BITMAP                  "res\\select_font.bmp"
-IDB_FILE_EXIT           BITMAP                  "res\\exit.bmp"
-IDB_HELP_CONTENTS       BITMAP                  "res\\help_contents.bmp"
-IDB_ERROR               BITMAP                  "res\\error.bmp"
-IDB_FOLDERUP            BITMAP                  "res\\folderup.bmp"
-IDB_FOLDERUP_DISABLE    BITMAP                  "res\\folderup_disable.bmp"
-IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
-IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
-IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
-IDB_MERGE_DELETE        BITMAP                  "res\\delete.bmp"
-IDB_FILE_PRINT          BITMAP                  "res\\print.bmp"
-IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
+IDR_MAINFRAME           BITMAP                  "..\\..\\res\\Toolbar.bmp"
+IDB_SPLASH              BITMAP                  "..\\..\\res\\splash1.bmp"
+IDB_EQUAL               BITMAP                  "..\\..\\res\\equal.bmp"
+IDB_NOTEQUAL            BITMAP                  "..\\..\\res\\notequal.bmp"
+IDB_UNKNOWN             BITMAP                  "..\\..\\res\\unknown.bmp"
+IDB_BINARYSAME          BITMAP                  "..\\..\\res\\binary.bmp"
+IDB_LFILE               BITMAP                  "..\\..\\res\\lfile.bmp"
+IDB_RFILE               BITMAP                  "..\\..\\res\\rfile.bmp"
+IDB_BINARYDIFF          BITMAP                  "..\\..\\res\\binarydiff.bmp"
+IDB_FILESKIP            BITMAP                  "..\\..\\res\\fileskip.bmp"
+IDB_EDIT_COPY           BITMAP                  "..\\..\\res\\copy.bmp"
+IDB_EDIT_CUT            BITMAP                  "..\\..\\res\\cut.bmp"
+IDB_EDIT_PASTE          BITMAP                  "..\\..\\res\\paste.bmp"
+IDB_EDIT_SEARCH         BITMAP                  "..\\..\\res\\search.bmp"
+IDB_WINDOW_CASCADE      BITMAP                  "..\\..\\res\\cascade.bmp"
+IDB_WINDOW_HORIZONTAL   BITMAP                  "..\\..\\res\\horizontally.bmp"
+IDB_WINDOW_VERTICAL     BITMAP                  "..\\..\\res\\vertically.bmp"
+IDB_WINDOW_CLOSE        BITMAP                  "..\\..\\res\\close.bmp"
+IDB_WINDOW_CHANGEPANE   BITMAP                  "..\\..\\res\\change_pane.bmp"
+IDB_EDIT_GOTO           BITMAP                  "..\\..\\res\\go_to.bmp"
+IDB_EDIT_REPLACE        BITMAP                  "..\\..\\res\\replace.bmp"
+IDB_VIEW_LANGUAGE       BITMAP                  "..\\..\\res\\language.bmp"
+IDB_VIEW_SELECTFONT     BITMAP                  "..\\..\\res\\select_font.bmp"
+IDB_FILE_EXIT           BITMAP                  "..\\..\\res\\exit.bmp"
+IDB_HELP_CONTENTS       BITMAP                  "..\\..\\res\\help_contents.bmp"
+IDB_ERROR               BITMAP                  "..\\..\\res\\error.bmp"
+IDB_FOLDERUP            BITMAP                  "..\\..\\res\\folderup.bmp"
+IDB_FOLDERUP_DISABLE    BITMAP                  "..\\..\\res\\folderup_disable.bmp"
+IDB_EDIT_SELECTALL      BITMAP                  "..\\..\\res\\select_all.bmp"
+IDB_TOOLS_FILTERS       BITMAP                  "..\\..\\res\\filters.bmp"
+IDB_TOOLS_COLUMNS       BITMAP                  "..\\..\\res\\customize_columns.bmp"
+IDB_MERGE_DELETE        BITMAP                  "..\\..\\res\\delete.bmp"
+IDB_FILE_PRINT          BITMAP                  "..\\..\\res\\print.bmp"
+IDB_SIGMA               BITMAP                  "..\\..\\res\\sigma.bmp"
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -1542,8 +1544,8 @@ IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
 // Cursor
 //
 
-IDR_MARGIN_CURSOR       CURSOR                  "res\\mg_cur.cur"
-IDR_MERGEHAND           CURSOR                  "res\\hand.cur"
+IDR_MARGIN_CURSOR       CURSOR                  "..\\..\\res\\mg_cur.cur"
+IDR_MERGEHAND           CURSOR                  "..\\..\\res\\hand.cur"
 
 /////////////////////////////////////////////////////////////////////////////
 //

diff --git a/Src/Languages/Bulgarian/res/Merge.ico b/Src/Languages/Bulgarian/res/Merge.ico
deleted file mode 100644 (file)
index 6fd5e56..0000000
Binary files a/Src/Languages/Bulgarian/res/Merge.ico and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/MergeDir.ico b/Src/Languages/Bulgarian/res/MergeDir.ico
deleted file mode 100644 (file)
index 349c926..0000000
Binary files a/Src/Languages/Bulgarian/res/MergeDir.ico and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/MergeDoc.ico b/Src/Languages/Bulgarian/res/MergeDoc.ico
deleted file mode 100644 (file)
index b2f417b..0000000
Binary files a/Src/Languages/Bulgarian/res/MergeDoc.ico and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/Toolbar.bmp b/Src/Languages/Bulgarian/res/Toolbar.bmp
deleted file mode 100644 (file)
index 7935cc8..0000000
Binary files a/Src/Languages/Bulgarian/res/Toolbar.bmp and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/WinMergeSplash.psd b/Src/Languages/Bulgarian/res/WinMergeSplash.psd
deleted file mode 100644 (file)
index fe7df64..0000000
Binary files a/Src/Languages/Bulgarian/res/WinMergeSplash.psd and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/binary.bmp b/Src/Languages/Bulgarian/res/binary.bmp
deleted file mode 100644 (file)
index 417eb30..0000000
Binary files a/Src/Languages/Bulgarian/res/binary.bmp and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/binarydiff.bmp b/Src/Languages/Bulgarian/res/binarydiff.bmp
deleted file mode 100644 (file)
index 4e45141..0000000
Binary files a/Src/Languages/Bulgarian/res/binarydiff.bmp and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/cascade.bmp b/Src/Languages/Bulgarian/res/cascade.bmp
deleted file mode 100644 (file)
index a56622c..0000000
Binary files a/Src/Languages/Bulgarian/res/cascade.bmp and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/change_pane.bmp b/Src/Languages/Bulgarian/res/change_pane.bmp
deleted file mode 100644 (file)
index 0a2e36a..0000000
Binary files a/Src/Languages/Bulgarian/res/change_pane.bmp and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/close.bmp b/Src/Languages/Bulgarian/res/close.bmp
deleted file mode 100644 (file)
index 55b5e87..0000000
Binary files a/Src/Languages/Bulgarian/res/close.bmp and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/copy.bmp b/Src/Languages/Bulgarian/res/copy.bmp
deleted file mode 100644 (file)
index 6565c6f..0000000
Binary files a/Src/Languages/Bulgarian/res/copy.bmp and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/customize_columns.bmp b/Src/Languages/Bulgarian/res/customize_columns.bmp
deleted file mode 100644 (file)
index 126345a..0000000
Binary files a/Src/Languages/Bulgarian/res/customize_columns.bmp and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/cut.bmp b/Src/Languages/Bulgarian/res/cut.bmp
deleted file mode 100644 (file)
index 976c5d2..0000000
Binary files a/Src/Languages/Bulgarian/res/cut.bmp and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/delete.bmp b/Src/Languages/Bulgarian/res/delete.bmp
deleted file mode 100644 (file)
index b70eeb8..0000000
Binary files a/Src/Languages/Bulgarian/res/delete.bmp and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/equal.bmp b/Src/Languages/Bulgarian/res/equal.bmp
deleted file mode 100644 (file)
index 9761d55..0000000
Binary files a/Src/Languages/Bulgarian/res/equal.bmp and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/error.bmp b/Src/Languages/Bulgarian/res/error.bmp
deleted file mode 100644 (file)
index f659c1d..0000000
Binary files a/Src/Languages/Bulgarian/res/error.bmp and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/exit.bmp b/Src/Languages/Bulgarian/res/exit.bmp
deleted file mode 100644 (file)
index 596127a..0000000
Binary files a/Src/Languages/Bulgarian/res/exit.bmp and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/fileskip.bmp b/Src/Languages/Bulgarian/res/fileskip.bmp
deleted file mode 100644 (file)
index 9e502d9..0000000
Binary files a/Src/Languages/Bulgarian/res/fileskip.bmp and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/filters.bmp b/Src/Languages/Bulgarian/res/filters.bmp
deleted file mode 100644 (file)
index e7ab693..0000000
Binary files a/Src/Languages/Bulgarian/res/filters.bmp and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/folder.ico b/Src/Languages/Bulgarian/res/folder.ico
deleted file mode 100644 (file)
index e18bd19..0000000
Binary files a/Src/Languages/Bulgarian/res/folder.ico and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/folderskip.ico b/Src/Languages/Bulgarian/res/folderskip.ico
deleted file mode 100644 (file)
index 3297496..0000000
Binary files a/Src/Languages/Bulgarian/res/folderskip.ico and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/folderup.bmp b/Src/Languages/Bulgarian/res/folderup.bmp
deleted file mode 100644 (file)
index 2d15145..0000000
Binary files a/Src/Languages/Bulgarian/res/folderup.bmp and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/folderup_disable.bmp b/Src/Languages/Bulgarian/res/folderup_disable.bmp
deleted file mode 100644 (file)
index 5829a19..0000000
Binary files a/Src/Languages/Bulgarian/res/folderup_disable.bmp and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/go_to.bmp b/Src/Languages/Bulgarian/res/go_to.bmp
deleted file mode 100644 (file)
index a6839aa..0000000
Binary files a/Src/Languages/Bulgarian/res/go_to.bmp and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/hand.cur b/Src/Languages/Bulgarian/res/hand.cur
deleted file mode 100644 (file)
index ed8db8c..0000000
Binary files a/Src/Languages/Bulgarian/res/hand.cur and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/help_contents.bmp b/Src/Languages/Bulgarian/res/help_contents.bmp
deleted file mode 100644 (file)
index 6662979..0000000
Binary files a/Src/Languages/Bulgarian/res/help_contents.bmp and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/horizontally.bmp b/Src/Languages/Bulgarian/res/horizontally.bmp
deleted file mode 100644 (file)
index 3c7a732..0000000
Binary files a/Src/Languages/Bulgarian/res/horizontally.bmp and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/language.bmp b/Src/Languages/Bulgarian/res/language.bmp
deleted file mode 100644 (file)
index 9e92e4d..0000000
Binary files a/Src/Languages/Bulgarian/res/language.bmp and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/lfile.bmp b/Src/Languages/Bulgarian/res/lfile.bmp
deleted file mode 100644 (file)
index bb7cf6c..0000000
Binary files a/Src/Languages/Bulgarian/res/lfile.bmp and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/lfolder.ico b/Src/Languages/Bulgarian/res/lfolder.ico
deleted file mode 100644 (file)
index fc1c797..0000000
Binary files a/Src/Languages/Bulgarian/res/lfolder.ico and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/mg_cur.cur b/Src/Languages/Bulgarian/res/mg_cur.cur
deleted file mode 100644 (file)
index 5691efb..0000000
Binary files a/Src/Languages/Bulgarian/res/mg_cur.cur and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/notequal.bmp b/Src/Languages/Bulgarian/res/notequal.bmp
deleted file mode 100644 (file)
index d747084..0000000
Binary files a/Src/Languages/Bulgarian/res/notequal.bmp and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/paste.bmp b/Src/Languages/Bulgarian/res/paste.bmp
deleted file mode 100644 (file)
index bcd5227..0000000
Binary files a/Src/Languages/Bulgarian/res/paste.bmp and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/print.bmp b/Src/Languages/Bulgarian/res/print.bmp
deleted file mode 100644 (file)
index 739ca01..0000000
Binary files a/Src/Languages/Bulgarian/res/print.bmp and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/replace.bmp b/Src/Languages/Bulgarian/res/replace.bmp
deleted file mode 100644 (file)
index e5586b9..0000000
Binary files a/Src/Languages/Bulgarian/res/replace.bmp and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/rfile.bmp b/Src/Languages/Bulgarian/res/rfile.bmp
deleted file mode 100644 (file)
index 1333733..0000000
Binary files a/Src/Languages/Bulgarian/res/rfile.bmp and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/rfolder.ico b/Src/Languages/Bulgarian/res/rfolder.ico
deleted file mode 100644 (file)
index 444d827..0000000
Binary files a/Src/Languages/Bulgarian/res/rfolder.ico and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/search.bmp b/Src/Languages/Bulgarian/res/search.bmp
deleted file mode 100644 (file)
index 9d606e5..0000000
Binary files a/Src/Languages/Bulgarian/res/search.bmp and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/select_all.bmp b/Src/Languages/Bulgarian/res/select_all.bmp
deleted file mode 100644 (file)
index 174e311..0000000
Binary files a/Src/Languages/Bulgarian/res/select_all.bmp and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/select_font.bmp b/Src/Languages/Bulgarian/res/select_font.bmp
deleted file mode 100644 (file)
index 2609538..0000000
Binary files a/Src/Languages/Bulgarian/res/select_font.bmp and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/sigma.bmp b/Src/Languages/Bulgarian/res/sigma.bmp
deleted file mode 100644 (file)
index eff4abe..0000000
Binary files a/Src/Languages/Bulgarian/res/sigma.bmp and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/splash1.bmp b/Src/Languages/Bulgarian/res/splash1.bmp
deleted file mode 100644 (file)
index f041297..0000000
Binary files a/Src/Languages/Bulgarian/res/splash1.bmp and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/unknown.bmp b/Src/Languages/Bulgarian/res/unknown.bmp
deleted file mode 100644 (file)
index 7f16906..0000000
Binary files a/Src/Languages/Bulgarian/res/unknown.bmp and /dev/null differ

diff --git a/Src/Languages/Bulgarian/res/vertically.bmp b/Src/Languages/Bulgarian/res/vertically.bmp
deleted file mode 100644 (file)
index e57c1b6..0000000
Binary files a/Src/Languages/Bulgarian/res/vertically.bmp and /dev/null differ

diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc
index 37c777a..be34cb8 100644 (file)
--- a/Src/Languages/Catalan/MergeCatalan.rc
+++ b/Src/Languages/Catalan/MergeCatalan.rc
@@ -67,13 +67,15 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDR_MAINFRAME           ICON                    "res\\Merge.ico"
-IDR_MERGETYPE           ICON                    "res\\MergeDoc.ico"
-IDR_DOC_FOLDERCMP       ICON                    "res\\MergeDir.ico"
-IDI_FOLDER              ICON                    "res\\folder.ico"
-IDI_LFOLDER             ICON                    "res\\lfolder.ico"
-IDI_RFOLDER             ICON                    "res\\rfolder.ico"
-IDI_FOLDERSKIP          ICON                    "res\\folderskip.ico"
+
+// Load shared resources from Src\res
+IDR_MAINFRAME           ICON                    "..\\..\\res\\Merge.ico"
+IDR_MERGETYPE           ICON                    "..\\..\\res\\MergeDoc.ico"
+IDR_DOC_FOLDERCMP       ICON                    "..\\..\\res\\MergeDir.ico"
+IDI_FOLDER              ICON                    "..\\..\\res\\folder.ico"
+IDI_LFOLDER             ICON                    "..\\..\\res\\lfolder.ico"
+IDI_RFOLDER             ICON                    "..\\..\\res\\rfolder.ico"
+IDI_FOLDERSKIP          ICON                    "..\\..\\res\\folderskip.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1500,41 +1502,42 @@ END
 //
 // Bitmap
 //
+// Catalan has localized splash screen.
 
-IDR_MAINFRAME           BITMAP                  "res\\Toolbar.bmp"
+IDR_MAINFRAME           BITMAP                  "..\\..\\res\\Toolbar.bmp"
 IDB_SPLASH              BITMAP                  "res\\splash1.bmp"
-IDB_EQUAL               BITMAP                  "res\\equal.bmp"
-IDB_NOTEQUAL            BITMAP                  "res\\notequal.bmp"
-IDB_UNKNOWN             BITMAP                  "res\\unknown.bmp"
-IDB_BINARYSAME          BITMAP                  "res\\binary.bmp"
-IDB_LFILE               BITMAP                  "res\\lfile.bmp"
-IDB_RFILE               BITMAP                  "res\\rfile.bmp"
-IDB_BINARYDIFF          BITMAP                  "res\\binarydiff.bmp"
-IDB_FILESKIP            BITMAP                  "res\\fileskip.bmp"
-IDB_EDIT_COPY           BITMAP                  "res\\copy.bmp"
-IDB_EDIT_CUT            BITMAP                  "res\\cut.bmp"
-IDB_EDIT_PASTE          BITMAP                  "res\\paste.bmp"
-IDB_EDIT_SEARCH         BITMAP                  "res\\search.bmp"
-IDB_WINDOW_CASCADE      BITMAP                  "res\\cascade.bmp"
-IDB_WINDOW_HORIZONTAL   BITMAP                  "res\\horizontally.bmp"
-IDB_WINDOW_VERTICAL     BITMAP                  "res\\vertically.bmp"
-IDB_WINDOW_CLOSE        BITMAP                  "res\\close.bmp"
-IDB_WINDOW_CHANGEPANE   BITMAP                  "res\\change_pane.bmp"
-IDB_EDIT_GOTO           BITMAP                  "res\\go_to.bmp"
-IDB_EDIT_REPLACE        BITMAP                  "res\\replace.bmp"
-IDB_VIEW_LANGUAGE       BITMAP                  "res\\language.bmp"
-IDB_VIEW_SELECTFONT     BITMAP                  "res\\select_font.bmp"
-IDB_FILE_EXIT           BITMAP                  "res\\exit.bmp"
-IDB_HELP_CONTENTS       BITMAP                  "res\\help_contents.bmp"
-IDB_ERROR               BITMAP                  "res\\error.bmp"
-IDB_FOLDERUP            BITMAP                  "res\\folderup.bmp"
-IDB_FOLDERUP_DISABLE    BITMAP                  "res\\folderup_disable.bmp"
-IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
-IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
-IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
-IDB_MERGE_DELETE        BITMAP                  "res\\delete.bmp"
-IDB_FILE_PRINT          BITMAP                  "res\\print.bmp"
-IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
+IDB_EQUAL               BITMAP                  "..\\..\\res\\equal.bmp"
+IDB_NOTEQUAL            BITMAP                  "..\\..\\res\\notequal.bmp"
+IDB_UNKNOWN             BITMAP                  "..\\..\\res\\unknown.bmp"
+IDB_BINARYSAME          BITMAP                  "..\\..\\res\\binary.bmp"
+IDB_LFILE               BITMAP                  "..\\..\\res\\lfile.bmp"
+IDB_RFILE               BITMAP                  "..\\..\\res\\rfile.bmp"
+IDB_BINARYDIFF          BITMAP                  "..\\..\\res\\binarydiff.bmp"
+IDB_FILESKIP            BITMAP                  "..\\..\\res\\fileskip.bmp"
+IDB_EDIT_COPY           BITMAP                  "..\\..\\res\\copy.bmp"
+IDB_EDIT_CUT            BITMAP                  "..\\..\\res\\cut.bmp"
+IDB_EDIT_PASTE          BITMAP                  "..\\..\\res\\paste.bmp"
+IDB_EDIT_SEARCH         BITMAP                  "..\\..\\res\\search.bmp"
+IDB_WINDOW_CASCADE      BITMAP                  "..\\..\\res\\cascade.bmp"
+IDB_WINDOW_HORIZONTAL   BITMAP                  "..\\..\\res\\horizontally.bmp"
+IDB_WINDOW_VERTICAL     BITMAP                  "..\\..\\res\\vertically.bmp"
+IDB_WINDOW_CLOSE        BITMAP                  "..\\..\\res\\close.bmp"
+IDB_WINDOW_CHANGEPANE   BITMAP                  "..\\..\\res\\change_pane.bmp"
+IDB_EDIT_GOTO           BITMAP                  "..\\..\\res\\go_to.bmp"
+IDB_EDIT_REPLACE        BITMAP                  "..\\..\\res\\replace.bmp"
+IDB_VIEW_LANGUAGE       BITMAP                  "..\\..\\res\\language.bmp"
+IDB_VIEW_SELECTFONT     BITMAP                  "..\\..\\res\\select_font.bmp"
+IDB_FILE_EXIT           BITMAP                  "..\\..\\res\\exit.bmp"
+IDB_HELP_CONTENTS       BITMAP                  "..\\..\\res\\help_contents.bmp"
+IDB_ERROR               BITMAP                  "..\\..\\res\\error.bmp"
+IDB_FOLDERUP            BITMAP                  "..\\..\\res\\folderup.bmp"
+IDB_FOLDERUP_DISABLE    BITMAP                  "..\\..\\res\\folderup_disable.bmp"
+IDB_EDIT_SELECTALL      BITMAP                  "..\\..\\res\\select_all.bmp"
+IDB_TOOLS_FILTERS       BITMAP                  "..\\..\\res\\filters.bmp"
+IDB_TOOLS_COLUMNS       BITMAP                  "..\\..\\res\\customize_columns.bmp"
+IDB_MERGE_DELETE        BITMAP                  "..\\..\\res\\delete.bmp"
+IDB_FILE_PRINT          BITMAP                  "..\\..\\res\\print.bmp"
+IDB_SIGMA               BITMAP                  "..\\..\\res\\sigma.bmp"
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -1542,8 +1545,8 @@ IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
 // Cursor
 //
 
-IDR_MARGIN_CURSOR       CURSOR                  "res\\mg_cur.cur"
-IDR_MERGEHAND           CURSOR                  "res\\hand.cur"
+IDR_MARGIN_CURSOR       CURSOR                  "..\\..\\res\\mg_cur.cur"
+IDR_MERGEHAND           CURSOR                  "..\\..\\res\\hand.cur"
 
 /////////////////////////////////////////////////////////////////////////////
 //

diff --git a/Src/Languages/Catalan/res/Merge.ico b/Src/Languages/Catalan/res/Merge.ico
deleted file mode 100644 (file)
index 6fd5e56..0000000
Binary files a/Src/Languages/Catalan/res/Merge.ico and /dev/null differ

diff --git a/Src/Languages/Catalan/res/MergeDir.ico b/Src/Languages/Catalan/res/MergeDir.ico
deleted file mode 100644 (file)
index 349c926..0000000
Binary files a/Src/Languages/Catalan/res/MergeDir.ico and /dev/null differ

diff --git a/Src/Languages/Catalan/res/MergeDoc.ico b/Src/Languages/Catalan/res/MergeDoc.ico
deleted file mode 100644 (file)
index b2f417b..0000000
Binary files a/Src/Languages/Catalan/res/MergeDoc.ico and /dev/null differ

diff --git a/Src/Languages/Catalan/res/Toolbar.bmp b/Src/Languages/Catalan/res/Toolbar.bmp
deleted file mode 100644 (file)
index 7935cc8..0000000
Binary files a/Src/Languages/Catalan/res/Toolbar.bmp and /dev/null differ

diff --git a/Src/Languages/Catalan/res/binary.bmp b/Src/Languages/Catalan/res/binary.bmp
deleted file mode 100644 (file)
index 417eb30..0000000
Binary files a/Src/Languages/Catalan/res/binary.bmp and /dev/null differ

diff --git a/Src/Languages/Catalan/res/binarydiff.bmp b/Src/Languages/Catalan/res/binarydiff.bmp
deleted file mode 100644 (file)
index 4e45141..0000000
Binary files a/Src/Languages/Catalan/res/binarydiff.bmp and /dev/null differ

diff --git a/Src/Languages/Catalan/res/cascade.bmp b/Src/Languages/Catalan/res/cascade.bmp
deleted file mode 100644 (file)
index a56622c..0000000
Binary files a/Src/Languages/Catalan/res/cascade.bmp and /dev/null differ

diff --git a/Src/Languages/Catalan/res/change_pane.bmp b/Src/Languages/Catalan/res/change_pane.bmp
deleted file mode 100644 (file)
index 0a2e36a..0000000
Binary files a/Src/Languages/Catalan/res/change_pane.bmp and /dev/null differ

diff --git a/Src/Languages/Catalan/res/close.bmp b/Src/Languages/Catalan/res/close.bmp
deleted file mode 100644 (file)
index 55b5e87..0000000
Binary files a/Src/Languages/Catalan/res/close.bmp and /dev/null differ

diff --git a/Src/Languages/Catalan/res/copy.bmp b/Src/Languages/Catalan/res/copy.bmp
deleted file mode 100644 (file)
index 6565c6f..0000000
Binary files a/Src/Languages/Catalan/res/copy.bmp and /dev/null differ

diff --git a/Src/Languages/Catalan/res/customize_columns.bmp b/Src/Languages/Catalan/res/customize_columns.bmp
deleted file mode 100644 (file)
index 126345a..0000000
Binary files a/Src/Languages/Catalan/res/customize_columns.bmp and /dev/null differ

diff --git a/Src/Languages/Catalan/res/cut.bmp b/Src/Languages/Catalan/res/cut.bmp
deleted file mode 100644 (file)
index 976c5d2..0000000
Binary files a/Src/Languages/Catalan/res/cut.bmp and /dev/null differ

diff --git a/Src/Languages/Catalan/res/delete.bmp b/Src/Languages/Catalan/res/delete.bmp
deleted file mode 100644 (file)
index b70eeb8..0000000
Binary files a/Src/Languages/Catalan/res/delete.bmp and /dev/null differ

diff --git a/Src/Languages/Catalan/res/equal.bmp b/Src/Languages/Catalan/res/equal.bmp
deleted file mode 100644 (file)
index 9761d55..0000000
Binary files a/Src/Languages/Catalan/res/equal.bmp and /dev/null differ

diff --git a/Src/Languages/Catalan/res/error.bmp b/Src/Languages/Catalan/res/error.bmp
deleted file mode 100644 (file)
index f659c1d..0000000
Binary files a/Src/Languages/Catalan/res/error.bmp and /dev/null differ

diff --git a/Src/Languages/Catalan/res/exit.bmp b/Src/Languages/Catalan/res/exit.bmp
deleted file mode 100644 (file)
index 596127a..0000000
Binary files a/Src/Languages/Catalan/res/exit.bmp and /dev/null differ

diff --git a/Src/Languages/Catalan/res/fileskip.bmp b/Src/Languages/Catalan/res/fileskip.bmp
deleted file mode 100644 (file)
index 9e502d9..0000000
Binary files a/Src/Languages/Catalan/res/fileskip.bmp and /dev/null differ

diff --git a/Src/Languages/Catalan/res/filters.bmp b/Src/Languages/Catalan/res/filters.bmp
deleted file mode 100644 (file)
index e7ab693..0000000
Binary files a/Src/Languages/Catalan/res/filters.bmp and /dev/null differ

diff --git a/Src/Languages/Catalan/res/folder.ico b/Src/Languages/Catalan/res/folder.ico
deleted file mode 100644 (file)
index e18bd19..0000000
Binary files a/Src/Languages/Catalan/res/folder.ico and /dev/null differ

diff --git a/Src/Languages/Catalan/res/folderskip.ico b/Src/Languages/Catalan/res/folderskip.ico
deleted file mode 100644 (file)
index 3297496..0000000
Binary files a/Src/Languages/Catalan/res/folderskip.ico and /dev/null differ

diff --git a/Src/Languages/Catalan/res/folderup.bmp b/Src/Languages/Catalan/res/folderup.bmp
deleted file mode 100644 (file)
index 2d15145..0000000
Binary files a/Src/Languages/Catalan/res/folderup.bmp and /dev/null differ

diff --git a/Src/Languages/Catalan/res/folderup_disable.bmp b/Src/Languages/Catalan/res/folderup_disable.bmp
deleted file mode 100644 (file)
index 5829a19..0000000
Binary files a/Src/Languages/Catalan/res/folderup_disable.bmp and /dev/null differ

diff --git a/Src/Languages/Catalan/res/go_to.bmp b/Src/Languages/Catalan/res/go_to.bmp
deleted file mode 100644 (file)
index a6839aa..0000000
Binary files a/Src/Languages/Catalan/res/go_to.bmp and /dev/null differ

diff --git a/Src/Languages/Catalan/res/hand.cur b/Src/Languages/Catalan/res/hand.cur
deleted file mode 100644 (file)
index ed8db8c..0000000
Binary files a/Src/Languages/Catalan/res/hand.cur and /dev/null differ

diff --git a/Src/Languages/Catalan/res/help_contents.bmp b/Src/Languages/Catalan/res/help_contents.bmp
deleted file mode 100644 (file)
index 6662979..0000000
Binary files a/Src/Languages/Catalan/res/help_contents.bmp and /dev/null differ

diff --git a/Src/Languages/Catalan/res/horizontally.bmp b/Src/Languages/Catalan/res/horizontally.bmp
deleted file mode 100644 (file)
index 3c7a732..0000000
Binary files a/Src/Languages/Catalan/res/horizontally.bmp and /dev/null differ

diff --git a/Src/Languages/Catalan/res/language.bmp b/Src/Languages/Catalan/res/language.bmp
deleted file mode 100644 (file)
index 9e92e4d..0000000
Binary files a/Src/Languages/Catalan/res/language.bmp and /dev/null differ

diff --git a/Src/Languages/Catalan/res/lfile.bmp b/Src/Languages/Catalan/res/lfile.bmp
deleted file mode 100644 (file)
index bb7cf6c..0000000
Binary files a/Src/Languages/Catalan/res/lfile.bmp and /dev/null differ

diff --git a/Src/Languages/Catalan/res/lfolder.ico b/Src/Languages/Catalan/res/lfolder.ico
deleted file mode 100644 (file)
index fc1c797..0000000
Binary files a/Src/Languages/Catalan/res/lfolder.ico and /dev/null differ

diff --git a/Src/Languages/Catalan/res/mg_cur.cur b/Src/Languages/Catalan/res/mg_cur.cur
deleted file mode 100644 (file)
index 5691efb..0000000
Binary files a/Src/Languages/Catalan/res/mg_cur.cur and /dev/null differ

diff --git a/Src/Languages/Catalan/res/notequal.bmp b/Src/Languages/Catalan/res/notequal.bmp
deleted file mode 100644 (file)
index d747084..0000000
Binary files a/Src/Languages/Catalan/res/notequal.bmp and /dev/null differ

diff --git a/Src/Languages/Catalan/res/paste.bmp b/Src/Languages/Catalan/res/paste.bmp
deleted file mode 100644 (file)
index bcd5227..0000000
Binary files a/Src/Languages/Catalan/res/paste.bmp and /dev/null differ

diff --git a/Src/Languages/Catalan/res/print.bmp b/Src/Languages/Catalan/res/print.bmp
deleted file mode 100644 (file)
index 739ca01..0000000
Binary files a/Src/Languages/Catalan/res/print.bmp and /dev/null differ

diff --git a/Src/Languages/Catalan/res/replace.bmp b/Src/Languages/Catalan/res/replace.bmp
deleted file mode 100644 (file)
index e5586b9..0000000
Binary files a/Src/Languages/Catalan/res/replace.bmp and /dev/null differ

diff --git a/Src/Languages/Catalan/res/rfile.bmp b/Src/Languages/Catalan/res/rfile.bmp
deleted file mode 100644 (file)
index 1333733..0000000
Binary files a/Src/Languages/Catalan/res/rfile.bmp and /dev/null differ

diff --git a/Src/Languages/Catalan/res/rfolder.ico b/Src/Languages/Catalan/res/rfolder.ico
deleted file mode 100644 (file)
index 444d827..0000000
Binary files a/Src/Languages/Catalan/res/rfolder.ico and /dev/null differ

diff --git a/Src/Languages/Catalan/res/search.bmp b/Src/Languages/Catalan/res/search.bmp
deleted file mode 100644 (file)
index 9d606e5..0000000
Binary files a/Src/Languages/Catalan/res/search.bmp and /dev/null differ

diff --git a/Src/Languages/Catalan/res/select_all.bmp b/Src/Languages/Catalan/res/select_all.bmp
deleted file mode 100644 (file)
index 174e311..0000000
Binary files a/Src/Languages/Catalan/res/select_all.bmp and /dev/null differ

diff --git a/Src/Languages/Catalan/res/select_font.bmp b/Src/Languages/Catalan/res/select_font.bmp
deleted file mode 100644 (file)
index 2609538..0000000
Binary files a/Src/Languages/Catalan/res/select_font.bmp and /dev/null differ

diff --git a/Src/Languages/Catalan/res/sigma.bmp b/Src/Languages/Catalan/res/sigma.bmp
deleted file mode 100644 (file)
index eff4abe..0000000
Binary files a/Src/Languages/Catalan/res/sigma.bmp and /dev/null differ

diff --git a/Src/Languages/Catalan/res/unknown.bmp b/Src/Languages/Catalan/res/unknown.bmp
deleted file mode 100644 (file)
index 7f16906..0000000
Binary files a/Src/Languages/Catalan/res/unknown.bmp and /dev/null differ

diff --git a/Src/Languages/Catalan/res/vertically.bmp b/Src/Languages/Catalan/res/vertically.bmp
deleted file mode 100644 (file)
index e57c1b6..0000000
Binary files a/Src/Languages/Catalan/res/vertically.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
index 0a9d051..ae4593e 100644 (file)
--- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
+++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
@@ -67,13 +67,15 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDR_MAINFRAME           ICON                    "res\\Merge.ico"
-IDR_MERGETYPE           ICON                    "res\\MergeDoc.ico"
-IDR_DOC_FOLDERCMP       ICON                    "res\\MergeDir.ico"
-IDI_FOLDER              ICON                    "res\\folder.ico"
-IDI_LFOLDER             ICON                    "res\\lfolder.ico"
-IDI_RFOLDER             ICON                    "res\\rfolder.ico"
-IDI_FOLDERSKIP          ICON                    "res\\folderskip.ico"
+
+// Load shared resources from Src\res
+IDR_MAINFRAME           ICON                    "..\\..\\res\\Merge.ico"
+IDR_MERGETYPE           ICON                    "..\\..\\res\\MergeDoc.ico"
+IDR_DOC_FOLDERCMP       ICON                    "..\\..\\res\\MergeDir.ico"
+IDI_FOLDER              ICON                    "..\\..\\res\\folder.ico"
+IDI_LFOLDER             ICON                    "..\\..\\res\\lfolder.ico"
+IDI_RFOLDER             ICON                    "..\\..\\res\\rfolder.ico"
+IDI_FOLDERSKIP          ICON                    "..\\..\\res\\folderskip.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1473,40 +1475,40 @@ END
 // Bitmap
 //
 
-IDR_MAINFRAME           BITMAP                  "res\\Toolbar.bmp"
-IDB_SPLASH              BITMAP                  "res\\splash1.bmp"
-IDB_EQUAL               BITMAP                  "res\\equal.bmp"
-IDB_NOTEQUAL            BITMAP                  "res\\notequal.bmp"
-IDB_UNKNOWN             BITMAP                  "res\\unknown.bmp"
-IDB_BINARYSAME          BITMAP                  "res\\binary.bmp"
-IDB_LFILE               BITMAP                  "res\\lfile.bmp"
-IDB_RFILE               BITMAP                  "res\\rfile.bmp"
-IDB_BINARYDIFF          BITMAP                  "res\\binarydiff.bmp"
-IDB_FILESKIP            BITMAP                  "res\\fileskip.bmp"
-IDB_EDIT_COPY           BITMAP                  "res\\copy.bmp"
-IDB_EDIT_CUT            BITMAP                  "res\\cut.bmp"
-IDB_EDIT_PASTE          BITMAP                  "res\\paste.bmp"
-IDB_EDIT_SEARCH         BITMAP                  "res\\search.bmp"
-IDB_WINDOW_CASCADE      BITMAP                  "res\\cascade.bmp"
-IDB_WINDOW_HORIZONTAL   BITMAP                  "res\\horizontally.bmp"
-IDB_WINDOW_VERTICAL     BITMAP                  "res\\vertically.bmp"
-IDB_WINDOW_CLOSE        BITMAP                  "res\\close.bmp"
-IDB_WINDOW_CHANGEPANE   BITMAP                  "res\\change_pane.bmp"
-IDB_EDIT_GOTO           BITMAP                  "res\\go_to.bmp"
-IDB_EDIT_REPLACE        BITMAP                  "res\\replace.bmp"
-IDB_VIEW_LANGUAGE       BITMAP                  "res\\language.bmp"
-IDB_VIEW_SELECTFONT     BITMAP                  "res\\select_font.bmp"
-IDB_FILE_EXIT           BITMAP                  "res\\exit.bmp"
-IDB_HELP_CONTENTS       BITMAP                  "res\\help_contents.bmp"
-IDB_ERROR               BITMAP                  "res\\error.bmp"
-IDB_FOLDERUP            BITMAP                  "res\\folderup.bmp"
-IDB_FOLDERUP_DISABLE    BITMAP                  "res\\folderup_disable.bmp"
-IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
-IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
-IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
-IDB_MERGE_DELETE        BITMAP                  "res\\delete.bmp"
-IDB_FILE_PRINT          BITMAP                  "res\\print.bmp"
-IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
+IDR_MAINFRAME           BITMAP                  "..\\..\\res\\Toolbar.bmp"
+IDB_SPLASH              BITMAP                  "..\\..\\res\\splash1.bmp"
+IDB_EQUAL               BITMAP                  "..\\..\\res\\equal.bmp"
+IDB_NOTEQUAL            BITMAP                  "..\\..\\res\\notequal.bmp"
+IDB_UNKNOWN             BITMAP                  "..\\..\\res\\unknown.bmp"
+IDB_BINARYSAME          BITMAP                  "..\\..\\res\\binary.bmp"
+IDB_LFILE               BITMAP                  "..\\..\\res\\lfile.bmp"
+IDB_RFILE               BITMAP                  "..\\..\\res\\rfile.bmp"
+IDB_BINARYDIFF          BITMAP                  "..\\..\\res\\binarydiff.bmp"
+IDB_FILESKIP            BITMAP                  "..\\..\\res\\fileskip.bmp"
+IDB_EDIT_COPY           BITMAP                  "..\\..\\res\\copy.bmp"
+IDB_EDIT_CUT            BITMAP                  "..\\..\\res\\cut.bmp"
+IDB_EDIT_PASTE          BITMAP                  "..\\..\\res\\paste.bmp"
+IDB_EDIT_SEARCH         BITMAP                  "..\\..\\res\\search.bmp"
+IDB_WINDOW_CASCADE      BITMAP                  "..\\..\\res\\cascade.bmp"
+IDB_WINDOW_HORIZONTAL   BITMAP                  "..\\..\\res\\horizontally.bmp"
+IDB_WINDOW_VERTICAL     BITMAP                  "..\\..\\res\\vertically.bmp"
+IDB_WINDOW_CLOSE        BITMAP                  "..\\..\\res\\close.bmp"
+IDB_WINDOW_CHANGEPANE   BITMAP                  "..\\..\\res\\change_pane.bmp"
+IDB_EDIT_GOTO           BITMAP                  "..\\..\\res\\go_to.bmp"
+IDB_EDIT_REPLACE        BITMAP                  "..\\..\\res\\replace.bmp"
+IDB_VIEW_LANGUAGE       BITMAP                  "..\\..\\res\\language.bmp"
+IDB_VIEW_SELECTFONT     BITMAP                  "..\\..\\res\\select_font.bmp"
+IDB_FILE_EXIT           BITMAP                  "..\\..\\res\\exit.bmp"
+IDB_HELP_CONTENTS       BITMAP                  "..\\..\\res\\help_contents.bmp"
+IDB_ERROR               BITMAP                  "..\\..\\res\\error.bmp"
+IDB_FOLDERUP            BITMAP                  "..\\..\\res\\folderup.bmp"
+IDB_FOLDERUP_DISABLE    BITMAP                  "..\\..\\res\\folderup_disable.bmp"
+IDB_EDIT_SELECTALL      BITMAP                  "..\\..\\res\\select_all.bmp"
+IDB_TOOLS_FILTERS       BITMAP                  "..\\..\\res\\filters.bmp"
+IDB_TOOLS_COLUMNS       BITMAP                  "..\\..\\res\\customize_columns.bmp"
+IDB_MERGE_DELETE        BITMAP                  "..\\..\\res\\delete.bmp"
+IDB_FILE_PRINT          BITMAP                  "..\\..\\res\\print.bmp"
+IDB_SIGMA               BITMAP                  "..\\..\\res\\sigma.bmp"
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -1514,8 +1516,8 @@ IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
 // Cursor
 //
 
-IDR_MARGIN_CURSOR       CURSOR                  "res\\mg_cur.cur"
-IDR_MERGEHAND           CURSOR                  "res\\hand.cur"
+IDR_MARGIN_CURSOR       CURSOR                  "..\\..\\res\\mg_cur.cur"
+IDR_MERGEHAND           CURSOR                  "..\\..\\res\\hand.cur"
 
 /////////////////////////////////////////////////////////////////////////////
 //

diff --git a/Src/Languages/ChineseSimplified/res/Merge.ico b/Src/Languages/ChineseSimplified/res/Merge.ico
deleted file mode 100644 (file)
index 6fd5e56..0000000
Binary files a/Src/Languages/ChineseSimplified/res/Merge.ico and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/MergeDir.ico b/Src/Languages/ChineseSimplified/res/MergeDir.ico
deleted file mode 100644 (file)
index 349c926..0000000
Binary files a/Src/Languages/ChineseSimplified/res/MergeDir.ico and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/MergeDoc.ico b/Src/Languages/ChineseSimplified/res/MergeDoc.ico
deleted file mode 100644 (file)
index b2f417b..0000000
Binary files a/Src/Languages/ChineseSimplified/res/MergeDoc.ico and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/Toolbar.bmp b/Src/Languages/ChineseSimplified/res/Toolbar.bmp
deleted file mode 100644 (file)
index 7935cc8..0000000
Binary files a/Src/Languages/ChineseSimplified/res/Toolbar.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/WinMergeSplash.psd b/Src/Languages/ChineseSimplified/res/WinMergeSplash.psd
deleted file mode 100644 (file)
index fe7df64..0000000
Binary files a/Src/Languages/ChineseSimplified/res/WinMergeSplash.psd and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/binary.bmp b/Src/Languages/ChineseSimplified/res/binary.bmp
deleted file mode 100644 (file)
index 417eb30..0000000
Binary files a/Src/Languages/ChineseSimplified/res/binary.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/binarydiff.bmp b/Src/Languages/ChineseSimplified/res/binarydiff.bmp
deleted file mode 100644 (file)
index 4e45141..0000000
Binary files a/Src/Languages/ChineseSimplified/res/binarydiff.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/cascade.bmp b/Src/Languages/ChineseSimplified/res/cascade.bmp
deleted file mode 100644 (file)
index a56622c..0000000
Binary files a/Src/Languages/ChineseSimplified/res/cascade.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/change_pane.bmp b/Src/Languages/ChineseSimplified/res/change_pane.bmp
deleted file mode 100644 (file)
index 0a2e36a..0000000
Binary files a/Src/Languages/ChineseSimplified/res/change_pane.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/close.bmp b/Src/Languages/ChineseSimplified/res/close.bmp
deleted file mode 100644 (file)
index 55b5e87..0000000
Binary files a/Src/Languages/ChineseSimplified/res/close.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/copy.bmp b/Src/Languages/ChineseSimplified/res/copy.bmp
deleted file mode 100644 (file)
index 6565c6f..0000000
Binary files a/Src/Languages/ChineseSimplified/res/copy.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/customize_columns.bmp b/Src/Languages/ChineseSimplified/res/customize_columns.bmp
deleted file mode 100644 (file)
index 126345a..0000000
Binary files a/Src/Languages/ChineseSimplified/res/customize_columns.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/cut.bmp b/Src/Languages/ChineseSimplified/res/cut.bmp
deleted file mode 100644 (file)
index 976c5d2..0000000
Binary files a/Src/Languages/ChineseSimplified/res/cut.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/delete.bmp b/Src/Languages/ChineseSimplified/res/delete.bmp
deleted file mode 100644 (file)
index b70eeb8..0000000
Binary files a/Src/Languages/ChineseSimplified/res/delete.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/equal.bmp b/Src/Languages/ChineseSimplified/res/equal.bmp
deleted file mode 100644 (file)
index 9761d55..0000000
Binary files a/Src/Languages/ChineseSimplified/res/equal.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/error.bmp b/Src/Languages/ChineseSimplified/res/error.bmp
deleted file mode 100644 (file)
index f659c1d..0000000
Binary files a/Src/Languages/ChineseSimplified/res/error.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/exit.bmp b/Src/Languages/ChineseSimplified/res/exit.bmp
deleted file mode 100644 (file)
index 596127a..0000000
Binary files a/Src/Languages/ChineseSimplified/res/exit.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/fileskip.bmp b/Src/Languages/ChineseSimplified/res/fileskip.bmp
deleted file mode 100644 (file)
index 9e502d9..0000000
Binary files a/Src/Languages/ChineseSimplified/res/fileskip.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/filters.bmp b/Src/Languages/ChineseSimplified/res/filters.bmp
deleted file mode 100644 (file)
index e7ab693..0000000
Binary files a/Src/Languages/ChineseSimplified/res/filters.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/folder.ico b/Src/Languages/ChineseSimplified/res/folder.ico
deleted file mode 100644 (file)
index e18bd19..0000000
Binary files a/Src/Languages/ChineseSimplified/res/folder.ico and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/folderskip.ico b/Src/Languages/ChineseSimplified/res/folderskip.ico
deleted file mode 100644 (file)
index 3297496..0000000
Binary files a/Src/Languages/ChineseSimplified/res/folderskip.ico and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/folderup.bmp b/Src/Languages/ChineseSimplified/res/folderup.bmp
deleted file mode 100644 (file)
index 2d15145..0000000
Binary files a/Src/Languages/ChineseSimplified/res/folderup.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/folderup_disable.bmp b/Src/Languages/ChineseSimplified/res/folderup_disable.bmp
deleted file mode 100644 (file)
index 5829a19..0000000
Binary files a/Src/Languages/ChineseSimplified/res/folderup_disable.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/go_to.bmp b/Src/Languages/ChineseSimplified/res/go_to.bmp
deleted file mode 100644 (file)
index a6839aa..0000000
Binary files a/Src/Languages/ChineseSimplified/res/go_to.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/hand.cur b/Src/Languages/ChineseSimplified/res/hand.cur
deleted file mode 100644 (file)
index ed8db8c..0000000
Binary files a/Src/Languages/ChineseSimplified/res/hand.cur and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/help_contents.bmp b/Src/Languages/ChineseSimplified/res/help_contents.bmp
deleted file mode 100644 (file)
index 6662979..0000000
Binary files a/Src/Languages/ChineseSimplified/res/help_contents.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/horizontally.bmp b/Src/Languages/ChineseSimplified/res/horizontally.bmp
deleted file mode 100644 (file)
index 3c7a732..0000000
Binary files a/Src/Languages/ChineseSimplified/res/horizontally.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/language.bmp b/Src/Languages/ChineseSimplified/res/language.bmp
deleted file mode 100644 (file)
index 9e92e4d..0000000
Binary files a/Src/Languages/ChineseSimplified/res/language.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/lfile.bmp b/Src/Languages/ChineseSimplified/res/lfile.bmp
deleted file mode 100644 (file)
index bb7cf6c..0000000
Binary files a/Src/Languages/ChineseSimplified/res/lfile.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/lfolder.ico b/Src/Languages/ChineseSimplified/res/lfolder.ico
deleted file mode 100644 (file)
index fc1c797..0000000
Binary files a/Src/Languages/ChineseSimplified/res/lfolder.ico and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/mg_cur.cur b/Src/Languages/ChineseSimplified/res/mg_cur.cur
deleted file mode 100644 (file)
index 5691efb..0000000
Binary files a/Src/Languages/ChineseSimplified/res/mg_cur.cur and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/notequal.bmp b/Src/Languages/ChineseSimplified/res/notequal.bmp
deleted file mode 100644 (file)
index d747084..0000000
Binary files a/Src/Languages/ChineseSimplified/res/notequal.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/paste.bmp b/Src/Languages/ChineseSimplified/res/paste.bmp
deleted file mode 100644 (file)
index bcd5227..0000000
Binary files a/Src/Languages/ChineseSimplified/res/paste.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/print.bmp b/Src/Languages/ChineseSimplified/res/print.bmp
deleted file mode 100644 (file)
index 739ca01..0000000
Binary files a/Src/Languages/ChineseSimplified/res/print.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/replace.bmp b/Src/Languages/ChineseSimplified/res/replace.bmp
deleted file mode 100644 (file)
index e5586b9..0000000
Binary files a/Src/Languages/ChineseSimplified/res/replace.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/rfile.bmp b/Src/Languages/ChineseSimplified/res/rfile.bmp
deleted file mode 100644 (file)
index 1333733..0000000
Binary files a/Src/Languages/ChineseSimplified/res/rfile.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/rfolder.ico b/Src/Languages/ChineseSimplified/res/rfolder.ico
deleted file mode 100644 (file)
index 444d827..0000000
Binary files a/Src/Languages/ChineseSimplified/res/rfolder.ico and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/search.bmp b/Src/Languages/ChineseSimplified/res/search.bmp
deleted file mode 100644 (file)
index 9d606e5..0000000
Binary files a/Src/Languages/ChineseSimplified/res/search.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/select_all.bmp b/Src/Languages/ChineseSimplified/res/select_all.bmp
deleted file mode 100644 (file)
index 174e311..0000000
Binary files a/Src/Languages/ChineseSimplified/res/select_all.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/select_font.bmp b/Src/Languages/ChineseSimplified/res/select_font.bmp
deleted file mode 100644 (file)
index 2609538..0000000
Binary files a/Src/Languages/ChineseSimplified/res/select_font.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/sigma.bmp b/Src/Languages/ChineseSimplified/res/sigma.bmp
deleted file mode 100644 (file)
index eff4abe..0000000
Binary files a/Src/Languages/ChineseSimplified/res/sigma.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/splash1.bmp b/Src/Languages/ChineseSimplified/res/splash1.bmp
deleted file mode 100644 (file)
index f041297..0000000
Binary files a/Src/Languages/ChineseSimplified/res/splash1.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/unknown.bmp b/Src/Languages/ChineseSimplified/res/unknown.bmp
deleted file mode 100644 (file)
index 7f16906..0000000
Binary files a/Src/Languages/ChineseSimplified/res/unknown.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseSimplified/res/vertically.bmp b/Src/Languages/ChineseSimplified/res/vertically.bmp
deleted file mode 100644 (file)
index e57c1b6..0000000
Binary files a/Src/Languages/ChineseSimplified/res/vertically.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
index f3abdcd..71851be 100644 (file)
--- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
+++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
@@ -67,13 +67,15 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDR_MAINFRAME           ICON                    "res\\Merge.ico"
-IDR_MERGETYPE           ICON                    "res\\MergeDoc.ico"
-IDR_DOC_FOLDERCMP       ICON                    "res\\MergeDir.ico"
-IDI_FOLDER              ICON                    "res\\folder.ico"
-IDI_LFOLDER             ICON                    "res\\lfolder.ico"
-IDI_RFOLDER             ICON                    "res\\rfolder.ico"
-IDI_FOLDERSKIP          ICON                    "res\\folderskip.ico"
+
+// Load shared resources from Src\res
+IDR_MAINFRAME           ICON                    "..\\..\\res\\Merge.ico"
+IDR_MERGETYPE           ICON                    "..\\..\\res\\MergeDoc.ico"
+IDR_DOC_FOLDERCMP       ICON                    "..\\..\\res\\MergeDir.ico"
+IDI_FOLDER              ICON                    "..\\..\\res\\folder.ico"
+IDI_LFOLDER             ICON                    "..\\..\\res\\lfolder.ico"
+IDI_RFOLDER             ICON                    "..\\..\\res\\rfolder.ico"
+IDI_FOLDERSKIP          ICON                    "..\\..\\res\\folderskip.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1584,40 +1586,40 @@ END
 // Bitmap
 //
 
-IDR_MAINFRAME           BITMAP                  "res\\Toolbar.bmp"
-IDB_SPLASH              BITMAP                  "res\\splash1.bmp"
-IDB_EQUAL               BITMAP                  "res\\equal.bmp"
-IDB_NOTEQUAL            BITMAP                  "res\\notequal.bmp"
-IDB_UNKNOWN             BITMAP                  "res\\unknown.bmp"
-IDB_BINARYSAME          BITMAP                  "res\\binary.bmp"
-IDB_LFILE               BITMAP                  "res\\lfile.bmp"
-IDB_RFILE               BITMAP                  "res\\rfile.bmp"
-IDB_BINARYDIFF          BITMAP                  "res\\binarydiff.bmp"
-IDB_FILESKIP            BITMAP                  "res\\fileskip.bmp"
-IDB_EDIT_COPY           BITMAP                  "res\\copy.bmp"
-IDB_EDIT_CUT            BITMAP                  "res\\cut.bmp"
-IDB_EDIT_PASTE          BITMAP                  "res\\paste.bmp"
-IDB_EDIT_SEARCH         BITMAP                  "res\\search.bmp"
-IDB_WINDOW_CASCADE      BITMAP                  "res\\cascade.bmp"
-IDB_WINDOW_HORIZONTAL   BITMAP                  "res\\horizontally.bmp"
-IDB_WINDOW_VERTICAL     BITMAP                  "res\\vertically.bmp"
-IDB_WINDOW_CLOSE        BITMAP                  "res\\close.bmp"
-IDB_WINDOW_CHANGEPANE   BITMAP                  "res\\change_pane.bmp"
-IDB_EDIT_GOTO           BITMAP                  "res\\go_to.bmp"
-IDB_EDIT_REPLACE        BITMAP                  "res\\replace.bmp"
-IDB_VIEW_LANGUAGE       BITMAP                  "res\\language.bmp"
-IDB_VIEW_SELECTFONT     BITMAP                  "res\\select_font.bmp"
-IDB_FILE_EXIT           BITMAP                  "res\\exit.bmp"
-IDB_HELP_CONTENTS       BITMAP                  "res\\help_contents.bmp"
-IDB_ERROR               BITMAP                  "res\\error.bmp"
-IDB_FOLDERUP            BITMAP                  "res\\folderup.bmp"
-IDB_FOLDERUP_DISABLE    BITMAP                  "res\\folderup_disable.bmp"
-IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
-IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
-IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
-IDB_MERGE_DELETE        BITMAP                  "res\\delete.bmp"
-IDB_FILE_PRINT          BITMAP                  "res\\print.bmp"
-IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
+IDR_MAINFRAME           BITMAP                  "..\\..\\res\\Toolbar.bmp"
+IDB_SPLASH              BITMAP                  "..\\..\\res\\splash1.bmp"
+IDB_EQUAL               BITMAP                  "..\\..\\res\\equal.bmp"
+IDB_NOTEQUAL            BITMAP                  "..\\..\\res\\notequal.bmp"
+IDB_UNKNOWN             BITMAP                  "..\\..\\res\\unknown.bmp"
+IDB_BINARYSAME          BITMAP                  "..\\..\\res\\binary.bmp"
+IDB_LFILE               BITMAP                  "..\\..\\res\\lfile.bmp"
+IDB_RFILE               BITMAP                  "..\\..\\res\\rfile.bmp"
+IDB_BINARYDIFF          BITMAP                  "..\\..\\res\\binarydiff.bmp"
+IDB_FILESKIP            BITMAP                  "..\\..\\res\\fileskip.bmp"
+IDB_EDIT_COPY           BITMAP                  "..\\..\\res\\copy.bmp"
+IDB_EDIT_CUT            BITMAP                  "..\\..\\res\\cut.bmp"
+IDB_EDIT_PASTE          BITMAP                  "..\\..\\res\\paste.bmp"
+IDB_EDIT_SEARCH         BITMAP                  "..\\..\\res\\search.bmp"
+IDB_WINDOW_CASCADE      BITMAP                  "..\\..\\res\\cascade.bmp"
+IDB_WINDOW_HORIZONTAL   BITMAP                  "..\\..\\res\\horizontally.bmp"
+IDB_WINDOW_VERTICAL     BITMAP                  "..\\..\\res\\vertically.bmp"
+IDB_WINDOW_CLOSE        BITMAP                  "..\\..\\res\\close.bmp"
+IDB_WINDOW_CHANGEPANE   BITMAP                  "..\\..\\res\\change_pane.bmp"
+IDB_EDIT_GOTO           BITMAP                  "..\\..\\res\\go_to.bmp"
+IDB_EDIT_REPLACE        BITMAP                  "..\\..\\res\\replace.bmp"
+IDB_VIEW_LANGUAGE       BITMAP                  "..\\..\\res\\language.bmp"
+IDB_VIEW_SELECTFONT     BITMAP                  "..\\..\\res\\select_font.bmp"
+IDB_FILE_EXIT           BITMAP                  "..\\..\\res\\exit.bmp"
+IDB_HELP_CONTENTS       BITMAP                  "..\\..\\res\\help_contents.bmp"
+IDB_ERROR               BITMAP                  "..\\..\\res\\error.bmp"
+IDB_FOLDERUP            BITMAP                  "..\\..\\res\\folderup.bmp"
+IDB_FOLDERUP_DISABLE    BITMAP                  "..\\..\\res\\folderup_disable.bmp"
+IDB_EDIT_SELECTALL      BITMAP                  "..\\..\\res\\select_all.bmp"
+IDB_TOOLS_FILTERS       BITMAP                  "..\\..\\res\\filters.bmp"
+IDB_TOOLS_COLUMNS       BITMAP                  "..\\..\\res\\customize_columns.bmp"
+IDB_MERGE_DELETE        BITMAP                  "..\\..\\res\\delete.bmp"
+IDB_FILE_PRINT          BITMAP                  "..\\..\\res\\print.bmp"
+IDB_SIGMA               BITMAP                  "..\\..\\res\\sigma.bmp"
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -1625,8 +1627,8 @@ IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
 // Cursor
 //
 
-IDR_MARGIN_CURSOR       CURSOR                  "res\\mg_cur.cur"
-IDR_MERGEHAND           CURSOR                  "res\\hand.cur"
+IDR_MARGIN_CURSOR       CURSOR                  "..\\..\\res\\mg_cur.cur"
+IDR_MERGEHAND           CURSOR                  "..\\..\\res\\hand.cur"
 
 /////////////////////////////////////////////////////////////////////////////
 //

diff --git a/Src/Languages/ChineseTraditional/res/Merge.ico b/Src/Languages/ChineseTraditional/res/Merge.ico
deleted file mode 100644 (file)
index 6fd5e56..0000000
Binary files a/Src/Languages/ChineseTraditional/res/Merge.ico and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/MergeDir.ico b/Src/Languages/ChineseTraditional/res/MergeDir.ico
deleted file mode 100644 (file)
index 349c926..0000000
Binary files a/Src/Languages/ChineseTraditional/res/MergeDir.ico and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/MergeDoc.ico b/Src/Languages/ChineseTraditional/res/MergeDoc.ico
deleted file mode 100644 (file)
index b2f417b..0000000
Binary files a/Src/Languages/ChineseTraditional/res/MergeDoc.ico and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/Toolbar.bmp b/Src/Languages/ChineseTraditional/res/Toolbar.bmp
deleted file mode 100644 (file)
index 7935cc8..0000000
Binary files a/Src/Languages/ChineseTraditional/res/Toolbar.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/WinMergeSplash.psd b/Src/Languages/ChineseTraditional/res/WinMergeSplash.psd
deleted file mode 100644 (file)
index fe7df64..0000000
Binary files a/Src/Languages/ChineseTraditional/res/WinMergeSplash.psd and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/binary.bmp b/Src/Languages/ChineseTraditional/res/binary.bmp
deleted file mode 100644 (file)
index 417eb30..0000000
Binary files a/Src/Languages/ChineseTraditional/res/binary.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/binarydiff.bmp b/Src/Languages/ChineseTraditional/res/binarydiff.bmp
deleted file mode 100644 (file)
index 4e45141..0000000
Binary files a/Src/Languages/ChineseTraditional/res/binarydiff.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/cascade.bmp b/Src/Languages/ChineseTraditional/res/cascade.bmp
deleted file mode 100644 (file)
index a56622c..0000000
Binary files a/Src/Languages/ChineseTraditional/res/cascade.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/change_pane.bmp b/Src/Languages/ChineseTraditional/res/change_pane.bmp
deleted file mode 100644 (file)
index 0a2e36a..0000000
Binary files a/Src/Languages/ChineseTraditional/res/change_pane.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/close.bmp b/Src/Languages/ChineseTraditional/res/close.bmp
deleted file mode 100644 (file)
index 55b5e87..0000000
Binary files a/Src/Languages/ChineseTraditional/res/close.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/copy.bmp b/Src/Languages/ChineseTraditional/res/copy.bmp
deleted file mode 100644 (file)
index 6565c6f..0000000
Binary files a/Src/Languages/ChineseTraditional/res/copy.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/customize_columns.bmp b/Src/Languages/ChineseTraditional/res/customize_columns.bmp
deleted file mode 100644 (file)
index 126345a..0000000
Binary files a/Src/Languages/ChineseTraditional/res/customize_columns.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/cut.bmp b/Src/Languages/ChineseTraditional/res/cut.bmp
deleted file mode 100644 (file)
index 976c5d2..0000000
Binary files a/Src/Languages/ChineseTraditional/res/cut.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/delete.bmp b/Src/Languages/ChineseTraditional/res/delete.bmp
deleted file mode 100644 (file)
index b70eeb8..0000000
Binary files a/Src/Languages/ChineseTraditional/res/delete.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/equal.bmp b/Src/Languages/ChineseTraditional/res/equal.bmp
deleted file mode 100644 (file)
index 9761d55..0000000
Binary files a/Src/Languages/ChineseTraditional/res/equal.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/error.bmp b/Src/Languages/ChineseTraditional/res/error.bmp
deleted file mode 100644 (file)
index f659c1d..0000000
Binary files a/Src/Languages/ChineseTraditional/res/error.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/exit.bmp b/Src/Languages/ChineseTraditional/res/exit.bmp
deleted file mode 100644 (file)
index 596127a..0000000
Binary files a/Src/Languages/ChineseTraditional/res/exit.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/fileskip.bmp b/Src/Languages/ChineseTraditional/res/fileskip.bmp
deleted file mode 100644 (file)
index 9e502d9..0000000
Binary files a/Src/Languages/ChineseTraditional/res/fileskip.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/filters.bmp b/Src/Languages/ChineseTraditional/res/filters.bmp
deleted file mode 100644 (file)
index e7ab693..0000000
Binary files a/Src/Languages/ChineseTraditional/res/filters.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/folder.ico b/Src/Languages/ChineseTraditional/res/folder.ico
deleted file mode 100644 (file)
index e18bd19..0000000
Binary files a/Src/Languages/ChineseTraditional/res/folder.ico and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/folderskip.ico b/Src/Languages/ChineseTraditional/res/folderskip.ico
deleted file mode 100644 (file)
index 3297496..0000000
Binary files a/Src/Languages/ChineseTraditional/res/folderskip.ico and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/folderup.bmp b/Src/Languages/ChineseTraditional/res/folderup.bmp
deleted file mode 100644 (file)
index 2d15145..0000000
Binary files a/Src/Languages/ChineseTraditional/res/folderup.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/folderup_disable.bmp b/Src/Languages/ChineseTraditional/res/folderup_disable.bmp
deleted file mode 100644 (file)
index 5829a19..0000000
Binary files a/Src/Languages/ChineseTraditional/res/folderup_disable.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/go_to.bmp b/Src/Languages/ChineseTraditional/res/go_to.bmp
deleted file mode 100644 (file)
index a6839aa..0000000
Binary files a/Src/Languages/ChineseTraditional/res/go_to.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/hand.cur b/Src/Languages/ChineseTraditional/res/hand.cur
deleted file mode 100644 (file)
index ed8db8c..0000000
Binary files a/Src/Languages/ChineseTraditional/res/hand.cur and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/help_contents.bmp b/Src/Languages/ChineseTraditional/res/help_contents.bmp
deleted file mode 100644 (file)
index 6662979..0000000
Binary files a/Src/Languages/ChineseTraditional/res/help_contents.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/horizontally.bmp b/Src/Languages/ChineseTraditional/res/horizontally.bmp
deleted file mode 100644 (file)
index 3c7a732..0000000
Binary files a/Src/Languages/ChineseTraditional/res/horizontally.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/language.bmp b/Src/Languages/ChineseTraditional/res/language.bmp
deleted file mode 100644 (file)
index 9e92e4d..0000000
Binary files a/Src/Languages/ChineseTraditional/res/language.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/lfile.bmp b/Src/Languages/ChineseTraditional/res/lfile.bmp
deleted file mode 100644 (file)
index bb7cf6c..0000000
Binary files a/Src/Languages/ChineseTraditional/res/lfile.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/lfolder.ico b/Src/Languages/ChineseTraditional/res/lfolder.ico
deleted file mode 100644 (file)
index fc1c797..0000000
Binary files a/Src/Languages/ChineseTraditional/res/lfolder.ico and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/mg_cur.cur b/Src/Languages/ChineseTraditional/res/mg_cur.cur
deleted file mode 100644 (file)
index 5691efb..0000000
Binary files a/Src/Languages/ChineseTraditional/res/mg_cur.cur and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/notequal.bmp b/Src/Languages/ChineseTraditional/res/notequal.bmp
deleted file mode 100644 (file)
index d747084..0000000
Binary files a/Src/Languages/ChineseTraditional/res/notequal.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/paste.bmp b/Src/Languages/ChineseTraditional/res/paste.bmp
deleted file mode 100644 (file)
index bcd5227..0000000
Binary files a/Src/Languages/ChineseTraditional/res/paste.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/print.bmp b/Src/Languages/ChineseTraditional/res/print.bmp
deleted file mode 100644 (file)
index 739ca01..0000000
Binary files a/Src/Languages/ChineseTraditional/res/print.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/replace.bmp b/Src/Languages/ChineseTraditional/res/replace.bmp
deleted file mode 100644 (file)
index e5586b9..0000000
Binary files a/Src/Languages/ChineseTraditional/res/replace.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/rfile.bmp b/Src/Languages/ChineseTraditional/res/rfile.bmp
deleted file mode 100644 (file)
index 1333733..0000000
Binary files a/Src/Languages/ChineseTraditional/res/rfile.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/rfolder.ico b/Src/Languages/ChineseTraditional/res/rfolder.ico
deleted file mode 100644 (file)
index 444d827..0000000
Binary files a/Src/Languages/ChineseTraditional/res/rfolder.ico and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/search.bmp b/Src/Languages/ChineseTraditional/res/search.bmp
deleted file mode 100644 (file)
index 9d606e5..0000000
Binary files a/Src/Languages/ChineseTraditional/res/search.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/select_all.bmp b/Src/Languages/ChineseTraditional/res/select_all.bmp
deleted file mode 100644 (file)
index 174e311..0000000
Binary files a/Src/Languages/ChineseTraditional/res/select_all.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/select_font.bmp b/Src/Languages/ChineseTraditional/res/select_font.bmp
deleted file mode 100644 (file)
index 2609538..0000000
Binary files a/Src/Languages/ChineseTraditional/res/select_font.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/sigma.bmp b/Src/Languages/ChineseTraditional/res/sigma.bmp
deleted file mode 100644 (file)
index eff4abe..0000000
Binary files a/Src/Languages/ChineseTraditional/res/sigma.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/splash1.bmp b/Src/Languages/ChineseTraditional/res/splash1.bmp
deleted file mode 100644 (file)
index f041297..0000000
Binary files a/Src/Languages/ChineseTraditional/res/splash1.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/unknown.bmp b/Src/Languages/ChineseTraditional/res/unknown.bmp
deleted file mode 100644 (file)
index 7f16906..0000000
Binary files a/Src/Languages/ChineseTraditional/res/unknown.bmp and /dev/null differ

diff --git a/Src/Languages/ChineseTraditional/res/vertically.bmp b/Src/Languages/ChineseTraditional/res/vertically.bmp
deleted file mode 100644 (file)
index e57c1b6..0000000
Binary files a/Src/Languages/ChineseTraditional/res/vertically.bmp and /dev/null differ

diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc
index 7def64d..c0f3a4e 100644 (file)
--- a/Src/Languages/Czech/MergeCzech.rc
+++ b/Src/Languages/Czech/MergeCzech.rc
@@ -67,13 +67,15 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDR_MAINFRAME           ICON                    "res\\Merge.ico"
-IDR_MERGETYPE           ICON                    "res\\MergeDoc.ico"
-IDR_DOC_FOLDERCMP       ICON                    "res\\MergeDir.ico"
-IDI_FOLDER              ICON                    "res\\folder.ico"
-IDI_LFOLDER             ICON                    "res\\lfolder.ico"
-IDI_RFOLDER             ICON                    "res\\rfolder.ico"
-IDI_FOLDERSKIP          ICON                    "res\\folderskip.ico"
+
+// Load shared resources from Src\res
+IDR_MAINFRAME           ICON                    "..\\..\\res\\Merge.ico"
+IDR_MERGETYPE           ICON                    "..\\..\\res\\MergeDoc.ico"
+IDR_DOC_FOLDERCMP       ICON                    "..\\..\\res\\MergeDir.ico"
+IDI_FOLDER              ICON                    "..\\..\\res\\folder.ico"
+IDI_LFOLDER             ICON                    "..\\..\\res\\lfolder.ico"
+IDI_RFOLDER             ICON                    "..\\..\\res\\rfolder.ico"
+IDI_FOLDERSKIP          ICON                    "..\\..\\res\\folderskip.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1599,40 +1601,40 @@ END
 // Bitmap
 //
 
-IDR_MAINFRAME           BITMAP                  "res\\Toolbar.bmp"
-IDB_SPLASH              BITMAP                  "res\\splash1.bmp"
-IDB_EQUAL               BITMAP                  "res\\equal.bmp"
-IDB_NOTEQUAL            BITMAP                  "res\\notequal.bmp"
-IDB_UNKNOWN             BITMAP                  "res\\unknown.bmp"
-IDB_BINARYSAME          BITMAP                  "res\\binary.bmp"
-IDB_LFILE               BITMAP                  "res\\lfile.bmp"
-IDB_RFILE               BITMAP                  "res\\rfile.bmp"
-IDB_BINARYDIFF          BITMAP                  "res\\binarydiff.bmp"
-IDB_FILESKIP            BITMAP                  "res\\fileskip.bmp"
-IDB_EDIT_COPY           BITMAP                  "res\\copy.bmp"
-IDB_EDIT_CUT            BITMAP                  "res\\cut.bmp"
-IDB_EDIT_PASTE          BITMAP                  "res\\paste.bmp"
-IDB_EDIT_SEARCH         BITMAP                  "res\\search.bmp"
-IDB_WINDOW_CASCADE      BITMAP                  "res\\cascade.bmp"
-IDB_WINDOW_HORIZONTAL   BITMAP                  "res\\horizontally.bmp"
-IDB_WINDOW_VERTICAL     BITMAP                  "res\\vertically.bmp"
-IDB_WINDOW_CLOSE        BITMAP                  "res\\close.bmp"
-IDB_WINDOW_CHANGEPANE   BITMAP                  "res\\change_pane.bmp"
-IDB_EDIT_GOTO           BITMAP                  "res\\go_to.bmp"
-IDB_EDIT_REPLACE        BITMAP                  "res\\replace.bmp"
-IDB_VIEW_LANGUAGE       BITMAP                  "res\\language.bmp"
-IDB_VIEW_SELECTFONT     BITMAP                  "res\\select_font.bmp"
-IDB_FILE_EXIT           BITMAP                  "res\\exit.bmp"
-IDB_HELP_CONTENTS       BITMAP                  "res\\help_contents.bmp"
-IDB_ERROR               BITMAP                  "res\\error.bmp"
-IDB_FOLDERUP            BITMAP                  "res\\folderup.bmp"
-IDB_FOLDERUP_DISABLE    BITMAP                  "res\\folderup_disable.bmp"
-IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
-IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
-IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
-IDB_MERGE_DELETE        BITMAP                  "res\\delete.bmp"
-IDB_FILE_PRINT          BITMAP                  "res\\print.bmp"
-IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
+IDR_MAINFRAME           BITMAP                  "..\\..\\res\\Toolbar.bmp"
+IDB_SPLASH              BITMAP                  "..\\..\\res\\splash1.bmp"
+IDB_EQUAL               BITMAP                  "..\\..\\res\\equal.bmp"
+IDB_NOTEQUAL            BITMAP                  "..\\..\\res\\notequal.bmp"
+IDB_UNKNOWN             BITMAP                  "..\\..\\res\\unknown.bmp"
+IDB_BINARYSAME          BITMAP                  "..\\..\\res\\binary.bmp"
+IDB_LFILE               BITMAP                  "..\\..\\res\\lfile.bmp"
+IDB_RFILE               BITMAP                  "..\\..\\res\\rfile.bmp"
+IDB_BINARYDIFF          BITMAP                  "..\\..\\res\\binarydiff.bmp"
+IDB_FILESKIP            BITMAP                  "..\\..\\res\\fileskip.bmp"
+IDB_EDIT_COPY           BITMAP                  "..\\..\\res\\copy.bmp"
+IDB_EDIT_CUT            BITMAP                  "..\\..\\res\\cut.bmp"
+IDB_EDIT_PASTE          BITMAP                  "..\\..\\res\\paste.bmp"
+IDB_EDIT_SEARCH         BITMAP                  "..\\..\\res\\search.bmp"
+IDB_WINDOW_CASCADE      BITMAP                  "..\\..\\res\\cascade.bmp"
+IDB_WINDOW_HORIZONTAL   BITMAP                  "..\\..\\res\\horizontally.bmp"
+IDB_WINDOW_VERTICAL     BITMAP                  "..\\..\\res\\vertically.bmp"
+IDB_WINDOW_CLOSE        BITMAP                  "..\\..\\res\\close.bmp"
+IDB_WINDOW_CHANGEPANE   BITMAP                  "..\\..\\res\\change_pane.bmp"
+IDB_EDIT_GOTO           BITMAP                  "..\\..\\res\\go_to.bmp"
+IDB_EDIT_REPLACE        BITMAP                  "..\\..\\res\\replace.bmp"
+IDB_VIEW_LANGUAGE       BITMAP                  "..\\..\\res\\language.bmp"
+IDB_VIEW_SELECTFONT     BITMAP                  "..\\..\\res\\select_font.bmp"
+IDB_FILE_EXIT           BITMAP                  "..\\..\\res\\exit.bmp"
+IDB_HELP_CONTENTS       BITMAP                  "..\\..\\res\\help_contents.bmp"
+IDB_ERROR               BITMAP                  "..\\..\\res\\error.bmp"
+IDB_FOLDERUP            BITMAP                  "..\\..\\res\\folderup.bmp"
+IDB_FOLDERUP_DISABLE    BITMAP                  "..\\..\\res\\folderup_disable.bmp"
+IDB_EDIT_SELECTALL      BITMAP                  "..\\..\\res\\select_all.bmp"
+IDB_TOOLS_FILTERS       BITMAP                  "..\\..\\res\\filters.bmp"
+IDB_TOOLS_COLUMNS       BITMAP                  "..\\..\\res\\customize_columns.bmp"
+IDB_MERGE_DELETE        BITMAP                  "..\\..\\res\\delete.bmp"
+IDB_FILE_PRINT          BITMAP                  "..\\..\\res\\print.bmp"
+IDB_SIGMA               BITMAP                  "..\\..\\res\\sigma.bmp"
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -1640,8 +1642,8 @@ IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
 // Cursor
 //
 
-IDR_MARGIN_CURSOR       CURSOR                  "res\\mg_cur.cur"
-IDR_MERGEHAND           CURSOR                  "res\\hand.cur"
+IDR_MARGIN_CURSOR       CURSOR                  "..\\..\\res\\mg_cur.cur"
+IDR_MERGEHAND           CURSOR                  "..\\..\\res\\hand.cur"
 
 /////////////////////////////////////////////////////////////////////////////
 //

diff --git a/Src/Languages/Czech/res/Merge.ico b/Src/Languages/Czech/res/Merge.ico
deleted file mode 100644 (file)
index 6fd5e56..0000000
Binary files a/Src/Languages/Czech/res/Merge.ico and /dev/null differ

diff --git a/Src/Languages/Czech/res/MergeDir.ico b/Src/Languages/Czech/res/MergeDir.ico
deleted file mode 100644 (file)
index 349c926..0000000
Binary files a/Src/Languages/Czech/res/MergeDir.ico and /dev/null differ

diff --git a/Src/Languages/Czech/res/MergeDoc.ico b/Src/Languages/Czech/res/MergeDoc.ico
deleted file mode 100644 (file)
index b2f417b..0000000
Binary files a/Src/Languages/Czech/res/MergeDoc.ico and /dev/null differ

diff --git a/Src/Languages/Czech/res/Toolbar.bmp b/Src/Languages/Czech/res/Toolbar.bmp
deleted file mode 100644 (file)
index 7935cc8..0000000
Binary files a/Src/Languages/Czech/res/Toolbar.bmp and /dev/null differ

diff --git a/Src/Languages/Czech/res/WinMergeSplash.psd b/Src/Languages/Czech/res/WinMergeSplash.psd
deleted file mode 100644 (file)
index fe7df64..0000000
Binary files a/Src/Languages/Czech/res/WinMergeSplash.psd and /dev/null differ

diff --git a/Src/Languages/Czech/res/binary.bmp b/Src/Languages/Czech/res/binary.bmp
deleted file mode 100644 (file)
index 417eb30..0000000
Binary files a/Src/Languages/Czech/res/binary.bmp and /dev/null differ

diff --git a/Src/Languages/Czech/res/binarydiff.bmp b/Src/Languages/Czech/res/binarydiff.bmp
deleted file mode 100644 (file)
index 4e45141..0000000
Binary files a/Src/Languages/Czech/res/binarydiff.bmp and /dev/null differ

diff --git a/Src/Languages/Czech/res/cascade.bmp b/Src/Languages/Czech/res/cascade.bmp
deleted file mode 100644 (file)
index a56622c..0000000
Binary files a/Src/Languages/Czech/res/cascade.bmp and /dev/null differ

diff --git a/Src/Languages/Czech/res/change_pane.bmp b/Src/Languages/Czech/res/change_pane.bmp
deleted file mode 100644 (file)
index 0a2e36a..0000000
Binary files a/Src/Languages/Czech/res/change_pane.bmp and /dev/null differ

diff --git a/Src/Languages/Czech/res/close.bmp b/Src/Languages/Czech/res/close.bmp
deleted file mode 100644 (file)
index 55b5e87..0000000
Binary files a/Src/Languages/Czech/res/close.bmp and /dev/null differ

diff --git a/Src/Languages/Czech/res/copy.bmp b/Src/Languages/Czech/res/copy.bmp
deleted file mode 100644 (file)
index 6565c6f..0000000
Binary files a/Src/Languages/Czech/res/copy.bmp and /dev/null differ

diff --git a/Src/Languages/Czech/res/customize_columns.bmp b/Src/Languages/Czech/res/customize_columns.bmp
deleted file mode 100644 (file)
index 126345a..0000000
Binary files a/Src/Languages/Czech/res/customize_columns.bmp and /dev/null differ

diff --git a/Src/Languages/Czech/res/cut.bmp b/Src/Languages/Czech/res/cut.bmp
deleted file mode 100644 (file)
index 976c5d2..0000000
Binary files a/Src/Languages/Czech/res/cut.bmp and /dev/null differ

diff --git a/Src/Languages/Czech/res/delete.bmp b/Src/Languages/Czech/res/delete.bmp
deleted file mode 100644 (file)
index b70eeb8..0000000
Binary files a/Src/Languages/Czech/res/delete.bmp and /dev/null differ

diff --git a/Src/Languages/Czech/res/equal.bmp b/Src/Languages/Czech/res/equal.bmp
deleted file mode 100644 (file)
index 9761d55..0000000
Binary files a/Src/Languages/Czech/res/equal.bmp and /dev/null differ

diff --git a/Src/Languages/Czech/res/error.bmp b/Src/Languages/Czech/res/error.bmp
deleted file mode 100644 (file)
index f659c1d..0000000
Binary files a/Src/Languages/Czech/res/error.bmp and /dev/null differ

diff --git a/Src/Languages/Czech/res/exit.bmp b/Src/Languages/Czech/res/exit.bmp
deleted file mode 100644 (file)
index 596127a..0000000
Binary files a/Src/Languages/Czech/res/exit.bmp and /dev/null differ

diff --git a/Src/Languages/Czech/res/fileskip.bmp b/Src/Languages/Czech/res/fileskip.bmp
deleted file mode 100644 (file)
index 9e502d9..0000000
Binary files a/Src/Languages/Czech/res/fileskip.bmp and /dev/null differ

diff --git a/Src/Languages/Czech/res/filters.bmp b/Src/Languages/Czech/res/filters.bmp
deleted file mode 100644 (file)
index e7ab693..0000000
Binary files a/Src/Languages/Czech/res/filters.bmp and /dev/null differ

diff --git a/Src/Languages/Czech/res/folder.ico b/Src/Languages/Czech/res/folder.ico
deleted file mode 100644 (file)
index e18bd19..0000000
Binary files a/Src/Languages/Czech/res/folder.ico and /dev/null differ

diff --git a/Src/Languages/Czech/res/folderskip.ico b/Src/Languages/Czech/res/folderskip.ico
deleted file mode 100644 (file)
index 3297496..0000000
Binary files a/Src/Languages/Czech/res/folderskip.ico and /dev/null differ

diff --git a/Src/Languages/Czech/res/folderup.bmp b/Src/Languages/Czech/res/folderup.bmp
deleted file mode 100644 (file)
index 2d15145..0000000
Binary files a/Src/Languages/Czech/res/folderup.bmp and /dev/null differ

diff --git a/Src/Languages/Czech/res/folderup_disable.bmp b/Src/Languages/Czech/res/folderup_disable.bmp
deleted file mode 100644 (file)
index 5829a19..0000000
Binary files a/Src/Languages/Czech/res/folderup_disable.bmp and /dev/null differ

diff --git a/Src/Languages/Czech/res/go_to.bmp b/Src/Languages/Czech/res/go_to.bmp
deleted file mode 100644 (file)
index a6839aa..0000000
Binary files a/Src/Languages/Czech/res/go_to.bmp and /dev/null differ

diff --git a/Src/Languages/Czech/res/hand.cur b/Src/Languages/Czech/res/hand.cur
deleted file mode 100644 (file)
index ed8db8c..0000000
Binary files a/Src/Languages/Czech/res/hand.cur and /dev/null differ

diff --git a/Src/Languages/Czech/res/help_contents.bmp b/Src/Languages/Czech/res/help_contents.bmp
deleted file mode 100644 (file)
index 6662979..0000000
Binary files a/Src/Languages/Czech/res/help_contents.bmp and /dev/null differ

diff --git a/Src/Languages/Czech/res/horizontally.bmp b/Src/Languages/Czech/res/horizontally.bmp
deleted file mode 100644 (file)
index 3c7a732..0000000
Binary files a/Src/Languages/Czech/res/horizontally.bmp and /dev/null differ

diff --git a/Src/Languages/Czech/res/language.bmp b/Src/Languages/Czech/res/language.bmp
deleted file mode 100644 (file)
index 9e92e4d..0000000
Binary files a/Src/Languages/Czech/res/language.bmp and /dev/null differ

diff --git a/Src/Languages/Czech/res/lfile.bmp b/Src/Languages/Czech/res/lfile.bmp
deleted file mode 100755 (executable)
index bb7cf6c..0000000
Binary files a/Src/Languages/Czech/res/lfile.bmp and /dev/null differ

diff --git a/Src/Languages/Czech/res/lfolder.ico b/Src/Languages/Czech/res/lfolder.ico
deleted file mode 100644 (file)
index fc1c797..0000000
Binary files a/Src/Languages/Czech/res/lfolder.ico and /dev/null differ

diff --git a/Src/Languages/Czech/res/mg_cur.cur b/Src/Languages/Czech/res/mg_cur.cur
deleted file mode 100644 (file)
index 5691efb..0000000
Binary files a/Src/Languages/Czech/res/mg_cur.cur and /dev/null differ

diff --git a/Src/Languages/Czech/res/notequal.bmp b/Src/Languages/Czech/res/notequal.bmp
deleted file mode 100644 (file)
index d747084..0000000
Binary files a/Src/Languages/Czech/res/notequal.bmp and /dev/null differ

diff --git a/Src/Languages/Czech/res/paste.bmp b/Src/Languages/Czech/res/paste.bmp
deleted file mode 100644 (file)
index bcd5227..0000000
Binary files a/Src/Languages/Czech/res/paste.bmp and /dev/null differ

diff --git a/Src/Languages/Czech/res/print.bmp b/Src/Languages/Czech/res/print.bmp
deleted file mode 100644 (file)
index 739ca01..0000000
Binary files a/Src/Languages/Czech/res/print.bmp and /dev/null differ

diff --git a/Src/Languages/Czech/res/replace.bmp b/Src/Languages/Czech/res/replace.bmp
deleted file mode 100644 (file)
index e5586b9..0000000
Binary files a/Src/Languages/Czech/res/replace.bmp and /dev/null differ

diff --git a/Src/Languages/Czech/res/rfile.bmp b/Src/Languages/Czech/res/rfile.bmp
deleted file mode 100755 (executable)
index 1333733..0000000
Binary files a/Src/Languages/Czech/res/rfile.bmp and /dev/null differ

diff --git a/Src/Languages/Czech/res/rfolder.ico b/Src/Languages/Czech/res/rfolder.ico
deleted file mode 100644 (file)
index 444d827..0000000
Binary files a/Src/Languages/Czech/res/rfolder.ico and /dev/null differ

diff --git a/Src/Languages/Czech/res/search.bmp b/Src/Languages/Czech/res/search.bmp
deleted file mode 100644 (file)
index 9d606e5..0000000
Binary files a/Src/Languages/Czech/res/search.bmp and /dev/null differ

diff --git a/Src/Languages/Czech/res/select_all.bmp b/Src/Languages/Czech/res/select_all.bmp
deleted file mode 100644 (file)
index 174e311..0000000
Binary files a/Src/Languages/Czech/res/select_all.bmp and /dev/null differ

diff --git a/Src/Languages/Czech/res/select_font.bmp b/Src/Languages/Czech/res/select_font.bmp
deleted file mode 100644 (file)
index 2609538..0000000
Binary files a/Src/Languages/Czech/res/select_font.bmp and /dev/null differ

diff --git a/Src/Languages/Czech/res/sigma.bmp b/Src/Languages/Czech/res/sigma.bmp
deleted file mode 100644 (file)
index eff4abe..0000000
Binary files a/Src/Languages/Czech/res/sigma.bmp and /dev/null differ

diff --git a/Src/Languages/Czech/res/splash1.bmp b/Src/Languages/Czech/res/splash1.bmp
deleted file mode 100644 (file)
index f041297..0000000
Binary files a/Src/Languages/Czech/res/splash1.bmp and /dev/null differ

diff --git a/Src/Languages/Czech/res/unknown.bmp b/Src/Languages/Czech/res/unknown.bmp
deleted file mode 100644 (file)
index 7f16906..0000000
Binary files a/Src/Languages/Czech/res/unknown.bmp and /dev/null differ

diff --git a/Src/Languages/Czech/res/vertically.bmp b/Src/Languages/Czech/res/vertically.bmp
deleted file mode 100644 (file)
index e57c1b6..0000000
Binary files a/Src/Languages/Czech/res/vertically.bmp and /dev/null differ

diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc
index f052dad..dd3a080 100644 (file)
--- a/Src/Languages/Danish/MergeDanish.rc
+++ b/Src/Languages/Danish/MergeDanish.rc
@@ -67,13 +67,15 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDR_MAINFRAME           ICON                    "res\\Merge.ico"
-IDR_MERGETYPE           ICON                    "res\\MergeDoc.ico"
-IDR_DOC_FOLDERCMP       ICON                    "res\\MergeDir.ico"
-IDI_FOLDER              ICON                    "res\\folder.ico"
-IDI_LFOLDER             ICON                    "res\\lfolder.ico"
-IDI_RFOLDER             ICON                    "res\\rfolder.ico"
-IDI_FOLDERSKIP          ICON                    "res\\folderskip.ico"
+
+// Load shared resources from Src\res
+IDR_MAINFRAME           ICON                    "..\\..\\res\\Merge.ico"
+IDR_MERGETYPE           ICON                    "..\\..\\res\\MergeDoc.ico"
+IDR_DOC_FOLDERCMP       ICON                    "..\\..\\res\\MergeDir.ico"
+IDI_FOLDER              ICON                    "..\\..\\res\\folder.ico"
+IDI_LFOLDER             ICON                    "..\\..\\res\\lfolder.ico"
+IDI_RFOLDER             ICON                    "..\\..\\res\\rfolder.ico"
+IDI_FOLDERSKIP          ICON                    "..\\..\\res\\folderskip.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1482,40 +1484,40 @@ END
 // Bitmap
 //
 
-IDR_MAINFRAME           BITMAP                  "res\\Toolbar.bmp"
-IDB_SPLASH              BITMAP                  "res\\splash1.bmp"
-IDB_EQUAL               BITMAP                  "res\\equal.bmp"
-IDB_NOTEQUAL            BITMAP                  "res\\notequal.bmp"
-IDB_UNKNOWN             BITMAP                  "res\\unknown.bmp"
-IDB_BINARYSAME          BITMAP                  "res\\binary.bmp"
-IDB_LFILE               BITMAP                  "res\\lfile.bmp"
-IDB_RFILE               BITMAP                  "res\\rfile.bmp"
-IDB_BINARYDIFF          BITMAP                  "res\\binarydiff.bmp"
-IDB_FILESKIP            BITMAP                  "res\\fileskip.bmp"
-IDB_EDIT_COPY           BITMAP                  "res\\copy.bmp"
-IDB_EDIT_CUT            BITMAP                  "res\\cut.bmp"
-IDB_EDIT_PASTE          BITMAP                  "res\\paste.bmp"
-IDB_EDIT_SEARCH         BITMAP                  "res\\search.bmp"
-IDB_WINDOW_CASCADE      BITMAP                  "res\\cascade.bmp"
-IDB_WINDOW_HORIZONTAL   BITMAP                  "res\\horizontally.bmp"
-IDB_WINDOW_VERTICAL     BITMAP                  "res\\vertically.bmp"
-IDB_WINDOW_CLOSE        BITMAP                  "res\\close.bmp"
-IDB_WINDOW_CHANGEPANE   BITMAP                  "res\\change_pane.bmp"
-IDB_EDIT_GOTO           BITMAP                  "res\\go_to.bmp"
-IDB_EDIT_REPLACE        BITMAP                  "res\\replace.bmp"
-IDB_VIEW_LANGUAGE       BITMAP                  "res\\language.bmp"
-IDB_VIEW_SELECTFONT     BITMAP                  "res\\select_font.bmp"
-IDB_FILE_EXIT           BITMAP                  "res\\exit.bmp"
-IDB_HELP_CONTENTS       BITMAP                  "res\\help_contents.bmp"
-IDB_ERROR               BITMAP                  "res\\error.bmp"
-IDB_FOLDERUP            BITMAP                  "res\\folderup.bmp"
-IDB_FOLDERUP_DISABLE    BITMAP                  "res\\folderup_disable.bmp"
-IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
-IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
-IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
-IDB_MERGE_DELETE        BITMAP                  "res\\delete.bmp"
-IDB_FILE_PRINT          BITMAP                  "res\\print.bmp"
-IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
+IDR_MAINFRAME           BITMAP                  "..\\..\\res\\Toolbar.bmp"
+IDB_SPLASH              BITMAP                  "..\\..\\res\\splash1.bmp"
+IDB_EQUAL               BITMAP                  "..\\..\\res\\equal.bmp"
+IDB_NOTEQUAL            BITMAP                  "..\\..\\res\\notequal.bmp"
+IDB_UNKNOWN             BITMAP                  "..\\..\\res\\unknown.bmp"
+IDB_BINARYSAME          BITMAP                  "..\\..\\res\\binary.bmp"
+IDB_LFILE               BITMAP                  "..\\..\\res\\lfile.bmp"
+IDB_RFILE               BITMAP                  "..\\..\\res\\rfile.bmp"
+IDB_BINARYDIFF          BITMAP                  "..\\..\\res\\binarydiff.bmp"
+IDB_FILESKIP            BITMAP                  "..\\..\\res\\fileskip.bmp"
+IDB_EDIT_COPY           BITMAP                  "..\\..\\res\\copy.bmp"
+IDB_EDIT_CUT            BITMAP                  "..\\..\\res\\cut.bmp"
+IDB_EDIT_PASTE          BITMAP                  "..\\..\\res\\paste.bmp"
+IDB_EDIT_SEARCH         BITMAP                  "..\\..\\res\\search.bmp"
+IDB_WINDOW_CASCADE      BITMAP                  "..\\..\\res\\cascade.bmp"
+IDB_WINDOW_HORIZONTAL   BITMAP                  "..\\..\\res\\horizontally.bmp"
+IDB_WINDOW_VERTICAL     BITMAP                  "..\\..\\res\\vertically.bmp"
+IDB_WINDOW_CLOSE        BITMAP                  "..\\..\\res\\close.bmp"
+IDB_WINDOW_CHANGEPANE   BITMAP                  "..\\..\\res\\change_pane.bmp"
+IDB_EDIT_GOTO           BITMAP                  "..\\..\\res\\go_to.bmp"
+IDB_EDIT_REPLACE        BITMAP                  "..\\..\\res\\replace.bmp"
+IDB_VIEW_LANGUAGE       BITMAP                  "..\\..\\res\\language.bmp"
+IDB_VIEW_SELECTFONT     BITMAP                  "..\\..\\res\\select_font.bmp"
+IDB_FILE_EXIT           BITMAP                  "..\\..\\res\\exit.bmp"
+IDB_HELP_CONTENTS       BITMAP                  "..\\..\\res\\help_contents.bmp"
+IDB_ERROR               BITMAP                  "..\\..\\res\\error.bmp"
+IDB_FOLDERUP            BITMAP                  "..\\..\\res\\folderup.bmp"
+IDB_FOLDERUP_DISABLE    BITMAP                  "..\\..\\res\\folderup_disable.bmp"
+IDB_EDIT_SELECTALL      BITMAP                  "..\\..\\res\\select_all.bmp"
+IDB_TOOLS_FILTERS       BITMAP                  "..\\..\\res\\filters.bmp"
+IDB_TOOLS_COLUMNS       BITMAP                  "..\\..\\res\\customize_columns.bmp"
+IDB_MERGE_DELETE        BITMAP                  "..\\..\\res\\delete.bmp"
+IDB_FILE_PRINT          BITMAP                  "..\\..\\res\\print.bmp"
+IDB_SIGMA               BITMAP                  "..\\..\\res\\sigma.bmp"
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -1523,8 +1525,8 @@ IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
 // Cursor
 //
 
-IDR_MARGIN_CURSOR       CURSOR                  "res\\mg_cur.cur"
-IDR_MERGEHAND           CURSOR                  "res\\hand.cur"
+IDR_MARGIN_CURSOR       CURSOR                  "..\\..\\res\\mg_cur.cur"
+IDR_MERGEHAND           CURSOR                  "..\\..\\res\\hand.cur"
 
 /////////////////////////////////////////////////////////////////////////////
 //

diff --git a/Src/Languages/Danish/res/Merge.ico b/Src/Languages/Danish/res/Merge.ico
deleted file mode 100644 (file)
index 6fd5e56..0000000
Binary files a/Src/Languages/Danish/res/Merge.ico and /dev/null differ

diff --git a/Src/Languages/Danish/res/MergeDir.ico b/Src/Languages/Danish/res/MergeDir.ico
deleted file mode 100644 (file)
index 349c926..0000000
Binary files a/Src/Languages/Danish/res/MergeDir.ico and /dev/null differ

diff --git a/Src/Languages/Danish/res/MergeDoc.ico b/Src/Languages/Danish/res/MergeDoc.ico
deleted file mode 100644 (file)
index b2f417b..0000000
Binary files a/Src/Languages/Danish/res/MergeDoc.ico and /dev/null differ

diff --git a/Src/Languages/Danish/res/Toolbar.bmp b/Src/Languages/Danish/res/Toolbar.bmp
deleted file mode 100644 (file)
index 7935cc8..0000000
Binary files a/Src/Languages/Danish/res/Toolbar.bmp and /dev/null differ

diff --git a/Src/Languages/Danish/res/WinMergeSplash.psd b/Src/Languages/Danish/res/WinMergeSplash.psd
deleted file mode 100644 (file)
index fe7df64..0000000
Binary files a/Src/Languages/Danish/res/WinMergeSplash.psd and /dev/null differ

diff --git a/Src/Languages/Danish/res/binary.bmp b/Src/Languages/Danish/res/binary.bmp
deleted file mode 100644 (file)
index 417eb30..0000000
Binary files a/Src/Languages/Danish/res/binary.bmp and /dev/null differ

diff --git a/Src/Languages/Danish/res/binarydiff.bmp b/Src/Languages/Danish/res/binarydiff.bmp
deleted file mode 100644 (file)
index 4e45141..0000000
Binary files a/Src/Languages/Danish/res/binarydiff.bmp and /dev/null differ

diff --git a/Src/Languages/Danish/res/cascade.bmp b/Src/Languages/Danish/res/cascade.bmp
deleted file mode 100644 (file)
index a56622c..0000000
Binary files a/Src/Languages/Danish/res/cascade.bmp and /dev/null differ

diff --git a/Src/Languages/Danish/res/change_pane.bmp b/Src/Languages/Danish/res/change_pane.bmp
deleted file mode 100644 (file)
index 0a2e36a..0000000
Binary files a/Src/Languages/Danish/res/change_pane.bmp and /dev/null differ

diff --git a/Src/Languages/Danish/res/close.bmp b/Src/Languages/Danish/res/close.bmp
deleted file mode 100644 (file)
index 55b5e87..0000000
Binary files a/Src/Languages/Danish/res/close.bmp and /dev/null differ

diff --git a/Src/Languages/Danish/res/copy.bmp b/Src/Languages/Danish/res/copy.bmp
deleted file mode 100644 (file)
index 6565c6f..0000000
Binary files a/Src/Languages/Danish/res/copy.bmp and /dev/null differ

diff --git a/Src/Languages/Danish/res/customize_columns.bmp b/Src/Languages/Danish/res/customize_columns.bmp
deleted file mode 100644 (file)
index 126345a..0000000
Binary files a/Src/Languages/Danish/res/customize_columns.bmp and /dev/null differ

diff --git a/Src/Languages/Danish/res/cut.bmp b/Src/Languages/Danish/res/cut.bmp
deleted file mode 100644 (file)
index 976c5d2..0000000
Binary files a/Src/Languages/Danish/res/cut.bmp and /dev/null differ

diff --git a/Src/Languages/Danish/res/delete.bmp b/Src/Languages/Danish/res/delete.bmp
deleted file mode 100644 (file)
index b70eeb8..0000000
Binary files a/Src/Languages/Danish/res/delete.bmp and /dev/null differ

diff --git a/Src/Languages/Danish/res/equal.bmp b/Src/Languages/Danish/res/equal.bmp
deleted file mode 100644 (file)
index 9761d55..0000000
Binary files a/Src/Languages/Danish/res/equal.bmp and /dev/null differ

diff --git a/Src/Languages/Danish/res/error.bmp b/Src/Languages/Danish/res/error.bmp
deleted file mode 100644 (file)
index f659c1d..0000000
Binary files a/Src/Languages/Danish/res/error.bmp and /dev/null differ

diff --git a/Src/Languages/Danish/res/exit.bmp b/Src/Languages/Danish/res/exit.bmp
deleted file mode 100644 (file)
index 596127a..0000000
Binary files a/Src/Languages/Danish/res/exit.bmp and /dev/null differ

diff --git a/Src/Languages/Danish/res/fileskip.bmp b/Src/Languages/Danish/res/fileskip.bmp
deleted file mode 100644 (file)
index 9e502d9..0000000
Binary files a/Src/Languages/Danish/res/fileskip.bmp and /dev/null differ

diff --git a/Src/Languages/Danish/res/filters.bmp b/Src/Languages/Danish/res/filters.bmp
deleted file mode 100644 (file)
index e7ab693..0000000
Binary files a/Src/Languages/Danish/res/filters.bmp and /dev/null differ

diff --git a/Src/Languages/Danish/res/folder.ico b/Src/Languages/Danish/res/folder.ico
deleted file mode 100644 (file)
index e18bd19..0000000
Binary files a/Src/Languages/Danish/res/folder.ico and /dev/null differ

diff --git a/Src/Languages/Danish/res/folderskip.ico b/Src/Languages/Danish/res/folderskip.ico
deleted file mode 100644 (file)
index 3297496..0000000
Binary files a/Src/Languages/Danish/res/folderskip.ico and /dev/null differ

diff --git a/Src/Languages/Danish/res/folderup.bmp b/Src/Languages/Danish/res/folderup.bmp
deleted file mode 100644 (file)
index 2d15145..0000000
Binary files a/Src/Languages/Danish/res/folderup.bmp and /dev/null differ

diff --git a/Src/Languages/Danish/res/folderup_disable.bmp b/Src/Languages/Danish/res/folderup_disable.bmp
deleted file mode 100644 (file)
index 5829a19..0000000
Binary files a/Src/Languages/Danish/res/folderup_disable.bmp and /dev/null differ

diff --git a/Src/Languages/Danish/res/go_to.bmp b/Src/Languages/Danish/res/go_to.bmp
deleted file mode 100644 (file)
index a6839aa..0000000
Binary files a/Src/Languages/Danish/res/go_to.bmp and /dev/null differ

diff --git a/Src/Languages/Danish/res/hand.cur b/Src/Languages/Danish/res/hand.cur
deleted file mode 100644 (file)
index ed8db8c..0000000
Binary files a/Src/Languages/Danish/res/hand.cur and /dev/null differ

diff --git a/Src/Languages/Danish/res/help_contents.bmp b/Src/Languages/Danish/res/help_contents.bmp
deleted file mode 100644 (file)
index 6662979..0000000
Binary files a/Src/Languages/Danish/res/help_contents.bmp and /dev/null differ

diff --git a/Src/Languages/Danish/res/horizontally.bmp b/Src/Languages/Danish/res/horizontally.bmp
deleted file mode 100644 (file)
index 3c7a732..0000000
Binary files a/Src/Languages/Danish/res/horizontally.bmp and /dev/null differ

diff --git a/Src/Languages/Danish/res/language.bmp b/Src/Languages/Danish/res/language.bmp
deleted file mode 100644 (file)
index 9e92e4d..0000000
Binary files a/Src/Languages/Danish/res/language.bmp and /dev/null differ

diff --git a/Src/Languages/Danish/res/lfile.bmp b/Src/Languages/Danish/res/lfile.bmp
deleted file mode 100644 (file)
index bb7cf6c..0000000
Binary files a/Src/Languages/Danish/res/lfile.bmp and /dev/null differ

diff --git a/Src/Languages/Danish/res/lfolder.ico b/Src/Languages/Danish/res/lfolder.ico
deleted file mode 100644 (file)
index fc1c797..0000000
Binary files a/Src/Languages/Danish/res/lfolder.ico and /dev/null differ

diff --git a/Src/Languages/Danish/res/mg_cur.cur b/Src/Languages/Danish/res/mg_cur.cur
deleted file mode 100644 (file)
index 5691efb..0000000
Binary files a/Src/Languages/Danish/res/mg_cur.cur and /dev/null differ

diff --git a/Src/Languages/Danish/res/notequal.bmp b/Src/Languages/Danish/res/notequal.bmp
deleted file mode 100644 (file)
index d747084..0000000
Binary files a/Src/Languages/Danish/res/notequal.bmp and /dev/null differ

diff --git a/Src/Languages/Danish/res/paste.bmp b/Src/Languages/Danish/res/paste.bmp
deleted file mode 100644 (file)
index bcd5227..0000000
Binary files a/Src/Languages/Danish/res/paste.bmp and /dev/null differ

diff --git a/Src/Languages/Danish/res/print.bmp b/Src/Languages/Danish/res/print.bmp
deleted file mode 100644 (file)
index 739ca01..0000000
Binary files a/Src/Languages/Danish/res/print.bmp and /dev/null differ

diff --git a/Src/Languages/Danish/res/replace.bmp b/Src/Languages/Danish/res/replace.bmp
deleted file mode 100644 (file)
index e5586b9..0000000
Binary files a/Src/Languages/Danish/res/replace.bmp and /dev/null differ

diff --git a/Src/Languages/Danish/res/rfile.bmp b/Src/Languages/Danish/res/rfile.bmp
deleted file mode 100644 (file)
index 1333733..0000000
Binary files a/Src/Languages/Danish/res/rfile.bmp and /dev/null differ

diff --git a/Src/Languages/Danish/res/rfolder.ico b/Src/Languages/Danish/res/rfolder.ico
deleted file mode 100644 (file)
index 444d827..0000000
Binary files a/Src/Languages/Danish/res/rfolder.ico and /dev/null differ

diff --git a/Src/Languages/Danish/res/search.bmp b/Src/Languages/Danish/res/search.bmp
deleted file mode 100644 (file)
index 9d606e5..0000000
Binary files a/Src/Languages/Danish/res/search.bmp and /dev/null differ

diff --git a/Src/Languages/Danish/res/select_all.bmp b/Src/Languages/Danish/res/select_all.bmp
deleted file mode 100644 (file)
index 174e311..0000000
Binary files a/Src/Languages/Danish/res/select_all.bmp and /dev/null differ

diff --git a/Src/Languages/Danish/res/select_font.bmp b/Src/Languages/Danish/res/select_font.bmp
deleted file mode 100644 (file)
index 2609538..0000000
Binary files a/Src/Languages/Danish/res/select_font.bmp and /dev/null differ

diff --git a/Src/Languages/Danish/res/sigma.bmp b/Src/Languages/Danish/res/sigma.bmp
deleted file mode 100644 (file)
index eff4abe..0000000
Binary files a/Src/Languages/Danish/res/sigma.bmp and /dev/null differ

diff --git a/Src/Languages/Danish/res/splash1.bmp b/Src/Languages/Danish/res/splash1.bmp
deleted file mode 100644 (file)
index f041297..0000000
Binary files a/Src/Languages/Danish/res/splash1.bmp and /dev/null differ

diff --git a/Src/Languages/Danish/res/unknown.bmp b/Src/Languages/Danish/res/unknown.bmp
deleted file mode 100644 (file)
index 7f16906..0000000
Binary files a/Src/Languages/Danish/res/unknown.bmp and /dev/null differ

diff --git a/Src/Languages/Danish/res/vertically.bmp b/Src/Languages/Danish/res/vertically.bmp
deleted file mode 100644 (file)
index e57c1b6..0000000
Binary files a/Src/Languages/Danish/res/vertically.bmp and /dev/null differ

diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc
index e4bd993..99dd1de 100644 (file)
--- a/Src/Languages/Dutch/MergeDutch.rc
+++ b/Src/Languages/Dutch/MergeDutch.rc
@@ -67,13 +67,15 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDR_MAINFRAME           ICON                    "res\\Merge.ico"
-IDR_MERGETYPE           ICON                    "res\\MergeDoc.ico"
-IDR_DOC_FOLDERCMP       ICON                    "res\\MergeDir.ico"
-IDI_FOLDER              ICON                    "res\\folder.ico"
-IDI_LFOLDER             ICON                    "res\\lfolder.ico"
-IDI_RFOLDER             ICON                    "res\\rfolder.ico"
-IDI_FOLDERSKIP          ICON                    "res\\folderskip.ico"
+
+// Load shared resources from Src\res
+IDR_MAINFRAME           ICON                    "..\\..\\res\\Merge.ico"
+IDR_MERGETYPE           ICON                    "..\\..\\res\\MergeDoc.ico"
+IDR_DOC_FOLDERCMP       ICON                    "..\\..\\res\\MergeDir.ico"
+IDI_FOLDER              ICON                    "..\\..\\res\\folder.ico"
+IDI_LFOLDER             ICON                    "..\\..\\res\\lfolder.ico"
+IDI_RFOLDER             ICON                    "..\\..\\res\\rfolder.ico"
+IDI_FOLDERSKIP          ICON                    "..\\..\\res\\folderskip.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1601,40 +1603,40 @@ END
 // Bitmap
 //
 
-IDR_MAINFRAME           BITMAP                  "res\\Toolbar.bmp"
-IDB_SPLASH              BITMAP                  "res\\splash1.bmp"
-IDB_EQUAL               BITMAP                  "res\\equal.bmp"
-IDB_NOTEQUAL            BITMAP                  "res\\notequal.bmp"
-IDB_UNKNOWN             BITMAP                  "res\\unknown.bmp"
-IDB_BINARYSAME          BITMAP                  "res\\binary.bmp"
-IDB_LFILE               BITMAP                  "res\\lfile.bmp"
-IDB_RFILE               BITMAP                  "res\\rfile.bmp"
-IDB_BINARYDIFF          BITMAP                  "res\\binarydiff.bmp"
-IDB_FILESKIP            BITMAP                  "res\\fileskip.bmp"
-IDB_EDIT_COPY           BITMAP                  "res\\copy.bmp"
-IDB_EDIT_CUT            BITMAP                  "res\\cut.bmp"
-IDB_EDIT_PASTE          BITMAP                  "res\\paste.bmp"
-IDB_EDIT_SEARCH         BITMAP                  "res\\search.bmp"
-IDB_WINDOW_CASCADE      BITMAP                  "res\\cascade.bmp"
-IDB_WINDOW_HORIZONTAL   BITMAP                  "res\\horizontally.bmp"
-IDB_WINDOW_VERTICAL     BITMAP                  "res\\vertically.bmp"
-IDB_WINDOW_CLOSE        BITMAP                  "res\\close.bmp"
-IDB_WINDOW_CHANGEPANE   BITMAP                  "res\\change_pane.bmp"
-IDB_EDIT_GOTO           BITMAP                  "res\\go_to.bmp"
-IDB_EDIT_REPLACE        BITMAP                  "res\\replace.bmp"
-IDB_VIEW_LANGUAGE       BITMAP                  "res\\language.bmp"
-IDB_VIEW_SELECTFONT     BITMAP                  "res\\select_font.bmp"
-IDB_FILE_EXIT           BITMAP                  "res\\exit.bmp"
-IDB_HELP_CONTENTS       BITMAP                  "res\\help_contents.bmp"
-IDB_ERROR               BITMAP                  "res\\error.bmp"
-IDB_FOLDERUP            BITMAP                  "res\\folderup.bmp"
-IDB_FOLDERUP_DISABLE    BITMAP                  "res\\folderup_disable.bmp"
-IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
-IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
-IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
-IDB_MERGE_DELETE        BITMAP                  "res\\delete.bmp"
-IDB_FILE_PRINT          BITMAP                  "res\\print.bmp"
-IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
+IDR_MAINFRAME           BITMAP                  "..\\..\\res\\Toolbar.bmp"
+IDB_SPLASH              BITMAP                  "..\\..\\res\\splash1.bmp"
+IDB_EQUAL               BITMAP                  "..\\..\\res\\equal.bmp"
+IDB_NOTEQUAL            BITMAP                  "..\\..\\res\\notequal.bmp"
+IDB_UNKNOWN             BITMAP                  "..\\..\\res\\unknown.bmp"
+IDB_BINARYSAME          BITMAP                  "..\\..\\res\\binary.bmp"
+IDB_LFILE               BITMAP                  "..\\..\\res\\lfile.bmp"
+IDB_RFILE               BITMAP                  "..\\..\\res\\rfile.bmp"
+IDB_BINARYDIFF          BITMAP                  "..\\..\\res\\binarydiff.bmp"
+IDB_FILESKIP            BITMAP                  "..\\..\\res\\fileskip.bmp"
+IDB_EDIT_COPY           BITMAP                  "..\\..\\res\\copy.bmp"
+IDB_EDIT_CUT            BITMAP                  "..\\..\\res\\cut.bmp"
+IDB_EDIT_PASTE          BITMAP                  "..\\..\\res\\paste.bmp"
+IDB_EDIT_SEARCH         BITMAP                  "..\\..\\res\\search.bmp"
+IDB_WINDOW_CASCADE      BITMAP                  "..\\..\\res\\cascade.bmp"
+IDB_WINDOW_HORIZONTAL   BITMAP                  "..\\..\\res\\horizontally.bmp"
+IDB_WINDOW_VERTICAL     BITMAP                  "..\\..\\res\\vertically.bmp"
+IDB_WINDOW_CLOSE        BITMAP                  "..\\..\\res\\close.bmp"
+IDB_WINDOW_CHANGEPANE   BITMAP                  "..\\..\\res\\change_pane.bmp"
+IDB_EDIT_GOTO           BITMAP                  "..\\..\\res\\go_to.bmp"
+IDB_EDIT_REPLACE        BITMAP                  "..\\..\\res\\replace.bmp"
+IDB_VIEW_LANGUAGE       BITMAP                  "..\\..\\res\\language.bmp"
+IDB_VIEW_SELECTFONT     BITMAP                  "..\\..\\res\\select_font.bmp"
+IDB_FILE_EXIT           BITMAP                  "..\\..\\res\\exit.bmp"
+IDB_HELP_CONTENTS       BITMAP                  "..\\..\\res\\help_contents.bmp"
+IDB_ERROR               BITMAP                  "..\\..\\res\\error.bmp"
+IDB_FOLDERUP            BITMAP                  "..\\..\\res\\folderup.bmp"
+IDB_FOLDERUP_DISABLE    BITMAP                  "..\\..\\res\\folderup_disable.bmp"
+IDB_EDIT_SELECTALL      BITMAP                  "..\\..\\res\\select_all.bmp"
+IDB_TOOLS_FILTERS       BITMAP                  "..\\..\\res\\filters.bmp"
+IDB_TOOLS_COLUMNS       BITMAP                  "..\\..\\res\\customize_columns.bmp"
+IDB_MERGE_DELETE        BITMAP                  "..\\..\\res\\delete.bmp"
+IDB_FILE_PRINT          BITMAP                  "..\\..\\res\\print.bmp"
+IDB_SIGMA               BITMAP                  "..\\..\\res\\sigma.bmp"
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -1642,8 +1644,8 @@ IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
 // Cursor
 //
 
-IDR_MARGIN_CURSOR       CURSOR                  "res\\mg_cur.cur"
-IDR_MERGEHAND           CURSOR                  "res\\hand.cur"
+IDR_MARGIN_CURSOR       CURSOR                  "..\\..\\res\\mg_cur.cur"
+IDR_MERGEHAND           CURSOR                  "..\\..\\res\\hand.cur"
 
 /////////////////////////////////////////////////////////////////////////////
 //

diff --git a/Src/Languages/Dutch/res/Merge.ico b/Src/Languages/Dutch/res/Merge.ico
deleted file mode 100644 (file)
index 6fd5e56..0000000
Binary files a/Src/Languages/Dutch/res/Merge.ico and /dev/null differ

diff --git a/Src/Languages/Dutch/res/MergeDir.ico b/Src/Languages/Dutch/res/MergeDir.ico
deleted file mode 100644 (file)
index 349c926..0000000
Binary files a/Src/Languages/Dutch/res/MergeDir.ico and /dev/null differ

diff --git a/Src/Languages/Dutch/res/MergeDoc.ico b/Src/Languages/Dutch/res/MergeDoc.ico
deleted file mode 100644 (file)
index b2f417b..0000000
Binary files a/Src/Languages/Dutch/res/MergeDoc.ico and /dev/null differ

diff --git a/Src/Languages/Dutch/res/Toolbar.bmp b/Src/Languages/Dutch/res/Toolbar.bmp
deleted file mode 100644 (file)
index 7935cc8..0000000
Binary files a/Src/Languages/Dutch/res/Toolbar.bmp and /dev/null differ

diff --git a/Src/Languages/Dutch/res/WinMergeSplash.psd b/Src/Languages/Dutch/res/WinMergeSplash.psd
deleted file mode 100644 (file)
index fe7df64..0000000
Binary files a/Src/Languages/Dutch/res/WinMergeSplash.psd and /dev/null differ

diff --git a/Src/Languages/Dutch/res/binary.bmp b/Src/Languages/Dutch/res/binary.bmp
deleted file mode 100644 (file)
index 417eb30..0000000
Binary files a/Src/Languages/Dutch/res/binary.bmp and /dev/null differ

diff --git a/Src/Languages/Dutch/res/binarydiff.bmp b/Src/Languages/Dutch/res/binarydiff.bmp
deleted file mode 100644 (file)
index 4e45141..0000000
Binary files a/Src/Languages/Dutch/res/binarydiff.bmp and /dev/null differ

diff --git a/Src/Languages/Dutch/res/cascade.bmp b/Src/Languages/Dutch/res/cascade.bmp
deleted file mode 100644 (file)
index a56622c..0000000
Binary files a/Src/Languages/Dutch/res/cascade.bmp and /dev/null differ

diff --git a/Src/Languages/Dutch/res/change_pane.bmp b/Src/Languages/Dutch/res/change_pane.bmp
deleted file mode 100644 (file)
index 0a2e36a..0000000
Binary files a/Src/Languages/Dutch/res/change_pane.bmp and /dev/null differ

diff --git a/Src/Languages/Dutch/res/close.bmp b/Src/Languages/Dutch/res/close.bmp
deleted file mode 100644 (file)
index 55b5e87..0000000
Binary files a/Src/Languages/Dutch/res/close.bmp and /dev/null differ

diff --git a/Src/Languages/Dutch/res/copy.bmp b/Src/Languages/Dutch/res/copy.bmp
deleted file mode 100644 (file)
index 6565c6f..0000000
Binary files a/Src/Languages/Dutch/res/copy.bmp and /dev/null differ

diff --git a/Src/Languages/Dutch/res/customize_columns.bmp b/Src/Languages/Dutch/res/customize_columns.bmp
deleted file mode 100644 (file)
index 126345a..0000000
Binary files a/Src/Languages/Dutch/res/customize_columns.bmp and /dev/null differ

diff --git a/Src/Languages/Dutch/res/cut.bmp b/Src/Languages/Dutch/res/cut.bmp
deleted file mode 100644 (file)
index 976c5d2..0000000
Binary files a/Src/Languages/Dutch/res/cut.bmp and /dev/null differ

diff --git a/Src/Languages/Dutch/res/delete.bmp b/Src/Languages/Dutch/res/delete.bmp
deleted file mode 100644 (file)
index b70eeb8..0000000
Binary files a/Src/Languages/Dutch/res/delete.bmp and /dev/null differ

diff --git a/Src/Languages/Dutch/res/equal.bmp b/Src/Languages/Dutch/res/equal.bmp
deleted file mode 100644 (file)
index 9761d55..0000000
Binary files a/Src/Languages/Dutch/res/equal.bmp and /dev/null differ

diff --git a/Src/Languages/Dutch/res/error.bmp b/Src/Languages/Dutch/res/error.bmp
deleted file mode 100644 (file)
index f659c1d..0000000
Binary files a/Src/Languages/Dutch/res/error.bmp and /dev/null differ

diff --git a/Src/Languages/Dutch/res/exit.bmp b/Src/Languages/Dutch/res/exit.bmp
deleted file mode 100644 (file)
index 596127a..0000000
Binary files a/Src/Languages/Dutch/res/exit.bmp and /dev/null differ

diff --git a/Src/Languages/Dutch/res/fileskip.bmp b/Src/Languages/Dutch/res/fileskip.bmp
deleted file mode 100644 (file)
index 9e502d9..0000000
Binary files a/Src/Languages/Dutch/res/fileskip.bmp and /dev/null differ

diff --git a/Src/Languages/Dutch/res/filters.bmp b/Src/Languages/Dutch/res/filters.bmp
deleted file mode 100644 (file)
index e7ab693..0000000
Binary files a/Src/Languages/Dutch/res/filters.bmp and /dev/null differ

diff --git a/Src/Languages/Dutch/res/folder.ico b/Src/Languages/Dutch/res/folder.ico
deleted file mode 100644 (file)
index e18bd19..0000000
Binary files a/Src/Languages/Dutch/res/folder.ico and /dev/null differ

diff --git a/Src/Languages/Dutch/res/folderskip.ico b/Src/Languages/Dutch/res/folderskip.ico
deleted file mode 100644 (file)
index 3297496..0000000
Binary files a/Src/Languages/Dutch/res/folderskip.ico and /dev/null differ

diff --git a/Src/Languages/Dutch/res/folderup.bmp b/Src/Languages/Dutch/res/folderup.bmp
deleted file mode 100644 (file)
index 2d15145..0000000
Binary files a/Src/Languages/Dutch/res/folderup.bmp and /dev/null differ

diff --git a/Src/Languages/Dutch/res/folderup_disable.bmp b/Src/Languages/Dutch/res/folderup_disable.bmp
deleted file mode 100644 (file)
index 5829a19..0000000
Binary files a/Src/Languages/Dutch/res/folderup_disable.bmp and /dev/null differ

diff --git a/Src/Languages/Dutch/res/go_to.bmp b/Src/Languages/Dutch/res/go_to.bmp
deleted file mode 100644 (file)
index a6839aa..0000000
Binary files a/Src/Languages/Dutch/res/go_to.bmp and /dev/null differ

diff --git a/Src/Languages/Dutch/res/hand.cur b/Src/Languages/Dutch/res/hand.cur
deleted file mode 100644 (file)
index ed8db8c..0000000
Binary files a/Src/Languages/Dutch/res/hand.cur and /dev/null differ

diff --git a/Src/Languages/Dutch/res/help_contents.bmp b/Src/Languages/Dutch/res/help_contents.bmp
deleted file mode 100644 (file)
index 6662979..0000000
Binary files a/Src/Languages/Dutch/res/help_contents.bmp and /dev/null differ

diff --git a/Src/Languages/Dutch/res/horizontally.bmp b/Src/Languages/Dutch/res/horizontally.bmp
deleted file mode 100644 (file)
index 3c7a732..0000000
Binary files a/Src/Languages/Dutch/res/horizontally.bmp and /dev/null differ

diff --git a/Src/Languages/Dutch/res/language.bmp b/Src/Languages/Dutch/res/language.bmp
deleted file mode 100644 (file)
index 9e92e4d..0000000
Binary files a/Src/Languages/Dutch/res/language.bmp and /dev/null differ

diff --git a/Src/Languages/Dutch/res/lfile.bmp b/Src/Languages/Dutch/res/lfile.bmp
deleted file mode 100644 (file)
index bb7cf6c..0000000
Binary files a/Src/Languages/Dutch/res/lfile.bmp and /dev/null differ

diff --git a/Src/Languages/Dutch/res/lfolder.ico b/Src/Languages/Dutch/res/lfolder.ico
deleted file mode 100644 (file)
index fc1c797..0000000
Binary files a/Src/Languages/Dutch/res/lfolder.ico and /dev/null differ

diff --git a/Src/Languages/Dutch/res/mg_cur.cur b/Src/Languages/Dutch/res/mg_cur.cur
deleted file mode 100644 (file)
index 5691efb..0000000
Binary files a/Src/Languages/Dutch/res/mg_cur.cur and /dev/null differ

diff --git a/Src/Languages/Dutch/res/notequal.bmp b/Src/Languages/Dutch/res/notequal.bmp
deleted file mode 100644 (file)
index d747084..0000000
Binary files a/Src/Languages/Dutch/res/notequal.bmp and /dev/null differ

diff --git a/Src/Languages/Dutch/res/paste.bmp b/Src/Languages/Dutch/res/paste.bmp
deleted file mode 100644 (file)
index bcd5227..0000000
Binary files a/Src/Languages/Dutch/res/paste.bmp and /dev/null differ

diff --git a/Src/Languages/Dutch/res/print.bmp b/Src/Languages/Dutch/res/print.bmp
deleted file mode 100644 (file)
index 739ca01..0000000
Binary files a/Src/Languages/Dutch/res/print.bmp and /dev/null differ

diff --git a/Src/Languages/Dutch/res/replace.bmp b/Src/Languages/Dutch/res/replace.bmp
deleted file mode 100644 (file)
index e5586b9..0000000
Binary files a/Src/Languages/Dutch/res/replace.bmp and /dev/null differ

diff --git a/Src/Languages/Dutch/res/rfile.bmp b/Src/Languages/Dutch/res/rfile.bmp
deleted file mode 100644 (file)
index 1333733..0000000
Binary files a/Src/Languages/Dutch/res/rfile.bmp and /dev/null differ

diff --git a/Src/Languages/Dutch/res/rfolder.ico b/Src/Languages/Dutch/res/rfolder.ico
deleted file mode 100644 (file)
index 444d827..0000000
Binary files a/Src/Languages/Dutch/res/rfolder.ico and /dev/null differ

diff --git a/Src/Languages/Dutch/res/search.bmp b/Src/Languages/Dutch/res/search.bmp
deleted file mode 100644 (file)
index 9d606e5..0000000
Binary files a/Src/Languages/Dutch/res/search.bmp and /dev/null differ

diff --git a/Src/Languages/Dutch/res/select_all.bmp b/Src/Languages/Dutch/res/select_all.bmp
deleted file mode 100644 (file)
index 174e311..0000000
Binary files a/Src/Languages/Dutch/res/select_all.bmp and /dev/null differ

diff --git a/Src/Languages/Dutch/res/select_font.bmp b/Src/Languages/Dutch/res/select_font.bmp
deleted file mode 100644 (file)
index 2609538..0000000
Binary files a/Src/Languages/Dutch/res/select_font.bmp and /dev/null differ

diff --git a/Src/Languages/Dutch/res/sigma.bmp b/Src/Languages/Dutch/res/sigma.bmp
deleted file mode 100644 (file)
index eff4abe..0000000
Binary files a/Src/Languages/Dutch/res/sigma.bmp and /dev/null differ

diff --git a/Src/Languages/Dutch/res/splash1.bmp b/Src/Languages/Dutch/res/splash1.bmp
deleted file mode 100644 (file)
index f041297..0000000
Binary files a/Src/Languages/Dutch/res/splash1.bmp and /dev/null differ

diff --git a/Src/Languages/Dutch/res/unknown.bmp b/Src/Languages/Dutch/res/unknown.bmp
deleted file mode 100644 (file)
index 7f16906..0000000
Binary files a/Src/Languages/Dutch/res/unknown.bmp and /dev/null differ

diff --git a/Src/Languages/Dutch/res/vertically.bmp b/Src/Languages/Dutch/res/vertically.bmp
deleted file mode 100644 (file)
index e57c1b6..0000000
Binary files a/Src/Languages/Dutch/res/vertically.bmp and /dev/null differ

diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc
index bf1310b..4f3ec63 100644 (file)
--- a/Src/Languages/French/MergeFrench.rc
+++ b/Src/Languages/French/MergeFrench.rc
@@ -67,13 +67,15 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDR_MAINFRAME           ICON                    "res\\Merge.ico"
-IDR_MERGETYPE           ICON                    "res\\MergeDoc.ico"
-IDR_DOC_FOLDERCMP       ICON                    "res\\MergeDir.ico"
-IDI_FOLDER              ICON                    "res\\folder.ico"
-IDI_LFOLDER             ICON                    "res\\lfolder.ico"
-IDI_RFOLDER             ICON                    "res\\rfolder.ico"
-IDI_FOLDERSKIP          ICON                    "res\\folderskip.ico"
+
+// Load shared resources from Src\res
+IDR_MAINFRAME           ICON                    "..\\..\\res\\Merge.ico"
+IDR_MERGETYPE           ICON                    "..\\..\\res\\MergeDoc.ico"
+IDR_DOC_FOLDERCMP       ICON                    "..\\..\\res\\MergeDir.ico"
+IDI_FOLDER              ICON                    "..\\..\\res\\folder.ico"
+IDI_LFOLDER             ICON                    "..\\..\\res\\lfolder.ico"
+IDI_RFOLDER             ICON                    "..\\..\\res\\rfolder.ico"
+IDI_FOLDERSKIP          ICON                    "..\\..\\res\\folderskip.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1488,40 +1490,40 @@ END
 // Bitmap
 //
 
-IDR_MAINFRAME           BITMAP                  "res\\Toolbar.bmp"
-IDB_SPLASH              BITMAP                  "res\\splash1.bmp"
-IDB_EQUAL               BITMAP                  "res\\equal.bmp"
-IDB_NOTEQUAL            BITMAP                  "res\\notequal.bmp"
-IDB_UNKNOWN             BITMAP                  "res\\unknown.bmp"
-IDB_BINARYSAME          BITMAP                  "res\\binary.bmp"
-IDB_LFILE               BITMAP                  "res\\lfile.bmp"
-IDB_RFILE               BITMAP                  "res\\rfile.bmp"
-IDB_BINARYDIFF          BITMAP                  "res\\binarydiff.bmp"
-IDB_FILESKIP            BITMAP                  "res\\fileskip.bmp"
-IDB_EDIT_COPY           BITMAP                  "res\\copy.bmp"
-IDB_EDIT_CUT            BITMAP                  "res\\cut.bmp"
-IDB_EDIT_PASTE          BITMAP                  "res\\paste.bmp"
-IDB_EDIT_SEARCH         BITMAP                  "res\\search.bmp"
-IDB_WINDOW_CASCADE      BITMAP                  "res\\cascade.bmp"
-IDB_WINDOW_HORIZONTAL   BITMAP                  "res\\horizontally.bmp"
-IDB_WINDOW_VERTICAL     BITMAP                  "res\\vertically.bmp"
-IDB_WINDOW_CLOSE        BITMAP                  "res\\close.bmp"
-IDB_WINDOW_CHANGEPANE   BITMAP                  "res\\change_pane.bmp"
-IDB_EDIT_GOTO           BITMAP                  "res\\go_to.bmp"
-IDB_EDIT_REPLACE        BITMAP                  "res\\replace.bmp"
-IDB_VIEW_LANGUAGE       BITMAP                  "res\\language.bmp"
-IDB_VIEW_SELECTFONT     BITMAP                  "res\\select_font.bmp"
-IDB_FILE_EXIT           BITMAP                  "res\\exit.bmp"
-IDB_HELP_CONTENTS       BITMAP                  "res\\help_contents.bmp"
-IDB_ERROR               BITMAP                  "res\\error.bmp"
-IDB_FOLDERUP            BITMAP                  "res\\folderup.bmp"
-IDB_FOLDERUP_DISABLE    BITMAP                  "res\\folderup_disable.bmp"
-IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
-IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
-IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
-IDB_MERGE_DELETE        BITMAP                  "res\\delete.bmp"
-IDB_FILE_PRINT          BITMAP                  "res\\print.bmp"
-IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
+IDR_MAINFRAME           BITMAP                  "..\\..\\res\\Toolbar.bmp"
+IDB_SPLASH              BITMAP                  "..\\..\\res\\splash1.bmp"
+IDB_EQUAL               BITMAP                  "..\\..\\res\\equal.bmp"
+IDB_NOTEQUAL            BITMAP                  "..\\..\\res\\notequal.bmp"
+IDB_UNKNOWN             BITMAP                  "..\\..\\res\\unknown.bmp"
+IDB_BINARYSAME          BITMAP                  "..\\..\\res\\binary.bmp"
+IDB_LFILE               BITMAP                  "..\\..\\res\\lfile.bmp"
+IDB_RFILE               BITMAP                  "..\\..\\res\\rfile.bmp"
+IDB_BINARYDIFF          BITMAP                  "..\\..\\res\\binarydiff.bmp"
+IDB_FILESKIP            BITMAP                  "..\\..\\res\\fileskip.bmp"
+IDB_EDIT_COPY           BITMAP                  "..\\..\\res\\copy.bmp"
+IDB_EDIT_CUT            BITMAP                  "..\\..\\res\\cut.bmp"
+IDB_EDIT_PASTE          BITMAP                  "..\\..\\res\\paste.bmp"
+IDB_EDIT_SEARCH         BITMAP                  "..\\..\\res\\search.bmp"
+IDB_WINDOW_CASCADE      BITMAP                  "..\\..\\res\\cascade.bmp"
+IDB_WINDOW_HORIZONTAL   BITMAP                  "..\\..\\res\\horizontally.bmp"
+IDB_WINDOW_VERTICAL     BITMAP                  "..\\..\\res\\vertically.bmp"
+IDB_WINDOW_CLOSE        BITMAP                  "..\\..\\res\\close.bmp"
+IDB_WINDOW_CHANGEPANE   BITMAP                  "..\\..\\res\\change_pane.bmp"
+IDB_EDIT_GOTO           BITMAP                  "..\\..\\res\\go_to.bmp"
+IDB_EDIT_REPLACE        BITMAP                  "..\\..\\res\\replace.bmp"
+IDB_VIEW_LANGUAGE       BITMAP                  "..\\..\\res\\language.bmp"
+IDB_VIEW_SELECTFONT     BITMAP                  "..\\..\\res\\select_font.bmp"
+IDB_FILE_EXIT           BITMAP                  "..\\..\\res\\exit.bmp"
+IDB_HELP_CONTENTS       BITMAP                  "..\\..\\res\\help_contents.bmp"
+IDB_ERROR               BITMAP                  "..\\..\\res\\error.bmp"
+IDB_FOLDERUP            BITMAP                  "..\\..\\res\\folderup.bmp"
+IDB_FOLDERUP_DISABLE    BITMAP                  "..\\..\\res\\folderup_disable.bmp"
+IDB_EDIT_SELECTALL      BITMAP                  "..\\..\\res\\select_all.bmp"
+IDB_TOOLS_FILTERS       BITMAP                  "..\\..\\res\\filters.bmp"
+IDB_TOOLS_COLUMNS       BITMAP                  "..\\..\\res\\customize_columns.bmp"
+IDB_MERGE_DELETE        BITMAP                  "..\\..\\res\\delete.bmp"
+IDB_FILE_PRINT          BITMAP                  "..\\..\\res\\print.bmp"
+IDB_SIGMA               BITMAP                  "..\\..\\res\\sigma.bmp"
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -1529,8 +1531,8 @@ IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
 // Cursor
 //
 
-IDR_MARGIN_CURSOR       CURSOR                  "res\\mg_cur.cur"
-IDR_MERGEHAND           CURSOR                  "res\\hand.cur"
+IDR_MARGIN_CURSOR       CURSOR                  "..\\..\\res\\mg_cur.cur"
+IDR_MERGEHAND           CURSOR                  "..\\..\\res\\hand.cur"
 
 /////////////////////////////////////////////////////////////////////////////
 //

diff --git a/Src/Languages/French/res/Merge.ico b/Src/Languages/French/res/Merge.ico
deleted file mode 100644 (file)
index 6fd5e56..0000000
Binary files a/Src/Languages/French/res/Merge.ico and /dev/null differ

diff --git a/Src/Languages/French/res/MergeDir.ico b/Src/Languages/French/res/MergeDir.ico
deleted file mode 100644 (file)
index 349c926..0000000
Binary files a/Src/Languages/French/res/MergeDir.ico and /dev/null differ

diff --git a/Src/Languages/French/res/MergeDoc.ico b/Src/Languages/French/res/MergeDoc.ico
deleted file mode 100644 (file)
index b2f417b..0000000
Binary files a/Src/Languages/French/res/MergeDoc.ico and /dev/null differ

diff --git a/Src/Languages/French/res/Splash1.bmp b/Src/Languages/French/res/Splash1.bmp
deleted file mode 100644 (file)
index f041297..0000000
Binary files a/Src/Languages/French/res/Splash1.bmp and /dev/null differ

diff --git a/Src/Languages/French/res/Toolbar.bmp b/Src/Languages/French/res/Toolbar.bmp
deleted file mode 100644 (file)
index 7935cc8..0000000
Binary files a/Src/Languages/French/res/Toolbar.bmp and /dev/null differ

diff --git a/Src/Languages/French/res/WinMergeSplash.psd b/Src/Languages/French/res/WinMergeSplash.psd
deleted file mode 100644 (file)
index fe7df64..0000000
Binary files a/Src/Languages/French/res/WinMergeSplash.psd and /dev/null differ

diff --git a/Src/Languages/French/res/binary.bmp b/Src/Languages/French/res/binary.bmp
deleted file mode 100644 (file)
index 417eb30..0000000
Binary files a/Src/Languages/French/res/binary.bmp and /dev/null differ

diff --git a/Src/Languages/French/res/binarydiff.bmp b/Src/Languages/French/res/binarydiff.bmp
deleted file mode 100644 (file)
index 4e45141..0000000
Binary files a/Src/Languages/French/res/binarydiff.bmp and /dev/null differ

diff --git a/Src/Languages/French/res/cascade.bmp b/Src/Languages/French/res/cascade.bmp
deleted file mode 100644 (file)
index a56622c..0000000
Binary files a/Src/Languages/French/res/cascade.bmp and /dev/null differ

diff --git a/Src/Languages/French/res/change_pane.bmp b/Src/Languages/French/res/change_pane.bmp
deleted file mode 100644 (file)
index 0a2e36a..0000000
Binary files a/Src/Languages/French/res/change_pane.bmp and /dev/null differ

diff --git a/Src/Languages/French/res/close.bmp b/Src/Languages/French/res/close.bmp
deleted file mode 100644 (file)
index 55b5e87..0000000
Binary files a/Src/Languages/French/res/close.bmp and /dev/null differ

diff --git a/Src/Languages/French/res/copy.bmp b/Src/Languages/French/res/copy.bmp
deleted file mode 100644 (file)
index 6565c6f..0000000
Binary files a/Src/Languages/French/res/copy.bmp and /dev/null differ

diff --git a/Src/Languages/French/res/customize_columns.bmp b/Src/Languages/French/res/customize_columns.bmp
deleted file mode 100644 (file)
index 126345a..0000000
Binary files a/Src/Languages/French/res/customize_columns.bmp and /dev/null differ

diff --git a/Src/Languages/French/res/cut.bmp b/Src/Languages/French/res/cut.bmp
deleted file mode 100644 (file)
index 976c5d2..0000000
Binary files a/Src/Languages/French/res/cut.bmp and /dev/null differ

diff --git a/Src/Languages/French/res/delete.bmp b/Src/Languages/French/res/delete.bmp
deleted file mode 100644 (file)
index b70eeb8..0000000
Binary files a/Src/Languages/French/res/delete.bmp and /dev/null differ

diff --git a/Src/Languages/French/res/equal.bmp b/Src/Languages/French/res/equal.bmp
deleted file mode 100644 (file)
index 9761d55..0000000
Binary files a/Src/Languages/French/res/equal.bmp and /dev/null differ

diff --git a/Src/Languages/French/res/error.bmp b/Src/Languages/French/res/error.bmp
deleted file mode 100644 (file)
index f659c1d..0000000
Binary files a/Src/Languages/French/res/error.bmp and /dev/null differ

diff --git a/Src/Languages/French/res/exit.bmp b/Src/Languages/French/res/exit.bmp
deleted file mode 100644 (file)
index 596127a..0000000
Binary files a/Src/Languages/French/res/exit.bmp and /dev/null differ

diff --git a/Src/Languages/French/res/fileskip.bmp b/Src/Languages/French/res/fileskip.bmp
deleted file mode 100644 (file)
index 9e502d9..0000000
Binary files a/Src/Languages/French/res/fileskip.bmp and /dev/null differ

diff --git a/Src/Languages/French/res/filters.bmp b/Src/Languages/French/res/filters.bmp
deleted file mode 100644 (file)
index e7ab693..0000000
Binary files a/Src/Languages/French/res/filters.bmp and /dev/null differ

diff --git a/Src/Languages/French/res/folder.ico b/Src/Languages/French/res/folder.ico
deleted file mode 100644 (file)
index e18bd19..0000000
Binary files a/Src/Languages/French/res/folder.ico and /dev/null differ

diff --git a/Src/Languages/French/res/folderskip.ico b/Src/Languages/French/res/folderskip.ico
deleted file mode 100644 (file)
index 3297496..0000000
Binary files a/Src/Languages/French/res/folderskip.ico and /dev/null differ

diff --git a/Src/Languages/French/res/folderup.bmp b/Src/Languages/French/res/folderup.bmp
deleted file mode 100644 (file)
index 2d15145..0000000
Binary files a/Src/Languages/French/res/folderup.bmp and /dev/null differ

diff --git a/Src/Languages/French/res/folderup_disable.bmp b/Src/Languages/French/res/folderup_disable.bmp
deleted file mode 100644 (file)
index 5829a19..0000000
Binary files a/Src/Languages/French/res/folderup_disable.bmp and /dev/null differ

diff --git a/Src/Languages/French/res/go_to.bmp b/Src/Languages/French/res/go_to.bmp
deleted file mode 100644 (file)
index a6839aa..0000000
Binary files a/Src/Languages/French/res/go_to.bmp and /dev/null differ

diff --git a/Src/Languages/French/res/hand.cur b/Src/Languages/French/res/hand.cur
deleted file mode 100644 (file)
index ed8db8c..0000000
Binary files a/Src/Languages/French/res/hand.cur and /dev/null differ

diff --git a/Src/Languages/French/res/help_contents.bmp b/Src/Languages/French/res/help_contents.bmp
deleted file mode 100644 (file)
index 6662979..0000000
Binary files a/Src/Languages/French/res/help_contents.bmp and /dev/null differ

diff --git a/Src/Languages/French/res/horizontally.bmp b/Src/Languages/French/res/horizontally.bmp
deleted file mode 100644 (file)
index 3c7a732..0000000
Binary files a/Src/Languages/French/res/horizontally.bmp and /dev/null differ

diff --git a/Src/Languages/French/res/language.bmp b/Src/Languages/French/res/language.bmp
deleted file mode 100644 (file)
index 9e92e4d..0000000
Binary files a/Src/Languages/French/res/language.bmp and /dev/null differ

diff --git a/Src/Languages/French/res/lfile.bmp b/Src/Languages/French/res/lfile.bmp
deleted file mode 100644 (file)
index bb7cf6c..0000000
Binary files a/Src/Languages/French/res/lfile.bmp and /dev/null differ

diff --git a/Src/Languages/French/res/lfolder.ico b/Src/Languages/French/res/lfolder.ico
deleted file mode 100644 (file)
index fc1c797..0000000
Binary files a/Src/Languages/French/res/lfolder.ico and /dev/null differ

diff --git a/Src/Languages/French/res/mg_cur.cur b/Src/Languages/French/res/mg_cur.cur
deleted file mode 100644 (file)
index 5691efb..0000000
Binary files a/Src/Languages/French/res/mg_cur.cur and /dev/null differ

diff --git a/Src/Languages/French/res/notequal.bmp b/Src/Languages/French/res/notequal.bmp
deleted file mode 100644 (file)
index d747084..0000000
Binary files a/Src/Languages/French/res/notequal.bmp and /dev/null differ

diff --git a/Src/Languages/French/res/paste.bmp b/Src/Languages/French/res/paste.bmp
deleted file mode 100644 (file)
index bcd5227..0000000
Binary files a/Src/Languages/French/res/paste.bmp and /dev/null differ

diff --git a/Src/Languages/French/res/print.bmp b/Src/Languages/French/res/print.bmp
deleted file mode 100644 (file)
index 739ca01..0000000
Binary files a/Src/Languages/French/res/print.bmp and /dev/null differ

diff --git a/Src/Languages/French/res/replace.bmp b/Src/Languages/French/res/replace.bmp
deleted file mode 100644 (file)
index e5586b9..0000000
Binary files a/Src/Languages/French/res/replace.bmp and /dev/null differ

diff --git a/Src/Languages/French/res/rfile.bmp b/Src/Languages/French/res/rfile.bmp
deleted file mode 100644 (file)
index 1333733..0000000
Binary files a/Src/Languages/French/res/rfile.bmp and /dev/null differ

diff --git a/Src/Languages/French/res/rfolder.ico b/Src/Languages/French/res/rfolder.ico
deleted file mode 100644 (file)
index 444d827..0000000
Binary files a/Src/Languages/French/res/rfolder.ico and /dev/null differ

diff --git a/Src/Languages/French/res/search.bmp b/Src/Languages/French/res/search.bmp
deleted file mode 100644 (file)
index 9d606e5..0000000
Binary files a/Src/Languages/French/res/search.bmp and /dev/null differ

diff --git a/Src/Languages/French/res/select_all.bmp b/Src/Languages/French/res/select_all.bmp
deleted file mode 100644 (file)
index 174e311..0000000
Binary files a/Src/Languages/French/res/select_all.bmp and /dev/null differ

diff --git a/Src/Languages/French/res/select_font.bmp b/Src/Languages/French/res/select_font.bmp
deleted file mode 100644 (file)
index 2609538..0000000
Binary files a/Src/Languages/French/res/select_font.bmp and /dev/null differ

diff --git a/Src/Languages/French/res/sigma.bmp b/Src/Languages/French/res/sigma.bmp
deleted file mode 100644 (file)
index eff4abe..0000000
Binary files a/Src/Languages/French/res/sigma.bmp and /dev/null differ

diff --git a/Src/Languages/French/res/splash1.old.bmp b/Src/Languages/French/res/splash1.old.bmp
deleted file mode 100644 (file)
index dfa5f80..0000000
Binary files a/Src/Languages/French/res/splash1.old.bmp and /dev/null differ

diff --git a/Src/Languages/French/res/unknown.bmp b/Src/Languages/French/res/unknown.bmp
deleted file mode 100644 (file)
index 7f16906..0000000
Binary files a/Src/Languages/French/res/unknown.bmp and /dev/null differ

diff --git a/Src/Languages/French/res/vertically.bmp b/Src/Languages/French/res/vertically.bmp
deleted file mode 100644 (file)
index e57c1b6..0000000
Binary files a/Src/Languages/French/res/vertically.bmp and /dev/null differ

diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc
index ae10dca..32c7a6d 100644 (file)
--- a/Src/Languages/German/MergeGerman.rc
+++ b/Src/Languages/German/MergeGerman.rc
@@ -67,13 +67,15 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDR_MAINFRAME           ICON                    "res\\Merge.ico"
-IDR_MERGETYPE           ICON                    "res\\MergeDoc.ico"
-IDR_DOC_FOLDERCMP       ICON                    "res\\MergeDir.ico"
-IDI_FOLDER              ICON                    "res\\folder.ico"
-IDI_LFOLDER             ICON                    "res\\lfolder.ico"
-IDI_RFOLDER             ICON                    "res\\rfolder.ico"
-IDI_FOLDERSKIP          ICON                    "res\\folderskip.ico"
+
+// Load shared resources from Src\res
+IDR_MAINFRAME           ICON                    "..\\..\\res\\Merge.ico"
+IDR_MERGETYPE           ICON                    "..\\..\\res\\MergeDoc.ico"
+IDR_DOC_FOLDERCMP       ICON                    "..\\..\\res\\MergeDir.ico"
+IDI_FOLDER              ICON                    "..\\..\\res\\folder.ico"
+IDI_LFOLDER             ICON                    "..\\..\\res\\lfolder.ico"
+IDI_RFOLDER             ICON                    "..\\..\\res\\rfolder.ico"
+IDI_FOLDERSKIP          ICON                    "..\\..\\res\\folderskip.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1599,40 +1601,40 @@ END
 // Bitmap
 //
 
-IDR_MAINFRAME           BITMAP                  "res\\Toolbar.bmp"
-IDB_SPLASH              BITMAP                  "res\\splash1.bmp"
-IDB_EQUAL               BITMAP                  "res\\equal.bmp"
-IDB_NOTEQUAL            BITMAP                  "res\\notequal.bmp"
-IDB_UNKNOWN             BITMAP                  "res\\unknown.bmp"
-IDB_BINARYSAME          BITMAP                  "res\\binary.bmp"
-IDB_LFILE               BITMAP                  "res\\lfile.bmp"
-IDB_RFILE               BITMAP                  "res\\rfile.bmp"
-IDB_BINARYDIFF          BITMAP                  "res\\binarydiff.bmp"
-IDB_FILESKIP            BITMAP                  "res\\fileskip.bmp"
-IDB_EDIT_COPY           BITMAP                  "res\\copy.bmp"
-IDB_EDIT_CUT            BITMAP                  "res\\cut.bmp"
-IDB_EDIT_PASTE          BITMAP                  "res\\paste.bmp"
-IDB_EDIT_SEARCH         BITMAP                  "res\\search.bmp"
-IDB_WINDOW_CASCADE      BITMAP                  "res\\cascade.bmp"
-IDB_WINDOW_HORIZONTAL   BITMAP                  "res\\horizontally.bmp"
-IDB_WINDOW_VERTICAL     BITMAP                  "res\\vertically.bmp"
-IDB_WINDOW_CLOSE        BITMAP                  "res\\close.bmp"
-IDB_WINDOW_CHANGEPANE   BITMAP                  "res\\change_pane.bmp"
-IDB_EDIT_GOTO           BITMAP                  "res\\go_to.bmp"
-IDB_EDIT_REPLACE        BITMAP                  "res\\replace.bmp"
-IDB_VIEW_LANGUAGE       BITMAP                  "res\\language.bmp"
-IDB_VIEW_SELECTFONT     BITMAP                  "res\\select_font.bmp"
-IDB_FILE_EXIT           BITMAP                  "res\\exit.bmp"
-IDB_HELP_CONTENTS       BITMAP                  "res\\help_contents.bmp"
-IDB_ERROR               BITMAP                  "res\\error.bmp"
-IDB_FOLDERUP            BITMAP                  "res\\folderup.bmp"
-IDB_FOLDERUP_DISABLE    BITMAP                  "res\\folderup_disable.bmp"
-IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
-IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
-IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
-IDB_MERGE_DELETE        BITMAP                  "res\\delete.bmp"
-IDB_FILE_PRINT          BITMAP                  "res\\print.bmp"
-IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
+IDR_MAINFRAME           BITMAP                  "..\\..\\res\\Toolbar.bmp"
+IDB_SPLASH              BITMAP                  "..\\..\\res\\splash1.bmp"
+IDB_EQUAL               BITMAP                  "..\\..\\res\\equal.bmp"
+IDB_NOTEQUAL            BITMAP                  "..\\..\\res\\notequal.bmp"
+IDB_UNKNOWN             BITMAP                  "..\\..\\res\\unknown.bmp"
+IDB_BINARYSAME          BITMAP                  "..\\..\\res\\binary.bmp"
+IDB_LFILE               BITMAP                  "..\\..\\res\\lfile.bmp"
+IDB_RFILE               BITMAP                  "..\\..\\res\\rfile.bmp"
+IDB_BINARYDIFF          BITMAP                  "..\\..\\res\\binarydiff.bmp"
+IDB_FILESKIP            BITMAP                  "..\\..\\res\\fileskip.bmp"
+IDB_EDIT_COPY           BITMAP                  "..\\..\\res\\copy.bmp"
+IDB_EDIT_CUT            BITMAP                  "..\\..\\res\\cut.bmp"
+IDB_EDIT_PASTE          BITMAP                  "..\\..\\res\\paste.bmp"
+IDB_EDIT_SEARCH         BITMAP                  "..\\..\\res\\search.bmp"
+IDB_WINDOW_CASCADE      BITMAP                  "..\\..\\res\\cascade.bmp"
+IDB_WINDOW_HORIZONTAL   BITMAP                  "..\\..\\res\\horizontally.bmp"
+IDB_WINDOW_VERTICAL     BITMAP                  "..\\..\\res\\vertically.bmp"
+IDB_WINDOW_CLOSE        BITMAP                  "..\\..\\res\\close.bmp"
+IDB_WINDOW_CHANGEPANE   BITMAP                  "..\\..\\res\\change_pane.bmp"
+IDB_EDIT_GOTO           BITMAP                  "..\\..\\res\\go_to.bmp"
+IDB_EDIT_REPLACE        BITMAP                  "..\\..\\res\\replace.bmp"
+IDB_VIEW_LANGUAGE       BITMAP                  "..\\..\\res\\language.bmp"
+IDB_VIEW_SELECTFONT     BITMAP                  "..\\..\\res\\select_font.bmp"
+IDB_FILE_EXIT           BITMAP                  "..\\..\\res\\exit.bmp"
+IDB_HELP_CONTENTS       BITMAP                  "..\\..\\res\\help_contents.bmp"
+IDB_ERROR               BITMAP                  "..\\..\\res\\error.bmp"
+IDB_FOLDERUP            BITMAP                  "..\\..\\res\\folderup.bmp"
+IDB_FOLDERUP_DISABLE    BITMAP                  "..\\..\\res\\folderup_disable.bmp"
+IDB_EDIT_SELECTALL      BITMAP                  "..\\..\\res\\select_all.bmp"
+IDB_TOOLS_FILTERS       BITMAP                  "..\\..\\res\\filters.bmp"
+IDB_TOOLS_COLUMNS       BITMAP                  "..\\..\\res\\customize_columns.bmp"
+IDB_MERGE_DELETE        BITMAP                  "..\\..\\res\\delete.bmp"
+IDB_FILE_PRINT          BITMAP                  "..\\..\\res\\print.bmp"
+IDB_SIGMA               BITMAP                  "..\\..\\res\\sigma.bmp"
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -1640,8 +1642,8 @@ IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
 // Cursor
 //
 
-IDR_MARGIN_CURSOR       CURSOR                  "res\\mg_cur.cur"
-IDR_MERGEHAND           CURSOR                  "res\\hand.cur"
+IDR_MARGIN_CURSOR       CURSOR                  "..\\..\\res\\mg_cur.cur"
+IDR_MERGEHAND           CURSOR                  "..\\..\\res\\hand.cur"
 
 /////////////////////////////////////////////////////////////////////////////
 //

diff --git a/Src/Languages/German/res/Merge.ico b/Src/Languages/German/res/Merge.ico
deleted file mode 100644 (file)
index 6fd5e56..0000000
Binary files a/Src/Languages/German/res/Merge.ico and /dev/null differ

diff --git a/Src/Languages/German/res/MergeDir.ico b/Src/Languages/German/res/MergeDir.ico
deleted file mode 100644 (file)
index 349c926..0000000
Binary files a/Src/Languages/German/res/MergeDir.ico and /dev/null differ

diff --git a/Src/Languages/German/res/MergeDoc.ico b/Src/Languages/German/res/MergeDoc.ico
deleted file mode 100644 (file)
index b2f417b..0000000
Binary files a/Src/Languages/German/res/MergeDoc.ico and /dev/null differ

diff --git a/Src/Languages/German/res/Toolbar.bmp b/Src/Languages/German/res/Toolbar.bmp
deleted file mode 100644 (file)
index 7935cc8..0000000
Binary files a/Src/Languages/German/res/Toolbar.bmp and /dev/null differ

diff --git a/Src/Languages/German/res/WinMergeSplash.psd b/Src/Languages/German/res/WinMergeSplash.psd
deleted file mode 100644 (file)
index fe7df64..0000000
Binary files a/Src/Languages/German/res/WinMergeSplash.psd and /dev/null differ

diff --git a/Src/Languages/German/res/binary.bmp b/Src/Languages/German/res/binary.bmp
deleted file mode 100644 (file)
index 417eb30..0000000
Binary files a/Src/Languages/German/res/binary.bmp and /dev/null differ

diff --git a/Src/Languages/German/res/binarydiff.bmp b/Src/Languages/German/res/binarydiff.bmp
deleted file mode 100644 (file)
index 4e45141..0000000
Binary files a/Src/Languages/German/res/binarydiff.bmp and /dev/null differ

diff --git a/Src/Languages/German/res/cascade.bmp b/Src/Languages/German/res/cascade.bmp
deleted file mode 100644 (file)
index a56622c..0000000
Binary files a/Src/Languages/German/res/cascade.bmp and /dev/null differ

diff --git a/Src/Languages/German/res/change_pane.bmp b/Src/Languages/German/res/change_pane.bmp
deleted file mode 100644 (file)
index 0a2e36a..0000000
Binary files a/Src/Languages/German/res/change_pane.bmp and /dev/null differ

diff --git a/Src/Languages/German/res/close.bmp b/Src/Languages/German/res/close.bmp
deleted file mode 100644 (file)
index 55b5e87..0000000
Binary files a/Src/Languages/German/res/close.bmp and /dev/null differ

diff --git a/Src/Languages/German/res/copy.bmp b/Src/Languages/German/res/copy.bmp
deleted file mode 100644 (file)
index 6565c6f..0000000
Binary files a/Src/Languages/German/res/copy.bmp and /dev/null differ

diff --git a/Src/Languages/German/res/customize_columns.bmp b/Src/Languages/German/res/customize_columns.bmp
deleted file mode 100644 (file)
index 126345a..0000000
Binary files a/Src/Languages/German/res/customize_columns.bmp and /dev/null differ

diff --git a/Src/Languages/German/res/cut.bmp b/Src/Languages/German/res/cut.bmp
deleted file mode 100644 (file)
index 976c5d2..0000000
Binary files a/Src/Languages/German/res/cut.bmp and /dev/null differ

diff --git a/Src/Languages/German/res/delete.bmp b/Src/Languages/German/res/delete.bmp
deleted file mode 100644 (file)
index b70eeb8..0000000
Binary files a/Src/Languages/German/res/delete.bmp and /dev/null differ

diff --git a/Src/Languages/German/res/equal.bmp b/Src/Languages/German/res/equal.bmp
deleted file mode 100644 (file)
index 9761d55..0000000
Binary files a/Src/Languages/German/res/equal.bmp and /dev/null differ

diff --git a/Src/Languages/German/res/error.bmp b/Src/Languages/German/res/error.bmp
deleted file mode 100644 (file)
index f659c1d..0000000
Binary files a/Src/Languages/German/res/error.bmp and /dev/null differ

diff --git a/Src/Languages/German/res/exit.bmp b/Src/Languages/German/res/exit.bmp
deleted file mode 100644 (file)
index 596127a..0000000
Binary files a/Src/Languages/German/res/exit.bmp and /dev/null differ

diff --git a/Src/Languages/German/res/fileskip.bmp b/Src/Languages/German/res/fileskip.bmp
deleted file mode 100644 (file)
index 9e502d9..0000000
Binary files a/Src/Languages/German/res/fileskip.bmp and /dev/null differ

diff --git a/Src/Languages/German/res/filters.bmp b/Src/Languages/German/res/filters.bmp
deleted file mode 100644 (file)
index e7ab693..0000000
Binary files a/Src/Languages/German/res/filters.bmp and /dev/null differ

diff --git a/Src/Languages/German/res/folder.ico b/Src/Languages/German/res/folder.ico
deleted file mode 100644 (file)
index e18bd19..0000000
Binary files a/Src/Languages/German/res/folder.ico and /dev/null differ

diff --git a/Src/Languages/German/res/folderskip.ico b/Src/Languages/German/res/folderskip.ico
deleted file mode 100644 (file)
index 3297496..0000000
Binary files a/Src/Languages/German/res/folderskip.ico and /dev/null differ

diff --git a/Src/Languages/German/res/folderup.bmp b/Src/Languages/German/res/folderup.bmp
deleted file mode 100644 (file)
index 2d15145..0000000
Binary files a/Src/Languages/German/res/folderup.bmp and /dev/null differ

diff --git a/Src/Languages/German/res/folderup_disable.bmp b/Src/Languages/German/res/folderup_disable.bmp
deleted file mode 100644 (file)
index 5829a19..0000000
Binary files a/Src/Languages/German/res/folderup_disable.bmp and /dev/null differ

diff --git a/Src/Languages/German/res/go_to.bmp b/Src/Languages/German/res/go_to.bmp
deleted file mode 100644 (file)
index a6839aa..0000000
Binary files a/Src/Languages/German/res/go_to.bmp and /dev/null differ

diff --git a/Src/Languages/German/res/hand.cur b/Src/Languages/German/res/hand.cur
deleted file mode 100644 (file)
index ed8db8c..0000000
Binary files a/Src/Languages/German/res/hand.cur and /dev/null differ

diff --git a/Src/Languages/German/res/help_contents.bmp b/Src/Languages/German/res/help_contents.bmp
deleted file mode 100644 (file)
index 6662979..0000000
Binary files a/Src/Languages/German/res/help_contents.bmp and /dev/null differ

diff --git a/Src/Languages/German/res/horizontally.bmp b/Src/Languages/German/res/horizontally.bmp
deleted file mode 100644 (file)
index 3c7a732..0000000
Binary files a/Src/Languages/German/res/horizontally.bmp and /dev/null differ

diff --git a/Src/Languages/German/res/language.bmp b/Src/Languages/German/res/language.bmp
deleted file mode 100644 (file)
index 9e92e4d..0000000
Binary files a/Src/Languages/German/res/language.bmp and /dev/null differ

diff --git a/Src/Languages/German/res/lfile.bmp b/Src/Languages/German/res/lfile.bmp
deleted file mode 100644 (file)
index bb7cf6c..0000000
Binary files a/Src/Languages/German/res/lfile.bmp and /dev/null differ

diff --git a/Src/Languages/German/res/lfolder.ico b/Src/Languages/German/res/lfolder.ico
deleted file mode 100644 (file)
index fc1c797..0000000
Binary files a/Src/Languages/German/res/lfolder.ico and /dev/null differ

diff --git a/Src/Languages/German/res/mg_cur.cur b/Src/Languages/German/res/mg_cur.cur
deleted file mode 100644 (file)
index 5691efb..0000000
Binary files a/Src/Languages/German/res/mg_cur.cur and /dev/null differ

diff --git a/Src/Languages/German/res/notequal.bmp b/Src/Languages/German/res/notequal.bmp
deleted file mode 100644 (file)
index d747084..0000000
Binary files a/Src/Languages/German/res/notequal.bmp and /dev/null differ

diff --git a/Src/Languages/German/res/paste.bmp b/Src/Languages/German/res/paste.bmp
deleted file mode 100644 (file)
index bcd5227..0000000
Binary files a/Src/Languages/German/res/paste.bmp and /dev/null differ

diff --git a/Src/Languages/German/res/print.bmp b/Src/Languages/German/res/print.bmp
deleted file mode 100644 (file)
index 739ca01..0000000
Binary files a/Src/Languages/German/res/print.bmp and /dev/null differ

diff --git a/Src/Languages/German/res/replace.bmp b/Src/Languages/German/res/replace.bmp
deleted file mode 100644 (file)
index e5586b9..0000000
Binary files a/Src/Languages/German/res/replace.bmp and /dev/null differ

diff --git a/Src/Languages/German/res/rfile.bmp b/Src/Languages/German/res/rfile.bmp
deleted file mode 100644 (file)
index 1333733..0000000
Binary files a/Src/Languages/German/res/rfile.bmp and /dev/null differ

diff --git a/Src/Languages/German/res/rfolder.ico b/Src/Languages/German/res/rfolder.ico
deleted file mode 100644 (file)
index 444d827..0000000
Binary files a/Src/Languages/German/res/rfolder.ico and /dev/null differ

diff --git a/Src/Languages/German/res/search.bmp b/Src/Languages/German/res/search.bmp
deleted file mode 100644 (file)
index 9d606e5..0000000
Binary files a/Src/Languages/German/res/search.bmp and /dev/null differ

diff --git a/Src/Languages/German/res/select_all.bmp b/Src/Languages/German/res/select_all.bmp
deleted file mode 100644 (file)
index 174e311..0000000
Binary files a/Src/Languages/German/res/select_all.bmp and /dev/null differ

diff --git a/Src/Languages/German/res/select_font.bmp b/Src/Languages/German/res/select_font.bmp
deleted file mode 100644 (file)
index 2609538..0000000
Binary files a/Src/Languages/German/res/select_font.bmp and /dev/null differ

diff --git a/Src/Languages/German/res/sigma.bmp b/Src/Languages/German/res/sigma.bmp
deleted file mode 100644 (file)
index eff4abe..0000000
Binary files a/Src/Languages/German/res/sigma.bmp and /dev/null differ

diff --git a/Src/Languages/German/res/splash1.bmp b/Src/Languages/German/res/splash1.bmp
deleted file mode 100644 (file)
index f041297..0000000
Binary files a/Src/Languages/German/res/splash1.bmp and /dev/null differ

diff --git a/Src/Languages/German/res/unknown.bmp b/Src/Languages/German/res/unknown.bmp
deleted file mode 100644 (file)
index 7f16906..0000000
Binary files a/Src/Languages/German/res/unknown.bmp and /dev/null differ

diff --git a/Src/Languages/German/res/vertically.bmp b/Src/Languages/German/res/vertically.bmp
deleted file mode 100644 (file)
index e57c1b6..0000000
Binary files a/Src/Languages/German/res/vertically.bmp and /dev/null differ

diff --git a/Src/Languages/Hungarian/MergeHungarian.rc b/Src/Languages/Hungarian/MergeHungarian.rc
index 43da924..e166df5 100644 (file)
--- a/Src/Languages/Hungarian/MergeHungarian.rc
+++ b/Src/Languages/Hungarian/MergeHungarian.rc
@@ -67,13 +67,15 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDR_MAINFRAME           ICON                    "res\\Merge.ico"
-IDR_MERGETYPE           ICON                    "res\\MergeDoc.ico"
-IDR_DOC_FOLDERCMP       ICON                    "res\\MergeDir.ico"
-IDI_FOLDER              ICON                    "res\\folder.ico"
-IDI_LFOLDER             ICON                    "res\\lfolder.ico"
-IDI_RFOLDER             ICON                    "res\\rfolder.ico"
-IDI_FOLDERSKIP          ICON                    "res\\folderskip.ico"
+
+// Load shared resources from Src\res
+IDR_MAINFRAME           ICON                    "..\\..\\res\\Merge.ico"
+IDR_MERGETYPE           ICON                    "..\\..\\res\\MergeDoc.ico"
+IDR_DOC_FOLDERCMP       ICON                    "..\\..\\res\\MergeDir.ico"
+IDI_FOLDER              ICON                    "..\\..\\res\\folder.ico"
+IDI_LFOLDER             ICON                    "..\\..\\res\\lfolder.ico"
+IDI_RFOLDER             ICON                    "..\\..\\res\\rfolder.ico"
+IDI_FOLDERSKIP          ICON                    "..\\..\\res\\folderskip.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1483,40 +1485,40 @@ END
 // Bitmap
 //
 
-IDR_MAINFRAME           BITMAP                  "res\\Toolbar.bmp"
-IDB_SPLASH              BITMAP                  "res\\splash1.bmp"
-IDB_EQUAL               BITMAP                  "res\\equal.bmp"
-IDB_NOTEQUAL            BITMAP                  "res\\notequal.bmp"
-IDB_UNKNOWN             BITMAP                  "res\\unknown.bmp"
-IDB_BINARYSAME          BITMAP                  "res\\binary.bmp"
-IDB_LFILE               BITMAP                  "res\\lfile.bmp"
-IDB_RFILE               BITMAP                  "res\\rfile.bmp"
-IDB_BINARYDIFF          BITMAP                  "res\\binarydiff.bmp"
-IDB_FILESKIP            BITMAP                  "res\\fileskip.bmp"
-IDB_EDIT_COPY           BITMAP                  "res\\copy.bmp"
-IDB_EDIT_CUT            BITMAP                  "res\\cut.bmp"
-IDB_EDIT_PASTE          BITMAP                  "res\\paste.bmp"
-IDB_EDIT_SEARCH         BITMAP                  "res\\search.bmp"
-IDB_WINDOW_CASCADE      BITMAP                  "res\\cascade.bmp"
-IDB_WINDOW_HORIZONTAL   BITMAP                  "res\\horizontally.bmp"
-IDB_WINDOW_VERTICAL     BITMAP                  "res\\vertically.bmp"
-IDB_WINDOW_CLOSE        BITMAP                  "res\\close.bmp"
-IDB_WINDOW_CHANGEPANE   BITMAP                  "res\\change_pane.bmp"
-IDB_EDIT_GOTO           BITMAP                  "res\\go_to.bmp"
-IDB_EDIT_REPLACE        BITMAP                  "res\\replace.bmp"
-IDB_VIEW_LANGUAGE       BITMAP                  "res\\language.bmp"
-IDB_VIEW_SELECTFONT     BITMAP                  "res\\select_font.bmp"
-IDB_FILE_EXIT           BITMAP                  "res\\exit.bmp"
-IDB_HELP_CONTENTS       BITMAP                  "res\\help_contents.bmp"
-IDB_ERROR               BITMAP                  "res\\error.bmp"
-IDB_FOLDERUP            BITMAP                  "res\\folderup.bmp"
-IDB_FOLDERUP_DISABLE    BITMAP                  "res\\folderup_disable.bmp"
-IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
-IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
-IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
-IDB_MERGE_DELETE        BITMAP                  "res\\delete.bmp"
-IDB_FILE_PRINT          BITMAP                  "res\\print.bmp"
-IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
+IDR_MAINFRAME           BITMAP                  "..\\..\\res\\Toolbar.bmp"
+IDB_SPLASH              BITMAP                  "..\\..\\res\\splash1.bmp"
+IDB_EQUAL               BITMAP                  "..\\..\\res\\equal.bmp"
+IDB_NOTEQUAL            BITMAP                  "..\\..\\res\\notequal.bmp"
+IDB_UNKNOWN             BITMAP                  "..\\..\\res\\unknown.bmp"
+IDB_BINARYSAME          BITMAP                  "..\\..\\res\\binary.bmp"
+IDB_LFILE               BITMAP                  "..\\..\\res\\lfile.bmp"
+IDB_RFILE               BITMAP                  "..\\..\\res\\rfile.bmp"
+IDB_BINARYDIFF          BITMAP                  "..\\..\\res\\binarydiff.bmp"
+IDB_FILESKIP            BITMAP                  "..\\..\\res\\fileskip.bmp"
+IDB_EDIT_COPY           BITMAP                  "..\\..\\res\\copy.bmp"
+IDB_EDIT_CUT            BITMAP                  "..\\..\\res\\cut.bmp"
+IDB_EDIT_PASTE          BITMAP                  "..\\..\\res\\paste.bmp"
+IDB_EDIT_SEARCH         BITMAP                  "..\\..\\res\\search.bmp"
+IDB_WINDOW_CASCADE      BITMAP                  "..\\..\\res\\cascade.bmp"
+IDB_WINDOW_HORIZONTAL   BITMAP                  "..\\..\\res\\horizontally.bmp"
+IDB_WINDOW_VERTICAL     BITMAP                  "..\\..\\res\\vertically.bmp"
+IDB_WINDOW_CLOSE        BITMAP                  "..\\..\\res\\close.bmp"
+IDB_WINDOW_CHANGEPANE   BITMAP                  "..\\..\\res\\change_pane.bmp"
+IDB_EDIT_GOTO           BITMAP                  "..\\..\\res\\go_to.bmp"
+IDB_EDIT_REPLACE        BITMAP                  "..\\..\\res\\replace.bmp"
+IDB_VIEW_LANGUAGE       BITMAP                  "..\\..\\res\\language.bmp"
+IDB_VIEW_SELECTFONT     BITMAP                  "..\\..\\res\\select_font.bmp"
+IDB_FILE_EXIT           BITMAP                  "..\\..\\res\\exit.bmp"
+IDB_HELP_CONTENTS       BITMAP                  "..\\..\\res\\help_contents.bmp"
+IDB_ERROR               BITMAP                  "..\\..\\res\\error.bmp"
+IDB_FOLDERUP            BITMAP                  "..\\..\\res\\folderup.bmp"
+IDB_FOLDERUP_DISABLE    BITMAP                  "..\\..\\res\\folderup_disable.bmp"
+IDB_EDIT_SELECTALL      BITMAP                  "..\\..\\res\\select_all.bmp"
+IDB_TOOLS_FILTERS       BITMAP                  "..\\..\\res\\filters.bmp"
+IDB_TOOLS_COLUMNS       BITMAP                  "..\\..\\res\\customize_columns.bmp"
+IDB_MERGE_DELETE        BITMAP                  "..\\..\\res\\delete.bmp"
+IDB_FILE_PRINT          BITMAP                  "..\\..\\res\\print.bmp"
+IDB_SIGMA               BITMAP                  "..\\..\\res\\sigma.bmp"
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -1524,8 +1526,8 @@ IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
 // Cursor
 //
 
-IDR_MARGIN_CURSOR       CURSOR                  "res\\mg_cur.cur"
-IDR_MERGEHAND           CURSOR                  "res\\hand.cur"
+IDR_MARGIN_CURSOR       CURSOR                  "..\\..\\res\\mg_cur.cur"
+IDR_MERGEHAND           CURSOR                  "..\\..\\res\\hand.cur"
 
 /////////////////////////////////////////////////////////////////////////////
 //

diff --git a/Src/Languages/Hungarian/res/Merge.ico b/Src/Languages/Hungarian/res/Merge.ico
deleted file mode 100644 (file)
index 6fd5e56..0000000
Binary files a/Src/Languages/Hungarian/res/Merge.ico and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/MergeDir.ico b/Src/Languages/Hungarian/res/MergeDir.ico
deleted file mode 100644 (file)
index 349c926..0000000
Binary files a/Src/Languages/Hungarian/res/MergeDir.ico and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/MergeDoc.ico b/Src/Languages/Hungarian/res/MergeDoc.ico
deleted file mode 100644 (file)
index b2f417b..0000000
Binary files a/Src/Languages/Hungarian/res/MergeDoc.ico and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/Splash2.bmp b/Src/Languages/Hungarian/res/Splash2.bmp
deleted file mode 100644 (file)
index 6add432..0000000
Binary files a/Src/Languages/Hungarian/res/Splash2.bmp and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/Toolbar.bmp b/Src/Languages/Hungarian/res/Toolbar.bmp
deleted file mode 100644 (file)
index 7935cc8..0000000
Binary files a/Src/Languages/Hungarian/res/Toolbar.bmp and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/WinMergeSplash.psd b/Src/Languages/Hungarian/res/WinMergeSplash.psd
deleted file mode 100644 (file)
index fe7df64..0000000
Binary files a/Src/Languages/Hungarian/res/WinMergeSplash.psd and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/binary.bmp b/Src/Languages/Hungarian/res/binary.bmp
deleted file mode 100644 (file)
index 417eb30..0000000
Binary files a/Src/Languages/Hungarian/res/binary.bmp and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/binarydiff.bmp b/Src/Languages/Hungarian/res/binarydiff.bmp
deleted file mode 100644 (file)
index 4e45141..0000000
Binary files a/Src/Languages/Hungarian/res/binarydiff.bmp and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/cascade.bmp b/Src/Languages/Hungarian/res/cascade.bmp
deleted file mode 100644 (file)
index a56622c..0000000
Binary files a/Src/Languages/Hungarian/res/cascade.bmp and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/change_pane.bmp b/Src/Languages/Hungarian/res/change_pane.bmp
deleted file mode 100644 (file)
index 0a2e36a..0000000
Binary files a/Src/Languages/Hungarian/res/change_pane.bmp and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/close.bmp b/Src/Languages/Hungarian/res/close.bmp
deleted file mode 100644 (file)
index 55b5e87..0000000
Binary files a/Src/Languages/Hungarian/res/close.bmp and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/copy.bmp b/Src/Languages/Hungarian/res/copy.bmp
deleted file mode 100644 (file)
index 6565c6f..0000000
Binary files a/Src/Languages/Hungarian/res/copy.bmp and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/customize_columns.bmp b/Src/Languages/Hungarian/res/customize_columns.bmp
deleted file mode 100644 (file)
index 126345a..0000000
Binary files a/Src/Languages/Hungarian/res/customize_columns.bmp and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/cut.bmp b/Src/Languages/Hungarian/res/cut.bmp
deleted file mode 100644 (file)
index 976c5d2..0000000
Binary files a/Src/Languages/Hungarian/res/cut.bmp and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/delete.bmp b/Src/Languages/Hungarian/res/delete.bmp
deleted file mode 100644 (file)
index b70eeb8..0000000
Binary files a/Src/Languages/Hungarian/res/delete.bmp and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/equal.bmp b/Src/Languages/Hungarian/res/equal.bmp
deleted file mode 100644 (file)
index 9761d55..0000000
Binary files a/Src/Languages/Hungarian/res/equal.bmp and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/error.bmp b/Src/Languages/Hungarian/res/error.bmp
deleted file mode 100644 (file)
index f659c1d..0000000
Binary files a/Src/Languages/Hungarian/res/error.bmp and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/exit.bmp b/Src/Languages/Hungarian/res/exit.bmp
deleted file mode 100644 (file)
index 596127a..0000000
Binary files a/Src/Languages/Hungarian/res/exit.bmp and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/fileskip.bmp b/Src/Languages/Hungarian/res/fileskip.bmp
deleted file mode 100644 (file)
index 9e502d9..0000000
Binary files a/Src/Languages/Hungarian/res/fileskip.bmp and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/filters.bmp b/Src/Languages/Hungarian/res/filters.bmp
deleted file mode 100644 (file)
index e7ab693..0000000
Binary files a/Src/Languages/Hungarian/res/filters.bmp and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/folder.ico b/Src/Languages/Hungarian/res/folder.ico
deleted file mode 100644 (file)
index e18bd19..0000000
Binary files a/Src/Languages/Hungarian/res/folder.ico and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/folderskip.ico b/Src/Languages/Hungarian/res/folderskip.ico
deleted file mode 100644 (file)
index 3297496..0000000
Binary files a/Src/Languages/Hungarian/res/folderskip.ico and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/folderup.bmp b/Src/Languages/Hungarian/res/folderup.bmp
deleted file mode 100644 (file)
index 2d15145..0000000
Binary files a/Src/Languages/Hungarian/res/folderup.bmp and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/folderup_disable.bmp b/Src/Languages/Hungarian/res/folderup_disable.bmp
deleted file mode 100644 (file)
index 5829a19..0000000
Binary files a/Src/Languages/Hungarian/res/folderup_disable.bmp and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/go_to.bmp b/Src/Languages/Hungarian/res/go_to.bmp
deleted file mode 100644 (file)
index a6839aa..0000000
Binary files a/Src/Languages/Hungarian/res/go_to.bmp and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/hand.cur b/Src/Languages/Hungarian/res/hand.cur
deleted file mode 100644 (file)
index ed8db8c..0000000
Binary files a/Src/Languages/Hungarian/res/hand.cur and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/help_contents.bmp b/Src/Languages/Hungarian/res/help_contents.bmp
deleted file mode 100644 (file)
index 6662979..0000000
Binary files a/Src/Languages/Hungarian/res/help_contents.bmp and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/horizontally.bmp b/Src/Languages/Hungarian/res/horizontally.bmp
deleted file mode 100644 (file)
index 3c7a732..0000000
Binary files a/Src/Languages/Hungarian/res/horizontally.bmp and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/language.bmp b/Src/Languages/Hungarian/res/language.bmp
deleted file mode 100644 (file)
index 9e92e4d..0000000
Binary files a/Src/Languages/Hungarian/res/language.bmp and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/lfile.bmp b/Src/Languages/Hungarian/res/lfile.bmp
deleted file mode 100644 (file)
index bb7cf6c..0000000
Binary files a/Src/Languages/Hungarian/res/lfile.bmp and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/lfolder.ico b/Src/Languages/Hungarian/res/lfolder.ico
deleted file mode 100644 (file)
index fc1c797..0000000
Binary files a/Src/Languages/Hungarian/res/lfolder.ico and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/mg_cur.cur b/Src/Languages/Hungarian/res/mg_cur.cur
deleted file mode 100644 (file)
index 5691efb..0000000
Binary files a/Src/Languages/Hungarian/res/mg_cur.cur and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/notequal.bmp b/Src/Languages/Hungarian/res/notequal.bmp
deleted file mode 100644 (file)
index d747084..0000000
Binary files a/Src/Languages/Hungarian/res/notequal.bmp and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/paste.bmp b/Src/Languages/Hungarian/res/paste.bmp
deleted file mode 100644 (file)
index bcd5227..0000000
Binary files a/Src/Languages/Hungarian/res/paste.bmp and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/print.bmp b/Src/Languages/Hungarian/res/print.bmp
deleted file mode 100644 (file)
index 739ca01..0000000
Binary files a/Src/Languages/Hungarian/res/print.bmp and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/replace.bmp b/Src/Languages/Hungarian/res/replace.bmp
deleted file mode 100644 (file)
index e5586b9..0000000
Binary files a/Src/Languages/Hungarian/res/replace.bmp and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/rfile.bmp b/Src/Languages/Hungarian/res/rfile.bmp
deleted file mode 100644 (file)
index 1333733..0000000
Binary files a/Src/Languages/Hungarian/res/rfile.bmp and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/rfolder.ico b/Src/Languages/Hungarian/res/rfolder.ico
deleted file mode 100644 (file)
index 444d827..0000000
Binary files a/Src/Languages/Hungarian/res/rfolder.ico and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/search.bmp b/Src/Languages/Hungarian/res/search.bmp
deleted file mode 100644 (file)
index 9d606e5..0000000
Binary files a/Src/Languages/Hungarian/res/search.bmp and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/select_all.bmp b/Src/Languages/Hungarian/res/select_all.bmp
deleted file mode 100644 (file)
index 174e311..0000000
Binary files a/Src/Languages/Hungarian/res/select_all.bmp and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/select_font.bmp b/Src/Languages/Hungarian/res/select_font.bmp
deleted file mode 100644 (file)
index 2609538..0000000
Binary files a/Src/Languages/Hungarian/res/select_font.bmp and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/sigma.bmp b/Src/Languages/Hungarian/res/sigma.bmp
deleted file mode 100644 (file)
index eff4abe..0000000
Binary files a/Src/Languages/Hungarian/res/sigma.bmp and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/splash1.bmp b/Src/Languages/Hungarian/res/splash1.bmp
deleted file mode 100644 (file)
index c97d02e..0000000
Binary files a/Src/Languages/Hungarian/res/splash1.bmp and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/unknown.bmp b/Src/Languages/Hungarian/res/unknown.bmp
deleted file mode 100644 (file)
index 7f16906..0000000
Binary files a/Src/Languages/Hungarian/res/unknown.bmp and /dev/null differ

diff --git a/Src/Languages/Hungarian/res/vertically.bmp b/Src/Languages/Hungarian/res/vertically.bmp
deleted file mode 100644 (file)
index e57c1b6..0000000
Binary files a/Src/Languages/Hungarian/res/vertically.bmp and /dev/null differ

diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc
index cf205e8..10d070a 100644 (file)
--- a/Src/Languages/Italian/MergeItalian.rc
+++ b/Src/Languages/Italian/MergeItalian.rc
@@ -67,13 +67,15 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDR_MAINFRAME           ICON                    "res\\Merge.ico"
-IDR_MERGETYPE           ICON                    "res\\MergeDoc.ico"
-IDR_DOC_FOLDERCMP       ICON                    "res\\MergeDir.ico"
-IDI_FOLDER              ICON                    "res\\folder.ico"
-IDI_LFOLDER             ICON                    "res\\lfolder.ico"
-IDI_RFOLDER             ICON                    "res\\rfolder.ico"
-IDI_FOLDERSKIP          ICON                    "res\\folderskip.ico"
+
+// Load shared resources from Src\res
+IDR_MAINFRAME           ICON                    "..\\..\\res\\Merge.ico"
+IDR_MERGETYPE           ICON                    "..\\..\\res\\MergeDoc.ico"
+IDR_DOC_FOLDERCMP       ICON                    "..\\..\\res\\MergeDir.ico"
+IDI_FOLDER              ICON                    "..\\..\\res\\folder.ico"
+IDI_LFOLDER             ICON                    "..\\..\\res\\lfolder.ico"
+IDI_RFOLDER             ICON                    "..\\..\\res\\rfolder.ico"
+IDI_FOLDERSKIP          ICON                    "..\\..\\res\\folderskip.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1599,40 +1601,40 @@ END
 // Bitmap
 //
 
-IDR_MAINFRAME           BITMAP                  "res\\Toolbar.bmp"
-IDB_SPLASH              BITMAP                  "res\\splash1.bmp"
-IDB_EQUAL               BITMAP                  "res\\equal.bmp"
-IDB_NOTEQUAL            BITMAP                  "res\\notequal.bmp"
-IDB_UNKNOWN             BITMAP                  "res\\unknown.bmp"
-IDB_BINARYSAME          BITMAP                  "res\\binary.bmp"
-IDB_LFILE               BITMAP                  "res\\lfile.bmp"
-IDB_RFILE               BITMAP                  "res\\rfile.bmp"
-IDB_BINARYDIFF          BITMAP                  "res\\binarydiff.bmp"
-IDB_FILESKIP            BITMAP                  "res\\fileskip.bmp"
-IDB_EDIT_COPY           BITMAP                  "res\\copy.bmp"
-IDB_EDIT_CUT            BITMAP                  "res\\cut.bmp"
-IDB_EDIT_PASTE          BITMAP                  "res\\paste.bmp"
-IDB_EDIT_SEARCH         BITMAP                  "res\\search.bmp"
-IDB_WINDOW_CASCADE      BITMAP                  "res\\cascade.bmp"
-IDB_WINDOW_HORIZONTAL   BITMAP                  "res\\horizontally.bmp"
-IDB_WINDOW_VERTICAL     BITMAP                  "res\\vertically.bmp"
-IDB_WINDOW_CLOSE        BITMAP                  "res\\close.bmp"
-IDB_WINDOW_CHANGEPANE   BITMAP                  "res\\change_pane.bmp"
-IDB_EDIT_GOTO           BITMAP                  "res\\go_to.bmp"
-IDB_EDIT_REPLACE        BITMAP                  "res\\replace.bmp"
-IDB_VIEW_LANGUAGE       BITMAP                  "res\\language.bmp"
-IDB_VIEW_SELECTFONT     BITMAP                  "res\\select_font.bmp"
-IDB_FILE_EXIT           BITMAP                  "res\\exit.bmp"
-IDB_HELP_CONTENTS       BITMAP                  "res\\help_contents.bmp"
-IDB_ERROR               BITMAP                  "res\\error.bmp"
-IDB_FOLDERUP            BITMAP                  "res\\folderup.bmp"
-IDB_FOLDERUP_DISABLE    BITMAP                  "res\\folderup_disable.bmp"
-IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
-IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
-IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
-IDB_MERGE_DELETE        BITMAP                  "res\\delete.bmp"
-IDB_FILE_PRINT          BITMAP                  "res\\print.bmp"
-IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
+IDR_MAINFRAME           BITMAP                  "..\\..\\res\\Toolbar.bmp"
+IDB_SPLASH              BITMAP                  "..\\..\\res\\splash1.bmp"
+IDB_EQUAL               BITMAP                  "..\\..\\res\\equal.bmp"
+IDB_NOTEQUAL            BITMAP                  "..\\..\\res\\notequal.bmp"
+IDB_UNKNOWN             BITMAP                  "..\\..\\res\\unknown.bmp"
+IDB_BINARYSAME          BITMAP                  "..\\..\\res\\binary.bmp"
+IDB_LFILE               BITMAP                  "..\\..\\res\\lfile.bmp"
+IDB_RFILE               BITMAP                  "..\\..\\res\\rfile.bmp"
+IDB_BINARYDIFF          BITMAP                  "..\\..\\res\\binarydiff.bmp"
+IDB_FILESKIP            BITMAP                  "..\\..\\res\\fileskip.bmp"
+IDB_EDIT_COPY           BITMAP                  "..\\..\\res\\copy.bmp"
+IDB_EDIT_CUT            BITMAP                  "..\\..\\res\\cut.bmp"
+IDB_EDIT_PASTE          BITMAP                  "..\\..\\res\\paste.bmp"
+IDB_EDIT_SEARCH         BITMAP                  "..\\..\\res\\search.bmp"
+IDB_WINDOW_CASCADE      BITMAP                  "..\\..\\res\\cascade.bmp"
+IDB_WINDOW_HORIZONTAL   BITMAP                  "..\\..\\res\\horizontally.bmp"
+IDB_WINDOW_VERTICAL     BITMAP                  "..\\..\\res\\vertically.bmp"
+IDB_WINDOW_CLOSE        BITMAP                  "..\\..\\res\\close.bmp"
+IDB_WINDOW_CHANGEPANE   BITMAP                  "..\\..\\res\\change_pane.bmp"
+IDB_EDIT_GOTO           BITMAP                  "..\\..\\res\\go_to.bmp"
+IDB_EDIT_REPLACE        BITMAP                  "..\\..\\res\\replace.bmp"
+IDB_VIEW_LANGUAGE       BITMAP                  "..\\..\\res\\language.bmp"
+IDB_VIEW_SELECTFONT     BITMAP                  "..\\..\\res\\select_font.bmp"
+IDB_FILE_EXIT           BITMAP                  "..\\..\\res\\exit.bmp"
+IDB_HELP_CONTENTS       BITMAP                  "..\\..\\res\\help_contents.bmp"
+IDB_ERROR               BITMAP                  "..\\..\\res\\error.bmp"
+IDB_FOLDERUP            BITMAP                  "..\\..\\res\\folderup.bmp"
+IDB_FOLDERUP_DISABLE    BITMAP                  "..\\..\\res\\folderup_disable.bmp"
+IDB_EDIT_SELECTALL      BITMAP                  "..\\..\\res\\select_all.bmp"
+IDB_TOOLS_FILTERS       BITMAP                  "..\\..\\res\\filters.bmp"
+IDB_TOOLS_COLUMNS       BITMAP                  "..\\..\\res\\customize_columns.bmp"
+IDB_MERGE_DELETE        BITMAP                  "..\\..\\res\\delete.bmp"
+IDB_FILE_PRINT          BITMAP                  "..\\..\\res\\print.bmp"
+IDB_SIGMA               BITMAP                  "..\\..\\res\\sigma.bmp"
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -1640,8 +1642,8 @@ IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
 // Cursor
 //
 
-IDR_MARGIN_CURSOR       CURSOR                  "res\\mg_cur.cur"
-IDR_MERGEHAND           CURSOR                  "res\\hand.cur"
+IDR_MARGIN_CURSOR       CURSOR                  "..\\..\\res\\mg_cur.cur"
+IDR_MERGEHAND           CURSOR                  "..\\..\\res\\hand.cur"
 
 /////////////////////////////////////////////////////////////////////////////
 //

diff --git a/Src/Languages/Italian/res/Merge.ico b/Src/Languages/Italian/res/Merge.ico
deleted file mode 100644 (file)
index 6fd5e56..0000000
Binary files a/Src/Languages/Italian/res/Merge.ico and /dev/null differ

diff --git a/Src/Languages/Italian/res/MergeDir.ico b/Src/Languages/Italian/res/MergeDir.ico
deleted file mode 100644 (file)
index 349c926..0000000
Binary files a/Src/Languages/Italian/res/MergeDir.ico and /dev/null differ

diff --git a/Src/Languages/Italian/res/MergeDoc.ico b/Src/Languages/Italian/res/MergeDoc.ico
deleted file mode 100644 (file)
index b2f417b..0000000
Binary files a/Src/Languages/Italian/res/MergeDoc.ico and /dev/null differ

diff --git a/Src/Languages/Italian/res/Toolbar.bmp b/Src/Languages/Italian/res/Toolbar.bmp
deleted file mode 100644 (file)
index 7935cc8..0000000
Binary files a/Src/Languages/Italian/res/Toolbar.bmp and /dev/null differ

diff --git a/Src/Languages/Italian/res/WinMergeSplash.psd b/Src/Languages/Italian/res/WinMergeSplash.psd
deleted file mode 100644 (file)
index fe7df64..0000000
Binary files a/Src/Languages/Italian/res/WinMergeSplash.psd and /dev/null differ

diff --git a/Src/Languages/Italian/res/binary.bmp b/Src/Languages/Italian/res/binary.bmp
deleted file mode 100644 (file)
index 417eb30..0000000
Binary files a/Src/Languages/Italian/res/binary.bmp and /dev/null differ

diff --git a/Src/Languages/Italian/res/binarydiff.bmp b/Src/Languages/Italian/res/binarydiff.bmp
deleted file mode 100644 (file)
index 4e45141..0000000
Binary files a/Src/Languages/Italian/res/binarydiff.bmp and /dev/null differ

diff --git a/Src/Languages/Italian/res/cascade.bmp b/Src/Languages/Italian/res/cascade.bmp
deleted file mode 100644 (file)
index a56622c..0000000
Binary files a/Src/Languages/Italian/res/cascade.bmp and /dev/null differ

diff --git a/Src/Languages/Italian/res/change_pane.bmp b/Src/Languages/Italian/res/change_pane.bmp
deleted file mode 100644 (file)
index 0a2e36a..0000000
Binary files a/Src/Languages/Italian/res/change_pane.bmp and /dev/null differ

diff --git a/Src/Languages/Italian/res/close.bmp b/Src/Languages/Italian/res/close.bmp
deleted file mode 100644 (file)
index 55b5e87..0000000
Binary files a/Src/Languages/Italian/res/close.bmp and /dev/null differ

diff --git a/Src/Languages/Italian/res/copy.bmp b/Src/Languages/Italian/res/copy.bmp
deleted file mode 100644 (file)
index 6565c6f..0000000
Binary files a/Src/Languages/Italian/res/copy.bmp and /dev/null differ

diff --git a/Src/Languages/Italian/res/customize_columns.bmp b/Src/Languages/Italian/res/customize_columns.bmp
deleted file mode 100644 (file)
index 126345a..0000000
Binary files a/Src/Languages/Italian/res/customize_columns.bmp and /dev/null differ

diff --git a/Src/Languages/Italian/res/cut.bmp b/Src/Languages/Italian/res/cut.bmp
deleted file mode 100644 (file)
index 976c5d2..0000000
Binary files a/Src/Languages/Italian/res/cut.bmp and /dev/null differ

diff --git a/Src/Languages/Italian/res/delete.bmp b/Src/Languages/Italian/res/delete.bmp
deleted file mode 100644 (file)
index b70eeb8..0000000
Binary files a/Src/Languages/Italian/res/delete.bmp and /dev/null differ

diff --git a/Src/Languages/Italian/res/equal.bmp b/Src/Languages/Italian/res/equal.bmp
deleted file mode 100644 (file)
index 9761d55..0000000
Binary files a/Src/Languages/Italian/res/equal.bmp and /dev/null differ

diff --git a/Src/Languages/Italian/res/error.bmp b/Src/Languages/Italian/res/error.bmp
deleted file mode 100644 (file)
index f659c1d..0000000
Binary files a/Src/Languages/Italian/res/error.bmp and /dev/null differ

diff --git a/Src/Languages/Italian/res/exit.bmp b/Src/Languages/Italian/res/exit.bmp
deleted file mode 100644 (file)
index 596127a..0000000
Binary files a/Src/Languages/Italian/res/exit.bmp and /dev/null differ

diff --git a/Src/Languages/Italian/res/fileskip.bmp b/Src/Languages/Italian/res/fileskip.bmp
deleted file mode 100644 (file)
index 9e502d9..0000000
Binary files a/Src/Languages/Italian/res/fileskip.bmp and /dev/null differ

diff --git a/Src/Languages/Italian/res/filters.bmp b/Src/Languages/Italian/res/filters.bmp
deleted file mode 100644 (file)
index e7ab693..0000000
Binary files a/Src/Languages/Italian/res/filters.bmp and /dev/null differ

diff --git a/Src/Languages/Italian/res/folder.ico b/Src/Languages/Italian/res/folder.ico
deleted file mode 100644 (file)
index e18bd19..0000000
Binary files a/Src/Languages/Italian/res/folder.ico and /dev/null differ

diff --git a/Src/Languages/Italian/res/folderskip.ico b/Src/Languages/Italian/res/folderskip.ico
deleted file mode 100644 (file)
index 3297496..0000000
Binary files a/Src/Languages/Italian/res/folderskip.ico and /dev/null differ

diff --git a/Src/Languages/Italian/res/folderup.bmp b/Src/Languages/Italian/res/folderup.bmp
deleted file mode 100644 (file)
index 2d15145..0000000
Binary files a/Src/Languages/Italian/res/folderup.bmp and /dev/null differ

diff --git a/Src/Languages/Italian/res/folderup_disable.bmp b/Src/Languages/Italian/res/folderup_disable.bmp
deleted file mode 100644 (file)
index 5829a19..0000000
Binary files a/Src/Languages/Italian/res/folderup_disable.bmp and /dev/null differ

diff --git a/Src/Languages/Italian/res/go_to.bmp b/Src/Languages/Italian/res/go_to.bmp
deleted file mode 100644 (file)
index a6839aa..0000000
Binary files a/Src/Languages/Italian/res/go_to.bmp and /dev/null differ

diff --git a/Src/Languages/Italian/res/hand.cur b/Src/Languages/Italian/res/hand.cur
deleted file mode 100644 (file)
index ed8db8c..0000000
Binary files a/Src/Languages/Italian/res/hand.cur and /dev/null differ

diff --git a/Src/Languages/Italian/res/help_contents.bmp b/Src/Languages/Italian/res/help_contents.bmp
deleted file mode 100644 (file)
index 6662979..0000000
Binary files a/Src/Languages/Italian/res/help_contents.bmp and /dev/null differ

diff --git a/Src/Languages/Italian/res/horizontally.bmp b/Src/Languages/Italian/res/horizontally.bmp
deleted file mode 100644 (file)
index 3c7a732..0000000
Binary files a/Src/Languages/Italian/res/horizontally.bmp and /dev/null differ

diff --git a/Src/Languages/Italian/res/language.bmp b/Src/Languages/Italian/res/language.bmp
deleted file mode 100644 (file)
index 9e92e4d..0000000
Binary files a/Src/Languages/Italian/res/language.bmp and /dev/null differ

diff --git a/Src/Languages/Italian/res/lfile.bmp b/Src/Languages/Italian/res/lfile.bmp
deleted file mode 100755 (executable)
index bb7cf6c..0000000
Binary files a/Src/Languages/Italian/res/lfile.bmp and /dev/null differ

diff --git a/Src/Languages/Italian/res/lfolder.ico b/Src/Languages/Italian/res/lfolder.ico
deleted file mode 100644 (file)
index fc1c797..0000000
Binary files a/Src/Languages/Italian/res/lfolder.ico and /dev/null differ

diff --git a/Src/Languages/Italian/res/mg_cur.cur b/Src/Languages/Italian/res/mg_cur.cur
deleted file mode 100755 (executable)
index 5691efb..0000000
Binary files a/Src/Languages/Italian/res/mg_cur.cur and /dev/null differ

diff --git a/Src/Languages/Italian/res/notequal.bmp b/Src/Languages/Italian/res/notequal.bmp
deleted file mode 100644 (file)
index d747084..0000000
Binary files a/Src/Languages/Italian/res/notequal.bmp and /dev/null differ

diff --git a/Src/Languages/Italian/res/paste.bmp b/Src/Languages/Italian/res/paste.bmp
deleted file mode 100644 (file)
index bcd5227..0000000
Binary files a/Src/Languages/Italian/res/paste.bmp and /dev/null differ

diff --git a/Src/Languages/Italian/res/print.bmp b/Src/Languages/Italian/res/print.bmp
deleted file mode 100644 (file)
index 739ca01..0000000
Binary files a/Src/Languages/Italian/res/print.bmp and /dev/null differ

diff --git a/Src/Languages/Italian/res/replace.bmp b/Src/Languages/Italian/res/replace.bmp
deleted file mode 100644 (file)
index e5586b9..0000000
Binary files a/Src/Languages/Italian/res/replace.bmp and /dev/null differ

diff --git a/Src/Languages/Italian/res/rfile.bmp b/Src/Languages/Italian/res/rfile.bmp
deleted file mode 100755 (executable)
index 1333733..0000000
Binary files a/Src/Languages/Italian/res/rfile.bmp and /dev/null differ

diff --git a/Src/Languages/Italian/res/rfolder.ico b/Src/Languages/Italian/res/rfolder.ico
deleted file mode 100644 (file)
index 444d827..0000000
Binary files a/Src/Languages/Italian/res/rfolder.ico and /dev/null differ

diff --git a/Src/Languages/Italian/res/search.bmp b/Src/Languages/Italian/res/search.bmp
deleted file mode 100644 (file)
index 9d606e5..0000000
Binary files a/Src/Languages/Italian/res/search.bmp and /dev/null differ

diff --git a/Src/Languages/Italian/res/select_all.bmp b/Src/Languages/Italian/res/select_all.bmp
deleted file mode 100644 (file)
index 174e311..0000000
Binary files a/Src/Languages/Italian/res/select_all.bmp and /dev/null differ

diff --git a/Src/Languages/Italian/res/select_font.bmp b/Src/Languages/Italian/res/select_font.bmp
deleted file mode 100644 (file)
index 2609538..0000000
Binary files a/Src/Languages/Italian/res/select_font.bmp and /dev/null differ

diff --git a/Src/Languages/Italian/res/sigma.bmp b/Src/Languages/Italian/res/sigma.bmp
deleted file mode 100644 (file)
index eff4abe..0000000
Binary files a/Src/Languages/Italian/res/sigma.bmp and /dev/null differ

diff --git a/Src/Languages/Italian/res/splash1.bmp b/Src/Languages/Italian/res/splash1.bmp
deleted file mode 100644 (file)
index f041297..0000000
Binary files a/Src/Languages/Italian/res/splash1.bmp and /dev/null differ

diff --git a/Src/Languages/Italian/res/unknown.bmp b/Src/Languages/Italian/res/unknown.bmp
deleted file mode 100644 (file)
index 7f16906..0000000
Binary files a/Src/Languages/Italian/res/unknown.bmp and /dev/null differ

diff --git a/Src/Languages/Italian/res/vertically.bmp b/Src/Languages/Italian/res/vertically.bmp
deleted file mode 100644 (file)
index e57c1b6..0000000
Binary files a/Src/Languages/Italian/res/vertically.bmp and /dev/null differ

diff --git a/Src/Languages/Japanese/MergeJapanese.rc b/Src/Languages/Japanese/MergeJapanese.rc
index 9b910bc..7659a85 100644 (file)
--- a/Src/Languages/Japanese/MergeJapanese.rc
+++ b/Src/Languages/Japanese/MergeJapanese.rc
@@ -67,13 +67,15 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDR_MAINFRAME           ICON                    "res\\Merge.ico"
-IDR_MERGETYPE           ICON                    "res\\MergeDoc.ico"
-IDR_DOC_FOLDERCMP       ICON                    "res\\MergeDir.ico"
-IDI_FOLDER              ICON                    "res\\folder.ico"
-IDI_LFOLDER             ICON                    "res\\lfolder.ico"
-IDI_RFOLDER             ICON                    "res\\rfolder.ico"
-IDI_FOLDERSKIP          ICON                    "res\\folderskip.ico"
+
+// Load shared resources from Src\res
+IDR_MAINFRAME           ICON                    "..\\..\\res\\Merge.ico"
+IDR_MERGETYPE           ICON                    "..\\..\\res\\MergeDoc.ico"
+IDR_DOC_FOLDERCMP       ICON                    "..\\..\\res\\MergeDir.ico"
+IDI_FOLDER              ICON                    "..\\..\\res\\folder.ico"
+IDI_LFOLDER             ICON                    "..\\..\\res\\lfolder.ico"
+IDI_RFOLDER             ICON                    "..\\..\\res\\rfolder.ico"
+IDI_FOLDERSKIP          ICON                    "..\\..\\res\\folderskip.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1487,40 +1489,40 @@ END
 // Bitmap
 //
 
-IDR_MAINFRAME           BITMAP                  "res\\Toolbar.bmp"
-IDB_SPLASH              BITMAP                  "res\\splash1.bmp"
-IDB_EQUAL               BITMAP                  "res\\equal.bmp"
-IDB_NOTEQUAL            BITMAP                  "res\\notequal.bmp"
-IDB_UNKNOWN             BITMAP                  "res\\unknown.bmp"
-IDB_BINARYSAME          BITMAP                  "res\\binary.bmp"
-IDB_LFILE               BITMAP                  "res\\lfile.bmp"
-IDB_RFILE               BITMAP                  "res\\rfile.bmp"
-IDB_BINARYDIFF          BITMAP                  "res\\binarydiff.bmp"
-IDB_FILESKIP            BITMAP                  "res\\fileskip.bmp"
-IDB_EDIT_COPY           BITMAP                  "res\\copy.bmp"
-IDB_EDIT_CUT            BITMAP                  "res\\cut.bmp"
-IDB_EDIT_PASTE          BITMAP                  "res\\paste.bmp"
-IDB_EDIT_SEARCH         BITMAP                  "res\\search.bmp"
-IDB_WINDOW_CASCADE      BITMAP                  "res\\cascade.bmp"
-IDB_WINDOW_HORIZONTAL   BITMAP                  "res\\horizontally.bmp"
-IDB_WINDOW_VERTICAL     BITMAP                  "res\\vertically.bmp"
-IDB_WINDOW_CLOSE        BITMAP                  "res\\close.bmp"
-IDB_WINDOW_CHANGEPANE   BITMAP                  "res\\change_pane.bmp"
-IDB_EDIT_GOTO           BITMAP                  "res\\go_to.bmp"
-IDB_EDIT_REPLACE        BITMAP                  "res\\replace.bmp"
-IDB_VIEW_LANGUAGE       BITMAP                  "res\\language.bmp"
-IDB_VIEW_SELECTFONT     BITMAP                  "res\\select_font.bmp"
-IDB_FILE_EXIT           BITMAP                  "res\\exit.bmp"
-IDB_HELP_CONTENTS       BITMAP                  "res\\help_contents.bmp"
-IDB_ERROR               BITMAP                  "res\\error.bmp"
-IDB_FOLDERUP            BITMAP                  "res\\folderup.bmp"
-IDB_FOLDERUP_DISABLE    BITMAP                  "res\\folderup_disable.bmp"
-IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
-IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
-IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
-IDB_MERGE_DELETE        BITMAP                  "res\\delete.bmp"
-IDB_FILE_PRINT          BITMAP                  "res\\print.bmp"
-IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
+IDR_MAINFRAME           BITMAP                  "..\\..\\res\\Toolbar.bmp"
+IDB_SPLASH              BITMAP                  "..\\..\\res\\splash1.bmp"
+IDB_EQUAL               BITMAP                  "..\\..\\res\\equal.bmp"
+IDB_NOTEQUAL            BITMAP                  "..\\..\\res\\notequal.bmp"
+IDB_UNKNOWN             BITMAP                  "..\\..\\res\\unknown.bmp"
+IDB_BINARYSAME          BITMAP                  "..\\..\\res\\binary.bmp"
+IDB_LFILE               BITMAP                  "..\\..\\res\\lfile.bmp"
+IDB_RFILE               BITMAP                  "..\\..\\res\\rfile.bmp"
+IDB_BINARYDIFF          BITMAP                  "..\\..\\res\\binarydiff.bmp"
+IDB_FILESKIP            BITMAP                  "..\\..\\res\\fileskip.bmp"
+IDB_EDIT_COPY           BITMAP                  "..\\..\\res\\copy.bmp"
+IDB_EDIT_CUT            BITMAP                  "..\\..\\res\\cut.bmp"
+IDB_EDIT_PASTE          BITMAP                  "..\\..\\res\\paste.bmp"
+IDB_EDIT_SEARCH         BITMAP                  "..\\..\\res\\search.bmp"
+IDB_WINDOW_CASCADE      BITMAP                  "..\\..\\res\\cascade.bmp"
+IDB_WINDOW_HORIZONTAL   BITMAP                  "..\\..\\res\\horizontally.bmp"
+IDB_WINDOW_VERTICAL     BITMAP                  "..\\..\\res\\vertically.bmp"
+IDB_WINDOW_CLOSE        BITMAP                  "..\\..\\res\\close.bmp"
+IDB_WINDOW_CHANGEPANE   BITMAP                  "..\\..\\res\\change_pane.bmp"
+IDB_EDIT_GOTO           BITMAP                  "..\\..\\res\\go_to.bmp"
+IDB_EDIT_REPLACE        BITMAP                  "..\\..\\res\\replace.bmp"
+IDB_VIEW_LANGUAGE       BITMAP                  "..\\..\\res\\language.bmp"
+IDB_VIEW_SELECTFONT     BITMAP                  "..\\..\\res\\select_font.bmp"
+IDB_FILE_EXIT           BITMAP                  "..\\..\\res\\exit.bmp"
+IDB_HELP_CONTENTS       BITMAP                  "..\\..\\res\\help_contents.bmp"
+IDB_ERROR               BITMAP                  "..\\..\\res\\error.bmp"
+IDB_FOLDERUP            BITMAP                  "..\\..\\res\\folderup.bmp"
+IDB_FOLDERUP_DISABLE    BITMAP                  "..\\..\\res\\folderup_disable.bmp"
+IDB_EDIT_SELECTALL      BITMAP                  "..\\..\\res\\select_all.bmp"
+IDB_TOOLS_FILTERS       BITMAP                  "..\\..\\res\\filters.bmp"
+IDB_TOOLS_COLUMNS       BITMAP                  "..\\..\\res\\customize_columns.bmp"
+IDB_MERGE_DELETE        BITMAP                  "..\\..\\res\\delete.bmp"
+IDB_FILE_PRINT          BITMAP                  "..\\..\\res\\print.bmp"
+IDB_SIGMA               BITMAP                  "..\\..\\res\\sigma.bmp"
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -1528,8 +1530,8 @@ IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
 // Cursor
 //
 
-IDR_MARGIN_CURSOR       CURSOR                  "res\\mg_cur.cur"
-IDR_MERGEHAND           CURSOR                  "res\\hand.cur"
+IDR_MARGIN_CURSOR       CURSOR                  "..\\..\\res\\mg_cur.cur"
+IDR_MERGEHAND           CURSOR                  "..\\..\\res\\hand.cur"
 
 /////////////////////////////////////////////////////////////////////////////
 //

diff --git a/Src/Languages/Japanese/res/Merge.ico b/Src/Languages/Japanese/res/Merge.ico
deleted file mode 100644 (file)
index 6fd5e56..0000000
Binary files a/Src/Languages/Japanese/res/Merge.ico and /dev/null differ

diff --git a/Src/Languages/Japanese/res/MergeDir.ico b/Src/Languages/Japanese/res/MergeDir.ico
deleted file mode 100644 (file)
index 349c926..0000000
Binary files a/Src/Languages/Japanese/res/MergeDir.ico and /dev/null differ

diff --git a/Src/Languages/Japanese/res/MergeDoc.ico b/Src/Languages/Japanese/res/MergeDoc.ico
deleted file mode 100644 (file)
index b2f417b..0000000
Binary files a/Src/Languages/Japanese/res/MergeDoc.ico and /dev/null differ

diff --git a/Src/Languages/Japanese/res/Toolbar.bmp b/Src/Languages/Japanese/res/Toolbar.bmp
deleted file mode 100644 (file)
index 7935cc8..0000000
Binary files a/Src/Languages/Japanese/res/Toolbar.bmp and /dev/null differ

diff --git a/Src/Languages/Japanese/res/binary.bmp b/Src/Languages/Japanese/res/binary.bmp
deleted file mode 100644 (file)
index 417eb30..0000000
Binary files a/Src/Languages/Japanese/res/binary.bmp and /dev/null differ

diff --git a/Src/Languages/Japanese/res/binarydiff.bmp b/Src/Languages/Japanese/res/binarydiff.bmp
deleted file mode 100644 (file)
index 4e45141..0000000
Binary files a/Src/Languages/Japanese/res/binarydiff.bmp and /dev/null differ

diff --git a/Src/Languages/Japanese/res/cascade.bmp b/Src/Languages/Japanese/res/cascade.bmp
deleted file mode 100644 (file)
index a56622c..0000000
Binary files a/Src/Languages/Japanese/res/cascade.bmp and /dev/null differ

diff --git a/Src/Languages/Japanese/res/change_pane.bmp b/Src/Languages/Japanese/res/change_pane.bmp
deleted file mode 100644 (file)
index 0a2e36a..0000000
Binary files a/Src/Languages/Japanese/res/change_pane.bmp and /dev/null differ

diff --git a/Src/Languages/Japanese/res/close.bmp b/Src/Languages/Japanese/res/close.bmp
deleted file mode 100644 (file)
index 55b5e87..0000000
Binary files a/Src/Languages/Japanese/res/close.bmp and /dev/null differ

diff --git a/Src/Languages/Japanese/res/copy.bmp b/Src/Languages/Japanese/res/copy.bmp
deleted file mode 100644 (file)
index 6565c6f..0000000
Binary files a/Src/Languages/Japanese/res/copy.bmp and /dev/null differ

diff --git a/Src/Languages/Japanese/res/customize_columns.bmp b/Src/Languages/Japanese/res/customize_columns.bmp
deleted file mode 100644 (file)
index 126345a..0000000
Binary files a/Src/Languages/Japanese/res/customize_columns.bmp and /dev/null differ

diff --git a/Src/Languages/Japanese/res/cut.bmp b/Src/Languages/Japanese/res/cut.bmp
deleted file mode 100644 (file)
index 976c5d2..0000000
Binary files a/Src/Languages/Japanese/res/cut.bmp and /dev/null differ

diff --git a/Src/Languages/Japanese/res/delete.bmp b/Src/Languages/Japanese/res/delete.bmp
deleted file mode 100644 (file)
index b70eeb8..0000000
Binary files a/Src/Languages/Japanese/res/delete.bmp and /dev/null differ

diff --git a/Src/Languages/Japanese/res/equal.bmp b/Src/Languages/Japanese/res/equal.bmp
deleted file mode 100644 (file)
index 9761d55..0000000
Binary files a/Src/Languages/Japanese/res/equal.bmp and /dev/null differ

diff --git a/Src/Languages/Japanese/res/error.bmp b/Src/Languages/Japanese/res/error.bmp
deleted file mode 100644 (file)
index f659c1d..0000000
Binary files a/Src/Languages/Japanese/res/error.bmp and /dev/null differ

diff --git a/Src/Languages/Japanese/res/exit.bmp b/Src/Languages/Japanese/res/exit.bmp
deleted file mode 100644 (file)
index 596127a..0000000
Binary files a/Src/Languages/Japanese/res/exit.bmp and /dev/null differ

diff --git a/Src/Languages/Japanese/res/fileskip.bmp b/Src/Languages/Japanese/res/fileskip.bmp
deleted file mode 100644 (file)
index 9e502d9..0000000
Binary files a/Src/Languages/Japanese/res/fileskip.bmp and /dev/null differ

diff --git a/Src/Languages/Japanese/res/filters.bmp b/Src/Languages/Japanese/res/filters.bmp
deleted file mode 100644 (file)
index e7ab693..0000000
Binary files a/Src/Languages/Japanese/res/filters.bmp and /dev/null differ

diff --git a/Src/Languages/Japanese/res/folder.ico b/Src/Languages/Japanese/res/folder.ico
deleted file mode 100644 (file)
index e18bd19..0000000
Binary files a/Src/Languages/Japanese/res/folder.ico and /dev/null differ

diff --git a/Src/Languages/Japanese/res/folderskip.ico b/Src/Languages/Japanese/res/folderskip.ico
deleted file mode 100644 (file)
index 3297496..0000000
Binary files a/Src/Languages/Japanese/res/folderskip.ico and /dev/null differ

diff --git a/Src/Languages/Japanese/res/folderup.bmp b/Src/Languages/Japanese/res/folderup.bmp
deleted file mode 100644 (file)
index 2d15145..0000000
Binary files a/Src/Languages/Japanese/res/folderup.bmp and /dev/null differ

diff --git a/Src/Languages/Japanese/res/folderup_disable.bmp b/Src/Languages/Japanese/res/folderup_disable.bmp
deleted file mode 100644 (file)
index 5829a19..0000000
Binary files a/Src/Languages/Japanese/res/folderup_disable.bmp and /dev/null differ

diff --git a/Src/Languages/Japanese/res/go_to.bmp b/Src/Languages/Japanese/res/go_to.bmp
deleted file mode 100644 (file)
index a6839aa..0000000
Binary files a/Src/Languages/Japanese/res/go_to.bmp and /dev/null differ

diff --git a/Src/Languages/Japanese/res/hand.cur b/Src/Languages/Japanese/res/hand.cur
deleted file mode 100644 (file)
index ed8db8c..0000000
Binary files a/Src/Languages/Japanese/res/hand.cur and /dev/null differ

diff --git a/Src/Languages/Japanese/res/help_contents.bmp b/Src/Languages/Japanese/res/help_contents.bmp
deleted file mode 100644 (file)
index 6662979..0000000
Binary files a/Src/Languages/Japanese/res/help_contents.bmp and /dev/null differ

diff --git a/Src/Languages/Japanese/res/horizontally.bmp b/Src/Languages/Japanese/res/horizontally.bmp
deleted file mode 100644 (file)
index 3c7a732..0000000
Binary files a/Src/Languages/Japanese/res/horizontally.bmp and /dev/null differ

diff --git a/Src/Languages/Japanese/res/language.bmp b/Src/Languages/Japanese/res/language.bmp
deleted file mode 100644 (file)
index 9e92e4d..0000000
Binary files a/Src/Languages/Japanese/res/language.bmp and /dev/null differ

diff --git a/Src/Languages/Japanese/res/lfile.bmp b/Src/Languages/Japanese/res/lfile.bmp
deleted file mode 100644 (file)
index bb7cf6c..0000000
Binary files a/Src/Languages/Japanese/res/lfile.bmp and /dev/null differ

diff --git a/Src/Languages/Japanese/res/lfolder.ico b/Src/Languages/Japanese/res/lfolder.ico
deleted file mode 100644 (file)
index fc1c797..0000000
Binary files a/Src/Languages/Japanese/res/lfolder.ico and /dev/null differ

diff --git a/Src/Languages/Japanese/res/mg_cur.cur b/Src/Languages/Japanese/res/mg_cur.cur
deleted file mode 100644 (file)
index 5691efb..0000000
Binary files a/Src/Languages/Japanese/res/mg_cur.cur and /dev/null differ

diff --git a/Src/Languages/Japanese/res/notequal.bmp b/Src/Languages/Japanese/res/notequal.bmp
deleted file mode 100644 (file)
index d747084..0000000
Binary files a/Src/Languages/Japanese/res/notequal.bmp and /dev/null differ

diff --git a/Src/Languages/Japanese/res/paste.bmp b/Src/Languages/Japanese/res/paste.bmp
deleted file mode 100644 (file)
index bcd5227..0000000
Binary files a/Src/Languages/Japanese/res/paste.bmp and /dev/null differ

diff --git a/Src/Languages/Japanese/res/print.bmp b/Src/Languages/Japanese/res/print.bmp
deleted file mode 100644 (file)
index 739ca01..0000000
Binary files a/Src/Languages/Japanese/res/print.bmp and /dev/null differ

diff --git a/Src/Languages/Japanese/res/replace.bmp b/Src/Languages/Japanese/res/replace.bmp
deleted file mode 100644 (file)
index e5586b9..0000000
Binary files a/Src/Languages/Japanese/res/replace.bmp and /dev/null differ

diff --git a/Src/Languages/Japanese/res/rfile.bmp b/Src/Languages/Japanese/res/rfile.bmp
deleted file mode 100644 (file)
index 1333733..0000000
Binary files a/Src/Languages/Japanese/res/rfile.bmp and /dev/null differ

diff --git a/Src/Languages/Japanese/res/rfolder.ico b/Src/Languages/Japanese/res/rfolder.ico
deleted file mode 100644 (file)
index 444d827..0000000
Binary files a/Src/Languages/Japanese/res/rfolder.ico and /dev/null differ

diff --git a/Src/Languages/Japanese/res/search.bmp b/Src/Languages/Japanese/res/search.bmp
deleted file mode 100644 (file)
index 9d606e5..0000000
Binary files a/Src/Languages/Japanese/res/search.bmp and /dev/null differ

diff --git a/Src/Languages/Japanese/res/select_all.bmp b/Src/Languages/Japanese/res/select_all.bmp
deleted file mode 100644 (file)
index 174e311..0000000
Binary files a/Src/Languages/Japanese/res/select_all.bmp and /dev/null differ

diff --git a/Src/Languages/Japanese/res/select_font.bmp b/Src/Languages/Japanese/res/select_font.bmp
deleted file mode 100644 (file)
index 2609538..0000000
Binary files a/Src/Languages/Japanese/res/select_font.bmp and /dev/null differ

diff --git a/Src/Languages/Japanese/res/sigma.bmp b/Src/Languages/Japanese/res/sigma.bmp
deleted file mode 100644 (file)
index eff4abe..0000000
Binary files a/Src/Languages/Japanese/res/sigma.bmp and /dev/null differ

diff --git a/Src/Languages/Japanese/res/splash1.bmp b/Src/Languages/Japanese/res/splash1.bmp
deleted file mode 100644 (file)
index f041297..0000000
Binary files a/Src/Languages/Japanese/res/splash1.bmp and /dev/null differ

diff --git a/Src/Languages/Japanese/res/unknown.bmp b/Src/Languages/Japanese/res/unknown.bmp
deleted file mode 100644 (file)
index 7f16906..0000000
Binary files a/Src/Languages/Japanese/res/unknown.bmp and /dev/null differ

diff --git a/Src/Languages/Japanese/res/vertically.bmp b/Src/Languages/Japanese/res/vertically.bmp
deleted file mode 100644 (file)
index e57c1b6..0000000
Binary files a/Src/Languages/Japanese/res/vertically.bmp and /dev/null differ

diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc
index 7ac089c..dfb29e1 100644 (file)
--- a/Src/Languages/Korean/MergeKorean.rc
+++ b/Src/Languages/Korean/MergeKorean.rc
@@ -67,13 +67,15 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDR_MAINFRAME           ICON                    "res\\Merge.ico"
-IDR_MERGETYPE           ICON                    "res\\MergeDoc.ico"
-IDR_DOC_FOLDERCMP       ICON                    "res\\MergeDir.ico"
-IDI_FOLDER              ICON                    "res\\folder.ico"
-IDI_LFOLDER             ICON                    "res\\lfolder.ico"
-IDI_RFOLDER             ICON                    "res\\rfolder.ico"
-IDI_FOLDERSKIP          ICON                    "res\\folderskip.ico"
+
+// Load shared resources from Src\res
+IDR_MAINFRAME           ICON                    "..\\..\\res\\Merge.ico"
+IDR_MERGETYPE           ICON                    "..\\..\\res\\MergeDoc.ico"
+IDR_DOC_FOLDERCMP       ICON                    "..\\..\\res\\MergeDir.ico"
+IDI_FOLDER              ICON                    "..\\..\\res\\folder.ico"
+IDI_LFOLDER             ICON                    "..\\..\\res\\lfolder.ico"
+IDI_RFOLDER             ICON                    "..\\..\\res\\rfolder.ico"
+IDI_FOLDERSKIP          ICON                    "..\\..\\res\\folderskip.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1479,40 +1481,40 @@ END
 // Bitmap
 //
 
-IDR_MAINFRAME           BITMAP                  "res\\Toolbar.bmp"
-IDB_SPLASH              BITMAP                  "res\\splash1.bmp"
-IDB_EQUAL               BITMAP                  "res\\equal.bmp"
-IDB_NOTEQUAL            BITMAP                  "res\\notequal.bmp"
-IDB_UNKNOWN             BITMAP                  "res\\unknown.bmp"
-IDB_BINARYSAME          BITMAP                  "res\\binary.bmp"
-IDB_LFILE               BITMAP                  "res\\lfile.bmp"
-IDB_RFILE               BITMAP                  "res\\rfile.bmp"
-IDB_BINARYDIFF          BITMAP                  "res\\binarydiff.bmp"
-IDB_FILESKIP            BITMAP                  "res\\fileskip.bmp"
-IDB_EDIT_COPY           BITMAP                  "res\\copy.bmp"
-IDB_EDIT_CUT            BITMAP                  "res\\cut.bmp"
-IDB_EDIT_PASTE          BITMAP                  "res\\paste.bmp"
-IDB_EDIT_SEARCH         BITMAP                  "res\\search.bmp"
-IDB_WINDOW_CASCADE      BITMAP                  "res\\cascade.bmp"
-IDB_WINDOW_HORIZONTAL   BITMAP                  "res\\horizontally.bmp"
-IDB_WINDOW_VERTICAL     BITMAP                  "res\\vertically.bmp"
-IDB_WINDOW_CLOSE        BITMAP                  "res\\close.bmp"
-IDB_WINDOW_CHANGEPANE   BITMAP                  "res\\change_pane.bmp"
-IDB_EDIT_GOTO           BITMAP                  "res\\go_to.bmp"
-IDB_EDIT_REPLACE        BITMAP                  "res\\replace.bmp"
-IDB_VIEW_LANGUAGE       BITMAP                  "res\\language.bmp"
-IDB_VIEW_SELECTFONT     BITMAP                  "res\\select_font.bmp"
-IDB_FILE_EXIT           BITMAP                  "res\\exit.bmp"
-IDB_HELP_CONTENTS       BITMAP                  "res\\help_contents.bmp"
-IDB_ERROR               BITMAP                  "res\\error.bmp"
-IDB_FOLDERUP            BITMAP                  "res\\folderup.bmp"
-IDB_FOLDERUP_DISABLE    BITMAP                  "res\\folderup_disable.bmp"
-IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
-IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
-IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
-IDB_MERGE_DELETE        BITMAP                  "res\\delete.bmp"
-IDB_FILE_PRINT          BITMAP                  "res\\print.bmp"
-IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
+IDR_MAINFRAME           BITMAP                  "..\\..\\res\\Toolbar.bmp"
+IDB_SPLASH              BITMAP                  "..\\..\\res\\splash1.bmp"
+IDB_EQUAL               BITMAP                  "..\\..\\res\\equal.bmp"
+IDB_NOTEQUAL            BITMAP                  "..\\..\\res\\notequal.bmp"
+IDB_UNKNOWN             BITMAP                  "..\\..\\res\\unknown.bmp"
+IDB_BINARYSAME          BITMAP                  "..\\..\\res\\binary.bmp"
+IDB_LFILE               BITMAP                  "..\\..\\res\\lfile.bmp"
+IDB_RFILE               BITMAP                  "..\\..\\res\\rfile.bmp"
+IDB_BINARYDIFF          BITMAP                  "..\\..\\res\\binarydiff.bmp"
+IDB_FILESKIP            BITMAP                  "..\\..\\res\\fileskip.bmp"
+IDB_EDIT_COPY           BITMAP                  "..\\..\\res\\copy.bmp"
+IDB_EDIT_CUT            BITMAP                  "..\\..\\res\\cut.bmp"
+IDB_EDIT_PASTE          BITMAP                  "..\\..\\res\\paste.bmp"
+IDB_EDIT_SEARCH         BITMAP                  "..\\..\\res\\search.bmp"
+IDB_WINDOW_CASCADE      BITMAP                  "..\\..\\res\\cascade.bmp"
+IDB_WINDOW_HORIZONTAL   BITMAP                  "..\\..\\res\\horizontally.bmp"
+IDB_WINDOW_VERTICAL     BITMAP                  "..\\..\\res\\vertically.bmp"
+IDB_WINDOW_CLOSE        BITMAP                  "..\\..\\res\\close.bmp"
+IDB_WINDOW_CHANGEPANE   BITMAP                  "..\\..\\res\\change_pane.bmp"
+IDB_EDIT_GOTO           BITMAP                  "..\\..\\res\\go_to.bmp"
+IDB_EDIT_REPLACE        BITMAP                  "..\\..\\res\\replace.bmp"
+IDB_VIEW_LANGUAGE       BITMAP                  "..\\..\\res\\language.bmp"
+IDB_VIEW_SELECTFONT     BITMAP                  "..\\..\\res\\select_font.bmp"
+IDB_FILE_EXIT           BITMAP                  "..\\..\\res\\exit.bmp"
+IDB_HELP_CONTENTS       BITMAP                  "..\\..\\res\\help_contents.bmp"
+IDB_ERROR               BITMAP                  "..\\..\\res\\error.bmp"
+IDB_FOLDERUP            BITMAP                  "..\\..\\res\\folderup.bmp"
+IDB_FOLDERUP_DISABLE    BITMAP                  "..\\..\\res\\folderup_disable.bmp"
+IDB_EDIT_SELECTALL      BITMAP                  "..\\..\\res\\select_all.bmp"
+IDB_TOOLS_FILTERS       BITMAP                  "..\\..\\res\\filters.bmp"
+IDB_TOOLS_COLUMNS       BITMAP                  "..\\..\\res\\customize_columns.bmp"
+IDB_MERGE_DELETE        BITMAP                  "..\\..\\res\\delete.bmp"
+IDB_FILE_PRINT          BITMAP                  "..\\..\\res\\print.bmp"
+IDB_SIGMA               BITMAP                  "..\\..\\res\\sigma.bmp"
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -1520,8 +1522,8 @@ IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
 // Cursor
 //
 
-IDR_MARGIN_CURSOR       CURSOR                  "res\\mg_cur.cur"
-IDR_MERGEHAND           CURSOR                  "res\\hand.cur"
+IDR_MARGIN_CURSOR       CURSOR                  "..\\..\\res\\mg_cur.cur"
+IDR_MERGEHAND           CURSOR                  "..\\..\\res\\hand.cur"
 
 /////////////////////////////////////////////////////////////////////////////
 //

diff --git a/Src/Languages/Korean/res/Merge.ico b/Src/Languages/Korean/res/Merge.ico
deleted file mode 100644 (file)
index 6fd5e56..0000000
Binary files a/Src/Languages/Korean/res/Merge.ico and /dev/null differ

diff --git a/Src/Languages/Korean/res/MergeDir.ico b/Src/Languages/Korean/res/MergeDir.ico
deleted file mode 100644 (file)
index 349c926..0000000
Binary files a/Src/Languages/Korean/res/MergeDir.ico and /dev/null differ

diff --git a/Src/Languages/Korean/res/MergeDoc.ico b/Src/Languages/Korean/res/MergeDoc.ico
deleted file mode 100644 (file)
index b2f417b..0000000
Binary files a/Src/Languages/Korean/res/MergeDoc.ico and /dev/null differ

diff --git a/Src/Languages/Korean/res/Toolbar.bmp b/Src/Languages/Korean/res/Toolbar.bmp
deleted file mode 100644 (file)
index 7935cc8..0000000
Binary files a/Src/Languages/Korean/res/Toolbar.bmp and /dev/null differ

diff --git a/Src/Languages/Korean/res/WinMergeSplash.psd b/Src/Languages/Korean/res/WinMergeSplash.psd
deleted file mode 100644 (file)
index fe7df64..0000000
Binary files a/Src/Languages/Korean/res/WinMergeSplash.psd and /dev/null differ

diff --git a/Src/Languages/Korean/res/binary.bmp b/Src/Languages/Korean/res/binary.bmp
deleted file mode 100644 (file)
index 417eb30..0000000
Binary files a/Src/Languages/Korean/res/binary.bmp and /dev/null differ

diff --git a/Src/Languages/Korean/res/binarydiff.bmp b/Src/Languages/Korean/res/binarydiff.bmp
deleted file mode 100644 (file)
index 4e45141..0000000
Binary files a/Src/Languages/Korean/res/binarydiff.bmp and /dev/null differ

diff --git a/Src/Languages/Korean/res/cascade.bmp b/Src/Languages/Korean/res/cascade.bmp
deleted file mode 100644 (file)
index a56622c..0000000
Binary files a/Src/Languages/Korean/res/cascade.bmp and /dev/null differ

diff --git a/Src/Languages/Korean/res/change_pane.bmp b/Src/Languages/Korean/res/change_pane.bmp
deleted file mode 100644 (file)
index 0a2e36a..0000000
Binary files a/Src/Languages/Korean/res/change_pane.bmp and /dev/null differ

diff --git a/Src/Languages/Korean/res/close.bmp b/Src/Languages/Korean/res/close.bmp
deleted file mode 100644 (file)
index 55b5e87..0000000
Binary files a/Src/Languages/Korean/res/close.bmp and /dev/null differ

diff --git a/Src/Languages/Korean/res/copy.bmp b/Src/Languages/Korean/res/copy.bmp
deleted file mode 100644 (file)
index 6565c6f..0000000
Binary files a/Src/Languages/Korean/res/copy.bmp and /dev/null differ

diff --git a/Src/Languages/Korean/res/customize_columns.bmp b/Src/Languages/Korean/res/customize_columns.bmp
deleted file mode 100644 (file)
index 126345a..0000000
Binary files a/Src/Languages/Korean/res/customize_columns.bmp and /dev/null differ

diff --git a/Src/Languages/Korean/res/cut.bmp b/Src/Languages/Korean/res/cut.bmp
deleted file mode 100644 (file)
index 976c5d2..0000000
Binary files a/Src/Languages/Korean/res/cut.bmp and /dev/null differ

diff --git a/Src/Languages/Korean/res/delete.bmp b/Src/Languages/Korean/res/delete.bmp
deleted file mode 100644 (file)
index b70eeb8..0000000
Binary files a/Src/Languages/Korean/res/delete.bmp and /dev/null differ

diff --git a/Src/Languages/Korean/res/equal.bmp b/Src/Languages/Korean/res/equal.bmp
deleted file mode 100644 (file)
index 9761d55..0000000
Binary files a/Src/Languages/Korean/res/equal.bmp and /dev/null differ

diff --git a/Src/Languages/Korean/res/error.bmp b/Src/Languages/Korean/res/error.bmp
deleted file mode 100644 (file)
index f659c1d..0000000
Binary files a/Src/Languages/Korean/res/error.bmp and /dev/null differ

diff --git a/Src/Languages/Korean/res/exit.bmp b/Src/Languages/Korean/res/exit.bmp
deleted file mode 100644 (file)
index 596127a..0000000
Binary files a/Src/Languages/Korean/res/exit.bmp and /dev/null differ

diff --git a/Src/Languages/Korean/res/fileskip.bmp b/Src/Languages/Korean/res/fileskip.bmp
deleted file mode 100644 (file)
index 9e502d9..0000000
Binary files a/Src/Languages/Korean/res/fileskip.bmp and /dev/null differ

diff --git a/Src/Languages/Korean/res/filters.bmp b/Src/Languages/Korean/res/filters.bmp
deleted file mode 100644 (file)
index e7ab693..0000000
Binary files a/Src/Languages/Korean/res/filters.bmp and /dev/null differ

diff --git a/Src/Languages/Korean/res/folder.ico b/Src/Languages/Korean/res/folder.ico
deleted file mode 100644 (file)
index e18bd19..0000000
Binary files a/Src/Languages/Korean/res/folder.ico and /dev/null differ

diff --git a/Src/Languages/Korean/res/folderskip.ico b/Src/Languages/Korean/res/folderskip.ico
deleted file mode 100644 (file)
index 3297496..0000000
Binary files a/Src/Languages/Korean/res/folderskip.ico and /dev/null differ

diff --git a/Src/Languages/Korean/res/folderup.bmp b/Src/Languages/Korean/res/folderup.bmp
deleted file mode 100644 (file)
index 2d15145..0000000
Binary files a/Src/Languages/Korean/res/folderup.bmp and /dev/null differ

diff --git a/Src/Languages/Korean/res/folderup_disable.bmp b/Src/Languages/Korean/res/folderup_disable.bmp
deleted file mode 100644 (file)
index 5829a19..0000000
Binary files a/Src/Languages/Korean/res/folderup_disable.bmp and /dev/null differ

diff --git a/Src/Languages/Korean/res/go_to.bmp b/Src/Languages/Korean/res/go_to.bmp
deleted file mode 100644 (file)
index a6839aa..0000000
Binary files a/Src/Languages/Korean/res/go_to.bmp and /dev/null differ

diff --git a/Src/Languages/Korean/res/hand.cur b/Src/Languages/Korean/res/hand.cur
deleted file mode 100644 (file)
index ed8db8c..0000000
Binary files a/Src/Languages/Korean/res/hand.cur and /dev/null differ

diff --git a/Src/Languages/Korean/res/help_contents.bmp b/Src/Languages/Korean/res/help_contents.bmp
deleted file mode 100644 (file)
index 6662979..0000000
Binary files a/Src/Languages/Korean/res/help_contents.bmp and /dev/null differ

diff --git a/Src/Languages/Korean/res/horizontally.bmp b/Src/Languages/Korean/res/horizontally.bmp
deleted file mode 100644 (file)
index 3c7a732..0000000
Binary files a/Src/Languages/Korean/res/horizontally.bmp and /dev/null differ

diff --git a/Src/Languages/Korean/res/language.bmp b/Src/Languages/Korean/res/language.bmp
deleted file mode 100644 (file)
index 9e92e4d..0000000
Binary files a/Src/Languages/Korean/res/language.bmp and /dev/null differ

diff --git a/Src/Languages/Korean/res/lfile.bmp b/Src/Languages/Korean/res/lfile.bmp
deleted file mode 100644 (file)
index bb7cf6c..0000000
Binary files a/Src/Languages/Korean/res/lfile.bmp and /dev/null differ

diff --git a/Src/Languages/Korean/res/lfolder.ico b/Src/Languages/Korean/res/lfolder.ico
deleted file mode 100644 (file)
index fc1c797..0000000
Binary files a/Src/Languages/Korean/res/lfolder.ico and /dev/null differ

diff --git a/Src/Languages/Korean/res/mg_cur.cur b/Src/Languages/Korean/res/mg_cur.cur
deleted file mode 100644 (file)
index 5691efb..0000000
Binary files a/Src/Languages/Korean/res/mg_cur.cur and /dev/null differ

diff --git a/Src/Languages/Korean/res/notequal.bmp b/Src/Languages/Korean/res/notequal.bmp
deleted file mode 100644 (file)
index d747084..0000000
Binary files a/Src/Languages/Korean/res/notequal.bmp and /dev/null differ

diff --git a/Src/Languages/Korean/res/paste.bmp b/Src/Languages/Korean/res/paste.bmp
deleted file mode 100644 (file)
index bcd5227..0000000
Binary files a/Src/Languages/Korean/res/paste.bmp and /dev/null differ

diff --git a/Src/Languages/Korean/res/print.bmp b/Src/Languages/Korean/res/print.bmp
deleted file mode 100644 (file)
index 739ca01..0000000
Binary files a/Src/Languages/Korean/res/print.bmp and /dev/null differ

diff --git a/Src/Languages/Korean/res/replace.bmp b/Src/Languages/Korean/res/replace.bmp
deleted file mode 100644 (file)
index e5586b9..0000000
Binary files a/Src/Languages/Korean/res/replace.bmp and /dev/null differ

diff --git a/Src/Languages/Korean/res/rfile.bmp b/Src/Languages/Korean/res/rfile.bmp
deleted file mode 100644 (file)
index 1333733..0000000
Binary files a/Src/Languages/Korean/res/rfile.bmp and /dev/null differ

diff --git a/Src/Languages/Korean/res/rfolder.ico b/Src/Languages/Korean/res/rfolder.ico
deleted file mode 100644 (file)
index 444d827..0000000
Binary files a/Src/Languages/Korean/res/rfolder.ico and /dev/null differ

diff --git a/Src/Languages/Korean/res/search.bmp b/Src/Languages/Korean/res/search.bmp
deleted file mode 100644 (file)
index 9d606e5..0000000
Binary files a/Src/Languages/Korean/res/search.bmp and /dev/null differ

diff --git a/Src/Languages/Korean/res/select_all.bmp b/Src/Languages/Korean/res/select_all.bmp
deleted file mode 100644 (file)
index 174e311..0000000
Binary files a/Src/Languages/Korean/res/select_all.bmp and /dev/null differ

diff --git a/Src/Languages/Korean/res/select_font.bmp b/Src/Languages/Korean/res/select_font.bmp
deleted file mode 100644 (file)
index 2609538..0000000
Binary files a/Src/Languages/Korean/res/select_font.bmp and /dev/null differ

diff --git a/Src/Languages/Korean/res/sigma.bmp b/Src/Languages/Korean/res/sigma.bmp
deleted file mode 100644 (file)
index eff4abe..0000000
Binary files a/Src/Languages/Korean/res/sigma.bmp and /dev/null differ

diff --git a/Src/Languages/Korean/res/splash1.bmp b/Src/Languages/Korean/res/splash1.bmp
deleted file mode 100644 (file)
index f041297..0000000
Binary files a/Src/Languages/Korean/res/splash1.bmp and /dev/null differ

diff --git a/Src/Languages/Korean/res/unknown.bmp b/Src/Languages/Korean/res/unknown.bmp
deleted file mode 100644 (file)
index 7f16906..0000000
Binary files a/Src/Languages/Korean/res/unknown.bmp and /dev/null differ

diff --git a/Src/Languages/Korean/res/vertically.bmp b/Src/Languages/Korean/res/vertically.bmp
deleted file mode 100644 (file)
index e57c1b6..0000000
Binary files a/Src/Languages/Korean/res/vertically.bmp and /dev/null differ

diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc
index 2b9d7d5..04f8be5 100644 (file)
--- a/Src/Languages/Norwegian/MergeNorwegian.rc
+++ b/Src/Languages/Norwegian/MergeNorwegian.rc
@@ -67,13 +67,15 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDR_MAINFRAME           ICON                    "res\\Merge.ico"
-IDR_MERGETYPE           ICON                    "res\\MergeDoc.ico"
-IDR_DOC_FOLDERCMP       ICON                    "res\\MergeDir.ico"
-IDI_FOLDER              ICON                    "res\\folder.ico"
-IDI_LFOLDER             ICON                    "res\\lfolder.ico"
-IDI_RFOLDER             ICON                    "res\\rfolder.ico"
-IDI_FOLDERSKIP          ICON                    "res\\folderskip.ico"
+
+// Load shared resources from Src\res
+IDR_MAINFRAME           ICON                    "..\\..\\res\\Merge.ico"
+IDR_MERGETYPE           ICON                    "..\\..\\res\\MergeDoc.ico"
+IDR_DOC_FOLDERCMP       ICON                    "..\\..\\res\\MergeDir.ico"
+IDI_FOLDER              ICON                    "..\\..\\res\\folder.ico"
+IDI_LFOLDER             ICON                    "..\\..\\res\\lfolder.ico"
+IDI_RFOLDER             ICON                    "..\\..\\res\\rfolder.ico"
+IDI_FOLDERSKIP          ICON                    "..\\..\\res\\folderskip.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1598,40 +1600,40 @@ END
 // Bitmap
 //
 
-IDR_MAINFRAME           BITMAP                  "res\\Toolbar.bmp"
-IDB_SPLASH              BITMAP                  "res\\splash1.bmp"
-IDB_EQUAL               BITMAP                  "res\\equal.bmp"
-IDB_NOTEQUAL            BITMAP                  "res\\notequal.bmp"
-IDB_UNKNOWN             BITMAP                  "res\\unknown.bmp"
-IDB_BINARYSAME          BITMAP                  "res\\binary.bmp"
-IDB_LFILE               BITMAP                  "res\\lfile.bmp"
-IDB_RFILE               BITMAP                  "res\\rfile.bmp"
-IDB_BINARYDIFF          BITMAP                  "res\\binarydiff.bmp"
-IDB_FILESKIP            BITMAP                  "res\\fileskip.bmp"
-IDB_EDIT_COPY           BITMAP                  "res\\copy.bmp"
-IDB_EDIT_CUT            BITMAP                  "res\\cut.bmp"
-IDB_EDIT_PASTE          BITMAP                  "res\\paste.bmp"
-IDB_EDIT_SEARCH         BITMAP                  "res\\search.bmp"
-IDB_WINDOW_CASCADE      BITMAP                  "res\\cascade.bmp"
-IDB_WINDOW_HORIZONTAL   BITMAP                  "res\\horizontally.bmp"
-IDB_WINDOW_VERTICAL     BITMAP                  "res\\vertically.bmp"
-IDB_WINDOW_CLOSE        BITMAP                  "res\\close.bmp"
-IDB_WINDOW_CHANGEPANE   BITMAP                  "res\\change_pane.bmp"
-IDB_EDIT_GOTO           BITMAP                  "res\\go_to.bmp"
-IDB_EDIT_REPLACE        BITMAP                  "res\\replace.bmp"
-IDB_VIEW_LANGUAGE       BITMAP                  "res\\language.bmp"
-IDB_VIEW_SELECTFONT     BITMAP                  "res\\select_font.bmp"
-IDB_FILE_EXIT           BITMAP                  "res\\exit.bmp"
-IDB_HELP_CONTENTS       BITMAP                  "res\\help_contents.bmp"
-IDB_ERROR               BITMAP                  "res\\error.bmp"
-IDB_FOLDERUP            BITMAP                  "res\\folderup.bmp"
-IDB_FOLDERUP_DISABLE    BITMAP                  "res\\folderup_disable.bmp"
-IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
-IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
-IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
-IDB_MERGE_DELETE        BITMAP                  "res\\delete.bmp"
-IDB_FILE_PRINT          BITMAP                  "res\\print.bmp"
-IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
+IDR_MAINFRAME           BITMAP                  "..\\..\\res\\Toolbar.bmp"
+IDB_SPLASH              BITMAP                  "..\\..\\res\\splash1.bmp"
+IDB_EQUAL               BITMAP                  "..\\..\\res\\equal.bmp"
+IDB_NOTEQUAL            BITMAP                  "..\\..\\res\\notequal.bmp"
+IDB_UNKNOWN             BITMAP                  "..\\..\\res\\unknown.bmp"
+IDB_BINARYSAME          BITMAP                  "..\\..\\res\\binary.bmp"
+IDB_LFILE               BITMAP                  "..\\..\\res\\lfile.bmp"
+IDB_RFILE               BITMAP                  "..\\..\\res\\rfile.bmp"
+IDB_BINARYDIFF          BITMAP                  "..\\..\\res\\binarydiff.bmp"
+IDB_FILESKIP            BITMAP                  "..\\..\\res\\fileskip.bmp"
+IDB_EDIT_COPY           BITMAP                  "..\\..\\res\\copy.bmp"
+IDB_EDIT_CUT            BITMAP                  "..\\..\\res\\cut.bmp"
+IDB_EDIT_PASTE          BITMAP                  "..\\..\\res\\paste.bmp"
+IDB_EDIT_SEARCH         BITMAP                  "..\\..\\res\\search.bmp"
+IDB_WINDOW_CASCADE      BITMAP                  "..\\..\\res\\cascade.bmp"
+IDB_WINDOW_HORIZONTAL   BITMAP                  "..\\..\\res\\horizontally.bmp"
+IDB_WINDOW_VERTICAL     BITMAP                  "..\\..\\res\\vertically.bmp"
+IDB_WINDOW_CLOSE        BITMAP                  "..\\..\\res\\close.bmp"
+IDB_WINDOW_CHANGEPANE   BITMAP                  "..\\..\\res\\change_pane.bmp"
+IDB_EDIT_GOTO           BITMAP                  "..\\..\\res\\go_to.bmp"
+IDB_EDIT_REPLACE        BITMAP                  "..\\..\\res\\replace.bmp"
+IDB_VIEW_LANGUAGE       BITMAP                  "..\\..\\res\\language.bmp"
+IDB_VIEW_SELECTFONT     BITMAP                  "..\\..\\res\\select_font.bmp"
+IDB_FILE_EXIT           BITMAP                  "..\\..\\res\\exit.bmp"
+IDB_HELP_CONTENTS       BITMAP                  "..\\..\\res\\help_contents.bmp"
+IDB_ERROR               BITMAP                  "..\\..\\res\\error.bmp"
+IDB_FOLDERUP            BITMAP                  "..\\..\\res\\folderup.bmp"
+IDB_FOLDERUP_DISABLE    BITMAP                  "..\\..\\res\\folderup_disable.bmp"
+IDB_EDIT_SELECTALL      BITMAP                  "..\\..\\res\\select_all.bmp"
+IDB_TOOLS_FILTERS       BITMAP                  "..\\..\\res\\filters.bmp"
+IDB_TOOLS_COLUMNS       BITMAP                  "..\\..\\res\\customize_columns.bmp"
+IDB_MERGE_DELETE        BITMAP                  "..\\..\\res\\delete.bmp"
+IDB_FILE_PRINT          BITMAP                  "..\\..\\res\\print.bmp"
+IDB_SIGMA               BITMAP                  "..\\..\\res\\sigma.bmp"
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -1639,8 +1641,8 @@ IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
 // Cursor
 //
 
-IDR_MARGIN_CURSOR       CURSOR                  "res\\mg_cur.cur"
-IDR_MERGEHAND           CURSOR                  "res\\hand.cur"
+IDR_MARGIN_CURSOR       CURSOR                  "..\\..\\res\\mg_cur.cur"
+IDR_MERGEHAND           CURSOR                  "..\\..\\res\\hand.cur"
 
 /////////////////////////////////////////////////////////////////////////////
 //

diff --git a/Src/Languages/Norwegian/res/Merge.ico b/Src/Languages/Norwegian/res/Merge.ico
deleted file mode 100644 (file)
index 6fd5e56..0000000
Binary files a/Src/Languages/Norwegian/res/Merge.ico and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/MergeDir.ico b/Src/Languages/Norwegian/res/MergeDir.ico
deleted file mode 100644 (file)
index 349c926..0000000
Binary files a/Src/Languages/Norwegian/res/MergeDir.ico and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/MergeDoc.ico b/Src/Languages/Norwegian/res/MergeDoc.ico
deleted file mode 100644 (file)
index b2f417b..0000000
Binary files a/Src/Languages/Norwegian/res/MergeDoc.ico and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/Toolbar.bmp b/Src/Languages/Norwegian/res/Toolbar.bmp
deleted file mode 100644 (file)
index 7935cc8..0000000
Binary files a/Src/Languages/Norwegian/res/Toolbar.bmp and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/WinMergeSplash.psd b/Src/Languages/Norwegian/res/WinMergeSplash.psd
deleted file mode 100644 (file)
index fe7df64..0000000
Binary files a/Src/Languages/Norwegian/res/WinMergeSplash.psd and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/binary.bmp b/Src/Languages/Norwegian/res/binary.bmp
deleted file mode 100644 (file)
index 417eb30..0000000
Binary files a/Src/Languages/Norwegian/res/binary.bmp and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/binarydiff.bmp b/Src/Languages/Norwegian/res/binarydiff.bmp
deleted file mode 100644 (file)
index 4e45141..0000000
Binary files a/Src/Languages/Norwegian/res/binarydiff.bmp and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/cascade.bmp b/Src/Languages/Norwegian/res/cascade.bmp
deleted file mode 100644 (file)
index a56622c..0000000
Binary files a/Src/Languages/Norwegian/res/cascade.bmp and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/change_pane.bmp b/Src/Languages/Norwegian/res/change_pane.bmp
deleted file mode 100644 (file)
index 0a2e36a..0000000
Binary files a/Src/Languages/Norwegian/res/change_pane.bmp and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/close.bmp b/Src/Languages/Norwegian/res/close.bmp
deleted file mode 100644 (file)
index 55b5e87..0000000
Binary files a/Src/Languages/Norwegian/res/close.bmp and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/copy.bmp b/Src/Languages/Norwegian/res/copy.bmp
deleted file mode 100644 (file)
index 6565c6f..0000000
Binary files a/Src/Languages/Norwegian/res/copy.bmp and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/customize_columns.bmp b/Src/Languages/Norwegian/res/customize_columns.bmp
deleted file mode 100644 (file)
index 126345a..0000000
Binary files a/Src/Languages/Norwegian/res/customize_columns.bmp and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/cut.bmp b/Src/Languages/Norwegian/res/cut.bmp
deleted file mode 100644 (file)
index 976c5d2..0000000
Binary files a/Src/Languages/Norwegian/res/cut.bmp and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/delete.bmp b/Src/Languages/Norwegian/res/delete.bmp
deleted file mode 100644 (file)
index b70eeb8..0000000
Binary files a/Src/Languages/Norwegian/res/delete.bmp and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/equal.bmp b/Src/Languages/Norwegian/res/equal.bmp
deleted file mode 100644 (file)
index 9761d55..0000000
Binary files a/Src/Languages/Norwegian/res/equal.bmp and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/error.bmp b/Src/Languages/Norwegian/res/error.bmp
deleted file mode 100644 (file)
index f659c1d..0000000
Binary files a/Src/Languages/Norwegian/res/error.bmp and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/exit.bmp b/Src/Languages/Norwegian/res/exit.bmp
deleted file mode 100644 (file)
index 596127a..0000000
Binary files a/Src/Languages/Norwegian/res/exit.bmp and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/fileskip.bmp b/Src/Languages/Norwegian/res/fileskip.bmp
deleted file mode 100644 (file)
index 9e502d9..0000000
Binary files a/Src/Languages/Norwegian/res/fileskip.bmp and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/filters.bmp b/Src/Languages/Norwegian/res/filters.bmp
deleted file mode 100644 (file)
index e7ab693..0000000
Binary files a/Src/Languages/Norwegian/res/filters.bmp and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/folder.ico b/Src/Languages/Norwegian/res/folder.ico
deleted file mode 100644 (file)
index e18bd19..0000000
Binary files a/Src/Languages/Norwegian/res/folder.ico and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/folderskip.ico b/Src/Languages/Norwegian/res/folderskip.ico
deleted file mode 100644 (file)
index 3297496..0000000
Binary files a/Src/Languages/Norwegian/res/folderskip.ico and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/folderup.bmp b/Src/Languages/Norwegian/res/folderup.bmp
deleted file mode 100644 (file)
index 2d15145..0000000
Binary files a/Src/Languages/Norwegian/res/folderup.bmp and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/folderup_disable.bmp b/Src/Languages/Norwegian/res/folderup_disable.bmp
deleted file mode 100644 (file)
index 5829a19..0000000
Binary files a/Src/Languages/Norwegian/res/folderup_disable.bmp and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/go_to.bmp b/Src/Languages/Norwegian/res/go_to.bmp
deleted file mode 100644 (file)
index a6839aa..0000000
Binary files a/Src/Languages/Norwegian/res/go_to.bmp and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/hand.cur b/Src/Languages/Norwegian/res/hand.cur
deleted file mode 100644 (file)
index ed8db8c..0000000
Binary files a/Src/Languages/Norwegian/res/hand.cur and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/help_contents.bmp b/Src/Languages/Norwegian/res/help_contents.bmp
deleted file mode 100644 (file)
index 6662979..0000000
Binary files a/Src/Languages/Norwegian/res/help_contents.bmp and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/horizontally.bmp b/Src/Languages/Norwegian/res/horizontally.bmp
deleted file mode 100644 (file)
index 3c7a732..0000000
Binary files a/Src/Languages/Norwegian/res/horizontally.bmp and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/language.bmp b/Src/Languages/Norwegian/res/language.bmp
deleted file mode 100644 (file)
index 9e92e4d..0000000
Binary files a/Src/Languages/Norwegian/res/language.bmp and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/lfile.bmp b/Src/Languages/Norwegian/res/lfile.bmp
deleted file mode 100644 (file)
index bb7cf6c..0000000
Binary files a/Src/Languages/Norwegian/res/lfile.bmp and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/lfolder.ico b/Src/Languages/Norwegian/res/lfolder.ico
deleted file mode 100644 (file)
index fc1c797..0000000
Binary files a/Src/Languages/Norwegian/res/lfolder.ico and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/mg_cur.cur b/Src/Languages/Norwegian/res/mg_cur.cur
deleted file mode 100644 (file)
index 5691efb..0000000
Binary files a/Src/Languages/Norwegian/res/mg_cur.cur and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/notequal.bmp b/Src/Languages/Norwegian/res/notequal.bmp
deleted file mode 100644 (file)
index d747084..0000000
Binary files a/Src/Languages/Norwegian/res/notequal.bmp and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/paste.bmp b/Src/Languages/Norwegian/res/paste.bmp
deleted file mode 100644 (file)
index bcd5227..0000000
Binary files a/Src/Languages/Norwegian/res/paste.bmp and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/print.bmp b/Src/Languages/Norwegian/res/print.bmp
deleted file mode 100644 (file)
index 739ca01..0000000
Binary files a/Src/Languages/Norwegian/res/print.bmp and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/replace.bmp b/Src/Languages/Norwegian/res/replace.bmp
deleted file mode 100644 (file)
index e5586b9..0000000
Binary files a/Src/Languages/Norwegian/res/replace.bmp and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/rfile.bmp b/Src/Languages/Norwegian/res/rfile.bmp
deleted file mode 100644 (file)
index 1333733..0000000
Binary files a/Src/Languages/Norwegian/res/rfile.bmp and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/rfolder.ico b/Src/Languages/Norwegian/res/rfolder.ico
deleted file mode 100644 (file)
index 444d827..0000000
Binary files a/Src/Languages/Norwegian/res/rfolder.ico and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/search.bmp b/Src/Languages/Norwegian/res/search.bmp
deleted file mode 100644 (file)
index 9d606e5..0000000
Binary files a/Src/Languages/Norwegian/res/search.bmp and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/select_all.bmp b/Src/Languages/Norwegian/res/select_all.bmp
deleted file mode 100644 (file)
index 174e311..0000000
Binary files a/Src/Languages/Norwegian/res/select_all.bmp and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/select_font.bmp b/Src/Languages/Norwegian/res/select_font.bmp
deleted file mode 100644 (file)
index 2609538..0000000
Binary files a/Src/Languages/Norwegian/res/select_font.bmp and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/sigma.bmp b/Src/Languages/Norwegian/res/sigma.bmp
deleted file mode 100644 (file)
index eff4abe..0000000
Binary files a/Src/Languages/Norwegian/res/sigma.bmp and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/splash1.bmp b/Src/Languages/Norwegian/res/splash1.bmp
deleted file mode 100644 (file)
index f041297..0000000
Binary files a/Src/Languages/Norwegian/res/splash1.bmp and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/unknown.bmp b/Src/Languages/Norwegian/res/unknown.bmp
deleted file mode 100644 (file)
index 7f16906..0000000
Binary files a/Src/Languages/Norwegian/res/unknown.bmp and /dev/null differ

diff --git a/Src/Languages/Norwegian/res/vertically.bmp b/Src/Languages/Norwegian/res/vertically.bmp
deleted file mode 100644 (file)
index e57c1b6..0000000
Binary files a/Src/Languages/Norwegian/res/vertically.bmp and /dev/null differ

diff --git a/Src/Languages/Polish/MergePolish.rc b/Src/Languages/Polish/MergePolish.rc
index f798611..45c8ec4 100644 (file)
--- a/Src/Languages/Polish/MergePolish.rc
+++ b/Src/Languages/Polish/MergePolish.rc
@@ -67,13 +67,15 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDR_MAINFRAME           ICON                    "res\\Merge.ico"
-IDR_MERGETYPE           ICON                    "res\\MergeDoc.ico"
-IDR_DOC_FOLDERCMP       ICON                    "res\\MergeDir.ico"
-IDI_FOLDER              ICON                    "res\\folder.ico"
-IDI_LFOLDER             ICON                    "res\\lfolder.ico"
-IDI_RFOLDER             ICON                    "res\\rfolder.ico"
-IDI_FOLDERSKIP          ICON                    "res\\folderskip.ico"
+
+// Load shared resources from Src\res
+IDR_MAINFRAME           ICON                    "..\\..\\res\\Merge.ico"
+IDR_MERGETYPE           ICON                    "..\\..\\res\\MergeDoc.ico"
+IDR_DOC_FOLDERCMP       ICON                    "..\\..\\res\\MergeDir.ico"
+IDI_FOLDER              ICON                    "..\\..\\res\\folder.ico"
+IDI_LFOLDER             ICON                    "..\\..\\res\\lfolder.ico"
+IDI_RFOLDER             ICON                    "..\\..\\res\\rfolder.ico"
+IDI_FOLDERSKIP          ICON                    "..\\..\\res\\folderskip.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1599,40 +1601,40 @@ END
 // Bitmap
 //
 
-IDR_MAINFRAME           BITMAP                  "res\\Toolbar.bmp"
-IDB_SPLASH              BITMAP                  "res\\splash1.bmp"
-IDB_EQUAL               BITMAP                  "res\\equal.bmp"
-IDB_NOTEQUAL            BITMAP                  "res\\notequal.bmp"
-IDB_UNKNOWN             BITMAP                  "res\\unknown.bmp"
-IDB_BINARYSAME          BITMAP                  "res\\binary.bmp"
-IDB_LFILE               BITMAP                  "res\\lfile.bmp"
-IDB_RFILE               BITMAP                  "res\\rfile.bmp"
-IDB_BINARYDIFF          BITMAP                  "res\\binarydiff.bmp"
-IDB_FILESKIP            BITMAP                  "res\\fileskip.bmp"
-IDB_EDIT_COPY           BITMAP                  "res\\copy.bmp"
-IDB_EDIT_CUT            BITMAP                  "res\\cut.bmp"
-IDB_EDIT_PASTE          BITMAP                  "res\\paste.bmp"
-IDB_EDIT_SEARCH         BITMAP                  "res\\search.bmp"
-IDB_WINDOW_CASCADE      BITMAP                  "res\\cascade.bmp"
-IDB_WINDOW_HORIZONTAL   BITMAP                  "res\\horizontally.bmp"
-IDB_WINDOW_VERTICAL     BITMAP                  "res\\vertically.bmp"
-IDB_WINDOW_CLOSE        BITMAP                  "res\\close.bmp"
-IDB_WINDOW_CHANGEPANE   BITMAP                  "res\\change_pane.bmp"
-IDB_EDIT_GOTO           BITMAP                  "res\\go_to.bmp"
-IDB_EDIT_REPLACE        BITMAP                  "res\\replace.bmp"
-IDB_VIEW_LANGUAGE       BITMAP                  "res\\language.bmp"
-IDB_VIEW_SELECTFONT     BITMAP                  "res\\select_font.bmp"
-IDB_FILE_EXIT           BITMAP                  "res\\exit.bmp"
-IDB_HELP_CONTENTS       BITMAP                  "res\\help_contents.bmp"
-IDB_ERROR               BITMAP                  "res\\error.bmp"
-IDB_FOLDERUP            BITMAP                  "res\\folderup.bmp"
-IDB_FOLDERUP_DISABLE    BITMAP                  "res\\folderup_disable.bmp"
-IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
-IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
-IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
-IDB_MERGE_DELETE        BITMAP                  "res\\delete.bmp"
-IDB_FILE_PRINT          BITMAP                  "res\\print.bmp"
-IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
+IDR_MAINFRAME           BITMAP                  "..\\..\\res\\Toolbar.bmp"
+IDB_SPLASH              BITMAP                  "..\\..\\res\\splash1.bmp"
+IDB_EQUAL               BITMAP                  "..\\..\\res\\equal.bmp"
+IDB_NOTEQUAL            BITMAP                  "..\\..\\res\\notequal.bmp"
+IDB_UNKNOWN             BITMAP                  "..\\..\\res\\unknown.bmp"
+IDB_BINARYSAME          BITMAP                  "..\\..\\res\\binary.bmp"
+IDB_LFILE               BITMAP                  "..\\..\\res\\lfile.bmp"
+IDB_RFILE               BITMAP                  "..\\..\\res\\rfile.bmp"
+IDB_BINARYDIFF          BITMAP                  "..\\..\\res\\binarydiff.bmp"
+IDB_FILESKIP            BITMAP                  "..\\..\\res\\fileskip.bmp"
+IDB_EDIT_COPY           BITMAP                  "..\\..\\res\\copy.bmp"
+IDB_EDIT_CUT            BITMAP                  "..\\..\\res\\cut.bmp"
+IDB_EDIT_PASTE          BITMAP                  "..\\..\\res\\paste.bmp"
+IDB_EDIT_SEARCH         BITMAP                  "..\\..\\res\\search.bmp"
+IDB_WINDOW_CASCADE      BITMAP                  "..\\..\\res\\cascade.bmp"
+IDB_WINDOW_HORIZONTAL   BITMAP                  "..\\..\\res\\horizontally.bmp"
+IDB_WINDOW_VERTICAL     BITMAP                  "..\\..\\res\\vertically.bmp"
+IDB_WINDOW_CLOSE        BITMAP                  "..\\..\\res\\close.bmp"
+IDB_WINDOW_CHANGEPANE   BITMAP                  "..\\..\\res\\change_pane.bmp"
+IDB_EDIT_GOTO           BITMAP                  "..\\..\\res\\go_to.bmp"
+IDB_EDIT_REPLACE        BITMAP                  "..\\..\\res\\replace.bmp"
+IDB_VIEW_LANGUAGE       BITMAP                  "..\\..\\res\\language.bmp"
+IDB_VIEW_SELECTFONT     BITMAP                  "..\\..\\res\\select_font.bmp"
+IDB_FILE_EXIT           BITMAP                  "..\\..\\res\\exit.bmp"
+IDB_HELP_CONTENTS       BITMAP                  "..\\..\\res\\help_contents.bmp"
+IDB_ERROR               BITMAP                  "..\\..\\res\\error.bmp"
+IDB_FOLDERUP            BITMAP                  "..\\..\\res\\folderup.bmp"
+IDB_FOLDERUP_DISABLE    BITMAP                  "..\\..\\res\\folderup_disable.bmp"
+IDB_EDIT_SELECTALL      BITMAP                  "..\\..\\res\\select_all.bmp"
+IDB_TOOLS_FILTERS       BITMAP                  "..\\..\\res\\filters.bmp"
+IDB_TOOLS_COLUMNS       BITMAP                  "..\\..\\res\\customize_columns.bmp"
+IDB_MERGE_DELETE        BITMAP                  "..\\..\\res\\delete.bmp"
+IDB_FILE_PRINT          BITMAP                  "..\\..\\res\\print.bmp"
+IDB_SIGMA               BITMAP                  "..\\..\\res\\sigma.bmp"
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -1640,8 +1642,8 @@ IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
 // Cursor
 //
 
-IDR_MARGIN_CURSOR       CURSOR                  "res\\mg_cur.cur"
-IDR_MERGEHAND           CURSOR                  "res\\hand.cur"
+IDR_MARGIN_CURSOR       CURSOR                  "..\\..\\res\\mg_cur.cur"
+IDR_MERGEHAND           CURSOR                  "..\\..\\res\\hand.cur"
 
 /////////////////////////////////////////////////////////////////////////////
 //

diff --git a/Src/Languages/Polish/res/Merge.ico b/Src/Languages/Polish/res/Merge.ico
deleted file mode 100644 (file)
index 6fd5e56..0000000
Binary files a/Src/Languages/Polish/res/Merge.ico and /dev/null differ

diff --git a/Src/Languages/Polish/res/MergeDir.ico b/Src/Languages/Polish/res/MergeDir.ico
deleted file mode 100644 (file)
index 349c926..0000000
Binary files a/Src/Languages/Polish/res/MergeDir.ico and /dev/null differ

diff --git a/Src/Languages/Polish/res/MergeDoc.ico b/Src/Languages/Polish/res/MergeDoc.ico
deleted file mode 100644 (file)
index b2f417b..0000000
Binary files a/Src/Languages/Polish/res/MergeDoc.ico and /dev/null differ

diff --git a/Src/Languages/Polish/res/Splash1.bmp b/Src/Languages/Polish/res/Splash1.bmp
deleted file mode 100644 (file)
index f041297..0000000
Binary files a/Src/Languages/Polish/res/Splash1.bmp and /dev/null differ

diff --git a/Src/Languages/Polish/res/Toolbar.bmp b/Src/Languages/Polish/res/Toolbar.bmp
deleted file mode 100644 (file)
index 7935cc8..0000000
Binary files a/Src/Languages/Polish/res/Toolbar.bmp and /dev/null differ

diff --git a/Src/Languages/Polish/res/WinMergeSplash.psd b/Src/Languages/Polish/res/WinMergeSplash.psd
deleted file mode 100644 (file)
index fe7df64..0000000
Binary files a/Src/Languages/Polish/res/WinMergeSplash.psd and /dev/null differ

diff --git a/Src/Languages/Polish/res/binary.bmp b/Src/Languages/Polish/res/binary.bmp
deleted file mode 100644 (file)
index 417eb30..0000000
Binary files a/Src/Languages/Polish/res/binary.bmp and /dev/null differ

diff --git a/Src/Languages/Polish/res/binarydiff.bmp b/Src/Languages/Polish/res/binarydiff.bmp
deleted file mode 100644 (file)
index 4e45141..0000000
Binary files a/Src/Languages/Polish/res/binarydiff.bmp and /dev/null differ

diff --git a/Src/Languages/Polish/res/cascade.bmp b/Src/Languages/Polish/res/cascade.bmp
deleted file mode 100644 (file)
index a56622c..0000000
Binary files a/Src/Languages/Polish/res/cascade.bmp and /dev/null differ

diff --git a/Src/Languages/Polish/res/change_pane.bmp b/Src/Languages/Polish/res/change_pane.bmp
deleted file mode 100644 (file)
index 0a2e36a..0000000
Binary files a/Src/Languages/Polish/res/change_pane.bmp and /dev/null differ

diff --git a/Src/Languages/Polish/res/close.bmp b/Src/Languages/Polish/res/close.bmp
deleted file mode 100644 (file)
index 55b5e87..0000000
Binary files a/Src/Languages/Polish/res/close.bmp and /dev/null differ

diff --git a/Src/Languages/Polish/res/copy.bmp b/Src/Languages/Polish/res/copy.bmp
deleted file mode 100644 (file)
index 6565c6f..0000000
Binary files a/Src/Languages/Polish/res/copy.bmp and /dev/null differ

diff --git a/Src/Languages/Polish/res/customize_columns.bmp b/Src/Languages/Polish/res/customize_columns.bmp
deleted file mode 100644 (file)
index 126345a..0000000
Binary files a/Src/Languages/Polish/res/customize_columns.bmp and /dev/null differ

diff --git a/Src/Languages/Polish/res/cut.bmp b/Src/Languages/Polish/res/cut.bmp
deleted file mode 100644 (file)
index 976c5d2..0000000
Binary files a/Src/Languages/Polish/res/cut.bmp and /dev/null differ

diff --git a/Src/Languages/Polish/res/delete.bmp b/Src/Languages/Polish/res/delete.bmp
deleted file mode 100644 (file)
index b70eeb8..0000000
Binary files a/Src/Languages/Polish/res/delete.bmp and /dev/null differ

diff --git a/Src/Languages/Polish/res/equal.bmp b/Src/Languages/Polish/res/equal.bmp
deleted file mode 100644 (file)
index 9761d55..0000000
Binary files a/Src/Languages/Polish/res/equal.bmp and /dev/null differ

diff --git a/Src/Languages/Polish/res/error.bmp b/Src/Languages/Polish/res/error.bmp
deleted file mode 100644 (file)
index f659c1d..0000000
Binary files a/Src/Languages/Polish/res/error.bmp and /dev/null differ

diff --git a/Src/Languages/Polish/res/exit.bmp b/Src/Languages/Polish/res/exit.bmp
deleted file mode 100644 (file)
index 596127a..0000000
Binary files a/Src/Languages/Polish/res/exit.bmp and /dev/null differ

diff --git a/Src/Languages/Polish/res/fileskip.bmp b/Src/Languages/Polish/res/fileskip.bmp
deleted file mode 100644 (file)
index 9e502d9..0000000
Binary files a/Src/Languages/Polish/res/fileskip.bmp and /dev/null differ

diff --git a/Src/Languages/Polish/res/filters.bmp b/Src/Languages/Polish/res/filters.bmp
deleted file mode 100644 (file)
index e7ab693..0000000
Binary files a/Src/Languages/Polish/res/filters.bmp and /dev/null differ

diff --git a/Src/Languages/Polish/res/folder.ico b/Src/Languages/Polish/res/folder.ico
deleted file mode 100644 (file)
index e18bd19..0000000
Binary files a/Src/Languages/Polish/res/folder.ico and /dev/null differ

diff --git a/Src/Languages/Polish/res/folderskip.ico b/Src/Languages/Polish/res/folderskip.ico
deleted file mode 100644 (file)
index 3297496..0000000
Binary files a/Src/Languages/Polish/res/folderskip.ico and /dev/null differ

diff --git a/Src/Languages/Polish/res/folderup.bmp b/Src/Languages/Polish/res/folderup.bmp
deleted file mode 100644 (file)
index 2d15145..0000000
Binary files a/Src/Languages/Polish/res/folderup.bmp and /dev/null differ

diff --git a/Src/Languages/Polish/res/folderup_disable.bmp b/Src/Languages/Polish/res/folderup_disable.bmp
deleted file mode 100644 (file)
index 5829a19..0000000
Binary files a/Src/Languages/Polish/res/folderup_disable.bmp and /dev/null differ

diff --git a/Src/Languages/Polish/res/go_to.bmp b/Src/Languages/Polish/res/go_to.bmp
deleted file mode 100644 (file)
index a6839aa..0000000
Binary files a/Src/Languages/Polish/res/go_to.bmp and /dev/null differ

diff --git a/Src/Languages/Polish/res/hand.cur b/Src/Languages/Polish/res/hand.cur
deleted file mode 100644 (file)
index ed8db8c..0000000
Binary files a/Src/Languages/Polish/res/hand.cur and /dev/null differ

diff --git a/Src/Languages/Polish/res/help_contents.bmp b/Src/Languages/Polish/res/help_contents.bmp
deleted file mode 100644 (file)
index 6662979..0000000
Binary files a/Src/Languages/Polish/res/help_contents.bmp and /dev/null differ

diff --git a/Src/Languages/Polish/res/horizontally.bmp b/Src/Languages/Polish/res/horizontally.bmp
deleted file mode 100644 (file)
index 3c7a732..0000000
Binary files a/Src/Languages/Polish/res/horizontally.bmp and /dev/null differ

diff --git a/Src/Languages/Polish/res/language.bmp b/Src/Languages/Polish/res/language.bmp
deleted file mode 100644 (file)
index 9e92e4d..0000000
Binary files a/Src/Languages/Polish/res/language.bmp and /dev/null differ

diff --git a/Src/Languages/Polish/res/lfile.bmp b/Src/Languages/Polish/res/lfile.bmp
deleted file mode 100644 (file)
index bb7cf6c..0000000
Binary files a/Src/Languages/Polish/res/lfile.bmp and /dev/null differ

diff --git a/Src/Languages/Polish/res/lfolder.ico b/Src/Languages/Polish/res/lfolder.ico
deleted file mode 100644 (file)
index fc1c797..0000000
Binary files a/Src/Languages/Polish/res/lfolder.ico and /dev/null differ

diff --git a/Src/Languages/Polish/res/mg_cur.cur b/Src/Languages/Polish/res/mg_cur.cur
deleted file mode 100644 (file)
index 5691efb..0000000
Binary files a/Src/Languages/Polish/res/mg_cur.cur and /dev/null differ

diff --git a/Src/Languages/Polish/res/notequal.bmp b/Src/Languages/Polish/res/notequal.bmp
deleted file mode 100644 (file)
index d747084..0000000
Binary files a/Src/Languages/Polish/res/notequal.bmp and /dev/null differ

diff --git a/Src/Languages/Polish/res/paste.bmp b/Src/Languages/Polish/res/paste.bmp
deleted file mode 100644 (file)
index bcd5227..0000000
Binary files a/Src/Languages/Polish/res/paste.bmp and /dev/null differ

diff --git a/Src/Languages/Polish/res/print.bmp b/Src/Languages/Polish/res/print.bmp
deleted file mode 100644 (file)
index 739ca01..0000000
Binary files a/Src/Languages/Polish/res/print.bmp and /dev/null differ

diff --git a/Src/Languages/Polish/res/replace.bmp b/Src/Languages/Polish/res/replace.bmp
deleted file mode 100644 (file)
index e5586b9..0000000
Binary files a/Src/Languages/Polish/res/replace.bmp and /dev/null differ

diff --git a/Src/Languages/Polish/res/rfile.bmp b/Src/Languages/Polish/res/rfile.bmp
deleted file mode 100644 (file)
index 1333733..0000000
Binary files a/Src/Languages/Polish/res/rfile.bmp and /dev/null differ

diff --git a/Src/Languages/Polish/res/rfolder.ico b/Src/Languages/Polish/res/rfolder.ico
deleted file mode 100644 (file)
index 444d827..0000000
Binary files a/Src/Languages/Polish/res/rfolder.ico and /dev/null differ

diff --git a/Src/Languages/Polish/res/search.bmp b/Src/Languages/Polish/res/search.bmp
deleted file mode 100644 (file)
index 9d606e5..0000000
Binary files a/Src/Languages/Polish/res/search.bmp and /dev/null differ

diff --git a/Src/Languages/Polish/res/select_all.bmp b/Src/Languages/Polish/res/select_all.bmp
deleted file mode 100644 (file)
index 174e311..0000000
Binary files a/Src/Languages/Polish/res/select_all.bmp and /dev/null differ

diff --git a/Src/Languages/Polish/res/select_font.bmp b/Src/Languages/Polish/res/select_font.bmp
deleted file mode 100644 (file)
index 2609538..0000000
Binary files a/Src/Languages/Polish/res/select_font.bmp and /dev/null differ

diff --git a/Src/Languages/Polish/res/sigma.bmp b/Src/Languages/Polish/res/sigma.bmp
deleted file mode 100644 (file)
index eff4abe..0000000
Binary files a/Src/Languages/Polish/res/sigma.bmp and /dev/null differ

diff --git a/Src/Languages/Polish/res/splash1.old.bmp b/Src/Languages/Polish/res/splash1.old.bmp
deleted file mode 100644 (file)
index dfa5f80..0000000
Binary files a/Src/Languages/Polish/res/splash1.old.bmp and /dev/null differ

diff --git a/Src/Languages/Polish/res/unknown.bmp b/Src/Languages/Polish/res/unknown.bmp
deleted file mode 100644 (file)
index 7f16906..0000000
Binary files a/Src/Languages/Polish/res/unknown.bmp and /dev/null differ

diff --git a/Src/Languages/Polish/res/vertically.bmp b/Src/Languages/Polish/res/vertically.bmp
deleted file mode 100644 (file)
index e57c1b6..0000000
Binary files a/Src/Languages/Polish/res/vertically.bmp and /dev/null differ

diff --git a/Src/Languages/Russian/MergeRussian.rc b/Src/Languages/Russian/MergeRussian.rc
index d3229a8..42f2015 100644 (file)
--- a/Src/Languages/Russian/MergeRussian.rc
+++ b/Src/Languages/Russian/MergeRussian.rc
@@ -67,13 +67,15 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDR_MAINFRAME           ICON                    "res\\Merge.ico"
-IDR_MERGETYPE           ICON                    "res\\MergeDoc.ico"
-IDR_DOC_FOLDERCMP       ICON                    "res\\MergeDir.ico"
-IDI_FOLDER              ICON                    "res\\folder.ico"
-IDI_LFOLDER             ICON                    "res\\lfolder.ico"
-IDI_RFOLDER             ICON                    "res\\rfolder.ico"
-IDI_FOLDERSKIP          ICON                    "res\\folderskip.ico"
+
+// Load shared resources from Src\res
+IDR_MAINFRAME           ICON                    "..\\..\\res\\Merge.ico"
+IDR_MERGETYPE           ICON                    "..\\..\\res\\MergeDoc.ico"
+IDR_DOC_FOLDERCMP       ICON                    "..\\..\\res\\MergeDir.ico"
+IDI_FOLDER              ICON                    "..\\..\\res\\folder.ico"
+IDI_LFOLDER             ICON                    "..\\..\\res\\lfolder.ico"
+IDI_RFOLDER             ICON                    "..\\..\\res\\rfolder.ico"
+IDI_FOLDERSKIP          ICON                    "..\\..\\res\\folderskip.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1499,40 +1501,40 @@ END
 // Bitmap
 //
 
-IDR_MAINFRAME           BITMAP                  "res\\Toolbar.bmp"
-IDB_SPLASH              BITMAP                  "res\\splash1.bmp"
-IDB_EQUAL               BITMAP                  "res\\equal.bmp"
-IDB_NOTEQUAL            BITMAP                  "res\\notequal.bmp"
-IDB_UNKNOWN             BITMAP                  "res\\unknown.bmp"
-IDB_BINARYSAME          BITMAP                  "res\\binary.bmp"
-IDB_LFILE               BITMAP                  "res\\lfile.bmp"
-IDB_RFILE               BITMAP                  "res\\rfile.bmp"
-IDB_BINARYDIFF          BITMAP                  "res\\binarydiff.bmp"
-IDB_FILESKIP            BITMAP                  "res\\fileskip.bmp"
-IDB_EDIT_COPY           BITMAP                  "res\\copy.bmp"
-IDB_EDIT_CUT            BITMAP                  "res\\cut.bmp"
-IDB_EDIT_PASTE          BITMAP                  "res\\paste.bmp"
-IDB_EDIT_SEARCH         BITMAP                  "res\\search.bmp"
-IDB_WINDOW_CASCADE      BITMAP                  "res\\cascade.bmp"
-IDB_WINDOW_HORIZONTAL   BITMAP                  "res\\horizontally.bmp"
-IDB_WINDOW_VERTICAL     BITMAP                  "res\\vertically.bmp"
-IDB_WINDOW_CLOSE        BITMAP                  "res\\close.bmp"
-IDB_WINDOW_CHANGEPANE   BITMAP                  "res\\change_pane.bmp"
-IDB_EDIT_GOTO           BITMAP                  "res\\go_to.bmp"
-IDB_EDIT_REPLACE        BITMAP                  "res\\replace.bmp"
-IDB_VIEW_LANGUAGE       BITMAP                  "res\\language.bmp"
-IDB_VIEW_SELECTFONT     BITMAP                  "res\\select_font.bmp"
-IDB_FILE_EXIT           BITMAP                  "res\\exit.bmp"
-IDB_HELP_CONTENTS       BITMAP                  "res\\help_contents.bmp"
-IDB_ERROR               BITMAP                  "res\\error.bmp"
-IDB_FOLDERUP            BITMAP                  "res\\folderup.bmp"
-IDB_FOLDERUP_DISABLE    BITMAP                  "res\\folderup_disable.bmp"
-IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
-IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
-IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
-IDB_MERGE_DELETE        BITMAP                  "res\\delete.bmp"
-IDB_FILE_PRINT          BITMAP                  "res\\print.bmp"
-IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
+IDR_MAINFRAME           BITMAP                  "..\\..\\res\\Toolbar.bmp"
+IDB_SPLASH              BITMAP                  "..\\..\\res\\splash1.bmp"
+IDB_EQUAL               BITMAP                  "..\\..\\res\\equal.bmp"
+IDB_NOTEQUAL            BITMAP                  "..\\..\\res\\notequal.bmp"
+IDB_UNKNOWN             BITMAP                  "..\\..\\res\\unknown.bmp"
+IDB_BINARYSAME          BITMAP                  "..\\..\\res\\binary.bmp"
+IDB_LFILE               BITMAP                  "..\\..\\res\\lfile.bmp"
+IDB_RFILE               BITMAP                  "..\\..\\res\\rfile.bmp"
+IDB_BINARYDIFF          BITMAP                  "..\\..\\res\\binarydiff.bmp"
+IDB_FILESKIP            BITMAP                  "..\\..\\res\\fileskip.bmp"
+IDB_EDIT_COPY           BITMAP                  "..\\..\\res\\copy.bmp"
+IDB_EDIT_CUT            BITMAP                  "..\\..\\res\\cut.bmp"
+IDB_EDIT_PASTE          BITMAP                  "..\\..\\res\\paste.bmp"
+IDB_EDIT_SEARCH         BITMAP                  "..\\..\\res\\search.bmp"
+IDB_WINDOW_CASCADE      BITMAP                  "..\\..\\res\\cascade.bmp"
+IDB_WINDOW_HORIZONTAL   BITMAP                  "..\\..\\res\\horizontally.bmp"
+IDB_WINDOW_VERTICAL     BITMAP                  "..\\..\\res\\vertically.bmp"
+IDB_WINDOW_CLOSE        BITMAP                  "..\\..\\res\\close.bmp"
+IDB_WINDOW_CHANGEPANE   BITMAP                  "..\\..\\res\\change_pane.bmp"
+IDB_EDIT_GOTO           BITMAP                  "..\\..\\res\\go_to.bmp"
+IDB_EDIT_REPLACE        BITMAP                  "..\\..\\res\\replace.bmp"
+IDB_VIEW_LANGUAGE       BITMAP                  "..\\..\\res\\language.bmp"
+IDB_VIEW_SELECTFONT     BITMAP                  "..\\..\\res\\select_font.bmp"
+IDB_FILE_EXIT           BITMAP                  "..\\..\\res\\exit.bmp"
+IDB_HELP_CONTENTS       BITMAP                  "..\\..\\res\\help_contents.bmp"
+IDB_ERROR               BITMAP                  "..\\..\\res\\error.bmp"
+IDB_FOLDERUP            BITMAP                  "..\\..\\res\\folderup.bmp"
+IDB_FOLDERUP_DISABLE    BITMAP                  "..\\..\\res\\folderup_disable.bmp"
+IDB_EDIT_SELECTALL      BITMAP                  "..\\..\\res\\select_all.bmp"
+IDB_TOOLS_FILTERS       BITMAP                  "..\\..\\res\\filters.bmp"
+IDB_TOOLS_COLUMNS       BITMAP                  "..\\..\\res\\customize_columns.bmp"
+IDB_MERGE_DELETE        BITMAP                  "..\\..\\res\\delete.bmp"
+IDB_FILE_PRINT          BITMAP                  "..\\..\\res\\print.bmp"
+IDB_SIGMA               BITMAP                  "..\\..\\res\\sigma.bmp"
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -1540,8 +1542,8 @@ IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
 // Cursor
 //
 
-IDR_MARGIN_CURSOR       CURSOR                  "res\\mg_cur.cur"
-IDR_MERGEHAND           CURSOR                  "res\\hand.cur"
+IDR_MARGIN_CURSOR       CURSOR                  "..\\..\\res\\mg_cur.cur"
+IDR_MERGEHAND           CURSOR                  "..\\..\\res\\hand.cur"
 
 /////////////////////////////////////////////////////////////////////////////
 //

diff --git a/Src/Languages/Russian/res/Merge.ico b/Src/Languages/Russian/res/Merge.ico
deleted file mode 100644 (file)
index 6fd5e56..0000000
Binary files a/Src/Languages/Russian/res/Merge.ico and /dev/null differ

diff --git a/Src/Languages/Russian/res/MergeDir.ico b/Src/Languages/Russian/res/MergeDir.ico
deleted file mode 100644 (file)
index 349c926..0000000
Binary files a/Src/Languages/Russian/res/MergeDir.ico and /dev/null differ

diff --git a/Src/Languages/Russian/res/MergeDoc.ico b/Src/Languages/Russian/res/MergeDoc.ico
deleted file mode 100644 (file)
index b2f417b..0000000
Binary files a/Src/Languages/Russian/res/MergeDoc.ico and /dev/null differ

diff --git a/Src/Languages/Russian/res/Toolbar.bmp b/Src/Languages/Russian/res/Toolbar.bmp
deleted file mode 100644 (file)
index 7935cc8..0000000
Binary files a/Src/Languages/Russian/res/Toolbar.bmp and /dev/null differ

diff --git a/Src/Languages/Russian/res/WinMergeSplash.psd b/Src/Languages/Russian/res/WinMergeSplash.psd
deleted file mode 100644 (file)
index fe7df64..0000000
Binary files a/Src/Languages/Russian/res/WinMergeSplash.psd and /dev/null differ

diff --git a/Src/Languages/Russian/res/binary.bmp b/Src/Languages/Russian/res/binary.bmp
deleted file mode 100644 (file)
index 417eb30..0000000
Binary files a/Src/Languages/Russian/res/binary.bmp and /dev/null differ

diff --git a/Src/Languages/Russian/res/binarydiff.bmp b/Src/Languages/Russian/res/binarydiff.bmp
deleted file mode 100644 (file)
index 4e45141..0000000
Binary files a/Src/Languages/Russian/res/binarydiff.bmp and /dev/null differ

diff --git a/Src/Languages/Russian/res/cascade.bmp b/Src/Languages/Russian/res/cascade.bmp
deleted file mode 100644 (file)
index a56622c..0000000
Binary files a/Src/Languages/Russian/res/cascade.bmp and /dev/null differ

diff --git a/Src/Languages/Russian/res/change_pane.bmp b/Src/Languages/Russian/res/change_pane.bmp
deleted file mode 100644 (file)
index 0a2e36a..0000000
Binary files a/Src/Languages/Russian/res/change_pane.bmp and /dev/null differ

diff --git a/Src/Languages/Russian/res/close.bmp b/Src/Languages/Russian/res/close.bmp
deleted file mode 100644 (file)
index 55b5e87..0000000
Binary files a/Src/Languages/Russian/res/close.bmp and /dev/null differ

diff --git a/Src/Languages/Russian/res/copy.bmp b/Src/Languages/Russian/res/copy.bmp
deleted file mode 100644 (file)
index 6565c6f..0000000
Binary files a/Src/Languages/Russian/res/copy.bmp and /dev/null differ

diff --git a/Src/Languages/Russian/res/customize_columns.bmp b/Src/Languages/Russian/res/customize_columns.bmp
deleted file mode 100644 (file)
index 126345a..0000000
Binary files a/Src/Languages/Russian/res/customize_columns.bmp and /dev/null differ

diff --git a/Src/Languages/Russian/res/cut.bmp b/Src/Languages/Russian/res/cut.bmp
deleted file mode 100644 (file)
index 976c5d2..0000000
Binary files a/Src/Languages/Russian/res/cut.bmp and /dev/null differ

diff --git a/Src/Languages/Russian/res/delete.bmp b/Src/Languages/Russian/res/delete.bmp
deleted file mode 100644 (file)
index b70eeb8..0000000
Binary files a/Src/Languages/Russian/res/delete.bmp and /dev/null differ

diff --git a/Src/Languages/Russian/res/equal.bmp b/Src/Languages/Russian/res/equal.bmp
deleted file mode 100644 (file)
index 9761d55..0000000
Binary files a/Src/Languages/Russian/res/equal.bmp and /dev/null differ

diff --git a/Src/Languages/Russian/res/error.bmp b/Src/Languages/Russian/res/error.bmp
deleted file mode 100644 (file)
index f659c1d..0000000
Binary files a/Src/Languages/Russian/res/error.bmp and /dev/null differ

diff --git a/Src/Languages/Russian/res/exit.bmp b/Src/Languages/Russian/res/exit.bmp
deleted file mode 100644 (file)
index 596127a..0000000
Binary files a/Src/Languages/Russian/res/exit.bmp and /dev/null differ

diff --git a/Src/Languages/Russian/res/fileskip.bmp b/Src/Languages/Russian/res/fileskip.bmp
deleted file mode 100644 (file)
index 9e502d9..0000000
Binary files a/Src/Languages/Russian/res/fileskip.bmp and /dev/null differ

diff --git a/Src/Languages/Russian/res/filters.bmp b/Src/Languages/Russian/res/filters.bmp
deleted file mode 100644 (file)
index e7ab693..0000000
Binary files a/Src/Languages/Russian/res/filters.bmp and /dev/null differ

diff --git a/Src/Languages/Russian/res/folder.ico b/Src/Languages/Russian/res/folder.ico
deleted file mode 100644 (file)
index e18bd19..0000000
Binary files a/Src/Languages/Russian/res/folder.ico and /dev/null differ

diff --git a/Src/Languages/Russian/res/folderskip.ico b/Src/Languages/Russian/res/folderskip.ico
deleted file mode 100644 (file)
index 3297496..0000000
Binary files a/Src/Languages/Russian/res/folderskip.ico and /dev/null differ

diff --git a/Src/Languages/Russian/res/folderup.bmp b/Src/Languages/Russian/res/folderup.bmp
deleted file mode 100644 (file)
index 2d15145..0000000
Binary files a/Src/Languages/Russian/res/folderup.bmp and /dev/null differ

diff --git a/Src/Languages/Russian/res/folderup_disable.bmp b/Src/Languages/Russian/res/folderup_disable.bmp
deleted file mode 100644 (file)
index 5829a19..0000000
Binary files a/Src/Languages/Russian/res/folderup_disable.bmp and /dev/null differ

diff --git a/Src/Languages/Russian/res/go_to.bmp b/Src/Languages/Russian/res/go_to.bmp
deleted file mode 100644 (file)
index a6839aa..0000000
Binary files a/Src/Languages/Russian/res/go_to.bmp and /dev/null differ

diff --git a/Src/Languages/Russian/res/hand.cur b/Src/Languages/Russian/res/hand.cur
deleted file mode 100644 (file)
index ed8db8c..0000000
Binary files a/Src/Languages/Russian/res/hand.cur and /dev/null differ

diff --git a/Src/Languages/Russian/res/help_contents.bmp b/Src/Languages/Russian/res/help_contents.bmp
deleted file mode 100644 (file)
index 6662979..0000000
Binary files a/Src/Languages/Russian/res/help_contents.bmp and /dev/null differ

diff --git a/Src/Languages/Russian/res/horizontally.bmp b/Src/Languages/Russian/res/horizontally.bmp
deleted file mode 100644 (file)
index 3c7a732..0000000
Binary files a/Src/Languages/Russian/res/horizontally.bmp and /dev/null differ

diff --git a/Src/Languages/Russian/res/language.bmp b/Src/Languages/Russian/res/language.bmp
deleted file mode 100644 (file)
index 9e92e4d..0000000
Binary files a/Src/Languages/Russian/res/language.bmp and /dev/null differ

diff --git a/Src/Languages/Russian/res/lfile.bmp b/Src/Languages/Russian/res/lfile.bmp
deleted file mode 100644 (file)
index bb7cf6c..0000000
Binary files a/Src/Languages/Russian/res/lfile.bmp and /dev/null differ

diff --git a/Src/Languages/Russian/res/lfolder.ico b/Src/Languages/Russian/res/lfolder.ico
deleted file mode 100644 (file)
index fc1c797..0000000
Binary files a/Src/Languages/Russian/res/lfolder.ico and /dev/null differ

diff --git a/Src/Languages/Russian/res/mg_cur.cur b/Src/Languages/Russian/res/mg_cur.cur
deleted file mode 100644 (file)
index 5691efb..0000000
Binary files a/Src/Languages/Russian/res/mg_cur.cur and /dev/null differ

diff --git a/Src/Languages/Russian/res/notequal.bmp b/Src/Languages/Russian/res/notequal.bmp
deleted file mode 100644 (file)
index d747084..0000000
Binary files a/Src/Languages/Russian/res/notequal.bmp and /dev/null differ

diff --git a/Src/Languages/Russian/res/paste.bmp b/Src/Languages/Russian/res/paste.bmp
deleted file mode 100644 (file)
index bcd5227..0000000
Binary files a/Src/Languages/Russian/res/paste.bmp and /dev/null differ

diff --git a/Src/Languages/Russian/res/print.bmp b/Src/Languages/Russian/res/print.bmp
deleted file mode 100644 (file)
index 739ca01..0000000
Binary files a/Src/Languages/Russian/res/print.bmp and /dev/null differ

diff --git a/Src/Languages/Russian/res/replace.bmp b/Src/Languages/Russian/res/replace.bmp
deleted file mode 100644 (file)
index e5586b9..0000000
Binary files a/Src/Languages/Russian/res/replace.bmp and /dev/null differ

diff --git a/Src/Languages/Russian/res/rfile.bmp b/Src/Languages/Russian/res/rfile.bmp
deleted file mode 100644 (file)
index 1333733..0000000
Binary files a/Src/Languages/Russian/res/rfile.bmp and /dev/null differ

diff --git a/Src/Languages/Russian/res/rfolder.ico b/Src/Languages/Russian/res/rfolder.ico
deleted file mode 100644 (file)
index 444d827..0000000
Binary files a/Src/Languages/Russian/res/rfolder.ico and /dev/null differ

diff --git a/Src/Languages/Russian/res/search.bmp b/Src/Languages/Russian/res/search.bmp
deleted file mode 100644 (file)
index 9d606e5..0000000
Binary files a/Src/Languages/Russian/res/search.bmp and /dev/null differ

diff --git a/Src/Languages/Russian/res/select_all.bmp b/Src/Languages/Russian/res/select_all.bmp
deleted file mode 100644 (file)
index 174e311..0000000
Binary files a/Src/Languages/Russian/res/select_all.bmp and /dev/null differ

diff --git a/Src/Languages/Russian/res/select_font.bmp b/Src/Languages/Russian/res/select_font.bmp
deleted file mode 100644 (file)
index 2609538..0000000
Binary files a/Src/Languages/Russian/res/select_font.bmp and /dev/null differ

diff --git a/Src/Languages/Russian/res/sigma.bmp b/Src/Languages/Russian/res/sigma.bmp
deleted file mode 100644 (file)
index eff4abe..0000000
Binary files a/Src/Languages/Russian/res/sigma.bmp and /dev/null differ

diff --git a/Src/Languages/Russian/res/splash1.bmp b/Src/Languages/Russian/res/splash1.bmp
deleted file mode 100644 (file)
index f041297..0000000
Binary files a/Src/Languages/Russian/res/splash1.bmp and /dev/null differ

diff --git a/Src/Languages/Russian/res/unknown.bmp b/Src/Languages/Russian/res/unknown.bmp
deleted file mode 100644 (file)
index 7f16906..0000000
Binary files a/Src/Languages/Russian/res/unknown.bmp and /dev/null differ

diff --git a/Src/Languages/Russian/res/vertically.bmp b/Src/Languages/Russian/res/vertically.bmp
deleted file mode 100644 (file)
index e57c1b6..0000000
Binary files a/Src/Languages/Russian/res/vertically.bmp and /dev/null differ

diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc
index 7271073..2f4830f 100644 (file)
--- a/Src/Languages/Slovak/MergeSlovak.rc
+++ b/Src/Languages/Slovak/MergeSlovak.rc
@@ -67,13 +67,15 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDR_MAINFRAME           ICON                    "res\\Merge.ico"
-IDR_MERGETYPE           ICON                    "res\\MergeDoc.ico"
-IDR_DOC_FOLDERCMP       ICON                    "res\\MergeDir.ico"
-IDI_FOLDER              ICON                    "res\\folder.ico"
-IDI_LFOLDER             ICON                    "res\\lfolder.ico"
-IDI_RFOLDER             ICON                    "res\\rfolder.ico"
-IDI_FOLDERSKIP          ICON                    "res\\folderskip.ico"
+
+// Load shared resources from Src\res
+IDR_MAINFRAME           ICON                    "..\\..\\res\\Merge.ico"
+IDR_MERGETYPE           ICON                    "..\\..\\res\\MergeDoc.ico"
+IDR_DOC_FOLDERCMP       ICON                    "..\\..\\res\\MergeDir.ico"
+IDI_FOLDER              ICON                    "..\\..\\res\\folder.ico"
+IDI_LFOLDER             ICON                    "..\\..\\res\\lfolder.ico"
+IDI_RFOLDER             ICON                    "..\\..\\res\\rfolder.ico"
+IDI_FOLDERSKIP          ICON                    "..\\..\\res\\folderskip.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1599,40 +1601,40 @@ END
 // Bitmap
 //
 
-IDR_MAINFRAME           BITMAP                  "res\\Toolbar.bmp"
-IDB_SPLASH              BITMAP                  "res\\splash1.bmp"
-IDB_EQUAL               BITMAP                  "res\\equal.bmp"
-IDB_NOTEQUAL            BITMAP                  "res\\notequal.bmp"
-IDB_UNKNOWN             BITMAP                  "res\\unknown.bmp"
-IDB_BINARYSAME          BITMAP                  "res\\binary.bmp"
-IDB_LFILE               BITMAP                  "res\\lfile.bmp"
-IDB_RFILE               BITMAP                  "res\\rfile.bmp"
-IDB_BINARYDIFF          BITMAP                  "res\\binarydiff.bmp"
-IDB_FILESKIP            BITMAP                  "res\\fileskip.bmp"
-IDB_EDIT_COPY           BITMAP                  "res\\copy.bmp"
-IDB_EDIT_CUT            BITMAP                  "res\\cut.bmp"
-IDB_EDIT_PASTE          BITMAP                  "res\\paste.bmp"
-IDB_EDIT_SEARCH         BITMAP                  "res\\search.bmp"
-IDB_WINDOW_CASCADE      BITMAP                  "res\\cascade.bmp"
-IDB_WINDOW_HORIZONTAL   BITMAP                  "res\\horizontally.bmp"
-IDB_WINDOW_VERTICAL     BITMAP                  "res\\vertically.bmp"
-IDB_WINDOW_CLOSE        BITMAP                  "res\\close.bmp"
-IDB_WINDOW_CHANGEPANE   BITMAP                  "res\\change_pane.bmp"
-IDB_EDIT_GOTO           BITMAP                  "res\\go_to.bmp"
-IDB_EDIT_REPLACE        BITMAP                  "res\\replace.bmp"
-IDB_VIEW_LANGUAGE       BITMAP                  "res\\language.bmp"
-IDB_VIEW_SELECTFONT     BITMAP                  "res\\select_font.bmp"
-IDB_FILE_EXIT           BITMAP                  "res\\exit.bmp"
-IDB_HELP_CONTENTS       BITMAP                  "res\\help_contents.bmp"
-IDB_ERROR               BITMAP                  "res\\error.bmp"
-IDB_FOLDERUP            BITMAP                  "res\\folderup.bmp"
-IDB_FOLDERUP_DISABLE    BITMAP                  "res\\folderup_disable.bmp"
-IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
-IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
-IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
-IDB_MERGE_DELETE        BITMAP                  "res\\delete.bmp"
-IDB_FILE_PRINT          BITMAP                  "res\\print.bmp"
-IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
+IDR_MAINFRAME           BITMAP                  "..\\..\\res\\Toolbar.bmp"
+IDB_SPLASH              BITMAP                  "..\\..\\res\\splash1.bmp"
+IDB_EQUAL               BITMAP                  "..\\..\\res\\equal.bmp"
+IDB_NOTEQUAL            BITMAP                  "..\\..\\res\\notequal.bmp"
+IDB_UNKNOWN             BITMAP                  "..\\..\\res\\unknown.bmp"
+IDB_BINARYSAME          BITMAP                  "..\\..\\res\\binary.bmp"
+IDB_LFILE               BITMAP                  "..\\..\\res\\lfile.bmp"
+IDB_RFILE               BITMAP                  "..\\..\\res\\rfile.bmp"
+IDB_BINARYDIFF          BITMAP                  "..\\..\\res\\binarydiff.bmp"
+IDB_FILESKIP            BITMAP                  "..\\..\\res\\fileskip.bmp"
+IDB_EDIT_COPY           BITMAP                  "..\\..\\res\\copy.bmp"
+IDB_EDIT_CUT            BITMAP                  "..\\..\\res\\cut.bmp"
+IDB_EDIT_PASTE          BITMAP                  "..\\..\\res\\paste.bmp"
+IDB_EDIT_SEARCH         BITMAP                  "..\\..\\res\\search.bmp"
+IDB_WINDOW_CASCADE      BITMAP                  "..\\..\\res\\cascade.bmp"
+IDB_WINDOW_HORIZONTAL   BITMAP                  "..\\..\\res\\horizontally.bmp"
+IDB_WINDOW_VERTICAL     BITMAP                  "..\\..\\res\\vertically.bmp"
+IDB_WINDOW_CLOSE        BITMAP                  "..\\..\\res\\close.bmp"
+IDB_WINDOW_CHANGEPANE   BITMAP                  "..\\..\\res\\change_pane.bmp"
+IDB_EDIT_GOTO           BITMAP                  "..\\..\\res\\go_to.bmp"
+IDB_EDIT_REPLACE        BITMAP                  "..\\..\\res\\replace.bmp"
+IDB_VIEW_LANGUAGE       BITMAP                  "..\\..\\res\\language.bmp"
+IDB_VIEW_SELECTFONT     BITMAP                  "..\\..\\res\\select_font.bmp"
+IDB_FILE_EXIT           BITMAP                  "..\\..\\res\\exit.bmp"
+IDB_HELP_CONTENTS       BITMAP                  "..\\..\\res\\help_contents.bmp"
+IDB_ERROR               BITMAP                  "..\\..\\res\\error.bmp"
+IDB_FOLDERUP            BITMAP                  "..\\..\\res\\folderup.bmp"
+IDB_FOLDERUP_DISABLE    BITMAP                  "..\\..\\res\\folderup_disable.bmp"
+IDB_EDIT_SELECTALL      BITMAP                  "..\\..\\res\\select_all.bmp"
+IDB_TOOLS_FILTERS       BITMAP                  "..\\..\\res\\filters.bmp"
+IDB_TOOLS_COLUMNS       BITMAP                  "..\\..\\res\\customize_columns.bmp"
+IDB_MERGE_DELETE        BITMAP                  "..\\..\\res\\delete.bmp"
+IDB_FILE_PRINT          BITMAP                  "..\\..\\res\\print.bmp"
+IDB_SIGMA               BITMAP                  "..\\..\\res\\sigma.bmp"
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -1640,8 +1642,8 @@ IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
 // Cursor
 //
 
-IDR_MARGIN_CURSOR       CURSOR                  "res\\mg_cur.cur"
-IDR_MERGEHAND           CURSOR                  "res\\hand.cur"
+IDR_MARGIN_CURSOR       CURSOR                  "..\\..\\res\\mg_cur.cur"
+IDR_MERGEHAND           CURSOR                  "..\\..\\res\\hand.cur"
 
 /////////////////////////////////////////////////////////////////////////////
 //

diff --git a/Src/Languages/Slovak/res/Merge.ico b/Src/Languages/Slovak/res/Merge.ico
deleted file mode 100644 (file)
index 6fd5e56..0000000
Binary files a/Src/Languages/Slovak/res/Merge.ico and /dev/null differ

diff --git a/Src/Languages/Slovak/res/MergeDir.ico b/Src/Languages/Slovak/res/MergeDir.ico
deleted file mode 100644 (file)
index 349c926..0000000
Binary files a/Src/Languages/Slovak/res/MergeDir.ico and /dev/null differ

diff --git a/Src/Languages/Slovak/res/MergeDoc.ico b/Src/Languages/Slovak/res/MergeDoc.ico
deleted file mode 100644 (file)
index b2f417b..0000000
Binary files a/Src/Languages/Slovak/res/MergeDoc.ico and /dev/null differ

diff --git a/Src/Languages/Slovak/res/Toolbar.bmp b/Src/Languages/Slovak/res/Toolbar.bmp
deleted file mode 100644 (file)
index 7935cc8..0000000
Binary files a/Src/Languages/Slovak/res/Toolbar.bmp and /dev/null differ

diff --git a/Src/Languages/Slovak/res/WinMergeSplash.psd b/Src/Languages/Slovak/res/WinMergeSplash.psd
deleted file mode 100644 (file)
index fe7df64..0000000
Binary files a/Src/Languages/Slovak/res/WinMergeSplash.psd and /dev/null differ

diff --git a/Src/Languages/Slovak/res/binary.bmp b/Src/Languages/Slovak/res/binary.bmp
deleted file mode 100644 (file)
index 417eb30..0000000
Binary files a/Src/Languages/Slovak/res/binary.bmp and /dev/null differ

diff --git a/Src/Languages/Slovak/res/binarydiff.bmp b/Src/Languages/Slovak/res/binarydiff.bmp
deleted file mode 100644 (file)
index 4e45141..0000000
Binary files a/Src/Languages/Slovak/res/binarydiff.bmp and /dev/null differ

diff --git a/Src/Languages/Slovak/res/cascade.bmp b/Src/Languages/Slovak/res/cascade.bmp
deleted file mode 100644 (file)
index a56622c..0000000
Binary files a/Src/Languages/Slovak/res/cascade.bmp and /dev/null differ

diff --git a/Src/Languages/Slovak/res/change_pane.bmp b/Src/Languages/Slovak/res/change_pane.bmp
deleted file mode 100644 (file)
index 0a2e36a..0000000
Binary files a/Src/Languages/Slovak/res/change_pane.bmp and /dev/null differ

diff --git a/Src/Languages/Slovak/res/close.bmp b/Src/Languages/Slovak/res/close.bmp
deleted file mode 100644 (file)
index 55b5e87..0000000
Binary files a/Src/Languages/Slovak/res/close.bmp and /dev/null differ

diff --git a/Src/Languages/Slovak/res/copy.bmp b/Src/Languages/Slovak/res/copy.bmp
deleted file mode 100644 (file)
index 6565c6f..0000000
Binary files a/Src/Languages/Slovak/res/copy.bmp and /dev/null differ

diff --git a/Src/Languages/Slovak/res/customize_columns.bmp b/Src/Languages/Slovak/res/customize_columns.bmp
deleted file mode 100644 (file)
index 126345a..0000000
Binary files a/Src/Languages/Slovak/res/customize_columns.bmp and /dev/null differ

diff --git a/Src/Languages/Slovak/res/cut.bmp b/Src/Languages/Slovak/res/cut.bmp
deleted file mode 100644 (file)
index 976c5d2..0000000
Binary files a/Src/Languages/Slovak/res/cut.bmp and /dev/null differ

diff --git a/Src/Languages/Slovak/res/delete.bmp b/Src/Languages/Slovak/res/delete.bmp
deleted file mode 100644 (file)
index b70eeb8..0000000
Binary files a/Src/Languages/Slovak/res/delete.bmp and /dev/null differ

diff --git a/Src/Languages/Slovak/res/equal.bmp b/Src/Languages/Slovak/res/equal.bmp
deleted file mode 100644 (file)
index 9761d55..0000000
Binary files a/Src/Languages/Slovak/res/equal.bmp and /dev/null differ

diff --git a/Src/Languages/Slovak/res/error.bmp b/Src/Languages/Slovak/res/error.bmp
deleted file mode 100644 (file)
index f659c1d..0000000
Binary files a/Src/Languages/Slovak/res/error.bmp and /dev/null differ

diff --git a/Src/Languages/Slovak/res/exit.bmp b/Src/Languages/Slovak/res/exit.bmp
deleted file mode 100644 (file)
index 596127a..0000000
Binary files a/Src/Languages/Slovak/res/exit.bmp and /dev/null differ

diff --git a/Src/Languages/Slovak/res/fileskip.bmp b/Src/Languages/Slovak/res/fileskip.bmp
deleted file mode 100644 (file)
index 9e502d9..0000000
Binary files a/Src/Languages/Slovak/res/fileskip.bmp and /dev/null differ

diff --git a/Src/Languages/Slovak/res/filters.bmp b/Src/Languages/Slovak/res/filters.bmp
deleted file mode 100644 (file)
index e7ab693..0000000
Binary files a/Src/Languages/Slovak/res/filters.bmp and /dev/null differ

diff --git a/Src/Languages/Slovak/res/folder.ico b/Src/Languages/Slovak/res/folder.ico
deleted file mode 100644 (file)
index e18bd19..0000000
Binary files a/Src/Languages/Slovak/res/folder.ico and /dev/null differ

diff --git a/Src/Languages/Slovak/res/folderskip.ico b/Src/Languages/Slovak/res/folderskip.ico
deleted file mode 100644 (file)
index 3297496..0000000
Binary files a/Src/Languages/Slovak/res/folderskip.ico and /dev/null differ

diff --git a/Src/Languages/Slovak/res/folderup.bmp b/Src/Languages/Slovak/res/folderup.bmp
deleted file mode 100644 (file)
index 2d15145..0000000
Binary files a/Src/Languages/Slovak/res/folderup.bmp and /dev/null differ

diff --git a/Src/Languages/Slovak/res/folderup_disable.bmp b/Src/Languages/Slovak/res/folderup_disable.bmp
deleted file mode 100644 (file)
index 5829a19..0000000
Binary files a/Src/Languages/Slovak/res/folderup_disable.bmp and /dev/null differ

diff --git a/Src/Languages/Slovak/res/go_to.bmp b/Src/Languages/Slovak/res/go_to.bmp
deleted file mode 100644 (file)
index a6839aa..0000000
Binary files a/Src/Languages/Slovak/res/go_to.bmp and /dev/null differ

diff --git a/Src/Languages/Slovak/res/hand.cur b/Src/Languages/Slovak/res/hand.cur
deleted file mode 100644 (file)
index ed8db8c..0000000
Binary files a/Src/Languages/Slovak/res/hand.cur and /dev/null differ

diff --git a/Src/Languages/Slovak/res/help_contents.bmp b/Src/Languages/Slovak/res/help_contents.bmp
deleted file mode 100644 (file)
index 6662979..0000000
Binary files a/Src/Languages/Slovak/res/help_contents.bmp and /dev/null differ

diff --git a/Src/Languages/Slovak/res/horizontally.bmp b/Src/Languages/Slovak/res/horizontally.bmp
deleted file mode 100644 (file)
index 3c7a732..0000000
Binary files a/Src/Languages/Slovak/res/horizontally.bmp and /dev/null differ

diff --git a/Src/Languages/Slovak/res/language.bmp b/Src/Languages/Slovak/res/language.bmp
deleted file mode 100644 (file)
index 9e92e4d..0000000
Binary files a/Src/Languages/Slovak/res/language.bmp and /dev/null differ

diff --git a/Src/Languages/Slovak/res/lfile.bmp b/Src/Languages/Slovak/res/lfile.bmp
deleted file mode 100644 (file)
index bb7cf6c..0000000
Binary files a/Src/Languages/Slovak/res/lfile.bmp and /dev/null differ

diff --git a/Src/Languages/Slovak/res/lfolder.ico b/Src/Languages/Slovak/res/lfolder.ico
deleted file mode 100644 (file)
index fc1c797..0000000
Binary files a/Src/Languages/Slovak/res/lfolder.ico and /dev/null differ

diff --git a/Src/Languages/Slovak/res/mg_cur.cur b/Src/Languages/Slovak/res/mg_cur.cur
deleted file mode 100644 (file)
index 5691efb..0000000
Binary files a/Src/Languages/Slovak/res/mg_cur.cur and /dev/null differ

diff --git a/Src/Languages/Slovak/res/notequal.bmp b/Src/Languages/Slovak/res/notequal.bmp
deleted file mode 100644 (file)
index d747084..0000000
Binary files a/Src/Languages/Slovak/res/notequal.bmp and /dev/null differ

diff --git a/Src/Languages/Slovak/res/paste.bmp b/Src/Languages/Slovak/res/paste.bmp
deleted file mode 100644 (file)
index bcd5227..0000000
Binary files a/Src/Languages/Slovak/res/paste.bmp and /dev/null differ

diff --git a/Src/Languages/Slovak/res/print.bmp b/Src/Languages/Slovak/res/print.bmp
deleted file mode 100644 (file)
index 739ca01..0000000
Binary files a/Src/Languages/Slovak/res/print.bmp and /dev/null differ

diff --git a/Src/Languages/Slovak/res/replace.bmp b/Src/Languages/Slovak/res/replace.bmp
deleted file mode 100644 (file)
index e5586b9..0000000
Binary files a/Src/Languages/Slovak/res/replace.bmp and /dev/null differ

diff --git a/Src/Languages/Slovak/res/rfile.bmp b/Src/Languages/Slovak/res/rfile.bmp
deleted file mode 100644 (file)
index 1333733..0000000
Binary files a/Src/Languages/Slovak/res/rfile.bmp and /dev/null differ

diff --git a/Src/Languages/Slovak/res/rfolder.ico b/Src/Languages/Slovak/res/rfolder.ico
deleted file mode 100644 (file)
index 444d827..0000000
Binary files a/Src/Languages/Slovak/res/rfolder.ico and /dev/null differ

diff --git a/Src/Languages/Slovak/res/search.bmp b/Src/Languages/Slovak/res/search.bmp
deleted file mode 100644 (file)
index 9d606e5..0000000
Binary files a/Src/Languages/Slovak/res/search.bmp and /dev/null differ

diff --git a/Src/Languages/Slovak/res/select_all.bmp b/Src/Languages/Slovak/res/select_all.bmp
deleted file mode 100644 (file)
index 174e311..0000000
Binary files a/Src/Languages/Slovak/res/select_all.bmp and /dev/null differ

diff --git a/Src/Languages/Slovak/res/select_font.bmp b/Src/Languages/Slovak/res/select_font.bmp
deleted file mode 100644 (file)
index 2609538..0000000
Binary files a/Src/Languages/Slovak/res/select_font.bmp and /dev/null differ

diff --git a/Src/Languages/Slovak/res/sigma.bmp b/Src/Languages/Slovak/res/sigma.bmp
deleted file mode 100644 (file)
index eff4abe..0000000
Binary files a/Src/Languages/Slovak/res/sigma.bmp and /dev/null differ

diff --git a/Src/Languages/Slovak/res/splash1.bmp b/Src/Languages/Slovak/res/splash1.bmp
deleted file mode 100644 (file)
index f041297..0000000
Binary files a/Src/Languages/Slovak/res/splash1.bmp and /dev/null differ

diff --git a/Src/Languages/Slovak/res/unknown.bmp b/Src/Languages/Slovak/res/unknown.bmp
deleted file mode 100644 (file)
index 7f16906..0000000
Binary files a/Src/Languages/Slovak/res/unknown.bmp and /dev/null differ

diff --git a/Src/Languages/Slovak/res/vertically.bmp b/Src/Languages/Slovak/res/vertically.bmp
deleted file mode 100644 (file)
index e57c1b6..0000000
Binary files a/Src/Languages/Slovak/res/vertically.bmp and /dev/null differ

diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc
index fb46c41..6184726 100644 (file)
--- a/Src/Languages/Spanish/MergeSpanish.rc
+++ b/Src/Languages/Spanish/MergeSpanish.rc
@@ -67,13 +67,15 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDR_MAINFRAME           ICON                    "res\\Merge.ico"
-IDR_MERGETYPE           ICON                    "res\\MergeDoc.ico"
-IDR_DOC_FOLDERCMP       ICON                    "res\\MergeDir.ico"
-IDI_FOLDER              ICON                    "res\\folder.ico"
-IDI_LFOLDER             ICON                    "res\\lfolder.ico"
-IDI_RFOLDER             ICON                    "res\\rfolder.ico"
-IDI_FOLDERSKIP          ICON                    "res\\folderskip.ico"
+
+// Load shared resources from Src\res
+IDR_MAINFRAME           ICON                    "..\\..\\res\\Merge.ico"
+IDR_MERGETYPE           ICON                    "..\\..\\res\\MergeDoc.ico"
+IDR_DOC_FOLDERCMP       ICON                    "..\\..\\res\\MergeDir.ico"
+IDI_FOLDER              ICON                    "..\\..\\res\\folder.ico"
+IDI_LFOLDER             ICON                    "..\\..\\res\\lfolder.ico"
+IDI_RFOLDER             ICON                    "..\\..\\res\\rfolder.ico"
+IDI_FOLDERSKIP          ICON                    "..\\..\\res\\folderskip.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1599,40 +1601,40 @@ END
 // Bitmap
 //
 
-IDR_MAINFRAME           BITMAP                  "res\\Toolbar.bmp"
-IDB_SPLASH              BITMAP                  "res\\splash1.bmp"
-IDB_EQUAL               BITMAP                  "res\\equal.bmp"
-IDB_NOTEQUAL            BITMAP                  "res\\notequal.bmp"
-IDB_UNKNOWN             BITMAP                  "res\\unknown.bmp"
-IDB_BINARYSAME          BITMAP                  "res\\binary.bmp"
-IDB_LFILE               BITMAP                  "res\\lfile.bmp"
-IDB_RFILE               BITMAP                  "res\\rfile.bmp"
-IDB_BINARYDIFF          BITMAP                  "res\\binarydiff.bmp"
-IDB_FILESKIP            BITMAP                  "res\\fileskip.bmp"
-IDB_EDIT_COPY           BITMAP                  "res\\copy.bmp"
-IDB_EDIT_CUT            BITMAP                  "res\\cut.bmp"
-IDB_EDIT_PASTE          BITMAP                  "res\\paste.bmp"
-IDB_EDIT_SEARCH         BITMAP                  "res\\search.bmp"
-IDB_WINDOW_CASCADE      BITMAP                  "res\\cascade.bmp"
-IDB_WINDOW_HORIZONTAL   BITMAP                  "res\\horizontally.bmp"
-IDB_WINDOW_VERTICAL     BITMAP                  "res\\vertically.bmp"
-IDB_WINDOW_CLOSE        BITMAP                  "res\\close.bmp"
-IDB_WINDOW_CHANGEPANE   BITMAP                  "res\\change_pane.bmp"
-IDB_EDIT_GOTO           BITMAP                  "res\\go_to.bmp"
-IDB_EDIT_REPLACE        BITMAP                  "res\\replace.bmp"
-IDB_VIEW_LANGUAGE       BITMAP                  "res\\language.bmp"
-IDB_VIEW_SELECTFONT     BITMAP                  "res\\select_font.bmp"
-IDB_FILE_EXIT           BITMAP                  "res\\exit.bmp"
-IDB_HELP_CONTENTS       BITMAP                  "res\\help_contents.bmp"
-IDB_ERROR               BITMAP                  "res\\error.bmp"
-IDB_FOLDERUP            BITMAP                  "res\\folderup.bmp"
-IDB_FOLDERUP_DISABLE    BITMAP                  "res\\folderup_disable.bmp"
-IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
-IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
-IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
-IDB_MERGE_DELETE        BITMAP                  "res\\delete.bmp"
-IDB_FILE_PRINT          BITMAP                  "res\\print.bmp"
-IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
+IDR_MAINFRAME           BITMAP                  "..\\..\\res\\Toolbar.bmp"
+IDB_SPLASH              BITMAP                  "..\\..\\res\\splash1.bmp"
+IDB_EQUAL               BITMAP                  "..\\..\\res\\equal.bmp"
+IDB_NOTEQUAL            BITMAP                  "..\\..\\res\\notequal.bmp"
+IDB_UNKNOWN             BITMAP                  "..\\..\\res\\unknown.bmp"
+IDB_BINARYSAME          BITMAP                  "..\\..\\res\\binary.bmp"
+IDB_LFILE               BITMAP                  "..\\..\\res\\lfile.bmp"
+IDB_RFILE               BITMAP                  "..\\..\\res\\rfile.bmp"
+IDB_BINARYDIFF          BITMAP                  "..\\..\\res\\binarydiff.bmp"
+IDB_FILESKIP            BITMAP                  "..\\..\\res\\fileskip.bmp"
+IDB_EDIT_COPY           BITMAP                  "..\\..\\res\\copy.bmp"
+IDB_EDIT_CUT            BITMAP                  "..\\..\\res\\cut.bmp"
+IDB_EDIT_PASTE          BITMAP                  "..\\..\\res\\paste.bmp"
+IDB_EDIT_SEARCH         BITMAP                  "..\\..\\res\\search.bmp"
+IDB_WINDOW_CASCADE      BITMAP                  "..\\..\\res\\cascade.bmp"
+IDB_WINDOW_HORIZONTAL   BITMAP                  "..\\..\\res\\horizontally.bmp"
+IDB_WINDOW_VERTICAL     BITMAP                  "..\\..\\res\\vertically.bmp"
+IDB_WINDOW_CLOSE        BITMAP                  "..\\..\\res\\close.bmp"
+IDB_WINDOW_CHANGEPANE   BITMAP                  "..\\..\\res\\change_pane.bmp"
+IDB_EDIT_GOTO           BITMAP                  "..\\..\\res\\go_to.bmp"
+IDB_EDIT_REPLACE        BITMAP                  "..\\..\\res\\replace.bmp"
+IDB_VIEW_LANGUAGE       BITMAP                  "..\\..\\res\\language.bmp"
+IDB_VIEW_SELECTFONT     BITMAP                  "..\\..\\res\\select_font.bmp"
+IDB_FILE_EXIT           BITMAP                  "..\\..\\res\\exit.bmp"
+IDB_HELP_CONTENTS       BITMAP                  "..\\..\\res\\help_contents.bmp"
+IDB_ERROR               BITMAP                  "..\\..\\res\\error.bmp"
+IDB_FOLDERUP            BITMAP                  "..\\..\\res\\folderup.bmp"
+IDB_FOLDERUP_DISABLE    BITMAP                  "..\\..\\res\\folderup_disable.bmp"
+IDB_EDIT_SELECTALL      BITMAP                  "..\\..\\res\\select_all.bmp"
+IDB_TOOLS_FILTERS       BITMAP                  "..\\..\\res\\filters.bmp"
+IDB_TOOLS_COLUMNS       BITMAP                  "..\\..\\res\\customize_columns.bmp"
+IDB_MERGE_DELETE        BITMAP                  "..\\..\\res\\delete.bmp"
+IDB_FILE_PRINT          BITMAP                  "..\\..\\res\\print.bmp"
+IDB_SIGMA               BITMAP                  "..\\..\\res\\sigma.bmp"
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -1640,8 +1642,8 @@ IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
 // Cursor
 //
 
-IDR_MARGIN_CURSOR       CURSOR                  "res\\mg_cur.cur"
-IDR_MERGEHAND           CURSOR                  "res\\hand.cur"
+IDR_MARGIN_CURSOR       CURSOR                  "..\\..\\res\\mg_cur.cur"
+IDR_MERGEHAND           CURSOR                  "..\\..\\res\\hand.cur"
 
 /////////////////////////////////////////////////////////////////////////////
 //

diff --git a/Src/Languages/Spanish/res/Merge.ico b/Src/Languages/Spanish/res/Merge.ico
deleted file mode 100644 (file)
index 6fd5e56..0000000
Binary files a/Src/Languages/Spanish/res/Merge.ico and /dev/null differ

diff --git a/Src/Languages/Spanish/res/MergeDir.ico b/Src/Languages/Spanish/res/MergeDir.ico
deleted file mode 100644 (file)
index 349c926..0000000
Binary files a/Src/Languages/Spanish/res/MergeDir.ico and /dev/null differ

diff --git a/Src/Languages/Spanish/res/MergeDoc.ico b/Src/Languages/Spanish/res/MergeDoc.ico
deleted file mode 100644 (file)
index b2f417b..0000000
Binary files a/Src/Languages/Spanish/res/MergeDoc.ico and /dev/null differ

diff --git a/Src/Languages/Spanish/res/Toolbar.bmp b/Src/Languages/Spanish/res/Toolbar.bmp
deleted file mode 100644 (file)
index 7935cc8..0000000
Binary files a/Src/Languages/Spanish/res/Toolbar.bmp and /dev/null differ

diff --git a/Src/Languages/Spanish/res/WinMergeSplash.psd b/Src/Languages/Spanish/res/WinMergeSplash.psd
deleted file mode 100644 (file)
index fe7df64..0000000
Binary files a/Src/Languages/Spanish/res/WinMergeSplash.psd and /dev/null differ

diff --git a/Src/Languages/Spanish/res/binary.bmp b/Src/Languages/Spanish/res/binary.bmp
deleted file mode 100644 (file)
index 417eb30..0000000
Binary files a/Src/Languages/Spanish/res/binary.bmp and /dev/null differ

diff --git a/Src/Languages/Spanish/res/binarydiff.bmp b/Src/Languages/Spanish/res/binarydiff.bmp
deleted file mode 100644 (file)
index 4e45141..0000000
Binary files a/Src/Languages/Spanish/res/binarydiff.bmp and /dev/null differ

diff --git a/Src/Languages/Spanish/res/cascade.bmp b/Src/Languages/Spanish/res/cascade.bmp
deleted file mode 100644 (file)
index a56622c..0000000
Binary files a/Src/Languages/Spanish/res/cascade.bmp and /dev/null differ

diff --git a/Src/Languages/Spanish/res/change_pane.bmp b/Src/Languages/Spanish/res/change_pane.bmp
deleted file mode 100644 (file)
index 0a2e36a..0000000
Binary files a/Src/Languages/Spanish/res/change_pane.bmp and /dev/null differ

diff --git a/Src/Languages/Spanish/res/close.bmp b/Src/Languages/Spanish/res/close.bmp
deleted file mode 100644 (file)
index 55b5e87..0000000
Binary files a/Src/Languages/Spanish/res/close.bmp and /dev/null differ

diff --git a/Src/Languages/Spanish/res/copy.bmp b/Src/Languages/Spanish/res/copy.bmp
deleted file mode 100644 (file)
index 6565c6f..0000000
Binary files a/Src/Languages/Spanish/res/copy.bmp and /dev/null differ

diff --git a/Src/Languages/Spanish/res/customize_columns.bmp b/Src/Languages/Spanish/res/customize_columns.bmp
deleted file mode 100644 (file)
index 126345a..0000000
Binary files a/Src/Languages/Spanish/res/customize_columns.bmp and /dev/null differ

diff --git a/Src/Languages/Spanish/res/cut.bmp b/Src/Languages/Spanish/res/cut.bmp
deleted file mode 100644 (file)
index 976c5d2..0000000
Binary files a/Src/Languages/Spanish/res/cut.bmp and /dev/null differ

diff --git a/Src/Languages/Spanish/res/delete.bmp b/Src/Languages/Spanish/res/delete.bmp
deleted file mode 100644 (file)
index b70eeb8..0000000
Binary files a/Src/Languages/Spanish/res/delete.bmp and /dev/null differ

diff --git a/Src/Languages/Spanish/res/equal.bmp b/Src/Languages/Spanish/res/equal.bmp
deleted file mode 100644 (file)
index 9761d55..0000000
Binary files a/Src/Languages/Spanish/res/equal.bmp and /dev/null differ

diff --git a/Src/Languages/Spanish/res/error.bmp b/Src/Languages/Spanish/res/error.bmp
deleted file mode 100644 (file)
index f659c1d..0000000
Binary files a/Src/Languages/Spanish/res/error.bmp and /dev/null differ

diff --git a/Src/Languages/Spanish/res/exit.bmp b/Src/Languages/Spanish/res/exit.bmp
deleted file mode 100644 (file)
index 596127a..0000000
Binary files a/Src/Languages/Spanish/res/exit.bmp and /dev/null differ

diff --git a/Src/Languages/Spanish/res/fileskip.bmp b/Src/Languages/Spanish/res/fileskip.bmp
deleted file mode 100644 (file)
index 9e502d9..0000000
Binary files a/Src/Languages/Spanish/res/fileskip.bmp and /dev/null differ

diff --git a/Src/Languages/Spanish/res/filters.bmp b/Src/Languages/Spanish/res/filters.bmp
deleted file mode 100644 (file)
index e7ab693..0000000
Binary files a/Src/Languages/Spanish/res/filters.bmp and /dev/null differ

diff --git a/Src/Languages/Spanish/res/folder.ico b/Src/Languages/Spanish/res/folder.ico
deleted file mode 100644 (file)
index e18bd19..0000000
Binary files a/Src/Languages/Spanish/res/folder.ico and /dev/null differ

diff --git a/Src/Languages/Spanish/res/folderskip.ico b/Src/Languages/Spanish/res/folderskip.ico
deleted file mode 100644 (file)
index 3297496..0000000
Binary files a/Src/Languages/Spanish/res/folderskip.ico and /dev/null differ

diff --git a/Src/Languages/Spanish/res/folderup.bmp b/Src/Languages/Spanish/res/folderup.bmp
deleted file mode 100644 (file)
index 2d15145..0000000
Binary files a/Src/Languages/Spanish/res/folderup.bmp and /dev/null differ

diff --git a/Src/Languages/Spanish/res/folderup_disable.bmp b/Src/Languages/Spanish/res/folderup_disable.bmp
deleted file mode 100644 (file)
index 5829a19..0000000
Binary files a/Src/Languages/Spanish/res/folderup_disable.bmp and /dev/null differ

diff --git a/Src/Languages/Spanish/res/go_to.bmp b/Src/Languages/Spanish/res/go_to.bmp
deleted file mode 100644 (file)
index a6839aa..0000000
Binary files a/Src/Languages/Spanish/res/go_to.bmp and /dev/null differ

diff --git a/Src/Languages/Spanish/res/hand.cur b/Src/Languages/Spanish/res/hand.cur
deleted file mode 100644 (file)
index ed8db8c..0000000
Binary files a/Src/Languages/Spanish/res/hand.cur and /dev/null differ

diff --git a/Src/Languages/Spanish/res/help_contents.bmp b/Src/Languages/Spanish/res/help_contents.bmp
deleted file mode 100644 (file)
index 6662979..0000000
Binary files a/Src/Languages/Spanish/res/help_contents.bmp and /dev/null differ

diff --git a/Src/Languages/Spanish/res/horizontally.bmp b/Src/Languages/Spanish/res/horizontally.bmp
deleted file mode 100644 (file)
index 3c7a732..0000000
Binary files a/Src/Languages/Spanish/res/horizontally.bmp and /dev/null differ

diff --git a/Src/Languages/Spanish/res/language.bmp b/Src/Languages/Spanish/res/language.bmp
deleted file mode 100644 (file)
index 9e92e4d..0000000
Binary files a/Src/Languages/Spanish/res/language.bmp and /dev/null differ

diff --git a/Src/Languages/Spanish/res/lfile.bmp b/Src/Languages/Spanish/res/lfile.bmp
deleted file mode 100755 (executable)
index bb7cf6c..0000000
Binary files a/Src/Languages/Spanish/res/lfile.bmp and /dev/null differ

diff --git a/Src/Languages/Spanish/res/lfolder.ico b/Src/Languages/Spanish/res/lfolder.ico
deleted file mode 100644 (file)
index fc1c797..0000000
Binary files a/Src/Languages/Spanish/res/lfolder.ico and /dev/null differ

diff --git a/Src/Languages/Spanish/res/mg_cur.cur b/Src/Languages/Spanish/res/mg_cur.cur
deleted file mode 100755 (executable)
index 5691efb..0000000
Binary files a/Src/Languages/Spanish/res/mg_cur.cur and /dev/null differ

diff --git a/Src/Languages/Spanish/res/notequal.bmp b/Src/Languages/Spanish/res/notequal.bmp
deleted file mode 100644 (file)
index d747084..0000000
Binary files a/Src/Languages/Spanish/res/notequal.bmp and /dev/null differ

diff --git a/Src/Languages/Spanish/res/paste.bmp b/Src/Languages/Spanish/res/paste.bmp
deleted file mode 100644 (file)
index bcd5227..0000000
Binary files a/Src/Languages/Spanish/res/paste.bmp and /dev/null differ

diff --git a/Src/Languages/Spanish/res/print.bmp b/Src/Languages/Spanish/res/print.bmp
deleted file mode 100644 (file)
index 739ca01..0000000
Binary files a/Src/Languages/Spanish/res/print.bmp and /dev/null differ

diff --git a/Src/Languages/Spanish/res/replace.bmp b/Src/Languages/Spanish/res/replace.bmp
deleted file mode 100644 (file)
index e5586b9..0000000
Binary files a/Src/Languages/Spanish/res/replace.bmp and /dev/null differ

diff --git a/Src/Languages/Spanish/res/rfile.bmp b/Src/Languages/Spanish/res/rfile.bmp
deleted file mode 100755 (executable)
index 1333733..0000000
Binary files a/Src/Languages/Spanish/res/rfile.bmp and /dev/null differ

diff --git a/Src/Languages/Spanish/res/rfolder.ico b/Src/Languages/Spanish/res/rfolder.ico
deleted file mode 100644 (file)
index 444d827..0000000
Binary files a/Src/Languages/Spanish/res/rfolder.ico and /dev/null differ

diff --git a/Src/Languages/Spanish/res/search.bmp b/Src/Languages/Spanish/res/search.bmp
deleted file mode 100644 (file)
index 9d606e5..0000000
Binary files a/Src/Languages/Spanish/res/search.bmp and /dev/null differ

diff --git a/Src/Languages/Spanish/res/select_all.bmp b/Src/Languages/Spanish/res/select_all.bmp
deleted file mode 100644 (file)
index 174e311..0000000
Binary files a/Src/Languages/Spanish/res/select_all.bmp and /dev/null differ

diff --git a/Src/Languages/Spanish/res/select_font.bmp b/Src/Languages/Spanish/res/select_font.bmp
deleted file mode 100644 (file)
index 2609538..0000000
Binary files a/Src/Languages/Spanish/res/select_font.bmp and /dev/null differ

diff --git a/Src/Languages/Spanish/res/sigma.bmp b/Src/Languages/Spanish/res/sigma.bmp
deleted file mode 100644 (file)
index eff4abe..0000000
Binary files a/Src/Languages/Spanish/res/sigma.bmp and /dev/null differ

diff --git a/Src/Languages/Spanish/res/splash1.bmp b/Src/Languages/Spanish/res/splash1.bmp
deleted file mode 100644 (file)
index f041297..0000000
Binary files a/Src/Languages/Spanish/res/splash1.bmp and /dev/null differ

diff --git a/Src/Languages/Spanish/res/unknown.bmp b/Src/Languages/Spanish/res/unknown.bmp
deleted file mode 100644 (file)
index 7f16906..0000000
Binary files a/Src/Languages/Spanish/res/unknown.bmp and /dev/null differ

diff --git a/Src/Languages/Spanish/res/vertically.bmp b/Src/Languages/Spanish/res/vertically.bmp
deleted file mode 100644 (file)
index e57c1b6..0000000
Binary files a/Src/Languages/Spanish/res/vertically.bmp and /dev/null differ

diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc
index 09ab204..d261c8c 100644 (file)
--- a/Src/Languages/Swedish/MergeSwedish.rc
+++ b/Src/Languages/Swedish/MergeSwedish.rc
@@ -66,13 +66,15 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDR_MAINFRAME           ICON                    "res\\Merge.ico"
-IDR_MERGETYPE           ICON                    "res\\MergeDoc.ico"
-IDR_DOC_FOLDERCMP       ICON                    "res\\MergeDir.ico"
-IDI_FOLDER              ICON                    "res\\folder.ico"
-IDI_LFOLDER             ICON                    "res\\lfolder.ico"
-IDI_RFOLDER             ICON                    "res\\rfolder.ico"
-IDI_FOLDERSKIP          ICON                    "res\\folderskip.ico"
+
+// Load shared resources from Src\res
+IDR_MAINFRAME           ICON                    "..\\..\\res\\Merge.ico"
+IDR_MERGETYPE           ICON                    "..\\..\\res\\MergeDoc.ico"
+IDR_DOC_FOLDERCMP       ICON                    "..\\..\\res\\MergeDir.ico"
+IDI_FOLDER              ICON                    "..\\..\\res\\folder.ico"
+IDI_LFOLDER             ICON                    "..\\..\\res\\lfolder.ico"
+IDI_RFOLDER             ICON                    "..\\..\\res\\rfolder.ico"
+IDI_FOLDERSKIP          ICON                    "..\\..\\res\\folderskip.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1598,40 +1600,40 @@ END
 // Bitmap
 //
 
-IDR_MAINFRAME           BITMAP                  "res\\Toolbar.bmp"
-IDB_SPLASH              BITMAP                  "res\\splash1.bmp"
-IDB_EQUAL               BITMAP                  "res\\equal.bmp"
-IDB_NOTEQUAL            BITMAP                  "res\\notequal.bmp"
-IDB_UNKNOWN             BITMAP                  "res\\unknown.bmp"
-IDB_BINARYSAME          BITMAP                  "res\\binary.bmp"
-IDB_LFILE               BITMAP                  "res\\lfile.bmp"
-IDB_RFILE               BITMAP                  "res\\rfile.bmp"
-IDB_BINARYDIFF          BITMAP                  "res\\binarydiff.bmp"
-IDB_FILESKIP            BITMAP                  "res\\fileskip.bmp"
-IDB_EDIT_COPY           BITMAP                  "res\\copy.bmp"
-IDB_EDIT_CUT            BITMAP                  "res\\cut.bmp"
-IDB_EDIT_PASTE          BITMAP                  "res\\paste.bmp"
-IDB_EDIT_SEARCH         BITMAP                  "res\\search.bmp"
-IDB_WINDOW_CASCADE      BITMAP                  "res\\cascade.bmp"
-IDB_WINDOW_HORIZONTAL   BITMAP                  "res\\horizontally.bmp"
-IDB_WINDOW_VERTICAL     BITMAP                  "res\\vertically.bmp"
-IDB_WINDOW_CLOSE        BITMAP                  "res\\close.bmp"
-IDB_WINDOW_CHANGEPANE   BITMAP                  "res\\change_pane.bmp"
-IDB_EDIT_GOTO           BITMAP                  "res\\go_to.bmp"
-IDB_EDIT_REPLACE        BITMAP                  "res\\replace.bmp"
-IDB_VIEW_LANGUAGE       BITMAP                  "res\\language.bmp"
-IDB_VIEW_SELECTFONT     BITMAP                  "res\\select_font.bmp"
-IDB_FILE_EXIT           BITMAP                  "res\\exit.bmp"
-IDB_HELP_CONTENTS       BITMAP                  "res\\help_contents.bmp"
-IDB_ERROR               BITMAP                  "res\\error.bmp"
-IDB_FOLDERUP            BITMAP                  "res\\folderup.bmp"
-IDB_FOLDERUP_DISABLE    BITMAP                  "res\\folderup_disable.bmp"
-IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
-IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
-IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
-IDB_MERGE_DELETE        BITMAP                  "res\\delete.bmp"
-IDB_FILE_PRINT          BITMAP                  "res\\print.bmp"
-IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
+IDR_MAINFRAME           BITMAP                  "..\\..\\res\\Toolbar.bmp"
+IDB_SPLASH              BITMAP                  "..\\..\\res\\splash1.bmp"
+IDB_EQUAL               BITMAP                  "..\\..\\res\\equal.bmp"
+IDB_NOTEQUAL            BITMAP                  "..\\..\\res\\notequal.bmp"
+IDB_UNKNOWN             BITMAP                  "..\\..\\res\\unknown.bmp"
+IDB_BINARYSAME          BITMAP                  "..\\..\\res\\binary.bmp"
+IDB_LFILE               BITMAP                  "..\\..\\res\\lfile.bmp"
+IDB_RFILE               BITMAP                  "..\\..\\res\\rfile.bmp"
+IDB_BINARYDIFF          BITMAP                  "..\\..\\res\\binarydiff.bmp"
+IDB_FILESKIP            BITMAP                  "..\\..\\res\\fileskip.bmp"
+IDB_EDIT_COPY           BITMAP                  "..\\..\\res\\copy.bmp"
+IDB_EDIT_CUT            BITMAP                  "..\\..\\res\\cut.bmp"
+IDB_EDIT_PASTE          BITMAP                  "..\\..\\res\\paste.bmp"
+IDB_EDIT_SEARCH         BITMAP                  "..\\..\\res\\search.bmp"
+IDB_WINDOW_CASCADE      BITMAP                  "..\\..\\res\\cascade.bmp"
+IDB_WINDOW_HORIZONTAL   BITMAP                  "..\\..\\res\\horizontally.bmp"
+IDB_WINDOW_VERTICAL     BITMAP                  "..\\..\\res\\vertically.bmp"
+IDB_WINDOW_CLOSE        BITMAP                  "..\\..\\res\\close.bmp"
+IDB_WINDOW_CHANGEPANE   BITMAP                  "..\\..\\res\\change_pane.bmp"
+IDB_EDIT_GOTO           BITMAP                  "..\\..\\res\\go_to.bmp"
+IDB_EDIT_REPLACE        BITMAP                  "..\\..\\res\\replace.bmp"
+IDB_VIEW_LANGUAGE       BITMAP                  "..\\..\\res\\language.bmp"
+IDB_VIEW_SELECTFONT     BITMAP                  "..\\..\\res\\select_font.bmp"
+IDB_FILE_EXIT           BITMAP                  "..\\..\\res\\exit.bmp"
+IDB_HELP_CONTENTS       BITMAP                  "..\\..\\res\\help_contents.bmp"
+IDB_ERROR               BITMAP                  "..\\..\\res\\error.bmp"
+IDB_FOLDERUP            BITMAP                  "..\\..\\res\\folderup.bmp"
+IDB_FOLDERUP_DISABLE    BITMAP                  "..\\..\\res\\folderup_disable.bmp"
+IDB_EDIT_SELECTALL      BITMAP                  "..\\..\\res\\select_all.bmp"
+IDB_TOOLS_FILTERS       BITMAP                  "..\\..\\res\\filters.bmp"
+IDB_TOOLS_COLUMNS       BITMAP                  "..\\..\\res\\customize_columns.bmp"
+IDB_MERGE_DELETE        BITMAP                  "..\\..\\res\\delete.bmp"
+IDB_FILE_PRINT          BITMAP                  "..\\..\\res\\print.bmp"
+IDB_SIGMA               BITMAP                  "..\\..\\res\\sigma.bmp"
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -1639,8 +1641,8 @@ IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
 // Cursor
 //
 
-IDR_MARGIN_CURSOR       CURSOR                  "res\\mg_cur.cur"
-IDR_MERGEHAND           CURSOR                  "res\\hand.cur"
+IDR_MARGIN_CURSOR       CURSOR                  "..\\..\\res\\mg_cur.cur"
+IDR_MERGEHAND           CURSOR                  "..\\..\\res\\hand.cur"
 
 /////////////////////////////////////////////////////////////////////////////
 //

diff --git a/Src/Languages/Swedish/res/Merge.ico b/Src/Languages/Swedish/res/Merge.ico
deleted file mode 100644 (file)
index 6fd5e56..0000000
Binary files a/Src/Languages/Swedish/res/Merge.ico and /dev/null differ

diff --git a/Src/Languages/Swedish/res/MergeDir.ico b/Src/Languages/Swedish/res/MergeDir.ico
deleted file mode 100644 (file)
index 349c926..0000000
Binary files a/Src/Languages/Swedish/res/MergeDir.ico and /dev/null differ

diff --git a/Src/Languages/Swedish/res/MergeDoc.ico b/Src/Languages/Swedish/res/MergeDoc.ico
deleted file mode 100644 (file)
index b2f417b..0000000
Binary files a/Src/Languages/Swedish/res/MergeDoc.ico and /dev/null differ

diff --git a/Src/Languages/Swedish/res/Toolbar.bmp b/Src/Languages/Swedish/res/Toolbar.bmp
deleted file mode 100644 (file)
index 7935cc8..0000000
Binary files a/Src/Languages/Swedish/res/Toolbar.bmp and /dev/null differ

diff --git a/Src/Languages/Swedish/res/WinMergeSplash.psd b/Src/Languages/Swedish/res/WinMergeSplash.psd
deleted file mode 100644 (file)
index fe7df64..0000000
Binary files a/Src/Languages/Swedish/res/WinMergeSplash.psd and /dev/null differ

diff --git a/Src/Languages/Swedish/res/binary.bmp b/Src/Languages/Swedish/res/binary.bmp
deleted file mode 100644 (file)
index 417eb30..0000000
Binary files a/Src/Languages/Swedish/res/binary.bmp and /dev/null differ

diff --git a/Src/Languages/Swedish/res/binarydiff.bmp b/Src/Languages/Swedish/res/binarydiff.bmp
deleted file mode 100644 (file)
index 4e45141..0000000
Binary files a/Src/Languages/Swedish/res/binarydiff.bmp and /dev/null differ

diff --git a/Src/Languages/Swedish/res/cascade.bmp b/Src/Languages/Swedish/res/cascade.bmp
deleted file mode 100644 (file)
index a56622c..0000000
Binary files a/Src/Languages/Swedish/res/cascade.bmp and /dev/null differ

diff --git a/Src/Languages/Swedish/res/change_pane.bmp b/Src/Languages/Swedish/res/change_pane.bmp
deleted file mode 100644 (file)
index 0a2e36a..0000000
Binary files a/Src/Languages/Swedish/res/change_pane.bmp and /dev/null differ

diff --git a/Src/Languages/Swedish/res/close.bmp b/Src/Languages/Swedish/res/close.bmp
deleted file mode 100644 (file)
index 55b5e87..0000000
Binary files a/Src/Languages/Swedish/res/close.bmp and /dev/null differ

diff --git a/Src/Languages/Swedish/res/copy.bmp b/Src/Languages/Swedish/res/copy.bmp
deleted file mode 100644 (file)
index 6565c6f..0000000
Binary files a/Src/Languages/Swedish/res/copy.bmp and /dev/null differ

diff --git a/Src/Languages/Swedish/res/customize_columns.bmp b/Src/Languages/Swedish/res/customize_columns.bmp
deleted file mode 100644 (file)
index 126345a..0000000
Binary files a/Src/Languages/Swedish/res/customize_columns.bmp and /dev/null differ

diff --git a/Src/Languages/Swedish/res/cut.bmp b/Src/Languages/Swedish/res/cut.bmp
deleted file mode 100644 (file)
index 976c5d2..0000000
Binary files a/Src/Languages/Swedish/res/cut.bmp and /dev/null differ

diff --git a/Src/Languages/Swedish/res/delete.bmp b/Src/Languages/Swedish/res/delete.bmp
deleted file mode 100644 (file)
index b70eeb8..0000000
Binary files a/Src/Languages/Swedish/res/delete.bmp and /dev/null differ

diff --git a/Src/Languages/Swedish/res/equal.bmp b/Src/Languages/Swedish/res/equal.bmp
deleted file mode 100644 (file)
index 9761d55..0000000
Binary files a/Src/Languages/Swedish/res/equal.bmp and /dev/null differ

diff --git a/Src/Languages/Swedish/res/error.bmp b/Src/Languages/Swedish/res/error.bmp
deleted file mode 100644 (file)
index f659c1d..0000000
Binary files a/Src/Languages/Swedish/res/error.bmp and /dev/null differ

diff --git a/Src/Languages/Swedish/res/exit.bmp b/Src/Languages/Swedish/res/exit.bmp
deleted file mode 100644 (file)
index 596127a..0000000
Binary files a/Src/Languages/Swedish/res/exit.bmp and /dev/null differ

diff --git a/Src/Languages/Swedish/res/fileskip.bmp b/Src/Languages/Swedish/res/fileskip.bmp
deleted file mode 100644 (file)
index 9e502d9..0000000
Binary files a/Src/Languages/Swedish/res/fileskip.bmp and /dev/null differ

diff --git a/Src/Languages/Swedish/res/filters.bmp b/Src/Languages/Swedish/res/filters.bmp
deleted file mode 100644 (file)
index e7ab693..0000000
Binary files a/Src/Languages/Swedish/res/filters.bmp and /dev/null differ

diff --git a/Src/Languages/Swedish/res/folder.ico b/Src/Languages/Swedish/res/folder.ico
deleted file mode 100644 (file)
index e18bd19..0000000
Binary files a/Src/Languages/Swedish/res/folder.ico and /dev/null differ

diff --git a/Src/Languages/Swedish/res/folderskip.ico b/Src/Languages/Swedish/res/folderskip.ico
deleted file mode 100644 (file)
index 3297496..0000000
Binary files a/Src/Languages/Swedish/res/folderskip.ico and /dev/null differ

diff --git a/Src/Languages/Swedish/res/folderup.bmp b/Src/Languages/Swedish/res/folderup.bmp
deleted file mode 100644 (file)
index 2d15145..0000000
Binary files a/Src/Languages/Swedish/res/folderup.bmp and /dev/null differ

diff --git a/Src/Languages/Swedish/res/folderup_disable.bmp b/Src/Languages/Swedish/res/folderup_disable.bmp
deleted file mode 100644 (file)
index 5829a19..0000000
Binary files a/Src/Languages/Swedish/res/folderup_disable.bmp and /dev/null differ

diff --git a/Src/Languages/Swedish/res/go_to.bmp b/Src/Languages/Swedish/res/go_to.bmp
deleted file mode 100644 (file)
index a6839aa..0000000
Binary files a/Src/Languages/Swedish/res/go_to.bmp and /dev/null differ

diff --git a/Src/Languages/Swedish/res/hand.cur b/Src/Languages/Swedish/res/hand.cur
deleted file mode 100644 (file)
index ed8db8c..0000000
Binary files a/Src/Languages/Swedish/res/hand.cur and /dev/null differ

diff --git a/Src/Languages/Swedish/res/help_contents.bmp b/Src/Languages/Swedish/res/help_contents.bmp
deleted file mode 100644 (file)
index 6662979..0000000
Binary files a/Src/Languages/Swedish/res/help_contents.bmp and /dev/null differ

diff --git a/Src/Languages/Swedish/res/horizontally.bmp b/Src/Languages/Swedish/res/horizontally.bmp
deleted file mode 100644 (file)
index 3c7a732..0000000
Binary files a/Src/Languages/Swedish/res/horizontally.bmp and /dev/null differ

diff --git a/Src/Languages/Swedish/res/language.bmp b/Src/Languages/Swedish/res/language.bmp
deleted file mode 100644 (file)
index 9e92e4d..0000000
Binary files a/Src/Languages/Swedish/res/language.bmp and /dev/null differ

diff --git a/Src/Languages/Swedish/res/lfile.bmp b/Src/Languages/Swedish/res/lfile.bmp
deleted file mode 100644 (file)
index bb7cf6c..0000000
Binary files a/Src/Languages/Swedish/res/lfile.bmp and /dev/null differ

diff --git a/Src/Languages/Swedish/res/lfolder.ico b/Src/Languages/Swedish/res/lfolder.ico
deleted file mode 100644 (file)
index fc1c797..0000000
Binary files a/Src/Languages/Swedish/res/lfolder.ico and /dev/null differ

diff --git a/Src/Languages/Swedish/res/mg_cur.cur b/Src/Languages/Swedish/res/mg_cur.cur
deleted file mode 100644 (file)
index 5691efb..0000000
Binary files a/Src/Languages/Swedish/res/mg_cur.cur and /dev/null differ

diff --git a/Src/Languages/Swedish/res/notequal.bmp b/Src/Languages/Swedish/res/notequal.bmp
deleted file mode 100644 (file)
index d747084..0000000
Binary files a/Src/Languages/Swedish/res/notequal.bmp and /dev/null differ

diff --git a/Src/Languages/Swedish/res/paste.bmp b/Src/Languages/Swedish/res/paste.bmp
deleted file mode 100644 (file)
index bcd5227..0000000
Binary files a/Src/Languages/Swedish/res/paste.bmp and /dev/null differ

diff --git a/Src/Languages/Swedish/res/print.bmp b/Src/Languages/Swedish/res/print.bmp
deleted file mode 100644 (file)
index 739ca01..0000000
Binary files a/Src/Languages/Swedish/res/print.bmp and /dev/null differ

diff --git a/Src/Languages/Swedish/res/replace.bmp b/Src/Languages/Swedish/res/replace.bmp
deleted file mode 100644 (file)
index e5586b9..0000000
Binary files a/Src/Languages/Swedish/res/replace.bmp and /dev/null differ

diff --git a/Src/Languages/Swedish/res/rfile.bmp b/Src/Languages/Swedish/res/rfile.bmp
deleted file mode 100644 (file)
index 1333733..0000000
Binary files a/Src/Languages/Swedish/res/rfile.bmp and /dev/null differ

diff --git a/Src/Languages/Swedish/res/rfolder.ico b/Src/Languages/Swedish/res/rfolder.ico
deleted file mode 100644 (file)
index 444d827..0000000
Binary files a/Src/Languages/Swedish/res/rfolder.ico and /dev/null differ

diff --git a/Src/Languages/Swedish/res/search.bmp b/Src/Languages/Swedish/res/search.bmp
deleted file mode 100644 (file)
index 9d606e5..0000000
Binary files a/Src/Languages/Swedish/res/search.bmp and /dev/null differ

diff --git a/Src/Languages/Swedish/res/select_all.bmp b/Src/Languages/Swedish/res/select_all.bmp
deleted file mode 100644 (file)
index 174e311..0000000
Binary files a/Src/Languages/Swedish/res/select_all.bmp and /dev/null differ

diff --git a/Src/Languages/Swedish/res/select_font.bmp b/Src/Languages/Swedish/res/select_font.bmp
deleted file mode 100644 (file)
index 2609538..0000000
Binary files a/Src/Languages/Swedish/res/select_font.bmp and /dev/null differ

diff --git a/Src/Languages/Swedish/res/sigma.bmp b/Src/Languages/Swedish/res/sigma.bmp
deleted file mode 100644 (file)
index eff4abe..0000000
Binary files a/Src/Languages/Swedish/res/sigma.bmp and /dev/null differ

diff --git a/Src/Languages/Swedish/res/splash1.bmp b/Src/Languages/Swedish/res/splash1.bmp
deleted file mode 100644 (file)
index f041297..0000000
Binary files a/Src/Languages/Swedish/res/splash1.bmp and /dev/null differ

diff --git a/Src/Languages/Swedish/res/unknown.bmp b/Src/Languages/Swedish/res/unknown.bmp
deleted file mode 100644 (file)
index 7f16906..0000000
Binary files a/Src/Languages/Swedish/res/unknown.bmp and /dev/null differ

diff --git a/Src/Languages/Swedish/res/vertically.bmp b/Src/Languages/Swedish/res/vertically.bmp
deleted file mode 100644 (file)
index e57c1b6..0000000
Binary files a/Src/Languages/Swedish/res/vertically.bmp and /dev/null differ

diff --git a/Src/Languages/Turkish/MergeTurkish.rc b/Src/Languages/Turkish/MergeTurkish.rc
index 2c64bfa..f19555e 100644 (file)
--- a/Src/Languages/Turkish/MergeTurkish.rc
+++ b/Src/Languages/Turkish/MergeTurkish.rc
@@ -66,13 +66,15 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDR_MAINFRAME           ICON                    "res\\Merge.ico"
-IDR_MERGETYPE           ICON                    "res\\MergeDoc.ico"
-IDR_DOC_FOLDERCMP       ICON                    "res\\MergeDir.ico"
-IDI_FOLDER              ICON                    "res\\folder.ico"
-IDI_LFOLDER             ICON                    "res\\lfolder.ico"
-IDI_RFOLDER             ICON                    "res\\rfolder.ico"
-IDI_FOLDERSKIP          ICON                    "res\\folderskip.ico"
+
+// Load shared resources from Src\res
+IDR_MAINFRAME           ICON                    "..\\..\\res\\Merge.ico"
+IDR_MERGETYPE           ICON                    "..\\..\\res\\MergeDoc.ico"
+IDR_DOC_FOLDERCMP       ICON                    "..\\..\\res\\MergeDir.ico"
+IDI_FOLDER              ICON                    "..\\..\\res\\folder.ico"
+IDI_LFOLDER             ICON                    "..\\..\\res\\lfolder.ico"
+IDI_RFOLDER             ICON                    "..\\..\\res\\rfolder.ico"
+IDI_FOLDERSKIP          ICON                    "..\\..\\res\\folderskip.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1485,40 +1487,40 @@ END
 // Bitmap
 //
 
-IDR_MAINFRAME           BITMAP                  "res\\Toolbar.bmp"
-IDB_SPLASH              BITMAP                  "res\\splash1.bmp"
-IDB_EQUAL               BITMAP                  "res\\equal.bmp"
-IDB_NOTEQUAL            BITMAP                  "res\\notequal.bmp"
-IDB_UNKNOWN             BITMAP                  "res\\unknown.bmp"
-IDB_BINARYSAME          BITMAP                  "res\\binary.bmp"
-IDB_LFILE               BITMAP                  "res\\lfile.bmp"
-IDB_RFILE               BITMAP                  "res\\rfile.bmp"
-IDB_BINARYDIFF          BITMAP                  "res\\binarydiff.bmp"
-IDB_FILESKIP            BITMAP                  "res\\fileskip.bmp"
-IDB_EDIT_COPY           BITMAP                  "res\\copy.bmp"
-IDB_EDIT_CUT            BITMAP                  "res\\cut.bmp"
-IDB_EDIT_PASTE          BITMAP                  "res\\paste.bmp"
-IDB_EDIT_SEARCH         BITMAP                  "res\\search.bmp"
-IDB_WINDOW_CASCADE      BITMAP                  "res\\cascade.bmp"
-IDB_WINDOW_HORIZONTAL   BITMAP                  "res\\horizontally.bmp"
-IDB_WINDOW_VERTICAL     BITMAP                  "res\\vertically.bmp"
-IDB_WINDOW_CLOSE        BITMAP                  "res\\close.bmp"
-IDB_WINDOW_CHANGEPANE   BITMAP                  "res\\change_pane.bmp"
-IDB_EDIT_GOTO           BITMAP                  "res\\go_to.bmp"
-IDB_EDIT_REPLACE        BITMAP                  "res\\replace.bmp"
-IDB_VIEW_LANGUAGE       BITMAP                  "res\\language.bmp"
-IDB_VIEW_SELECTFONT     BITMAP                  "res\\select_font.bmp"
-IDB_FILE_EXIT           BITMAP                  "res\\exit.bmp"
-IDB_HELP_CONTENTS       BITMAP                  "res\\help_contents.bmp"
-IDB_ERROR               BITMAP                  "res\\error.bmp"
-IDB_FOLDERUP            BITMAP                  "res\\folderup.bmp"
-IDB_FOLDERUP_DISABLE    BITMAP                  "res\\folderup_disable.bmp"
-IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
-IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
-IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
-IDB_MERGE_DELETE        BITMAP                  "res\\delete.bmp"
-IDB_FILE_PRINT          BITMAP                  "res\\print.bmp"
-IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
+IDR_MAINFRAME           BITMAP                  "..\\..\\res\\Toolbar.bmp"
+IDB_SPLASH              BITMAP                  "..\\..\\res\\splash1.bmp"
+IDB_EQUAL               BITMAP                  "..\\..\\res\\equal.bmp"
+IDB_NOTEQUAL            BITMAP                  "..\\..\\res\\notequal.bmp"
+IDB_UNKNOWN             BITMAP                  "..\\..\\res\\unknown.bmp"
+IDB_BINARYSAME          BITMAP                  "..\\..\\res\\binary.bmp"
+IDB_LFILE               BITMAP                  "..\\..\\res\\lfile.bmp"
+IDB_RFILE               BITMAP                  "..\\..\\res\\rfile.bmp"
+IDB_BINARYDIFF          BITMAP                  "..\\..\\res\\binarydiff.bmp"
+IDB_FILESKIP            BITMAP                  "..\\..\\res\\fileskip.bmp"
+IDB_EDIT_COPY           BITMAP                  "..\\..\\res\\copy.bmp"
+IDB_EDIT_CUT            BITMAP                  "..\\..\\res\\cut.bmp"
+IDB_EDIT_PASTE          BITMAP                  "..\\..\\res\\paste.bmp"
+IDB_EDIT_SEARCH         BITMAP                  "..\\..\\res\\search.bmp"
+IDB_WINDOW_CASCADE      BITMAP                  "..\\..\\res\\cascade.bmp"
+IDB_WINDOW_HORIZONTAL   BITMAP                  "..\\..\\res\\horizontally.bmp"
+IDB_WINDOW_VERTICAL     BITMAP                  "..\\..\\res\\vertically.bmp"
+IDB_WINDOW_CLOSE        BITMAP                  "..\\..\\res\\close.bmp"
+IDB_WINDOW_CHANGEPANE   BITMAP                  "..\\..\\res\\change_pane.bmp"
+IDB_EDIT_GOTO           BITMAP                  "..\\..\\res\\go_to.bmp"
+IDB_EDIT_REPLACE        BITMAP                  "..\\..\\res\\replace.bmp"
+IDB_VIEW_LANGUAGE       BITMAP                  "..\\..\\res\\language.bmp"
+IDB_VIEW_SELECTFONT     BITMAP                  "..\\..\\res\\select_font.bmp"
+IDB_FILE_EXIT           BITMAP                  "..\\..\\res\\exit.bmp"
+IDB_HELP_CONTENTS       BITMAP                  "..\\..\\res\\help_contents.bmp"
+IDB_ERROR               BITMAP                  "..\\..\\res\\error.bmp"
+IDB_FOLDERUP            BITMAP                  "..\\..\\res\\folderup.bmp"
+IDB_FOLDERUP_DISABLE    BITMAP                  "..\\..\\res\\folderup_disable.bmp"
+IDB_EDIT_SELECTALL      BITMAP                  "..\\..\\res\\select_all.bmp"
+IDB_TOOLS_FILTERS       BITMAP                  "..\\..\\res\\filters.bmp"
+IDB_TOOLS_COLUMNS       BITMAP                  "..\\..\\res\\customize_columns.bmp"
+IDB_MERGE_DELETE        BITMAP                  "..\\..\\res\\delete.bmp"
+IDB_FILE_PRINT          BITMAP                  "..\\..\\res\\print.bmp"
+IDB_SIGMA               BITMAP                  "..\\..\\res\\sigma.bmp"
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -1526,8 +1528,8 @@ IDB_SIGMA               BITMAP                  "res\\sigma.bmp"
 // Cursor
 //
 
-IDR_MARGIN_CURSOR       CURSOR                  "res\\mg_cur.cur"
-IDR_MERGEHAND           CURSOR                  "res\\hand.cur"
+IDR_MARGIN_CURSOR       CURSOR                  "..\\..\\res\\mg_cur.cur"
+IDR_MERGEHAND           CURSOR                  "..\\..\\res\\hand.cur"
 
 /////////////////////////////////////////////////////////////////////////////
 //

diff --git a/Src/Languages/Turkish/res/Merge.ico b/Src/Languages/Turkish/res/Merge.ico
deleted file mode 100644 (file)
index 6fd5e56..0000000
Binary files a/Src/Languages/Turkish/res/Merge.ico and /dev/null differ

diff --git a/Src/Languages/Turkish/res/MergeDir.ico b/Src/Languages/Turkish/res/MergeDir.ico
deleted file mode 100644 (file)
index 349c926..0000000
Binary files a/Src/Languages/Turkish/res/MergeDir.ico and /dev/null differ

diff --git a/Src/Languages/Turkish/res/MergeDoc.ico b/Src/Languages/Turkish/res/MergeDoc.ico
deleted file mode 100644 (file)
index b2f417b..0000000
Binary files a/Src/Languages/Turkish/res/MergeDoc.ico and /dev/null differ

diff --git a/Src/Languages/Turkish/res/Toolbar.bmp b/Src/Languages/Turkish/res/Toolbar.bmp
deleted file mode 100644 (file)
index 7935cc8..0000000
Binary files a/Src/Languages/Turkish/res/Toolbar.bmp and /dev/null differ

diff --git a/Src/Languages/Turkish/res/WinMergeSplash.psd b/Src/Languages/Turkish/res/WinMergeSplash.psd
deleted file mode 100644 (file)
index fe7df64..0000000
Binary files a/Src/Languages/Turkish/res/WinMergeSplash.psd and /dev/null differ

diff --git a/Src/Languages/Turkish/res/binary.bmp b/Src/Languages/Turkish/res/binary.bmp
deleted file mode 100644 (file)
index 417eb30..0000000
Binary files a/Src/Languages/Turkish/res/binary.bmp and /dev/null differ

diff --git a/Src/Languages/Turkish/res/binarydiff.bmp b/Src/Languages/Turkish/res/binarydiff.bmp
deleted file mode 100755 (executable)
index 4e45141..0000000
Binary files a/Src/Languages/Turkish/res/binarydiff.bmp and /dev/null differ

diff --git a/Src/Languages/Turkish/res/cascade.bmp b/Src/Languages/Turkish/res/cascade.bmp
deleted file mode 100644 (file)
index a56622c..0000000
Binary files a/Src/Languages/Turkish/res/cascade.bmp and /dev/null differ

diff --git a/Src/Languages/Turkish/res/change_pane.bmp b/Src/Languages/Turkish/res/change_pane.bmp
deleted file mode 100644 (file)
index 0a2e36a..0000000
Binary files a/Src/Languages/Turkish/res/change_pane.bmp and /dev/null differ

diff --git a/Src/Languages/Turkish/res/close.bmp b/Src/Languages/Turkish/res/close.bmp
deleted file mode 100644 (file)
index 55b5e87..0000000
Binary files a/Src/Languages/Turkish/res/close.bmp and /dev/null differ

diff --git a/Src/Languages/Turkish/res/copy.bmp b/Src/Languages/Turkish/res/copy.bmp
deleted file mode 100644 (file)
index 6565c6f..0000000
Binary files a/Src/Languages/Turkish/res/copy.bmp and /dev/null differ

diff --git a/Src/Languages/Turkish/res/customize_columns.bmp b/Src/Languages/Turkish/res/customize_columns.bmp
deleted file mode 100644 (file)
index 126345a..0000000
Binary files a/Src/Languages/Turkish/res/customize_columns.bmp and /dev/null differ

diff --git a/Src/Languages/Turkish/res/cut.bmp b/Src/Languages/Turkish/res/cut.bmp
deleted file mode 100644 (file)
index 976c5d2..0000000
Binary files a/Src/Languages/Turkish/res/cut.bmp and /dev/null differ

diff --git a/Src/Languages/Turkish/res/delete.bmp b/Src/Languages/Turkish/res/delete.bmp
deleted file mode 100644 (file)
index b70eeb8..0000000
Binary files a/Src/Languages/Turkish/res/delete.bmp and /dev/null differ

diff --git a/Src/Languages/Turkish/res/equal.bmp b/Src/Languages/Turkish/res/equal.bmp
deleted file mode 100644 (file)
index 9761d55..0000000
Binary files a/Src/Languages/Turkish/res/equal.bmp and /dev/null differ

diff --git a/Src/Languages/Turkish/res/error.bmp b/Src/Languages/Turkish/res/error.bmp
deleted file mode 100644 (file)
index f659c1d..0000000
Binary files a/Src/Languages/Turkish/res/error.bmp and /dev/null differ

diff --git a/Src/Languages/Turkish/res/exit.bmp b/Src/Languages/Turkish/res/exit.bmp
deleted file mode 100644 (file)
index 596127a..0000000
Binary files a/Src/Languages/Turkish/res/exit.bmp and /dev/null differ

diff --git a/Src/Languages/Turkish/res/fileskip.bmp b/Src/Languages/Turkish/res/fileskip.bmp
deleted file mode 100644 (file)
index 9e502d9..0000000
Binary files a/Src/Languages/Turkish/res/fileskip.bmp and /dev/null differ

diff --git a/Src/Languages/Turkish/res/filters.bmp b/Src/Languages/Turkish/res/filters.bmp
deleted file mode 100644 (file)
index e7ab693..0000000
Binary files a/Src/Languages/Turkish/res/filters.bmp and /dev/null differ

diff --git a/Src/Languages/Turkish/res/folder.ico b/Src/Languages/Turkish/res/folder.ico
deleted file mode 100644 (file)
index e18bd19..0000000
Binary files a/Src/Languages/Turkish/res/folder.ico and /dev/null differ

diff --git a/Src/Languages/Turkish/res/folderskip.ico b/Src/Languages/Turkish/res/folderskip.ico
deleted file mode 100644 (file)
index 3297496..0000000
Binary files a/Src/Languages/Turkish/res/folderskip.ico and /dev/null differ

diff --git a/Src/Languages/Turkish/res/folderup.bmp b/Src/Languages/Turkish/res/folderup.bmp
deleted file mode 100644 (file)
index 2d15145..0000000
Binary files a/Src/Languages/Turkish/res/folderup.bmp and /dev/null differ

diff --git a/Src/Languages/Turkish/res/folderup_disable.bmp b/Src/Languages/Turkish/res/folderup_disable.bmp
deleted file mode 100644 (file)
index 5829a19..0000000
Binary files a/Src/Languages/Turkish/res/folderup_disable.bmp and /dev/null differ

diff --git a/Src/Languages/Turkish/res/go_to.bmp b/Src/Languages/Turkish/res/go_to.bmp
deleted file mode 100644 (file)
index a6839aa..0000000
Binary files a/Src/Languages/Turkish/res/go_to.bmp and /dev/null differ

diff --git a/Src/Languages/Turkish/res/hand.cur b/Src/Languages/Turkish/res/hand.cur
deleted file mode 100644 (file)
index ed8db8c..0000000
Binary files a/Src/Languages/Turkish/res/hand.cur and /dev/null differ

diff --git a/Src/Languages/Turkish/res/help_contents.bmp b/Src/Languages/Turkish/res/help_contents.bmp
deleted file mode 100644 (file)
index 6662979..0000000
Binary files a/Src/Languages/Turkish/res/help_contents.bmp and /dev/null differ

diff --git a/Src/Languages/Turkish/res/horizontally.bmp b/Src/Languages/Turkish/res/horizontally.bmp
deleted file mode 100644 (file)
index 3c7a732..0000000
Binary files a/Src/Languages/Turkish/res/horizontally.bmp and /dev/null differ

diff --git a/Src/Languages/Turkish/res/language.bmp b/Src/Languages/Turkish/res/language.bmp
deleted file mode 100644 (file)
index 9e92e4d..0000000
Binary files a/Src/Languages/Turkish/res/language.bmp and /dev/null differ

diff --git a/Src/Languages/Turkish/res/lfile.bmp b/Src/Languages/Turkish/res/lfile.bmp
deleted file mode 100644 (file)
index bb7cf6c..0000000
Binary files a/Src/Languages/Turkish/res/lfile.bmp and /dev/null differ

diff --git a/Src/Languages/Turkish/res/lfolder.ico b/Src/Languages/Turkish/res/lfolder.ico
deleted file mode 100644 (file)
index fc1c797..0000000
Binary files a/Src/Languages/Turkish/res/lfolder.ico and /dev/null differ

diff --git a/Src/Languages/Turkish/res/mg_cur.cur b/Src/Languages/Turkish/res/mg_cur.cur
deleted file mode 100644 (file)
index 5691efb..0000000
Binary files a/Src/Languages/Turkish/res/mg_cur.cur and /dev/null differ

diff --git a/Src/Languages/Turkish/res/notequal.bmp b/Src/Languages/Turkish/res/notequal.bmp
deleted file mode 100644 (file)
index d747084..0000000
Binary files a/Src/Languages/Turkish/res/notequal.bmp and /dev/null differ

diff --git a/Src/Languages/Turkish/res/paste.bmp b/Src/Languages/Turkish/res/paste.bmp
deleted file mode 100644 (file)
index bcd5227..0000000
Binary files a/Src/Languages/Turkish/res/paste.bmp and /dev/null differ

diff --git a/Src/Languages/Turkish/res/print.bmp b/Src/Languages/Turkish/res/print.bmp
deleted file mode 100644 (file)
index 739ca01..0000000
Binary files a/Src/Languages/Turkish/res/print.bmp and /dev/null differ

diff --git a/Src/Languages/Turkish/res/replace.bmp b/Src/Languages/Turkish/res/replace.bmp
deleted file mode 100644 (file)
index e5586b9..0000000
Binary files a/Src/Languages/Turkish/res/replace.bmp and /dev/null differ

diff --git a/Src/Languages/Turkish/res/rfile.bmp b/Src/Languages/Turkish/res/rfile.bmp
deleted file mode 100644 (file)
index 1333733..0000000
Binary files a/Src/Languages/Turkish/res/rfile.bmp and /dev/null differ

diff --git a/Src/Languages/Turkish/res/rfolder.ico b/Src/Languages/Turkish/res/rfolder.ico
deleted file mode 100644 (file)
index 444d827..0000000
Binary files a/Src/Languages/Turkish/res/rfolder.ico and /dev/null differ

diff --git a/Src/Languages/Turkish/res/search.bmp b/Src/Languages/Turkish/res/search.bmp
deleted file mode 100644 (file)
index 9d606e5..0000000
Binary files a/Src/Languages/Turkish/res/search.bmp and /dev/null differ

diff --git a/Src/Languages/Turkish/res/select_all.bmp b/Src/Languages/Turkish/res/select_all.bmp
deleted file mode 100644 (file)
index 174e311..0000000
Binary files a/Src/Languages/Turkish/res/select_all.bmp and /dev/null differ

diff --git a/Src/Languages/Turkish/res/select_font.bmp b/Src/Languages/Turkish/res/select_font.bmp
deleted file mode 100644 (file)
index 2609538..0000000
Binary files a/Src/Languages/Turkish/res/select_font.bmp and /dev/null differ

diff --git a/Src/Languages/Turkish/res/sigma.bmp b/Src/Languages/Turkish/res/sigma.bmp
deleted file mode 100644 (file)
index eff4abe..0000000
Binary files a/Src/Languages/Turkish/res/sigma.bmp and /dev/null differ

diff --git a/Src/Languages/Turkish/res/splash1.bmp b/Src/Languages/Turkish/res/splash1.bmp
deleted file mode 100644 (file)
index f041297..0000000
Binary files a/Src/Languages/Turkish/res/splash1.bmp and /dev/null differ

diff --git a/Src/Languages/Turkish/res/unknown.bmp b/Src/Languages/Turkish/res/unknown.bmp
deleted file mode 100644 (file)
index 7f16906..0000000
Binary files a/Src/Languages/Turkish/res/unknown.bmp and /dev/null differ

diff --git a/Src/Languages/Turkish/res/vertically.bmp b/Src/Languages/Turkish/res/vertically.bmp
deleted file mode 100644 (file)
index e57c1b6..0000000
Binary files a/Src/Languages/Turkish/res/vertically.bmp and /dev/null differ