Rename folder1.bmp to lfolder.bmp (suggested in PATCH [ 841039 ] Green "binary.bmp")

diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc
index d9a8eed..9b4e2b3 100644 (file)
--- a/Src/Languages/Brazilian/MergeBrazilian.rc
+++ b/Src/Languages/Brazilian/MergeBrazilian.rc
@@ -947,7 +947,7 @@ END
 
 IDR_MAINFRAME           BITMAP  MOVEABLE PURE   "res\\Toolbar.bmp"
 IDB_SPLASH              BITMAP  DISCARDABLE     "res\\splash1.bmp"
-IDB_LFOLDER             BITMAP  DISCARDABLE     "res\\folder1.bmp"
+IDB_LFOLDER             BITMAP  DISCARDABLE     "res\\lfolder.bmp"
 IDB_EQUAL               BITMAP  DISCARDABLE     "res\\equal.bmp"
 IDB_NOTEQUAL            BITMAP  DISCARDABLE     "res\\notequal.bmp"
 IDB_RFOLDER             BITMAP  DISCARDABLE     "res\\rfolder.bmp"

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

diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc
index bbff5b9..baa9ccd 100644 (file)
--- a/Src/Languages/Catalan/MergeCatalan.rc
+++ b/Src/Languages/Catalan/MergeCatalan.rc
@@ -965,7 +965,7 @@ END
 
 IDR_MAINFRAME           BITMAP  MOVEABLE PURE   "res\\Toolbar.bmp"
 IDB_SPLASH              BITMAP  DISCARDABLE     "res\\splash1.bmp"
-IDB_LFOLDER             BITMAP  DISCARDABLE     "res\\folder1.bmp"
+IDB_LFOLDER             BITMAP  DISCARDABLE     "res\\lfolder.bmp"
 IDB_EQUAL               BITMAP  DISCARDABLE     "res\\equal.bmp"
 IDB_NOTEQUAL            BITMAP  DISCARDABLE     "res\\notequal.bmp"
 IDB_RFOLDER             BITMAP  DISCARDABLE     "res\\rfolder.bmp"

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

diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
index 546f873..7264460 100644 (file)
--- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
+++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
@@ -816,7 +816,7 @@ END
 
 IDR_MAINFRAME           BITMAP  MOVEABLE PURE   "res\\Toolbar.bmp"
 IDB_SPLASH              BITMAP  DISCARDABLE     "res\\splash1.bmp"
-IDB_LFOLDER             BITMAP  DISCARDABLE     "res\\folder1.bmp"
+IDB_LFOLDER             BITMAP  DISCARDABLE     "res\\lfolder.bmp"
 IDB_EQUAL               BITMAP  DISCARDABLE     "res\\equal.bmp"
 IDB_NOTEQUAL            BITMAP  DISCARDABLE     "res\\notequal.bmp"
 IDB_RFOLDER             BITMAP  DISCARDABLE     "res\\rfolder.bmp"

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

diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
index 4416683..83ae52f 100644 (file)
--- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
+++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
@@ -923,7 +923,7 @@ END
 
 IDR_MAINFRAME           BITMAP  MOVEABLE PURE   "res\\Toolbar.bmp"
 IDB_SPLASH              BITMAP  DISCARDABLE     "res\\splash1.bmp"
-IDB_LFOLDER             BITMAP  DISCARDABLE     "res\\folder1.bmp"
+IDB_LFOLDER             BITMAP  DISCARDABLE     "res\\lfolder.bmp"
 IDB_EQUAL               BITMAP  DISCARDABLE     "res\\equal.bmp"
 IDB_NOTEQUAL            BITMAP  DISCARDABLE     "res\\notequal.bmp"
 IDB_RFOLDER             BITMAP  DISCARDABLE     "res\\rfolder.bmp"

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

diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc
index b34dd56..3aaf5ef 100644 (file)
--- a/Src/Languages/Czech/MergeCzech.rc
+++ b/Src/Languages/Czech/MergeCzech.rc
@@ -943,7 +943,7 @@ END
 
 IDR_MAINFRAME           BITMAP  MOVEABLE PURE   "res\\Toolbar.bmp"
 IDB_SPLASH              BITMAP  DISCARDABLE     "res\\splash1.bmp"
