Merge.rc: To prevent that VisualStudio edits Version Info block, move it to Merge2.rc

diff --git a/Src/Merge.rc b/Src/Merge.rc
index a8093d7..ce8a7bb 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1980,50 +1980,6 @@ BEGIN
 END
 
 
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-#include "../Version.h"
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION FILEVER
- PRODUCTVERSION PRODUCTVER
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x9L
-#else
- FILEFLAGS 0x8L
-#endif
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904e4"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "http://winmerge.org\0"
-            VALUE "FileDescription", "WinMerge\0"
-            VALUE "FileVersion", STRFILEVER
-            VALUE "InternalName", "WinMerge\0"
-            VALUE "LegalCopyright", "(c) 1996-2014 Dean P. Grimm / Thingamahoochie Software\0"
-            VALUE "OriginalFilename", "WinMerge.EXE\0"
-            VALUE "PrivateBuild", ""
-            VALUE "ProductName", "WinMerge\0"
-            VALUE "ProductVersion", STRPRODUCTVER
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1252
-    END
-END
-
-#endif    // !_MAC
-
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // String Table

diff --git a/Src/Merge2.rc b/Src/Merge2.rc
index d897f0b..1f2be40 100644 (file)
--- a/Src/Merge2.rc
+++ b/Src/Merge2.rc
@@ -173,3 +173,47 @@ IDB_MERGE_COMPARE_LEFT2_RIGHT1 BITMAP           "res\\compare_left2_right1.bmp"
 
 IDR_MARGIN_CURSOR       CURSOR                  "res\\mg_cur.cur"
 IDR_MERGEHAND           CURSOR                  "res\\hand.cur"
+
+#ifndef _MAC
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+#include "../Version.h"
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION FILEVER
+ PRODUCTVERSION PRODUCTVER
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x9L
+#else
+ FILEFLAGS 0x8L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904e4"
+        BEGIN
+            VALUE "Comments", "\0"
+            VALUE "CompanyName", "http://winmerge.org\0"
+            VALUE "FileDescription", "WinMerge\0"
+            VALUE "FileVersion", STRFILEVER
+            VALUE "InternalName", "WinMerge\0"
+            VALUE "LegalCopyright", "(c) 1996-2014 Dean P. Grimm / Thingamahoochie Software\0"
+            VALUE "OriginalFilename", "WinMerge.EXE\0"
+            VALUE "PrivateBuild", ""
+            VALUE "ProductName", "WinMerge\0"
+            VALUE "ProductVersion", STRPRODUCTVER
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1252
+    END
+END
+
+#endif    // !_MAC
+

diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po
index 8ac6f5f..f6084c1 100644 (file)
--- a/Translations/WinMerge/Basque.po
+++ b/Translations/WinMerge/Basque.po
@@ -2688,18 +2688,6 @@ msgstr ""
 msgid "&Hex View"
 msgstr ""
 
-#. StringFileInfo.Block
-#: Merge.rc:6DC3523
-#, c-format
-msgid "040904e4"
-msgstr "040904e4"
-
-#. VarFileInfo.Translation
-#: Merge.rc:53CC5469
-#, c-format
-msgid "0x409, 1252"
-msgstr "0x409, 1252"
-
 #: Merge.rc:206940
 #, c-format
 msgid "EXT"

diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po
index 72f81ab..1a71626 100644 (file)
--- a/Translations/WinMerge/Brazilian.po
+++ b/Translations/WinMerge/Brazilian.po
@@ -2687,18 +2687,6 @@ msgstr ""
 msgid "&Hex View"
 msgstr ""
 
-#. StringFileInfo.Block
-#: Merge.rc:6DC3523
-#, c-format
-msgid "040904e4"
-msgstr "041604e4"
-
-#. VarFileInfo.Translation
-#: Merge.rc:53CC5469
-#, c-format
-msgid "0x409, 1252"
-msgstr "0x416, 1252"
-
 #: Merge.rc:206940
 #, c-format
 msgid "EXT"

diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po
index bdbef4e..95fa524 100644 (file)
--- a/Translations/WinMerge/Bulgarian.po
+++ b/Translations/WinMerge/Bulgarian.po
@@ -2681,18 +2681,6 @@ msgstr ""
 msgid "&Hex View"
 msgstr ""
 
