|
From: <ge...@us...> - 2010-12-07 17:35:38
|
Revision: 7457
http://winmerge.svn.sourceforge.net/winmerge/?rev=7457&view=rev
Author: gerundt
Date: 2010-12-07 17:35:31 +0000 (Tue, 07 Dec 2010)
Log Message:
-----------
PATCH: [ 2894123 ] Drop codepage translations
Modified Paths:
--------------
branches/R2_14/Src/Merge.rc
branches/R2_14/Src/resource.h
Modified: branches/R2_14/Src/Merge.rc
===================================================================
--- branches/R2_14/Src/Merge.rc 2010-12-07 14:42:56 UTC (rev 7456)
+++ branches/R2_14/Src/Merge.rc 2010-12-07 17:35:31 UTC (rev 7457)
@@ -2528,105 +2528,6 @@
IDS_REGEXP_UNMATCHED_RPAREN "Unmatched ) or \\)"
END
-// CODEPAGE GEOGRAPHIC GROUPS
-STRINGTABLE
-BEGIN
- IDS_CPG_WESTERN_EUROPEAN "Western European"
- IDS_CPG_EASTERN_EUROPEAN "Eastern European"
- IDS_CPG_EAST_ASIAN "East Asian"
- IDS_CPG_SOUTH_ASIAN "SE & SW Asian"
- IDS_CPG_MIDDLE_EASTERN "Middle Eastern"
- IDS_CPG_NA "Not applicable"
-END
-
-// CODEPAGE PLATFORM GROUPS
-STRINGTABLE
-BEGIN
- IDS_CPP_WINDOWS "MS-Windows"
- IDS_CPP_DOS "MS-DOS"
- IDS_CPP_MACINTOSH "Macintosh"
- IDS_CPP_IBM "IBM"
- IDS_CPP_NA "Not applicable"
-END
-
-// CODEPAGES #1 (IBM)
-STRINGTABLE
-BEGIN
- IDS_CP_EBCDIC "EBCDIC"
- IDS_CP_IBM_EBCDIC_CYRILLIC "IBM EBCDIC Cyrillic"
-END
-
-// CODEPAGES #1 (DOS)
-STRINGTABLE
-BEGIN
- IDS_CP_DOS_US "MS-DOS Latin US"
- IDS_CP_DOS_ARABIC "MS-DOS Arabic"
- IDS_CP_DOS_GREEK "MS-DOS Greek"
- IDS_CP_DOS_BALTIC "MS-DOS Baltic Rim"
- IDS_CP_DOS_LATIN1 "MS-DOS Latin 1"
- IDS_CP_DOS_GREEK1 "MS-DOS Greek 1"
- IDS_CP_DOS_LATIN2 "MS-DOS Latin 2"
- IDS_CP_DOS_CYRILLIC "MS-DOS Cyrillic"
- IDS_CP_DOS_TURKISH "MS-DOS Turkish"
- IDS_CP_DOS_PORTUGUESE "MS-DOS Portuguese"
-END
-
-// CODEPAGES #2 (more DOS)
-STRINGTABLE
-BEGIN
- IDS_CP_DOS_ICELANDIC "MS-DOS Icelandic"
- IDS_CP_DOS_HEBREW "MS-DOS Hebrew"
- IDS_CP_DOS_FRENCH_CANADA "MS-DOS French Canada"
- IDS_CP_DOS_NORDIC "MS-DOS Nordic"
- IDS_CP_DOS_CYRILLIC_CIS1 "MS-DOS Cyrillic CIS 1"
- IDS_CP_DOS_GREEK2 "MS-DOS Greek 2"
-END
-
-// CODEPAGES #3 (Windows)
-STRINGTABLE
-BEGIN
- IDS_CP_WINDOWS_THAI "Windows Thai"
- IDS_CP_WINDOWS_JAPANESE "Windows Japanese"
- IDS_CP_WINDOWS_CHINESE_SIMP "Windows Simplified Chinese"
- IDS_CP_WINDOWS_KOREAN "Windows Korean"
- IDS_CP_WINDOWS_CHINESE_TRAD "Windows Traditional Chinese"
- IDS_CP_WINDOWS_LATIN2 "Windows Latin 2"
- IDS_CP_WINDOWS_CYRILLIC "Windows Cyrillic (Slavic)"
- IDS_CP_WINDOWS_LATIN1 "Windows Latin 1"
- IDS_CP_WINDOWS_GREEK "Windows Greek"
- IDS_CP_WINDOWS_TURKISH "Windows Latin 5 (Turkish)"
- IDS_CP_WINDOWS_HEBREW "Windows Hebrew"
- IDS_CP_WINDOWS_ARABIC "Windows Arabic"
- IDS_CP_WINDOWS_BALTIC "Windows Baltic Rim"
- IDS_CP_WINDOWS_VIETNAM "Windows Vietnamese"
-END
-
-// CODEPAGES #4 (Macintosh)
-STRINGTABLE
-BEGIN
- IDS_CP_MACINTOSH_ROMAN "Macintosh Roman"
- IDS_CP_MACINTOSH_GREEK "Macintosh Greek"
- IDS_CP_MACINTOSH_CYRILLIC "Macintosh Cyrillic"
- IDS_CP_MACINTOSH_CENTRAL_EUROPE "Macintosh "
- IDS_CP_MACINTOSH_ICELANDIC "Macintosh Central Europe"
- IDS_CP_MACINTOSH_TURKISH "Macintosh Turkish"
-END
-
-// CODEPAGES #5 (Extra (alias) information)
-STRINGTABLE
-BEGIN
- IDS_CP_WINDOWS_JAPANESE_EXTRA ""
- IDS_CP_WINDOWS_CHINESE_SIMP_EXTRA ""
- IDS_CP_WINDOWS_KOREAN_EXTRA ""
- IDS_CP_WINDOWS_LATIN2_EXTRA "Approximates ISO-8859-2"
- IDS_CP_WINDOWS_CHINESE_TRAD_EXTRA ""
- IDS_CP_WINDOWS_CYRILLIC_EXTRA ""
- IDS_CP_WINDOWS_LATIN1_EXTRA "Approximates ISO-8859-1"
- IDS_CP_WINDOWS_GREEK_EXTRA "Approximates ISO-8859-7"
- IDS_CP_WINDOWS_TURKISH_EXTRA "Approximates ISO-8859-9"
- IDS_CP_WINDOWS_HEBREW_EXTRA "Approximates ISO-8859-8"
-END
-
// EOL types shown in folder compare EOL type column and in file compare statusbar
STRINGTABLE
BEGIN
Modified: branches/R2_14/Src/resource.h
===================================================================
--- branches/R2_14/Src/resource.h 2010-12-07 14:42:56 UTC (rev 7456)
+++ branches/R2_14/Src/resource.h 2010-12-07 17:35:31 UTC (rev 7457)
@@ -812,67 +812,6 @@
#define IDS_UNICODING_UCS2_LE 18594
#define IDS_UNICODING_UCS2_BE 18595
#define IDD_LANGUAGE_SELECT 30000
-#define IDS_CPG_WESTERN_EUROPEAN 30200
-#define IDS_CPG_EASTERN_EUROPEAN 30201
-#define IDS_CPG_EAST_ASIAN 30202
-#define IDS_CPG_SOUTH_ASIAN 30203
-#define IDS_CPG_MIDDLE_EASTERN 30204
-#define IDS_CPG_NA 30205
-#define IDS_CPP_WINDOWS 30210
-#define IDS_CPP_DOS 30211
-#define IDS_CPP_MACINTOSH 30212
-#define IDS_CPP_IBM 30213
-#define IDS_CPP_NA 30214
-#define IDS_CP_EBCDIC 30220
-#define IDS_CP_IBM_EBCDIC_CYRILLIC 30221
-#define IDS_CP_DOS_US 30230
-#define IDS_CP_DOS_ARABIC 30231
-#define IDS_CP_DOS_GREEK 30232
-#define IDS_CP_DOS_BALTIC 30233
-#define IDS_CP_DOS_LATIN1 30234
-#define IDS_CP_DOS_GREEK1 30235
-#define IDS_CP_DOS_LATIN2 30236
-#define IDS_CP_DOS_CYRILLIC 30237
-#define IDS_CP_DOS_TURKISH 30238
-#define IDS_CP_DOS_PORTUGUESE 30239
-#define IDS_CP_DOS_ICELANDIC 30250
-#define IDS_CP_DOS_HEBREW 30251
-#define IDS_CP_DOS_FRENCH_CANADA 30252
-#define IDS_CP_DOS_NORDIC 30253
-#define IDS_CP_DOS_CYRILLIC_CIS1 30254
-#define IDS_CP_DOS_GREEK2 30255
-#define IDS_CP_WINDOWS_THAI 30256
-#define IDS_CP_WINDOWS_JAPANESE 30257
-#define IDS_CP_WINDOWS_CHINESE_SIMP 30258
-#define IDS_CP_WINDOWS_KOREAN 30259
-#define IDS_CP_WINDOWS_CHINESE_TRAD 30270
-#define IDS_CP_WINDOWS_LATIN2 30271
-#define IDS_CP_WINDOWS_CYRILLIC 30272
-#define IDS_CP_WINDOWS_LATIN1 30273
-#define IDS_CP_WINDOWS_GREEK 30274
-#define IDS_CP_WINDOWS_TURKISH 30275
-#define IDS_CP_WINDOWS_HEBREW 30276
-#define IDS_CP_WINDOWS_ARABIC 30277
-#define IDS_CP_WINDOWS_BALTIC 30278
-#define IDS_CP_WINDOWS_VIETNAM 30279
-#define IDS_CP_MACINTOSH_ROMAN 30290
-#define IDS_CP_MACINTOSH_GREEK 30291
-#define IDS_CP_MACINTOSH_CYRILLIC 30292
-#define IDS_CP_MACINTOSH_CENTRAL_EUROPE 30293
-#define IDS_CP_MACINTOSH_ICELANDIC 30294
-#define IDS_CP_MACINTOSH_TURKISH 30295
-#define IDS_CP_UTF7 30300
-#define IDS_CP_UTF8 30301
-#define IDS_CP_WINDOWS_JAPANESE_EXTRA 30320
-#define IDS_CP_WINDOWS_CHINESE_SIMP_EXTRA 30321
-#define IDS_CP_WINDOWS_KOREAN_EXTRA 30322
-#define IDS_CP_WINDOWS_LATIN2_EXTRA 30323
-#define IDS_CP_WINDOWS_CHINESE_TRAD_EXTRA 30324
-#define IDS_CP_WINDOWS_CYRILLIC_EXTRA 30326
-#define IDS_CP_WINDOWS_LATIN1_EXTRA 30327
-#define IDS_CP_WINDOWS_GREEK_EXTRA 30328
-#define IDS_CP_WINDOWS_TURKISH_EXTRA 30329
-#define IDS_CP_WINDOWS_HEBREW_EXTRA 30340
#define IDS_EOL_DOS 30400
#define IDS_EOL_MAC 30401
#define IDS_EOL_UNIX 30402
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
