PATCH: [ 841062 ] Alternative icons for PATCH [ 840273 ] (for hilight line diff)

diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc
index 823b6f0..07dc708 100644 (file)
--- a/Src/Languages/Brazilian/MergeBrazilian.rc
+++ b/Src/Languages/Brazilian/MergeBrazilian.rc
@@ -906,6 +906,8 @@ BEGIN
     BUTTON      ID_EDIT_UNDO
     BUTTON      ID_EDIT_REDO
     SEPARATOR
+    BUTTON      ID_SHOWLINEDIFF
+    SEPARATOR
     BUTTON      ID_NEXTDIFF
     BUTTON      ID_PREVDIFF
     BUTTON      ID_LASTDIFF

diff --git a/Src/Languages/Brazilian/res/Toolbar.bmp b/Src/Languages/Brazilian/res/Toolbar.bmp
index 264bae3..e7d2380 100644 (file)
Binary files a/Src/Languages/Brazilian/res/Toolbar.bmp and b/Src/Languages/Brazilian/res/Toolbar.bmp differ

diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc
index 586b0af..feabd9e 100644 (file)
--- a/Src/Languages/Catalan/MergeCatalan.rc
+++ b/Src/Languages/Catalan/MergeCatalan.rc
@@ -924,6 +924,8 @@ BEGIN
     BUTTON      ID_EDIT_UNDO
     BUTTON      ID_EDIT_REDO
     SEPARATOR
+    BUTTON      ID_SHOWLINEDIFF
+    SEPARATOR
     BUTTON      ID_NEXTDIFF
     BUTTON      ID_PREVDIFF
     BUTTON      ID_LASTDIFF

diff --git a/Src/Languages/Catalan/res/Toolbar.bmp b/Src/Languages/Catalan/res/Toolbar.bmp
index 264bae3..e7d2380 100644 (file)
Binary files a/Src/Languages/Catalan/res/Toolbar.bmp and b/Src/Languages/Catalan/res/Toolbar.bmp differ

diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
index b22585c..846728e 100644 (file)
--- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
+++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
@@ -775,6 +775,8 @@ BEGIN
     BUTTON      ID_EDIT_UNDO
     BUTTON      ID_EDIT_REDO
     SEPARATOR
+    BUTTON      ID_SHOWLINEDIFF
+    SEPARATOR
     BUTTON      ID_NEXTDIFF
     BUTTON      ID_PREVDIFF
     BUTTON      ID_LASTDIFF

diff --git a/Src/Languages/ChineseSimplified/res/Toolbar.bmp b/Src/Languages/ChineseSimplified/res/Toolbar.bmp
index 264bae3..e7d2380 100644 (file)
Binary files a/Src/Languages/ChineseSimplified/res/Toolbar.bmp and b/Src/Languages/ChineseSimplified/res/Toolbar.bmp differ

diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
index ed6ad4e..8dec44a 100644 (file)
--- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
+++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
@@ -882,6 +882,8 @@ BEGIN
     BUTTON      ID_EDIT_UNDO
     BUTTON      ID_EDIT_REDO
     SEPARATOR
+    BUTTON      ID_SHOWLINEDIFF
+    SEPARATOR
     BUTTON      ID_NEXTDIFF
     BUTTON      ID_PREVDIFF
     BUTTON      ID_LASTDIFF

diff --git a/Src/Languages/ChineseTraditional/res/Toolbar.bmp b/Src/Languages/ChineseTraditional/res/Toolbar.bmp
index 264bae3..e7d2380 100644 (file)
Binary files a/Src/Languages/ChineseTraditional/res/Toolbar.bmp and b/Src/Languages/ChineseTraditional/res/Toolbar.bmp differ

diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc
index 3f474b7..3563f52 100644 (file)
--- a/Src/Languages/Czech/MergeCzech.rc
+++ b/Src/Languages/Czech/MergeCzech.rc
@@ -902,6 +902,8 @@ BEGIN
     BUTTON      ID_EDIT_UNDO
     BUTTON      ID_EDIT_REDO
     SEPARATOR
+    BUTTON      ID_SHOWLINEDIFF
+    SEPARATOR
     BUTTON      ID_NEXTDIFF
     BUTTON      ID_PREVDIFF
     BUTTON      ID_LASTDIFF

diff --git a/Src/Languages/Czech/res/Toolbar.bmp b/Src/Languages/Czech/res/Toolbar.bmp
index 264bae3..e7d2380 100644 (file)
Binary files a/Src/Languages/Czech/res/Toolbar.bmp and b/Src/Languages/Czech/res/Toolbar.bmp differ

diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc
index b8447f5..568f047 100644 (file)
--- a/Src/Languages/Danish/MergeDanish.rc
+++ b/Src/Languages/Danish/MergeDanish.rc
@@ -900,6 +900,8 @@ BEGIN
     BUTTON      ID_EDIT_UNDO
     BUTTON      ID_EDIT_REDO
     SEPARATOR