-#. StringFileInfo.Block
-#: Merge.rc:6DC3523
-#, c-format
-msgid "040904e4"
-msgstr "040204e3"
-
-#. VarFileInfo.Translation
-#: Merge.rc:53CC5469
-#, c-format
-msgid "0x409, 1252"
-msgstr "0x402, 1251"
-
 #: Merge.rc:206940
 #, c-format
 msgid "EXT"

diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po
index 2b3e3a7..908f7f4 100644 (file)
--- a/Translations/WinMerge/Catalan.po
+++ b/Translations/WinMerge/Catalan.po
@@ -2680,18 +2680,6 @@ msgstr ""
 msgid "&Hex View"
 msgstr ""
 
-#. StringFileInfo.Block
-#: Merge.rc:6DC3523
-#, c-format
-msgid "040904e4"
-msgstr "040304e4"
-
-#. VarFileInfo.Translation
-#: Merge.rc:53CC5469
-#, c-format
-msgid "0x409, 1252"
-msgstr "0x403, 1252"
-
 #: Merge.rc:206940
 #, c-format
 msgid "EXT"

diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po
index 498a27f..ee6829f 100644 (file)
--- a/Translations/WinMerge/ChineseSimplified.po
+++ b/Translations/WinMerge/ChineseSimplified.po
@@ -2681,18 +2681,6 @@ msgstr ""
 msgid "&Hex View"
 msgstr ""
 
-#. StringFileInfo.Block
-#: Merge.rc:6DC3523
-#, c-format
-msgid "040904e4"
-msgstr "040903a8"
-
-#. VarFileInfo.Translation
-#: Merge.rc:53CC5469
-#, c-format
-msgid "0x409, 1252"
-msgstr "0x804, 936"
-
 #: Merge.rc:206940
 #, c-format
 msgid "EXT"

diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po
index 0246dca..7a536c5 100644 (file)
--- a/Translations/WinMerge/ChineseTraditional.po
+++ b/Translations/WinMerge/ChineseTraditional.po
@@ -2694,18 +2694,6 @@ msgstr ""
 msgid "&Hex View"
 msgstr ""
 
-#. StringFileInfo.Block
-#: Merge.rc:6DC3523
-#, c-format
-msgid "040904e4"
-msgstr "040403B6"
-
-#. VarFileInfo.Translation
-#: Merge.rc:53CC5469
-#, c-format
-msgid "0x409, 1252"
-msgstr "0x404, 950"
-
 #: Merge.rc:206940
 #, c-format
 msgid "EXT"

diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po
index 223fa7f..2c5aac1 100644 (file)
--- a/Translations/WinMerge/Croatian.po
+++ b/Translations/WinMerge/Croatian.po
@@ -2685,18 +2685,6 @@ msgstr ""
 msgid "&Hex View"
 msgstr ""
 
-#. StringFileInfo.Block
-#: Merge.rc:6DC3523
-#, c-format
-msgid "040904e4"
-msgstr "041a04e2"
-
-#. VarFileInfo.Translation
-#: Merge.rc:53CC5469
-#, c-format
-msgid "0x409, 1252"
-msgstr "0x41a, 1250"
-
 #: Merge.rc:206940
 #, c-format
 msgid "EXT"

diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po
index c27fa34..d4aa4d9 100644 (file)
--- a/Translations/WinMerge/Czech.po
+++ b/Translations/WinMerge/Czech.po
@@ -2683,18 +2683,6 @@ msgstr ""
 msgid "&Hex View"
 msgstr ""
 
-#. StringFileInfo.Block
-#: Merge.rc:6DC3523
-#, c-format
-msgid "040904e4"
-msgstr "040504e2"
-
-#. VarFileInfo.Translation
-#: Merge.rc:53CC5469
-#, c-format
-msgid "0x409, 1252"
-msgstr "0x405, 1250"
-
 #: Merge.rc:206940
 #, c-format
 msgid "EXT"

diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po
index 43630e3..6018490 100644 (file)
--- a/Translations/WinMerge/Danish.po
+++ b/Translations/WinMerge/Danish.po
@@ -2692,18 +2692,6 @@ msgstr ""
 msgid "&Hex View"
 msgstr ""
 
-#. StringFileInfo.Block
-#: Merge.rc:6DC3523
-#, c-format
-msgid "040904e4"
-msgstr "040904e4"
-
-#. VarFileInfo.Translation
-#: Merge.rc:53CC5469
-#, c-format
-msgid "0x409, 1252"
-msgstr "0x406, 1252"
-
 #: Merge.rc:206940
 #, c-format
 msgid "EXT"

diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po
index 94631bf..fde8447 100644 (file)
--- a/Translations/WinMerge/Dutch.po
+++ b/Translations/WinMerge/Dutch.po
@@ -2693,18 +2693,6 @@ msgstr ""
 msgid "&Hex View"
 msgstr ""
 
-#. StringFileInfo.Block
-#: Merge.rc:6DC3523
-#, c-format
-msgid "040904e4"
-msgstr "041304e4"
-
-#. VarFileInfo.Translation
-#: Merge.rc:53CC5469
-#, c-format
-msgid "0x409, 1252"
-msgstr "0x413, 1252"
-
 #: Merge.rc:206940
 #, c-format
 msgid "EXT"

diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot
index 29eab92..4244474 100644 (file)
--- a/Translations/WinMerge/English.pot
+++ b/Translations/WinMerge/English.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2016-01-26 00:44+0000\n"
+"POT-Creation-Date: 2016-02-06 10:45+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
@@ -2677,18 +2677,6 @@ msgstr ""
 msgid "&Hex View"
 msgstr ""
 
-#. StringFileInfo.Block
-#: Merge.rc:6DC3523
-#, c-format
-msgid "040904e4"
-msgstr ""
-
-#. VarFileInfo.Translation
-#: Merge.rc:53CC5469
-#, c-format
-msgid "0x409, 1252"
-msgstr ""
-
 #: Merge.rc:206940
 #, c-format
 msgid "EXT"

diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po
index 3c02e27..c4f0113 100644 (file)
--- a/Translations/WinMerge/French.po
+++ b/Translations/WinMerge/French.po
@@ -2689,18 +2689,6 @@ msgstr ""
 msgid "&Hex View"
 msgstr ""
 
-#. StringFileInfo.Block
-#: Merge.rc:6DC3523
-#, c-format
-msgid "040904e4"
-msgstr "040c04e4"
-
-#. VarFileInfo.Translation
-#: Merge.rc:53CC5469
-#, c-format
-msgid "0x409, 1252"
-msgstr "0x40c, 1252"
-
 #: Merge.rc:206940
 #, c-format
 msgid "EXT"

diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po
index 301e091..2fb6bbe 100644 (file)
--- a/Translations/WinMerge/Galician.po
+++ b/Translations/WinMerge/Galician.po
@@ -2686,18 +2686,6 @@ msgstr ""
 msgid "&Hex View"
 msgstr ""
 
-#. StringFileInfo.Block
-#: Merge.rc:6DC3523
-#, c-format
-msgid "040904e4"
-msgstr "040904e4"
-
-#. VarFileInfo.Translation
-#: Merge.rc:53CC5469
-#, c-format
-msgid "0x409, 1252"
-msgstr "0x409, 1252"
-
 #: Merge.rc:206940
 #, c-format
 msgid "EXT"

diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po
index 445207c..14b5ebc 100644 (file)
--- a/Translations/WinMerge/German.po
+++ b/Translations/WinMerge/German.po
@@ -2690,18 +2690,6 @@ msgstr ""
 msgid "&Hex View"
 msgstr ""
 
-#. StringFileInfo.Block
-#: Merge.rc:6DC3523
-#, c-format
-msgid "040904e4"
-msgstr "040704e4"
-
-#. VarFileInfo.Translation
-#: Merge.rc:53CC5469
-#, c-format
-msgid "0x409, 1252"
-msgstr "0x407, 1252"
-
 #: Merge.rc:206940
 #, c-format
 msgid "EXT"

diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po
index 2f85d8d..decdf83 100644 (file)
--- a/Translations/WinMerge/Greek.po
+++ b/Translations/WinMerge/Greek.po
@@ -2680,18 +2680,6 @@ msgstr ""
 msgid "&Hex View"
 msgstr ""
 
-#. StringFileInfo.Block
-#: Merge.rc:6DC3523
-#, c-format
-msgid "040904e4"
-msgstr ""
-
-#. VarFileInfo.Translation
-#: Merge.rc:53CC5469
-#, c-format
-msgid "0x409, 1252"
-msgstr ""
-
 #: Merge.rc:206940
 #, c-format
 msgid "EXT"

diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po
index b02acb0..97911fc 100644 (file)
--- a/Translations/WinMerge/Hungarian.po
+++ b/Translations/WinMerge/Hungarian.po
@@ -2681,18 +2681,6 @@ msgstr ""
 msgid "&Hex View"
 msgstr ""
 
-#. StringFileInfo.Block
-#: Merge.rc:6DC3523
-#, c-format
-msgid "040904e4"
-msgstr "040E04e2"
-
-#. VarFileInfo.Translation
-#: Merge.rc:53CC5469
-#, c-format
-msgid "0x409, 1252"
-msgstr "0x040E, 1250"
-
 #: Merge.rc:206940
 #, c-format
 msgid "EXT"

diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po
index 4ab501a..bcb5bdd 100644 (file)
--- a/Translations/WinMerge/Italian.po
+++ b/Translations/WinMerge/Italian.po
@@ -2681,18 +2681,6 @@ msgstr ""
 msgid "&Hex View"
 msgstr ""
 
-#. StringFileInfo.Block
-#: Merge.rc:6DC3523
-#, c-format
-msgid "040904e4"
-msgstr "041004e4"
-
-#. VarFileInfo.Translation
-#: Merge.rc:53CC5469
-#, c-format
-msgid "0x409, 1252"
-msgstr "0x410, 1252"
-
 #: Merge.rc:206940
 #, c-format
 msgid "EXT"

diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po
index bbe84ca..f46f61b 100644 (file)
--- a/Translations/WinMerge/Japanese.po
+++ b/Translations/WinMerge/Japanese.po
@@ -2700,18 +2700,6 @@ msgstr "
 msgid "&Hex View"
 msgstr "HEX\95\\8e¦(&H)"
 
-#. StringFileInfo.Block
-#: Merge.rc:6DC3523
-#, c-format
-msgid "040904e4"
-msgstr "041103a4"
-
-#. VarFileInfo.Translation
-#: Merge.rc:53CC5469
-#, c-format
-msgid "0x409, 1252"
-msgstr "0x411, 932"
-
 #: Merge.rc:206940
 #, c-format
 msgid "EXT"

diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po
index 08d573f..718e3d7 100644 (file)
--- a/Translations/WinMerge/Korean.po
+++ b/Translations/WinMerge/Korean.po
@@ -2682,18 +2682,6 @@ msgstr ""
 msgid "&Hex View"
 msgstr ""
 
-#. StringFileInfo.Block
-#: Merge.rc:6DC3523
-#, c-format
-msgid "040904e4"
-msgstr "041203b5"
-
-#. VarFileInfo.Translation
-#: Merge.rc:53CC5469
-#, c-format
-msgid "0x409, 1252"
-msgstr "0x412, 949"
-
 #: Merge.rc:206940
 #, c-format
 msgid "EXT"

diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po
index c22c734..737f647 100644 (file)
--- a/Translations/WinMerge/Norwegian.po
+++ b/Translations/WinMerge/Norwegian.po
@@ -2685,18 +2685,6 @@ msgstr ""
 msgid "&Hex View"
 msgstr ""
 
-#. StringFileInfo.Block
-#: Merge.rc:6DC3523
-#, c-format
-msgid "040904e4"
-msgstr "041404e4"
-
-#. VarFileInfo.Translation
-#: Merge.rc:53CC5469
-#, c-format
-msgid "0x409, 1252"
-msgstr "0x414, 1252"
-
 #: Merge.rc:206940
 #, c-format
 msgid "EXT"

diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po
index 389f6f9..97a2260 100644 (file)
--- a/Translations/WinMerge/Persian.po
+++ b/Translations/WinMerge/Persian.po
@@ -2684,18 +2684,6 @@ msgstr ""
 msgid "&Hex View"
 msgstr ""
 
-#. StringFileInfo.Block
-#: Merge.rc:6DC3523
-#, c-format
-msgid "040904e4"
-msgstr "042904e8"
-
-#. VarFileInfo.Translation
-#: Merge.rc:53CC5469
-#, c-format
-msgid "0x409, 1252"
-msgstr "0x429, 1256"
-
 #: Merge.rc:206940
 #, c-format
 msgid "EXT"

diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po
index b91fd20..dbef3eb 100644 (file)
--- a/Translations/WinMerge/Polish.po
+++ b/Translations/WinMerge/Polish.po
@@ -2686,18 +2686,6 @@ msgstr ""
 msgid "&Hex View"
 msgstr ""
 
-#. StringFileInfo.Block
-#: Merge.rc:6DC3523
-#, c-format
-msgid "040904e4"
-msgstr "041504e2"
-
-#. VarFileInfo.Translation
-#: Merge.rc:53CC5469
-#, c-format
-msgid "0x409, 1252"
-msgstr "0x415, 1250"
-
 #: Merge.rc:206940
 #, c-format
 msgid "EXT"

diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po
index 0e359d4..4a6ada8 100644 (file)
--- a/Translations/WinMerge/Portuguese.po
+++ b/Translations/WinMerge/Portuguese.po
@@ -2680,18 +2680,6 @@ msgstr ""
 msgid "&Hex View"
 msgstr ""
 
-#. StringFileInfo.Block
-#: Merge.rc:6DC3523
-#, c-format
-msgid "040904e4"
-msgstr "081604e4"
-
-#. VarFileInfo.Translation
-#: Merge.rc:53CC5469
-#, c-format
-msgid "0x409, 1252"
-msgstr "0x816, 1252"
-
 #: Merge.rc:206940
 #, c-format
 msgid "EXT"

diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po
index b1f3866..ae5198c 100644 (file)
--- a/Translations/WinMerge/Romanian.po
+++ b/Translations/WinMerge/Romanian.po
@@ -2681,18 +2681,6 @@ msgstr ""
 msgid "&Hex View"
 msgstr ""
 
-#. StringFileInfo.Block
-#: Merge.rc:6DC3523
-#, fuzzy, c-format
-msgid "040904e4"
-msgstr "040904e4"
-
-#. VarFileInfo.Translation
-#: Merge.rc:53CC5469
-#, fuzzy, c-format
-msgid "0x409, 1252"
-msgstr "0x409, 1250"
-
 #: Merge.rc:206940
 #, c-format
 msgid "EXT"

diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po
index 80f80f4..2a41327 100644 (file)
--- a/Translations/WinMerge/Russian.po
+++ b/Translations/WinMerge/Russian.po
@@ -2687,18 +2687,6 @@ msgstr ""
 msgid "&Hex View"
 msgstr ""
 
-#. StringFileInfo.Block
-#: Merge.rc:6DC3523
-#, c-format
-msgid "040904e4"
-msgstr "041904e3"
-
-#. VarFileInfo.Translation
-#: Merge.rc:53CC5469
-#, c-format
-msgid "0x409, 1252"
-msgstr "0x419, 1251"
-
 #: Merge.rc:206940
 #, c-format
 msgid "EXT"

diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po
index a0dd3b6..9da479d 100644 (file)
--- a/Translations/WinMerge/Serbian.po
+++ b/Translations/WinMerge/Serbian.po
@@ -2684,18 +2684,6 @@ msgstr ""
 msgid "&Hex View"
 msgstr ""
 
-#. StringFileInfo.Block
-#: Merge.rc:6DC3523
-#, c-format
-msgid "040904e4"
-msgstr "041904e3"
-
-#. VarFileInfo.Translation
-#: Merge.rc:53CC5469
-#, c-format
-msgid "0x409, 1252"
-msgstr "0x419, 1251"
-
 #: Merge.rc:206940
 #, c-format
 msgid "EXT"

diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po
index 8bd2932..cebf0df 100644 (file)
--- a/Translations/WinMerge/Slovak.po
+++ b/Translations/WinMerge/Slovak.po
@@ -2681,18 +2681,6 @@ msgstr ""
 msgid "&Hex View"
 msgstr ""
 
-#. StringFileInfo.Block
-#: Merge.rc:6DC3523
-#, c-format
-msgid "040904e4"
-msgstr "041b04e2"
-
-#. VarFileInfo.Translation
-#: Merge.rc:53CC5469
-#, c-format
-msgid "0x409, 1252"
-msgstr "0x41b, 1250"
-
 #: Merge.rc:206940
 #, c-format
 msgid "EXT"

diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po
index dcc2557..7e80866 100644 (file)
--- a/Translations/WinMerge/Slovenian.po
+++ b/Translations/WinMerge/Slovenian.po
@@ -2688,18 +2688,6 @@ msgstr ""
 msgid "&Hex View"
 msgstr ""
 
-#. StringFileInfo.Block
-#: Merge.rc:6DC3523
-#, c-format
-msgid "040904e4"
-msgstr "040904e4"
-
-#. VarFileInfo.Translation
-#: Merge.rc:53CC5469
-#, c-format
-msgid "0x409, 1252"
-msgstr "0x407, 1250"
-
 #: Merge.rc:206940
 #, c-format
 msgid "EXT"

diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po
index a4025fe..606d024 100644 (file)
--- a/Translations/WinMerge/Spanish.po
+++ b/Translations/WinMerge/Spanish.po
@@ -2687,18 +2687,6 @@ msgstr ""
 msgid "&Hex View"
 msgstr ""
 
-#. StringFileInfo.Block
-#: Merge.rc:6DC3523
-#, c-format
-msgid "040904e4"
-msgstr "0c0a04e4"
-
-#. VarFileInfo.Translation
-#: Merge.rc:53CC5469
-#, c-format
-msgid "0x409, 1252"
-msgstr "0xc0a, 1252"
-
 #: Merge.rc:206940
 #, c-format
 msgid "EXT"

diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po
index 334d9a5..23f0a70 100644 (file)
--- a/Translations/WinMerge/Swedish.po
+++ b/Translations/WinMerge/Swedish.po
@@ -2685,18 +2685,6 @@ msgstr ""
 msgid "&Hex View"
 msgstr ""
 
-#. StringFileInfo.Block
-#: Merge.rc:6DC3523
-#, c-format
-msgid "040904e4"
-msgstr "041d04e4"
-
-#. VarFileInfo.Translation
-#: Merge.rc:53CC5469
-#, c-format
-msgid "0x409, 1252"
-msgstr "0x41d, 1252"
-
 #: Merge.rc:206940
 #, c-format
 msgid "EXT"

diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po
index 11bdba8..1eabd96 100644 (file)
--- a/Translations/WinMerge/Turkish.po
+++ b/Translations/WinMerge/Turkish.po
@@ -2688,18 +2688,6 @@ msgstr ""
 msgid "&Hex View"
 msgstr ""
 
-#. StringFileInfo.Block
-#: Merge.rc:6DC3523
-#, c-format
-msgid "040904e4"
-msgstr "041f04e6"
-
-#. VarFileInfo.Translation
-#: Merge.rc:53CC5469
-#, c-format
-msgid "0x409, 1252"
-msgstr "0x41f, 1254"
-
 #: Merge.rc:206940
 #, c-format
 msgid "EXT"

diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po
index 78e7ddc..6a2e8fb 100644 (file)
--- a/Translations/WinMerge/Ukrainian.po
+++ b/Translations/WinMerge/Ukrainian.po
@@ -2686,18 +2686,6 @@ msgstr ""
 msgid "&Hex View"
 msgstr ""
 
-#. StringFileInfo.Block
-#: Merge.rc:6DC3523
-#, c-format
-msgid "040904e4"
-msgstr "042204e3"
-
-#. VarFileInfo.Translation
-#: Merge.rc:53CC5469
-#, c-format
-msgid "0x409, 1252"
-msgstr "0x422, 1251"
-
 #: Merge.rc:206940
 #, c-format
 msgid "EXT"