BUG [ 1193561 ] v2.2, version copyrights not all up-to-date

  Adjusted all to say 1996-2005 just as English
  Src/Languages: Merge*.rc

diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc
index 1ad2990..7fa465c 100644 (file)
--- a/Src/Languages/Brazilian/MergeBrazilian.rc
+++ b/Src/Languages/Brazilian/MergeBrazilian.rc
@@ -1338,7 +1338,7 @@ BEGIN
             VALUE "FileDescription", "WinMerge\0"
             VALUE "FileVersion", "999.999.999.999\0"
             VALUE "InternalName", "WinMerge\0"
-            VALUE "LegalCopyright", "© 1996-2001 Dean P. Grimm / Thingamahoochie Software\0"
+            VALUE "LegalCopyright", "© 1996-2005 Dean P. Grimm / Thingamahoochie Software\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "WinMerge.EXE\0"
             VALUE "PrivateBuild", ""

diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc
index d045b11..de4ab07 100644 (file)
--- a/Src/Languages/Catalan/MergeCatalan.rc
+++ b/Src/Languages/Catalan/MergeCatalan.rc
@@ -1335,7 +1335,7 @@ BEGIN
             VALUE "FileDescription", "Recursos en català del WinMerge\0"
             VALUE "FileVersion", "000.000.000.000\0"
             VALUE "InternalName", "MergeCatalan\0"
-            VALUE "LegalCopyright", "© 1996-2001 Dean P. Grimm / Thingamahoochie Software\0"
+            VALUE "LegalCopyright", "© 1996-2005 Dean P. Grimm / Thingamahoochie Software\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "MergeCatalan.lang\0"
             VALUE "PrivateBuild", ""
@@ -1350,7 +1350,7 @@ BEGIN
             VALUE "FileDescription", "WinMerge Catalan resources\0"
             VALUE "FileVersion", "000.000.000.000\0"
             VALUE "InternalName", "MergeCatalan\0"
-            VALUE "LegalCopyright", "© 1996-2001 Dean P. Grimm / Thingamahoochie Software\0"
+            VALUE "LegalCopyright", "© 1996-2005 Dean P. Grimm / Thingamahoochie Software\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "MergeCatalan.lang\0"
             VALUE "PrivateBuild", "\0"

diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
index d4ba72c..9d6693c 100644 (file)
--- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
+++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
@@ -1323,7 +1323,7 @@ BEGIN
             VALUE "FileDescription", "WinMerge Application\0"
             VALUE "FileVersion", "000.000.000.000\0"
             VALUE "InternalName", "WinMerge\0"
-            VALUE "LegalCopyright", "c 1996-2001 Dean P. Grimm / Thingamahoochie Software\0"
+            VALUE "LegalCopyright", "c 1996-2005 Dean P. Grimm / Thingamahoochie Software\0"
             VALUE "OriginalFilename", "WinMerge.EXE\0"
             VALUE "PrivateBuild", ""
             VALUE "ProductName", "WinMerge\0"

diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
index dbc8cda..437909e 100644 (file)
--- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
+++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
@@ -1322,7 +1322,7 @@ BEGIN
             VALUE "FileDescription", "WinMerge Application\0"
             VALUE "FileVersion", "000.000.000.000\0"
             VALUE "InternalName", "WinMerge\0"
-            VALUE "LegalCopyright", "c 1996-2003 Dean P. Grimm / Thingamahoochie Software\0"
+            VALUE "LegalCopyright", "c 1996-2005 Dean P. Grimm / Thingamahoochie Software\0"
             VALUE "OriginalFilename", "WinMerge.EXE\0"
             VALUE "PrivateBuild", ""
             VALUE "ProductName", "WinMerge\0"

diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc
index 7c760fd..51576e0 100644 (file)
--- a/Src/Languages/Czech/MergeCzech.rc
+++ b/Src/Languages/Czech/MergeCzech.rc
@@ -1335,7 +1335,7 @@ BEGIN
             VALUE "FileDescription", "WinMerge Application\0"
             VALUE "FileVersion", "000.000.000.000\0"
             VALUE "InternalName", "WinMerge\0"
-            VALUE "LegalCopyright", "© 1996-2001 Dean P. Grimm / Thingamahoochie Software\0"
+            VALUE "LegalCopyright", "© 1996-2005 Dean P. Grimm / Thingamahoochie Software\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "WinMerge.EXE\0"
             VALUE "PrivateBuild", ""

diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc
index 4203894..b70cea3 100644 (file)
--- a/Src/Languages/Danish/MergeDanish.rc
+++ b/Src/Languages/Danish/MergeDanish.rc
@@ -1334,7 +1334,7 @@ BEGIN
             VALUE "FileDescription", "WinMerge Application\0"
             VALUE "FileVersion", "000.000.000.000\0"
             VALUE "InternalName", "WinMerge\0"