+    BUTTON      ID_SHOWLINEDIFF
+    SEPARATOR
     BUTTON      ID_NEXTDIFF
     BUTTON      ID_PREVDIFF
     BUTTON      ID_LASTDIFF

diff --git a/Src/Languages/Danish/res/Toolbar.bmp b/Src/Languages/Danish/res/Toolbar.bmp
index 264bae3..e7d2380 100644 (file)
Binary files a/Src/Languages/Danish/res/Toolbar.bmp and b/Src/Languages/Danish/res/Toolbar.bmp differ

diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc
index 78fe47c..41e8911 100644 (file)
--- a/Src/Languages/Dutch/MergeDutch.rc
+++ b/Src/Languages/Dutch/MergeDutch.rc
@@ -904,6 +904,8 @@ BEGIN
     BUTTON      ID_EDIT_UNDO
     BUTTON      ID_EDIT_REDO
     SEPARATOR
+    BUTTON      ID_SHOWLINEDIFF
+    SEPARATOR
     BUTTON      ID_NEXTDIFF
     BUTTON      ID_PREVDIFF
     BUTTON      ID_LASTDIFF

diff --git a/Src/Languages/Dutch/res/Toolbar.bmp b/Src/Languages/Dutch/res/Toolbar.bmp
index 264bae3..e7d2380 100644 (file)
Binary files a/Src/Languages/Dutch/res/Toolbar.bmp and b/Src/Languages/Dutch/res/Toolbar.bmp differ

diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc
index 774bf03..7356b21 100644 (file)
--- a/Src/Languages/French/MergeFrench.rc
+++ b/Src/Languages/French/MergeFrench.rc
@@ -904,6 +904,8 @@ BEGIN
     BUTTON      ID_EDIT_UNDO
     BUTTON      ID_EDIT_REDO
     SEPARATOR
+    BUTTON      ID_SHOWLINEDIFF
+    SEPARATOR
     BUTTON      ID_NEXTDIFF
     BUTTON      ID_PREVDIFF
     BUTTON      ID_LASTDIFF

diff --git a/Src/Languages/French/res/Toolbar.bmp b/Src/Languages/French/res/Toolbar.bmp
index 264bae3..e7d2380 100644 (file)
Binary files a/Src/Languages/French/res/Toolbar.bmp and b/Src/Languages/French/res/Toolbar.bmp differ

diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc
index 55df747..8fefa4f 100644 (file)
--- a/Src/Languages/German/MergeGerman.rc
+++ b/Src/Languages/German/MergeGerman.rc
@@ -905,6 +905,8 @@ BEGIN
     BUTTON      ID_EDIT_UNDO
     BUTTON      ID_EDIT_REDO
     SEPARATOR
+    BUTTON      ID_SHOWLINEDIFF
+    SEPARATOR
     BUTTON      ID_NEXTDIFF
     BUTTON      ID_PREVDIFF
     BUTTON      ID_LASTDIFF

diff --git a/Src/Languages/German/res/Toolbar.bmp b/Src/Languages/German/res/Toolbar.bmp
index 264bae3..e7d2380 100644 (file)
Binary files a/Src/Languages/German/res/Toolbar.bmp and b/Src/Languages/German/res/Toolbar.bmp differ

diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc
index fc31484..01c2c0b 100644 (file)
--- a/Src/Languages/Italian/MergeItalian.rc
+++ b/Src/Languages/Italian/MergeItalian.rc
@@ -899,6 +899,8 @@ BEGIN
     BUTTON      ID_EDIT_UNDO
     BUTTON      ID_EDIT_REDO
     SEPARATOR
+    BUTTON      ID_SHOWLINEDIFF
+    SEPARATOR
     BUTTON      ID_NEXTDIFF
     BUTTON      ID_PREVDIFF
     BUTTON      ID_LASTDIFF

diff --git a/Src/Languages/Italian/res/Toolbar.bmp b/Src/Languages/Italian/res/Toolbar.bmp
index 264bae3..e7d2380 100644 (file)
Binary files a/Src/Languages/Italian/res/Toolbar.bmp and b/Src/Languages/Italian/res/Toolbar.bmp differ

diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc
index 105010d..584e0e4 100644 (file)
--- a/Src/Languages/Korean/MergeKorean.rc
+++ b/Src/Languages/Korean/MergeKorean.rc
@@ -867,6 +867,8 @@ BEGIN
     BUTTON      ID_EDIT_UNDO
     BUTTON      ID_EDIT_REDO
     SEPARATOR
+    BUTTON      ID_SHOWLINEDIFF
+    SEPARATOR
     BUTTON      ID_NEXTDIFF
     BUTTON      ID_PREVDIFF
     BUTTON      ID_LASTDIFF