-IDB_LFOLDER             BITMAP  DISCARDABLE     "res\\folder1.bmp"
+IDB_LFOLDER             BITMAP  DISCARDABLE     "res\\lfolder.bmp"
 IDB_EQUAL               BITMAP  DISCARDABLE     "res\\equal.bmp"
 IDB_NOTEQUAL            BITMAP  DISCARDABLE     "res\\notequal.bmp"
 IDB_RFOLDER             BITMAP  DISCARDABLE     "res\\rfolder.bmp"

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

diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc
index 3746768..853feb0 100644 (file)
--- a/Src/Languages/Danish/MergeDanish.rc
+++ b/Src/Languages/Danish/MergeDanish.rc
@@ -941,7 +941,7 @@ END
 
 IDR_MAINFRAME           BITMAP  MOVEABLE PURE   "res\\Toolbar.bmp"
 IDB_SPLASH              BITMAP  DISCARDABLE     "res\\splash1.bmp"
-IDB_LFOLDER             BITMAP  DISCARDABLE     "res\\folder1.bmp"
+IDB_LFOLDER             BITMAP  DISCARDABLE     "res\\lfolder.bmp"
 IDB_EQUAL               BITMAP  DISCARDABLE     "res\\equal.bmp"
 IDB_NOTEQUAL            BITMAP  DISCARDABLE     "res\\notequal.bmp"
 IDB_RFOLDER             BITMAP  DISCARDABLE     "res\\rfolder.bmp"

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

diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc
index d2db4ca..706a7b8 100644 (file)
--- a/Src/Languages/Dutch/MergeDutch.rc
+++ b/Src/Languages/Dutch/MergeDutch.rc
@@ -945,7 +945,7 @@ END
 
 IDR_MAINFRAME           BITMAP  MOVEABLE PURE   "res\\Toolbar.bmp"
 IDB_SPLASH              BITMAP  DISCARDABLE     "res\\splash1.bmp"
-IDB_LFOLDER             BITMAP  DISCARDABLE     "res\\folder1.bmp"
+IDB_LFOLDER             BITMAP  DISCARDABLE     "res\\lfolder.bmp"
 IDB_EQUAL               BITMAP  DISCARDABLE     "res\\equal.bmp"
 IDB_NOTEQUAL            BITMAP  DISCARDABLE     "res\\notequal.bmp"
 IDB_RFOLDER             BITMAP  DISCARDABLE     "res\\rfolder.bmp"

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

diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc
index b78127a..a2a75d5 100644 (file)
--- a/Src/Languages/French/MergeFrench.rc
+++ b/Src/Languages/French/MergeFrench.rc
@@ -943,7 +943,7 @@ END
 
 IDR_MAINFRAME           BITMAP  MOVEABLE PURE   "res\\Toolbar.bmp"
 IDB_SPLASH              BITMAP  DISCARDABLE     "res\\splash1.bmp"
-IDB_LFOLDER             BITMAP  DISCARDABLE     "res\\folder1.bmp"
+IDB_LFOLDER             BITMAP  DISCARDABLE     "res\\lfolder.bmp"
 IDB_EQUAL               BITMAP  DISCARDABLE     "res\\equal.bmp"
 IDB_NOTEQUAL            BITMAP  DISCARDABLE     "res\\notequal.bmp"
 IDB_RFOLDER             BITMAP  DISCARDABLE     "res\\rfolder.bmp"

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

diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc
index 2a705cd..e8cedcb 100644 (file)
--- a/Src/Languages/German/MergeGerman.rc
+++ b/Src/Languages/German/MergeGerman.rc
@@ -946,7 +946,7 @@ END
 
 IDR_MAINFRAME           BITMAP  MOVEABLE PURE   "res\\Toolbar.bmp"
 IDB_SPLASH              BITMAP  DISCARDABLE     "res\\splash1.bmp"
-IDB_LFOLDER             BITMAP  DISCARDABLE     "res\\folder1.bmp"
+IDB_LFOLDER             BITMAP  DISCARDABLE     "res\\lfolder.bmp"
 IDB_EQUAL               BITMAP  DISCARDABLE     "res\\equal.bmp"
 IDB_NOTEQUAL            BITMAP  DISCARDABLE     "res\\notequal.bmp"
 IDB_RFOLDER             BITMAP  DISCARDABLE     "res\\rfolder.bmp"

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

diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc
index 1251426..22cb467 100644 (file)
--- a/Src/Languages/Italian/MergeItalian.rc
+++ b/Src/Languages/Italian/MergeItalian.rc
@@ -940,7 +940,7 @@ END
 
 IDR_MAINFRAME           BITMAP  MOVEABLE PURE   "res\\Toolbar.bmp"
 IDB_SPLASH              BITMAP  DISCARDABLE     "res\\splash1.bmp"
-IDB_LFOLDER             BITMAP  DISCARDABLE     "res\\folder1.bmp"
+IDB_LFOLDER             BITMAP  DISCARDABLE     "res\\lfolder.bmp"
 IDB_EQUAL               BITMAP  DISCARDABLE     "res\\equal.bmp"
 IDB_NOTEQUAL            BITMAP  DISCARDABLE     "res\\notequal.bmp"
 IDB_RFOLDER             BITMAP  DISCARDABLE     "res\\rfolder.bmp"

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

diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc
index ede91ad..5f9ff7f 100644 (file)
--- a/Src/Languages/Korean/MergeKorean.rc
+++ b/Src/Languages/Korean/MergeKorean.rc
@@ -908,7 +908,7 @@ END
 
 IDR_MAINFRAME           BITMAP                  "res\\Toolbar.bmp"
 IDB_SPLASH              BITMAP                  "res\\splash1.bmp"
-IDB_LFOLDER             BITMAP                  "res\\folder1.bmp"
+IDB_LFOLDER             BITMAP                  "res\\lfolder.bmp"
 IDB_EQUAL               BITMAP                  "res\\equal.bmp"
 IDB_NOTEQUAL            BITMAP                  "res\\notequal.bmp"
 IDB_RFOLDER             BITMAP                  "res\\rfolder.bmp"

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

diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc
index a3f8bf1..78aee73 100644 (file)
--- a/Src/Languages/Norwegian/MergeNorwegian.rc
+++ b/Src/Languages/Norwegian/MergeNorwegian.rc
@@ -941,7 +941,7 @@ END
 
 IDR_MAINFRAME           BITMAP  MOVEABLE PURE   "res\\Toolbar.bmp"
 IDB_SPLASH              BITMAP  DISCARDABLE     "res\\splash1.bmp"
-IDB_LFOLDER             BITMAP  DISCARDABLE     "res\\folder1.bmp"
+IDB_LFOLDER             BITMAP  DISCARDABLE     "res\\lfolder.bmp"
 IDB_EQUAL               BITMAP  DISCARDABLE     "res\\equal.bmp"
 IDB_NOTEQUAL            BITMAP  DISCARDABLE     "res\\notequal.bmp"
 IDB_RFOLDER             BITMAP  DISCARDABLE     "res\\rfolder.bmp"

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

diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc
index 836cf19..a6c06ae 100644 (file)
--- a/Src/Languages/Slovak/MergeSlovak.rc
+++ b/Src/Languages/Slovak/MergeSlovak.rc
@@ -944,7 +944,7 @@ END
 
 IDR_MAINFRAME           BITMAP  MOVEABLE PURE   "res\\Toolbar.bmp"
 IDB_SPLASH              BITMAP  DISCARDABLE     "res\\splash1.bmp"
-IDB_LFOLDER             BITMAP  DISCARDABLE     "res\\folder1.bmp"
+IDB_LFOLDER             BITMAP  DISCARDABLE     "res\\lfolder.bmp"
 IDB_EQUAL               BITMAP  DISCARDABLE     "res\\equal.bmp"
 IDB_NOTEQUAL            BITMAP  DISCARDABLE     "res\\notequal.bmp"
 IDB_RFOLDER             BITMAP  DISCARDABLE     "res\\rfolder.bmp"

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

diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc
index 1558b03..5f7d3a6 100644 (file)
--- a/Src/Languages/Spanish/MergeSpanish.rc
+++ b/Src/Languages/Spanish/MergeSpanish.rc
@@ -942,7 +942,7 @@ END
 
 IDR_MAINFRAME           BITMAP  MOVEABLE PURE   "res\\Toolbar.bmp"
 IDB_SPLASH              BITMAP  DISCARDABLE     "res\\splash1.bmp"
-IDB_LFOLDER             BITMAP  DISCARDABLE     "res\\folder1.bmp"
+IDB_LFOLDER             BITMAP  DISCARDABLE     "res\\lfolder.bmp"
 IDB_EQUAL               BITMAP  DISCARDABLE     "res\\equal.bmp"
 IDB_NOTEQUAL            BITMAP  DISCARDABLE     "res\\notequal.bmp"
 IDB_RFOLDER             BITMAP  DISCARDABLE     "res\\rfolder.bmp"