-            VALUE "LegalCopyright", "© 1996-2004 Dean P. Grimm / Thingamahoochie Software\0"
+            VALUE "LegalCopyright", "© 1996-2005 Dean P. Grimm / Thingamahoochie Software\0"
             VALUE "OriginalFilename", "WinMerge.EXE\0"
             VALUE "PrivateBuild", ""
             VALUE "ProductName", "WinMerge\0"

diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc
index ac91e92..52f0238 100644 (file)
--- a/Src/Languages/Dutch/MergeDutch.rc
+++ b/Src/Languages/Dutch/MergeDutch.rc
@@ -1337,7 +1337,7 @@ BEGIN
             VALUE "FileDescription", "WinMerge Application\0"
             VALUE "FileVersion", "000.000.000.000\0"
             VALUE "InternalName", "WinMerge\0"
-            VALUE "LegalCopyright", "© 1996-2001 Dean P. Grimm / Thingamahoochie Software\0"
+            VALUE "LegalCopyright", "© 1996-2005 Dean P. Grimm / Thingamahoochie Software\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "WinMerge.EXE\0"
             VALUE "PrivateBuild", ""

diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc
index 4abdc82..50212d2 100644 (file)
--- a/Src/Languages/German/MergeGerman.rc
+++ b/Src/Languages/German/MergeGerman.rc
@@ -1340,7 +1340,7 @@ BEGIN
             VALUE "FileDescription", "WinMerge Anwendung\0"
             VALUE "FileVersion", "000.000.000.000\0"
             VALUE "InternalName", "WinMerge\0"
-            VALUE "LegalCopyright", "© 1996-2001 Dean P. Grimm / Thingamahoochie Software\0"
+            VALUE "LegalCopyright", "© 1996-2005 Dean P. Grimm / Thingamahoochie Software\0"
             VALUE "OriginalFilename", "WinMerge.EXE\0"
             VALUE "PrivateBuild", ""
             VALUE "ProductName", "WinMerge\0"

diff --git a/Src/Languages/Hungarian/MergeHungarian.rc b/Src/Languages/Hungarian/MergeHungarian.rc
index 10ca741..3e0f974 100644 (file)
--- a/Src/Languages/Hungarian/MergeHungarian.rc
+++ b/Src/Languages/Hungarian/MergeHungarian.rc
@@ -1335,7 +1335,7 @@ BEGIN
             VALUE "FileDescription", "WinMerge Application\0"
             VALUE "FileVersion", "000.000.000.000\0"
             VALUE "InternalName", "WinMerge\0"
-            VALUE "LegalCopyright", "© 1996-2001 Dean P. Grimm / Thingamahoochie Software\0"
+            VALUE "LegalCopyright", "© 1996-2005 Dean P. Grimm / Thingamahoochie Software\0"
             VALUE "OriginalFilename", "WinMerge.EXE\0"
             VALUE "PrivateBuild", ""
             VALUE "ProductName", "WinMerge\0"

diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc
index f4e4748..e1c0147 100644 (file)
--- a/Src/Languages/Italian/MergeItalian.rc
+++ b/Src/Languages/Italian/MergeItalian.rc
@@ -1337,7 +1337,7 @@ BEGIN
             VALUE "FileDescription", "Applicazione di WinMerge\0"
             VALUE "FileVersion", "000.000.000.000\0"
             VALUE "InternalName", "WinMerge\0"
-            VALUE "LegalCopyright", "© 1996-2001 Dean P. Grimm / Thingamahoochie Software\0"
+            VALUE "LegalCopyright", "© 1996-2005 Dean P. Grimm / Thingamahoochie Software\0"
             VALUE "OriginalFilename", "WinMerge.EXE\0"
             VALUE "PrivateBuild", ""
             VALUE "ProductName", "WinMerge\0"

diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc
index b0b992f..84209b5 100644 (file)
--- a/Src/Languages/Korean/MergeKorean.rc
+++ b/Src/Languages/Korean/MergeKorean.rc
@@ -1331,7 +1331,7 @@ BEGIN
             VALUE "FileDescription", "WinMerge Application\0"
             VALUE "FileVersion", "2.1.10.0\0"
             VALUE "InternalName", "WinMerge\0"
-            VALUE "LegalCopyright", "?1996-2001 Dean P. Grimm / Thingamahoochie Software\0"
+            VALUE "LegalCopyright", "c 1996-2005 Dean P. Grimm / Thingamahoochie Software\0"
             VALUE "OriginalFilename", "WinMerge.EXE\0"
             VALUE "PrivateBuild", ""
             VALUE "ProductName", "WinMerge\0"

diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc
index 88eb148..62dbdaf 100644 (file)
--- a/Src/Languages/Norwegian/MergeNorwegian.rc
+++ b/Src/Languages/Norwegian/MergeNorwegian.rc
@@ -1332,7 +1332,7 @@ BEGIN
             VALUE "FileDescription", "WinMerge Application\0"
             VALUE "FileVersion", "000.000.000.000\0"
             VALUE "InternalName", "WinMerge\0"