diff --git a/Src/Languages/Korean/res/Toolbar.bmp b/Src/Languages/Korean/res/Toolbar.bmp
index 264bae3..e7d2380 100644 (file)
Binary files a/Src/Languages/Korean/res/Toolbar.bmp and b/Src/Languages/Korean/res/Toolbar.bmp differ

diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc
index 7d756f7..9ef9c31 100644 (file)
--- a/Src/Languages/Norwegian/MergeNorwegian.rc
+++ b/Src/Languages/Norwegian/MergeNorwegian.rc
@@ -900,6 +900,8 @@ BEGIN
     BUTTON      ID_EDIT_UNDO
     BUTTON      ID_EDIT_REDO
     SEPARATOR
+    BUTTON      ID_SHOWLINEDIFF
+    SEPARATOR
     BUTTON      ID_NEXTDIFF
     BUTTON      ID_PREVDIFF
     BUTTON      ID_LASTDIFF

diff --git a/Src/Languages/Norwegian/res/Toolbar.bmp b/Src/Languages/Norwegian/res/Toolbar.bmp
index 264bae3..e7d2380 100644 (file)
Binary files a/Src/Languages/Norwegian/res/Toolbar.bmp and b/Src/Languages/Norwegian/res/Toolbar.bmp differ

diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc
index 146cc45..d9b6f4e 100644 (file)
--- a/Src/Languages/Slovak/MergeSlovak.rc
+++ b/Src/Languages/Slovak/MergeSlovak.rc
@@ -903,6 +903,8 @@ BEGIN
     BUTTON      ID_EDIT_UNDO
     BUTTON      ID_EDIT_REDO
     SEPARATOR
+    BUTTON      ID_SHOWLINEDIFF
+    SEPARATOR
     BUTTON      ID_NEXTDIFF
     BUTTON      ID_PREVDIFF
     BUTTON      ID_LASTDIFF

diff --git a/Src/Languages/Slovak/res/Toolbar.bmp b/Src/Languages/Slovak/res/Toolbar.bmp
index 264bae3..e7d2380 100644 (file)
Binary files a/Src/Languages/Slovak/res/Toolbar.bmp and b/Src/Languages/Slovak/res/Toolbar.bmp differ

diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc
index 2b4bdc4..42edbd1 100644 (file)
--- a/Src/Languages/Spanish/MergeSpanish.rc
+++ b/Src/Languages/Spanish/MergeSpanish.rc
@@ -901,6 +901,8 @@ BEGIN
     BUTTON      ID_EDIT_UNDO
     BUTTON      ID_EDIT_REDO
     SEPARATOR
+    BUTTON      ID_SHOWLINEDIFF
+    SEPARATOR
     BUTTON      ID_NEXTDIFF
     BUTTON      ID_PREVDIFF
     BUTTON      ID_LASTDIFF

diff --git a/Src/Languages/Spanish/res/Toolbar.bmp b/Src/Languages/Spanish/res/Toolbar.bmp
index 264bae3..e7d2380 100644 (file)
Binary files a/Src/Languages/Spanish/res/Toolbar.bmp and b/Src/Languages/Spanish/res/Toolbar.bmp differ

diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc
index e43ddba..6b1a3a9 100644 (file)
--- a/Src/Languages/Swedish/MergeSwedish.rc
+++ b/Src/Languages/Swedish/MergeSwedish.rc
@@ -905,6 +905,8 @@ BEGIN
     BUTTON      ID_EDIT_UNDO
     BUTTON      ID_EDIT_REDO
     SEPARATOR
+    BUTTON      ID_SHOWLINEDIFF
+    SEPARATOR
     BUTTON      ID_NEXTDIFF
     BUTTON      ID_PREVDIFF
     BUTTON      ID_LASTDIFF

diff --git a/Src/Languages/Swedish/res/Toolbar.bmp b/Src/Languages/Swedish/res/Toolbar.bmp
index 264bae3..e7d2380 100644 (file)
Binary files a/Src/Languages/Swedish/res/Toolbar.bmp and b/Src/Languages/Swedish/res/Toolbar.bmp differ

diff --git a/Src/Merge.rc b/Src/Merge.rc
index b5b06e7..b71702c 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1,5 +1,7 @@
 //Microsoft Developer Studio generated resource script.
 //
+// $Id$
+
 #include "resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS

diff --git a/Src/readme.txt b/Src/readme.txt
index 3310811..a4f09a7 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -3,6 +3,7 @@
   Submitted by Tim Gerundt
    WinMerge: Merge.rc
    res: Toolbar.bmp
+   Languages/res: Toolbar.bmp
 
 2003-11-14 Kimmo
  PATCH: [ 841767 ] Store unique item path