diff --git a/Src/Languages/Spanish/res/lfolder.bmp b/Src/Languages/Spanish/res/lfolder.bmp
new file mode 100644 (file)
index 0000000..fc0c90c
Binary files /dev/null and b/Src/Languages/Spanish/res/lfolder.bmp differ

diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc
index 920ec89..e5767b2 100644 (file)
--- a/Src/Languages/Swedish/MergeSwedish.rc
+++ b/Src/Languages/Swedish/MergeSwedish.rc
@@ -946,7 +946,7 @@ END
 
 IDR_MAINFRAME           BITMAP  MOVEABLE PURE   "res\\Toolbar.bmp"
 IDB_SPLASH              BITMAP  DISCARDABLE     "res\\splash1.bmp"
-IDB_LFOLDER             BITMAP  DISCARDABLE     "res\\folder1.bmp"
+IDB_LFOLDER             BITMAP  DISCARDABLE     "res\\lfolder.bmp"
 IDB_EQUAL               BITMAP  DISCARDABLE     "res\\equal.bmp"
 IDB_NOTEQUAL            BITMAP  DISCARDABLE     "res\\notequal.bmp"
 IDB_RFOLDER             BITMAP  DISCARDABLE     "res\\rfolder.bmp"

diff --git a/Src/Languages/Swedish/res/lfolder.bmp b/Src/Languages/Swedish/res/lfolder.bmp
new file mode 100644 (file)
index 0000000..fc0c90c
Binary files /dev/null and b/Src/Languages/Swedish/res/lfolder.bmp differ

diff --git a/Src/Merge.dsp b/Src/Merge.dsp
index be3388a..38280f4 100644 (file)
--- a/Src/Merge.dsp
+++ b/Src/Merge.dsp
@@ -1782,15 +1782,15 @@ SOURCE=.\res\fileskip.bmp
 # End Source File
 # Begin Source File
 
-SOURCE=.\res\folder1.bmp
+SOURCE=.\res\folderskip.bmp
 # End Source File
 # Begin Source File
 
-SOURCE=.\res\folderskip.bmp
+SOURCE=.\res\lfile.bmp
 # End Source File
 # Begin Source File
 
-SOURCE=.\res\lfile.bmp
+SOURCE=.\res\lfolder.bmp
 # End Source File
 # Begin Source File
 

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 36650a0..980f1f4 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -953,7 +953,7 @@ END
 
 IDR_MAINFRAME           BITMAP  MOVEABLE PURE   "res\\Toolbar.bmp"
 IDB_SPLASH              BITMAP  DISCARDABLE     "res\\splash1.bmp"
-IDB_LFOLDER             BITMAP  DISCARDABLE     "res\\folder1.bmp"
+IDB_LFOLDER             BITMAP  DISCARDABLE     "res\\lfolder.bmp"
 IDB_EQUAL               BITMAP  DISCARDABLE     "res\\equal.bmp"
 IDB_NOTEQUAL            BITMAP  DISCARDABLE     "res\\notequal.bmp"
 IDB_RFOLDER             BITMAP  DISCARDABLE     "res\\rfolder.bmp"

diff --git a/Src/readme.txt b/Src/readme.txt
index 081aa0b..dc61404 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,9 +1,17 @@
+2003-11-29 Kimmo
+ Rename folder1.bmp to lfolder.bmp (suggested in PATCH [ 841039 ] Green "binary.bmp")
+  WinMerge: Merge.dsp Merge.rc
+  Added WinMerge/res/lfolder.bmp
+  Removed WinMerge/res/folder1.bmp
+  Updated languages
+
 2003-11-28 Laoran
  Add header and RCS ID
   common: lwdisp.h unicoder.cpp unicoder.h FileTransform.h Plugins.h SelectUnpackerDlg.h
 
 2003-11-28 Kimmo
  BUG: [ 848725 ] Crash trying to generate report
+  Fix submitted by Perry
   WinMerge: DirView.cpp
 
 2003-11-27 Perry

diff --git a/Src/res/lfolder.bmp b/Src/res/lfolder.bmp
new file mode 100644 (file)
index 0000000..fc0c90c
Binary files /dev/null and b/Src/res/lfolder.bmp differ