-            VALUE "LegalCopyright", "© 1996-2001 Dean P. Grimm / Thingamahoochie Software\0"
+            VALUE "LegalCopyright", "© 1996-2005 Dean P. Grimm / Thingamahoochie Software\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "WinMerge.EXE\0"
             VALUE "PrivateBuild", ""

diff --git a/Src/Languages/Polish/MergePolish.rc b/Src/Languages/Polish/MergePolish.rc
index 1eaeedf..5f4cc27 100644 (file)
--- a/Src/Languages/Polish/MergePolish.rc
+++ b/Src/Languages/Polish/MergePolish.rc
@@ -1335,7 +1335,7 @@ BEGIN
             VALUE "FileDescription", "Aplikacja WinMerge\0"
             VALUE "FileVersion", "2.0.0\0"
             VALUE "InternalName", "WinMerge\0"
-            VALUE "LegalCopyright", "© 1996-2001 Dean P. Grimm / Thingamahoochie Software\0"
+            VALUE "LegalCopyright", "© 1996-2005 Dean P. Grimm / Thingamahoochie Software\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "WinMerge.EXE\0"
             VALUE "PrivateBuild", ""

diff --git a/Src/Languages/Russian/MergeRussian.rc b/Src/Languages/Russian/MergeRussian.rc
index 7215122..a9687c4 100644 (file)
--- a/Src/Languages/Russian/MergeRussian.rc
+++ b/Src/Languages/Russian/MergeRussian.rc
@@ -1349,7 +1349,7 @@ BEGIN
             VALUE "FileDescription", "WinMerge Application\0"
             VALUE "FileVersion", "000.000.000.000\0"
             VALUE "InternalName", "WinMerge\0"
-            VALUE "LegalCopyright", "© 1996-2001 Dean P. Grimm / Thingamahoochie Software\0"
+            VALUE "LegalCopyright", "© 1996-2005 Dean P. Grimm / Thingamahoochie Software\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "WinMerge.EXE\0"
             VALUE "PrivateBuild", ""

diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc
index a245ad6..0db960d 100644 (file)
--- a/Src/Languages/Slovak/MergeSlovak.rc
+++ b/Src/Languages/Slovak/MergeSlovak.rc
@@ -1335,7 +1335,7 @@ BEGIN
             VALUE "FileDescription", "Slovak for WinMerge Application \0"
             VALUE "FileVersion", "000.000.000.000\0"
             VALUE "InternalName", "MergeSlovak\0"
-            VALUE "LegalCopyright", "© 1996-2001 Dean P. Grimm / Thingamahoochie Software\0"
+            VALUE "LegalCopyright", "© 1996-2005 Dean P. Grimm / Thingamahoochie Software\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "MergeSlovak.rc\0"
             VALUE "PrivateBuild", ""

diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc
index 6f99017..dfc337c 100644 (file)
--- a/Src/Languages/Spanish/MergeSpanish.rc
+++ b/Src/Languages/Spanish/MergeSpanish.rc
@@ -1335,7 +1335,7 @@ BEGIN
             VALUE "FileDescription", "WinMerge Application\0"
             VALUE "FileVersion", "000.000.000.000\0"
             VALUE "InternalName", "WinMerge\0"
-            VALUE "LegalCopyright", "© 1996-2001 Dean P. Grimm / Thingamahoochie Software\0"
+            VALUE "LegalCopyright", "© 1996-2005 Dean P. Grimm / Thingamahoochie Software\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "WinMerge.EXE\0"
             VALUE "PrivateBuild", ""

diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc
index 575f80b..b2d0939 100644 (file)
--- a/Src/Languages/Swedish/MergeSwedish.rc
+++ b/Src/Languages/Swedish/MergeSwedish.rc
@@ -1334,7 +1334,7 @@ BEGIN
             VALUE "FileDescription", "WinMerge Application\0"
             VALUE "FileVersion", "000.000.000.000\0"
             VALUE "InternalName", "WinMerge\0"
-            VALUE "LegalCopyright", "© 1996-2001 Dean P. Grimm / Thingamahoochie Software\0"
+            VALUE "LegalCopyright", "© 1996-2005 Dean P. Grimm / Thingamahoochie Software\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "WinMerge.EXE\0"
             VALUE "PrivateBuild", ""

diff --git a/Src/readme.txt b/Src/readme.txt
index 7a40b5e..cd11c0d 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -3,6 +3,10 @@
   Src: MainFrm.cpp PatchDlg.cpp StdAfx.cpp StdAfx.h
  BUG: [ 1197972 ] current cvs doesn't compile
   Src: MainFrm.h
+ BUG [ 1193561 ] v2.2, version copyrights not all up-to-date
+  Adjusted all to say 1996-2005 just as English
+  Src/Languages: Merge*.rc
+
 
 2005-05-08 Kimmo
  PATCH: [ 1196889 ] Move options initializations to own file