diff --git a/Build/Changes.txt b/Build/Changes.txt
index 69938e49b..a20c4831c 100644
--- a/Build/Changes.txt
+++ b/Build/Changes.txt
@@ -34,7 +34,7 @@ SUP - (S)et(UP) / Installer Package
========================================================
-Current BETA/RC Version 5.20.1125.(build_#) (2020-11-25)
+Current BETA/RC Version 5.20.1201.(build_#) (2020-12-01)
========================================================
--------------------------------------------------------
@@ -63,6 +63,8 @@ NEW:
CHANGES:
--------------------------------------------------------
[.xxx.x]- .
+[1201.1]- Renaming Chinese displayed encoding according to MIME/IANA.
+[1125.2]- Code styling reformat (AStyle: OTBS).
[1125.2]- Format: AStyle ALLMAN core code base.
[1118.1]- Sci_PositionCR type reverted to long for Win32 compatibility reasons.
[1001.1]- Rebase DarkMode module on delay load version branch of win32-darkmode project.
@@ -94,7 +96,6 @@ CHANGES:
FIXES:
--------------------------------------------------------
[.xxx.x]- .
-[1125.2]- Code styling reformat (AStyle: OTBS).
[1125.2]- File encoding analysis with 7-bit ASCII only.
[1125.2]- File save problem after switching encoding to GB2312 (52936).
[1116.1]- Initial path on OpenFile dialog (load file).
@@ -149,9 +150,9 @@ TRANSLATIONS (MUI):
--------------------------------------------------------
[.xxx.x]- .
[1028.1]- Hindi (hi-IN).
-[.915.2]- Turkish (tr-TR) in processing...
[.915.2]- Chinese Traditional (zh-TW) in waiting...
[.915.2]- Indonesian (id-ID) in waiting...
+[.915.2]- Turkish (tr-TR) in waiting...
[.915.2]- Vietnamese (vi-VN) in waiting...
diff --git a/Versions/build.txt b/Versions/build.txt
index 0cfbf0888..d00491fd7 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-2
+1
diff --git a/Versions/day.txt b/Versions/day.txt
index 706146535..44acfebd5 100644
--- a/Versions/day.txt
+++ b/Versions/day.txt
@@ -1 +1 @@
-1125
+1201
diff --git a/language/np3_af_za/encode_af_za.rc b/language/np3_af_za/encode_af_za.rc
index f9d50d203..cad12d67a 100644
--- a/language/np3_af_za/encode_af_za.rc
+++ b/language/np3_af_za/encode_af_za.rc
@@ -79,9 +79,9 @@ BEGIN
IDS_ENC_ISO_8859_2 "C;Central European (ISO-8859-2);ISO-8859-2"
IDS_ENC_MAC_CENTRAL_EUROP "C;Central European (Mac);Mac (Central)"
IDS_ENC_WIN_1250 "C;Central European (Windows-1250);Windows-1250"
- IDS_ENC_GB18030 "C;Chinese (GB18030);GB-18030"
- IDS_ENC_GBK_936 "C;Chinese (GBK);GBK-936"
- IDS_ENC_GB2312_80 "C;Chinese Simplified (GB2312-80);GB-2312-80"
+ IDS_ENC_GB18030 "C;Chinese (GB18030);GB18030"
+ IDS_ENC_GBK_936 "C;Chinese (GBK);GBK"
+ IDS_ENC_GB2312_80 "C;Chinese Simplified (GB_2312-80);GB_2312-80"
IDS_ENC_MAC_ZH_CN "C;Chinese Simplified (Mac);Mac (zh-cn)"
IDS_ENC_BIG5 "C;Chinese Traditional (Big5);Big5"
IDS_ENC_MAC_ZH_TW "C;Chinese Traditional (Mac);Mac (zh-tw)"
@@ -115,7 +115,7 @@ BEGIN
IDS_ENC_DOS_861 "C;Icelandic (DOS-861);DOS-861"
IDS_ENC_MAC_ICELANDIC "C;Icelandic (Mac);Mac (Icelandic)"
IDS_ENC_MAC_JAPANESE "C;Japanese (Mac);Mac (Japanese)"
- IDS_ENC_SHIFT_JIS "C;Japanese (Shift-JIS);Shift-JIS"
+ IDS_ENC_SHIFT_JIS "C;Japanese (Shift_JIS);Shift_JIS"
IDS_ENC_MAC_KOREAN "C;Korean (Mac);Mac (Korean)"
IDS_ENC_WIN_949 "C;Korean (Windows-949);Windows-949"
IDS_ENC_ISO_8859_3 "C;Latin 3 (ISO-8859-3);ISO-8859-3"
@@ -149,16 +149,16 @@ END
STRINGTABLE
BEGIN
- IDS_ENC_EUC_JAPANESE "C;Japanese (EUC);Japanese (EUC)"
- IDS_ENC_EUC_KOREAN "C;Korean (EUC);Korean (EUC)"
- IDS_ENC_ISO_2022_CN "C;Chinese (ISO-2022);ISO-2022-CN"
- IDS_ENC_HZ_GB2312 "C;Chinese Simplified (GB2312);HZ-GB2312"
- IDS_ENC_ISO_2022_JP "C;Japanese (ISO-2022);ISO-2022-JP"
- IDS_ENC_ISO_2022_KR "C;Korean (ISO-2022);ISO-2022-KR"
- IDS_ENC_X_CHINESE_CNS "C;Chinese Traditional (CNS);x-chinese-cns"
+ IDS_ENC_EUC_JAPANESE "C;Japanese (EUC-JP);EUC-JP"
+ IDS_ENC_EUC_KOREAN "C;Korean (EUC-KR);EUC-KR"
+ IDS_ENC_ISO_2022_CN "C;Chinese (ISO-2022-CN);ISO-2022-CN"
+ IDS_ENC_HZ_GB2312 "C;Chinese Simplified (HZ-GB-2312);HZ-GB-2312"
+ IDS_ENC_ISO_2022_JP "C;Japanese (ISO-2022-JP);ISO-2022-JP"
+ IDS_ENC_ISO_2022_KR "C;Korean (ISO-2022-KR);ISO-2022-KR"
+ IDS_ENC_X_CHINESE_CNS "C;Chinese Traditional (CNS);x-Chinese-CNS"
IDS_ENC_JOHAB "C;Korean (Johab);Korean (Johab)"
IDS_ENC_ISO_8859_10 "B;Nordic (ISO-8859-10);ISO-8859-10"
- IDS_ENC_BIG5_HKSCS "C;Chinese Traditional (Big5HKSCS);Big5HKSCS"
+ IDS_ENC_BIG5_HKSCS "C;Chinese Traditional (Big5-HKSCS);Big5-HKSCS"
END
diff --git a/language/np3_be_by/encode_be_by.rc b/language/np3_be_by/encode_be_by.rc
index 4815bfc59..a0b30dcb7 100644
--- a/language/np3_be_by/encode_be_by.rc
+++ b/language/np3_be_by/encode_be_by.rc
@@ -79,9 +79,9 @@ BEGIN
IDS_ENC_ISO_8859_2 "C;Central European (ISO-8859-2);ISO-8859-2"
IDS_ENC_MAC_CENTRAL_EUROP "C;Central European (Mac);Mac (Central)"
IDS_ENC_WIN_1250 "C;Central European (Windows-1250);Windows-1250"
- IDS_ENC_GB18030 "C;Chinese (GB18030);GB-18030"
- IDS_ENC_GBK_936 "C;Chinese (GBK);GBK-936"
- IDS_ENC_GB2312_80 "C;Chinese Simplified (GB2312-80);GB-2312-80"
+ IDS_ENC_GB18030 "C;Chinese (GB18030);GB18030"
+ IDS_ENC_GBK_936 "C;Chinese (GBK);GBK"
+ IDS_ENC_GB2312_80 "C;Chinese Simplified (GB_2312-80);GB_2312-80"
IDS_ENC_MAC_ZH_CN "C;Chinese Simplified (Mac);Mac (zh-cn)"
IDS_ENC_BIG5 "C;Chinese Traditional (Big5);Big5"
IDS_ENC_MAC_ZH_TW "C;Chinese Traditional (Mac);Mac (zh-tw)"
@@ -115,7 +115,7 @@ BEGIN
IDS_ENC_DOS_861 "C;Icelandic (DOS-861);DOS-861"
IDS_ENC_MAC_ICELANDIC "C;Icelandic (Mac);Mac (Icelandic)"
IDS_ENC_MAC_JAPANESE "C;Japanese (Mac);Mac (Japanese)"
- IDS_ENC_SHIFT_JIS "C;Japanese (Shift-JIS);Shift-JIS"
+ IDS_ENC_SHIFT_JIS "C;Japanese (Shift_JIS);Shift_JIS"
IDS_ENC_MAC_KOREAN "C;Korean (Mac);Mac (Korean)"
IDS_ENC_WIN_949 "C;Korean (Windows-949);Windows-949"
IDS_ENC_ISO_8859_3 "C;Latin 3 (ISO-8859-3);ISO-8859-3"
@@ -149,16 +149,16 @@ END
STRINGTABLE
BEGIN
- IDS_ENC_EUC_JAPANESE "C;Japanese (EUC);Japanese (EUC)"
- IDS_ENC_EUC_KOREAN "C;Korean (EUC);Korean (EUC)"
- IDS_ENC_ISO_2022_CN "C;Chinese (ISO-2022);ISO-2022-CN"
- IDS_ENC_HZ_GB2312 "C;Chinese Simplified (GB2312);HZ-GB2312"
- IDS_ENC_ISO_2022_JP "C;Japanese (ISO-2022);ISO-2022-JP"
- IDS_ENC_ISO_2022_KR "C;Korean (ISO-2022);ISO-2022-KR"
- IDS_ENC_X_CHINESE_CNS "C;Chinese Traditional (CNS);x-chinese-cns"
+ IDS_ENC_EUC_JAPANESE "C;Japanese (EUC-JP);EUC-JP"
+ IDS_ENC_EUC_KOREAN "C;Korean (EUC-KR);EUC-KR"
+ IDS_ENC_ISO_2022_CN "C;Chinese (ISO-2022-CN);ISO-2022-CN"
+ IDS_ENC_HZ_GB2312 "C;Chinese Simplified (HZ-GB-2312);HZ-GB-2312"
+ IDS_ENC_ISO_2022_JP "C;Japanese (ISO-2022-JP);ISO-2022-JP"
+ IDS_ENC_ISO_2022_KR "C;Korean (ISO-2022-KR);ISO-2022-KR"
+ IDS_ENC_X_CHINESE_CNS "C;Chinese Traditional (CNS);x-Chinese-CNS"
IDS_ENC_JOHAB "C;Korean (Johab);Korean (Johab)"
IDS_ENC_ISO_8859_10 "B;Nordic (ISO-8859-10);ISO-8859-10"
- IDS_ENC_BIG5_HKSCS "C;Chinese Traditional (Big5HKSCS);Big5HKSCS"
+ IDS_ENC_BIG5_HKSCS "C;Chinese Traditional (Big5-HKSCS);Big5-HKSCS"
END
diff --git a/language/np3_de_de/encode_de_de.rc b/language/np3_de_de/encode_de_de.rc
index e15c6b4fa..510def945 100644
--- a/language/np3_de_de/encode_de_de.rc
+++ b/language/np3_de_de/encode_de_de.rc
@@ -79,9 +79,9 @@ BEGIN
IDS_ENC_ISO_8859_2 "C;Central European (ISO-8859-2);ISO-8859-2"
IDS_ENC_MAC_CENTRAL_EUROP "C;Central European (Mac);Mac (Central)"
IDS_ENC_WIN_1250 "C;Central European (Windows-1250);Windows-1250"
- IDS_ENC_GB18030 "C;Chinese (GB18030);GB-18030"
- IDS_ENC_GBK_936 "C;Chinese (GBK);GBK-936"
- IDS_ENC_GB2312_80 "C;Chinese Simplified (GB2312-80);GB-2312-80"
+ IDS_ENC_GB18030 "C;Chinese (GB18030);GB18030"
+ IDS_ENC_GBK_936 "C;Chinese (GBK);GBK"
+ IDS_ENC_GB2312_80 "C;Chinese Simplified (GB_2312-80);GB_2312-80"
IDS_ENC_MAC_ZH_CN "C;Chinese Simplified (Mac);Mac (zh-cn)"
IDS_ENC_BIG5 "C;Chinese Traditional (Big5);Big5"
IDS_ENC_MAC_ZH_TW "C;Chinese Traditional (Mac);Mac (zh-tw)"
@@ -115,7 +115,7 @@ BEGIN
IDS_ENC_DOS_861 "C;Icelandic (DOS-861);DOS-861"
IDS_ENC_MAC_ICELANDIC "C;Icelandic (Mac);Mac (Icelandic)"
IDS_ENC_MAC_JAPANESE "C;Japanese (Mac);Mac (Japanese)"
- IDS_ENC_SHIFT_JIS "C;Japanese (Shift-JIS);Shift-JIS"
+ IDS_ENC_SHIFT_JIS "C;Japanese (Shift_JIS);Shift_JIS"
IDS_ENC_MAC_KOREAN "C;Korean (Mac);Mac (Korean)"
IDS_ENC_WIN_949 "C;Korean (Windows-949);Windows-949"
IDS_ENC_ISO_8859_3 "C;Latin 3 (ISO-8859-3);ISO-8859-3"
@@ -149,16 +149,16 @@ END
STRINGTABLE
BEGIN
- IDS_ENC_EUC_JAPANESE "C;Japanese (EUC);Japanese (EUC)"
- IDS_ENC_EUC_KOREAN "C;Korean (EUC);Korean (EUC)"
- IDS_ENC_ISO_2022_CN "C;Chinese (ISO-2022);ISO-2022-CN"
- IDS_ENC_HZ_GB2312 "C;Chinese Simplified (GB2312);HZ-GB2312"
- IDS_ENC_ISO_2022_JP "C;Japanese (ISO-2022);ISO-2022-JP"
- IDS_ENC_ISO_2022_KR "C;Korean (ISO-2022);ISO-2022-KR"
- IDS_ENC_X_CHINESE_CNS "C;Chinese Traditional (CNS);x-chinese-cns"
+ IDS_ENC_EUC_JAPANESE "C;Japanese (EUC-JP);EUC-JP"
+ IDS_ENC_EUC_KOREAN "C;Korean (EUC-KR);EUC-KR"
+ IDS_ENC_ISO_2022_CN "C;Chinese (ISO-2022-CN);ISO-2022-CN"
+ IDS_ENC_HZ_GB2312 "C;Chinese Simplified (HZ-GB-2312);HZ-GB-2312"
+ IDS_ENC_ISO_2022_JP "C;Japanese (ISO-2022-JP);ISO-2022-JP"
+ IDS_ENC_ISO_2022_KR "C;Korean (ISO-2022-KR);ISO-2022-KR"
+ IDS_ENC_X_CHINESE_CNS "C;Chinese Traditional (CNS);x-Chinese-CNS"
IDS_ENC_JOHAB "C;Korean (Johab);Korean (Johab)"
IDS_ENC_ISO_8859_10 "B;Nordic (ISO-8859-10);ISO-8859-10"
- IDS_ENC_BIG5_HKSCS "C;Chinese Traditional (Big5HKSCS);Big5HKSCS"
+ IDS_ENC_BIG5_HKSCS "C;Chinese Traditional (Big5-HKSCS);Big5-HKSCS"
END
diff --git a/language/np3_en_gb/encode_en_gb.rc b/language/np3_en_gb/encode_en_gb.rc
index f920a8962..79e58a752 100644
--- a/language/np3_en_gb/encode_en_gb.rc
+++ b/language/np3_en_gb/encode_en_gb.rc
@@ -79,9 +79,9 @@ BEGIN
IDS_ENC_ISO_8859_2 "C;Central European (ISO-8859-2);ISO-8859-2"
IDS_ENC_MAC_CENTRAL_EUROP "C;Central European (Mac);Mac (Central)"
IDS_ENC_WIN_1250 "C;Central European (Windows-1250);Windows-1250"
- IDS_ENC_GB18030 "C;Chinese (GB18030);GB-18030"
- IDS_ENC_GBK_936 "C;Chinese (GBK);GBK-936"
- IDS_ENC_GB2312_80 "C;Chinese Simplified (GB2312-80);GB-2312-80"
+ IDS_ENC_GB18030 "C;Chinese (GB18030);GB18030"
+ IDS_ENC_GBK_936 "C;Chinese (GBK);GBK"
+ IDS_ENC_GB2312_80 "C;Chinese Simplified (GB_2312-80);GB_2312-80"
IDS_ENC_MAC_ZH_CN "C;Chinese Simplified (Mac);Mac (zh-cn)"
IDS_ENC_BIG5 "C;Chinese Traditional (Big5);Big5"
IDS_ENC_MAC_ZH_TW "C;Chinese Traditional (Mac);Mac (zh-tw)"
@@ -115,7 +115,7 @@ BEGIN
IDS_ENC_DOS_861 "C;Icelandic (DOS-861);DOS-861"
IDS_ENC_MAC_ICELANDIC "C;Icelandic (Mac);Mac (Icelandic)"
IDS_ENC_MAC_JAPANESE "C;Japanese (Mac);Mac (Japanese)"
- IDS_ENC_SHIFT_JIS "C;Japanese (Shift-JIS);Shift-JIS"
+ IDS_ENC_SHIFT_JIS "C;Japanese (Shift_JIS);Shift_JIS"
IDS_ENC_MAC_KOREAN "C;Korean (Mac);Mac (Korean)"
IDS_ENC_WIN_949 "C;Korean (Windows-949);Windows-949"
IDS_ENC_ISO_8859_3 "C;Latin 3 (ISO-8859-3);ISO-8859-3"
@@ -149,16 +149,16 @@ END
STRINGTABLE
BEGIN
- IDS_ENC_EUC_JAPANESE "C;Japanese (EUC);Japanese (EUC)"
- IDS_ENC_EUC_KOREAN "C;Korean (EUC);Korean (EUC)"
- IDS_ENC_ISO_2022_CN "C;Chinese (ISO-2022);ISO-2022-CN"
- IDS_ENC_HZ_GB2312 "C;Chinese Simplified (GB2312);HZ-GB2312"
- IDS_ENC_ISO_2022_JP "C;Japanese (ISO-2022);ISO-2022-JP"
- IDS_ENC_ISO_2022_KR "C;Korean (ISO-2022);ISO-2022-KR"
- IDS_ENC_X_CHINESE_CNS "C;Chinese Traditional (CNS);x-chinese-cns"
+ IDS_ENC_EUC_JAPANESE "C;Japanese (EUC-JP);EUC-JP"
+ IDS_ENC_EUC_KOREAN "C;Korean (EUC-KR);EUC-KR"
+ IDS_ENC_ISO_2022_CN "C;Chinese (ISO-2022-CN);ISO-2022-CN"
+ IDS_ENC_HZ_GB2312 "C;Chinese Simplified (HZ-GB-2312);HZ-GB-2312"
+ IDS_ENC_ISO_2022_JP "C;Japanese (ISO-2022-JP);ISO-2022-JP"
+ IDS_ENC_ISO_2022_KR "C;Korean (ISO-2022-KR);ISO-2022-KR"
+ IDS_ENC_X_CHINESE_CNS "C;Chinese Traditional (CNS);x-Chinese-CNS"
IDS_ENC_JOHAB "C;Korean (Johab);Korean (Johab)"
IDS_ENC_ISO_8859_10 "B;Nordic (ISO-8859-10);ISO-8859-10"
- IDS_ENC_BIG5_HKSCS "C;Chinese Traditional (Big5HKSCS);Big5HKSCS"
+ IDS_ENC_BIG5_HKSCS "C;Chinese Traditional (Big5-HKSCS);Big5-HKSCS"
END
diff --git a/language/np3_en_us/encode_en_us.rc b/language/np3_en_us/encode_en_us.rc
index e22e71eb3..e660fac1e 100644
--- a/language/np3_en_us/encode_en_us.rc
+++ b/language/np3_en_us/encode_en_us.rc
@@ -79,9 +79,9 @@ BEGIN
IDS_ENC_ISO_8859_2 "C;Central European (ISO-8859-2);ISO-8859-2"
IDS_ENC_MAC_CENTRAL_EUROP "C;Central European (Mac);Mac (Central)"
IDS_ENC_WIN_1250 "C;Central European (Windows-1250);Windows-1250"
- IDS_ENC_GB18030 "C;Chinese (GB18030);GB-18030"
- IDS_ENC_GBK_936 "C;Chinese (GBK);GBK-936"
- IDS_ENC_GB2312_80 "C;Chinese Simplified (GB2312-80);GB-2312-80"
+ IDS_ENC_GB18030 "C;Chinese (GB18030);GB18030"
+ IDS_ENC_GBK_936 "C;Chinese (GBK);GBK"
+ IDS_ENC_GB2312_80 "C;Chinese Simplified (GB_2312-80);GB_2312-80"
IDS_ENC_MAC_ZH_CN "C;Chinese Simplified (Mac);Mac (zh-cn)"
IDS_ENC_BIG5 "C;Chinese Traditional (Big5);Big5"
IDS_ENC_MAC_ZH_TW "C;Chinese Traditional (Mac);Mac (zh-tw)"
@@ -115,7 +115,7 @@ BEGIN
IDS_ENC_DOS_861 "C;Icelandic (DOS-861);DOS-861"
IDS_ENC_MAC_ICELANDIC "C;Icelandic (Mac);Mac (Icelandic)"
IDS_ENC_MAC_JAPANESE "C;Japanese (Mac);Mac (Japanese)"
- IDS_ENC_SHIFT_JIS "C;Japanese (Shift-JIS);Shift-JIS"
+ IDS_ENC_SHIFT_JIS "C;Japanese (Shift_JIS);Shift_JIS"
IDS_ENC_MAC_KOREAN "C;Korean (Mac);Mac (Korean)"
IDS_ENC_WIN_949 "C;Korean (Windows-949);Windows-949"
IDS_ENC_ISO_8859_3 "C;Latin 3 (ISO-8859-3);ISO-8859-3"
@@ -149,16 +149,16 @@ END
STRINGTABLE
BEGIN
- IDS_ENC_EUC_JAPANESE "C;Japanese (EUC);Japanese (EUC)"
- IDS_ENC_EUC_KOREAN "C;Korean (EUC);Korean (EUC)"
- IDS_ENC_ISO_2022_CN "C;Chinese (ISO-2022);ISO-2022-CN"
- IDS_ENC_HZ_GB2312 "C;Chinese Simplified (GB2312);HZ-GB2312"
- IDS_ENC_ISO_2022_JP "C;Japanese (ISO-2022);ISO-2022-JP"
- IDS_ENC_ISO_2022_KR "C;Korean (ISO-2022);ISO-2022-KR"
- IDS_ENC_X_CHINESE_CNS "C;Chinese Traditional (CNS);x-chinese-cns"
+ IDS_ENC_EUC_JAPANESE "C;Japanese (EUC-JP);EUC-JP"
+ IDS_ENC_EUC_KOREAN "C;Korean (EUC-KR);EUC-KR"
+ IDS_ENC_ISO_2022_CN "C;Chinese (ISO-2022-CN);ISO-2022-CN"
+ IDS_ENC_HZ_GB2312 "C;Chinese Simplified (HZ-GB-2312);HZ-GB-2312"
+ IDS_ENC_ISO_2022_JP "C;Japanese (ISO-2022-JP);ISO-2022-JP"
+ IDS_ENC_ISO_2022_KR "C;Korean (ISO-2022-KR);ISO-2022-KR"
+ IDS_ENC_X_CHINESE_CNS "C;Chinese Traditional (CNS);x-Chinese-CNS"
IDS_ENC_JOHAB "C;Korean (Johab);Korean (Johab)"
IDS_ENC_ISO_8859_10 "B;Nordic (ISO-8859-10);ISO-8859-10"
- IDS_ENC_BIG5_HKSCS "C;Chinese Traditional (Big5HKSCS);Big5HKSCS"
+ IDS_ENC_BIG5_HKSCS "C;Chinese Traditional (Big5-HKSCS);Big5-HKSCS"
END
diff --git a/language/np3_es_es/encode_es_es.rc b/language/np3_es_es/encode_es_es.rc
index 5eed0fa1d..91265a88f 100644
--- a/language/np3_es_es/encode_es_es.rc
+++ b/language/np3_es_es/encode_es_es.rc
@@ -79,9 +79,9 @@ BEGIN
IDS_ENC_ISO_8859_2 "C;Central European (ISO-8859-2);ISO-8859-2"
IDS_ENC_MAC_CENTRAL_EUROP "C;Central European (Mac);Mac (Central)"
IDS_ENC_WIN_1250 "C;Central European (Windows-1250);Windows-1250"
- IDS_ENC_GB18030 "C;Chinese (GB18030);GB-18030"
- IDS_ENC_GBK_936 "C;Chinese (GBK);GBK-936"
- IDS_ENC_GB2312_80 "C;Chinese Simplified (GB2312-80);GB-2312-80"
+ IDS_ENC_GB18030 "C;Chinese (GB18030);GB18030"
+ IDS_ENC_GBK_936 "C;Chinese (GBK);GBK"
+ IDS_ENC_GB2312_80 "C;Chinese Simplified (GB_2312-80);GB_2312-80"
IDS_ENC_MAC_ZH_CN "C;Chinese Simplified (Mac);Mac (zh-cn)"
IDS_ENC_BIG5 "C;Chinese Traditional (Big5);Big5"
IDS_ENC_MAC_ZH_TW "C;Chinese Traditional (Mac);Mac (zh-tw)"
@@ -115,7 +115,7 @@ BEGIN
IDS_ENC_DOS_861 "C;Icelandic (DOS-861);DOS-861"
IDS_ENC_MAC_ICELANDIC "C;Icelandic (Mac);Mac (Icelandic)"
IDS_ENC_MAC_JAPANESE "C;Japanese (Mac);Mac (Japanese)"
- IDS_ENC_SHIFT_JIS "C;Japanese (Shift-JIS);Shift-JIS"
+ IDS_ENC_SHIFT_JIS "C;Japanese (Shift_JIS);Shift_JIS"
IDS_ENC_MAC_KOREAN "C;Korean (Mac);Mac (Korean)"
IDS_ENC_WIN_949 "C;Korean (Windows-949);Windows-949"
IDS_ENC_ISO_8859_3 "C;Latin 3 (ISO-8859-3);ISO-8859-3"
@@ -149,16 +149,16 @@ END
STRINGTABLE
BEGIN
- IDS_ENC_EUC_JAPANESE "C;Japanese (EUC);Japanese (EUC)"
- IDS_ENC_EUC_KOREAN "C;Korean (EUC);Korean (EUC)"
- IDS_ENC_ISO_2022_CN "C;Chinese (ISO-2022);ISO-2022-CN"
- IDS_ENC_HZ_GB2312 "C;Chinese Simplified (GB2312);HZ-GB2312"
- IDS_ENC_ISO_2022_JP "C;Japanese (ISO-2022);ISO-2022-JP"
- IDS_ENC_ISO_2022_KR "C;Korean (ISO-2022);ISO-2022-KR"
- IDS_ENC_X_CHINESE_CNS "C;Chinese Traditional (CNS);x-chinese-cns"
+ IDS_ENC_EUC_JAPANESE "C;Japanese (EUC-JP);EUC-JP"
+ IDS_ENC_EUC_KOREAN "C;Korean (EUC-KR);EUC-KR"
+ IDS_ENC_ISO_2022_CN "C;Chinese (ISO-2022-CN);ISO-2022-CN"
+ IDS_ENC_HZ_GB2312 "C;Chinese Simplified (HZ-GB-2312);HZ-GB-2312"
+ IDS_ENC_ISO_2022_JP "C;Japanese (ISO-2022-JP);ISO-2022-JP"
+ IDS_ENC_ISO_2022_KR "C;Korean (ISO-2022-KR);ISO-2022-KR"
+ IDS_ENC_X_CHINESE_CNS "C;Chinese Traditional (CNS);x-Chinese-CNS"
IDS_ENC_JOHAB "C;Korean (Johab);Korean (Johab)"
IDS_ENC_ISO_8859_10 "B;Nordic (ISO-8859-10);ISO-8859-10"
- IDS_ENC_BIG5_HKSCS "C;Chinese Traditional (Big5HKSCS);Big5HKSCS"
+ IDS_ENC_BIG5_HKSCS "C;Chinese Traditional (Big5-HKSCS);Big5-HKSCS"
END
diff --git a/language/np3_es_mx/encode_es_mx.rc b/language/np3_es_mx/encode_es_mx.rc
index 0674e30cf..a18684fc5 100644
--- a/language/np3_es_mx/encode_es_mx.rc
+++ b/language/np3_es_mx/encode_es_mx.rc
@@ -79,9 +79,9 @@ BEGIN
IDS_ENC_ISO_8859_2 "C;Central European (ISO-8859-2);ISO-8859-2"
IDS_ENC_MAC_CENTRAL_EUROP "C;Central European (Mac);Mac (Central)"
IDS_ENC_WIN_1250 "C;Central European (Windows-1250);Windows-1250"
- IDS_ENC_GB18030 "C;Chinese (GB18030);GB-18030"
- IDS_ENC_GBK_936 "C;Chinese (GBK);GBK-936"
- IDS_ENC_GB2312_80 "C;Chinese Simplified (GB2312-80);GB-2312-80"
+ IDS_ENC_GB18030 "C;Chinese (GB18030);GB18030"
+ IDS_ENC_GBK_936 "C;Chinese (GBK);GBK"
+ IDS_ENC_GB2312_80 "C;Chinese Simplified (GB_2312-80);GB_2312-80"
IDS_ENC_MAC_ZH_CN "C;Chinese Simplified (Mac);Mac (zh-cn)"
IDS_ENC_BIG5 "C;Chinese Traditional (Big5);Big5"
IDS_ENC_MAC_ZH_TW "C;Chinese Traditional (Mac);Mac (zh-tw)"
@@ -115,7 +115,7 @@ BEGIN
IDS_ENC_DOS_861 "C;Icelandic (DOS-861);DOS-861"
IDS_ENC_MAC_ICELANDIC "C;Icelandic (Mac);Mac (Icelandic)"
IDS_ENC_MAC_JAPANESE "C;Japanese (Mac);Mac (Japanese)"
- IDS_ENC_SHIFT_JIS "C;Japanese (Shift-JIS);Shift-JIS"
+ IDS_ENC_SHIFT_JIS "C;Japanese (Shift_JIS);Shift_JIS"
IDS_ENC_MAC_KOREAN "C;Korean (Mac);Mac (Korean)"
IDS_ENC_WIN_949 "C;Korean (Windows-949);Windows-949"
IDS_ENC_ISO_8859_3 "C;Latin 3 (ISO-8859-3);ISO-8859-3"
@@ -149,16 +149,16 @@ END
STRINGTABLE
BEGIN
- IDS_ENC_EUC_JAPANESE "C;Japanese (EUC);Japanese (EUC)"
- IDS_ENC_EUC_KOREAN "C;Korean (EUC);Korean (EUC)"
- IDS_ENC_ISO_2022_CN "C;Chinese (ISO-2022);ISO-2022-CN"
- IDS_ENC_HZ_GB2312 "C;Chinese Simplified (GB2312);HZ-GB2312"
- IDS_ENC_ISO_2022_JP "C;Japanese (ISO-2022);ISO-2022-JP"
- IDS_ENC_ISO_2022_KR "C;Korean (ISO-2022);ISO-2022-KR"
- IDS_ENC_X_CHINESE_CNS "C;Chinese Traditional (CNS);x-chinese-cns"
+ IDS_ENC_EUC_JAPANESE "C;Japanese (EUC-JP);EUC-JP"
+ IDS_ENC_EUC_KOREAN "C;Korean (EUC-KR);EUC-KR"
+ IDS_ENC_ISO_2022_CN "C;Chinese (ISO-2022-CN);ISO-2022-CN"
+ IDS_ENC_HZ_GB2312 "C;Chinese Simplified (HZ-GB-2312);HZ-GB-2312"
+ IDS_ENC_ISO_2022_JP "C;Japanese (ISO-2022-JP);ISO-2022-JP"
+ IDS_ENC_ISO_2022_KR "C;Korean (ISO-2022-KR);ISO-2022-KR"
+ IDS_ENC_X_CHINESE_CNS "C;Chinese Traditional (CNS);x-Chinese-CNS"
IDS_ENC_JOHAB "C;Korean (Johab);Korean (Johab)"
IDS_ENC_ISO_8859_10 "B;Nordic (ISO-8859-10);ISO-8859-10"
- IDS_ENC_BIG5_HKSCS "C;Chinese Traditional (Big5HKSCS);Big5HKSCS"
+ IDS_ENC_BIG5_HKSCS "C;Chinese Traditional (Big5-HKSCS);Big5-HKSCS"
END
diff --git a/language/np3_fr_fr/encode_fr_fr.rc b/language/np3_fr_fr/encode_fr_fr.rc
index f14e66780..a4127dfce 100644
--- a/language/np3_fr_fr/encode_fr_fr.rc
+++ b/language/np3_fr_fr/encode_fr_fr.rc
@@ -79,9 +79,9 @@ BEGIN
IDS_ENC_ISO_8859_2 "C;Central European (ISO-8859-2);ISO-8859-2"
IDS_ENC_MAC_CENTRAL_EUROP "C;Central European (Mac);Mac (Central)"
IDS_ENC_WIN_1250 "C;Central European (Windows-1250);Windows-1250"
- IDS_ENC_GB18030 "C;Chinese (GB18030);GB-18030"
- IDS_ENC_GBK_936 "C;Chinese (GBK);GBK-936"
- IDS_ENC_GB2312_80 "C;Chinese Simplified (GB2312-80);GB-2312-80"
+ IDS_ENC_GB18030 "C;Chinese (GB18030);GB18030"
+ IDS_ENC_GBK_936 "C;Chinese (GBK);GBK"
+ IDS_ENC_GB2312_80 "C;Chinese Simplified (GB_2312-80);GB_2312-80"
IDS_ENC_MAC_ZH_CN "C;Chinese Simplified (Mac);Mac (zh-cn)"
IDS_ENC_BIG5 "C;Chinese Traditional (Big5);Big5"
IDS_ENC_MAC_ZH_TW "C;Chinese Traditional (Mac);Mac (zh-tw)"
@@ -115,7 +115,7 @@ BEGIN
IDS_ENC_DOS_861 "C;Icelandic (DOS-861);DOS-861"
IDS_ENC_MAC_ICELANDIC "C;Icelandic (Mac);Mac (Icelandic)"
IDS_ENC_MAC_JAPANESE "C;Japanese (Mac);Mac (Japanese)"
- IDS_ENC_SHIFT_JIS "C;Japanese (Shift-JIS);Shift-JIS"
+ IDS_ENC_SHIFT_JIS "C;Japanese (Shift_JIS);Shift_JIS"
IDS_ENC_MAC_KOREAN "C;Korean (Mac);Mac (Korean)"
IDS_ENC_WIN_949 "C;Korean (Windows-949);Windows-949"
IDS_ENC_ISO_8859_3 "C;Latin 3 (ISO-8859-3);ISO-8859-3"
@@ -149,16 +149,16 @@ END
STRINGTABLE
BEGIN
- IDS_ENC_EUC_JAPANESE "C;Japanese (EUC);Japanese (EUC)"
- IDS_ENC_EUC_KOREAN "C;Korean (EUC);Korean (EUC)"
- IDS_ENC_ISO_2022_CN "C;Chinese (ISO-2022);ISO-2022-CN"
- IDS_ENC_HZ_GB2312 "C;Chinese Simplified (GB2312);HZ-GB2312"
- IDS_ENC_ISO_2022_JP "C;Japanese (ISO-2022);ISO-2022-JP"
- IDS_ENC_ISO_2022_KR "C;Korean (ISO-2022);ISO-2022-KR"
- IDS_ENC_X_CHINESE_CNS "C;Chinese Traditional (CNS);x-chinese-cns"
+ IDS_ENC_EUC_JAPANESE "C;Japanese (EUC-JP);EUC-JP"
+ IDS_ENC_EUC_KOREAN "C;Korean (EUC-KR);EUC-KR"
+ IDS_ENC_ISO_2022_CN "C;Chinese (ISO-2022-CN);ISO-2022-CN"
+ IDS_ENC_HZ_GB2312 "C;Chinese Simplified (HZ-GB-2312);HZ-GB-2312"
+ IDS_ENC_ISO_2022_JP "C;Japanese (ISO-2022-JP);ISO-2022-JP"
+ IDS_ENC_ISO_2022_KR "C;Korean (ISO-2022-KR);ISO-2022-KR"
+ IDS_ENC_X_CHINESE_CNS "C;Chinese Traditional (CNS);x-Chinese-CNS"
IDS_ENC_JOHAB "C;Korean (Johab);Korean (Johab)"
IDS_ENC_ISO_8859_10 "B;Nordic (ISO-8859-10);ISO-8859-10"
- IDS_ENC_BIG5_HKSCS "C;Chinese Traditional (Big5HKSCS);Big5HKSCS"
+ IDS_ENC_BIG5_HKSCS "C;Chinese Traditional (Big5-HKSCS);Big5-HKSCS"
END
diff --git a/language/np3_hi_in/encode_hi_in.rc b/language/np3_hi_in/encode_hi_in.rc
index ce2e8d236..92e13b8c1 100644
--- a/language/np3_hi_in/encode_hi_in.rc
+++ b/language/np3_hi_in/encode_hi_in.rc
@@ -79,9 +79,9 @@ BEGIN
IDS_ENC_ISO_8859_2 "C;Central European (ISO-8859-2);ISO-8859-2"
IDS_ENC_MAC_CENTRAL_EUROP "C;Central European (Mac);Mac (Central)"
IDS_ENC_WIN_1250 "C;Central European (Windows-1250);Windows-1250"
- IDS_ENC_GB18030 "C;Chinese (GB18030);GB-18030"
- IDS_ENC_GBK_936 "C;Chinese (GBK);GBK-936"
- IDS_ENC_GB2312_80 "C;Chinese Simplified (GB2312-80);GB-2312-80"
+ IDS_ENC_GB18030 "C;Chinese (GB18030);GB18030"
+ IDS_ENC_GBK_936 "C;Chinese (GBK);GBK"
+ IDS_ENC_GB2312_80 "C;Chinese Simplified (GB_2312-80);GB_2312-80"
IDS_ENC_MAC_ZH_CN "C;Chinese Simplified (Mac);Mac (zh-cn)"
IDS_ENC_BIG5 "C;Chinese Traditional (Big5);Big5"
IDS_ENC_MAC_ZH_TW "C;Chinese Traditional (Mac);Mac (zh-tw)"
@@ -115,7 +115,7 @@ BEGIN
IDS_ENC_DOS_861 "C;Icelandic (DOS-861);DOS-861"
IDS_ENC_MAC_ICELANDIC "C;Icelandic (Mac);Mac (Icelandic)"
IDS_ENC_MAC_JAPANESE "C;Japanese (Mac);Mac (Japanese)"
- IDS_ENC_SHIFT_JIS "C;Japanese (Shift-JIS);Shift-JIS"
+ IDS_ENC_SHIFT_JIS "C;Japanese (Shift_JIS);Shift_JIS"
IDS_ENC_MAC_KOREAN "C;Korean (Mac);Mac (Korean)"
IDS_ENC_WIN_949 "C;Korean (Windows-949);Windows-949"
IDS_ENC_ISO_8859_3 "C;Latin 3 (ISO-8859-3);ISO-8859-3"
@@ -149,16 +149,16 @@ END
STRINGTABLE
BEGIN
- IDS_ENC_EUC_JAPANESE "C;Japanese (EUC);Japanese (EUC)"
- IDS_ENC_EUC_KOREAN "C;Korean (EUC);Korean (EUC)"
- IDS_ENC_ISO_2022_CN "C;Chinese (ISO-2022);ISO-2022-CN"
- IDS_ENC_HZ_GB2312 "C;Chinese Simplified (GB2312);HZ-GB2312"
- IDS_ENC_ISO_2022_JP "C;Japanese (ISO-2022);ISO-2022-JP"
- IDS_ENC_ISO_2022_KR "C;Korean (ISO-2022);ISO-2022-KR"
- IDS_ENC_X_CHINESE_CNS "C;Chinese Traditional (CNS);x-chinese-cns"
+ IDS_ENC_EUC_JAPANESE "C;Japanese (EUC-JP);EUC-JP"
+ IDS_ENC_EUC_KOREAN "C;Korean (EUC-KR);EUC-KR"
+ IDS_ENC_ISO_2022_CN "C;Chinese (ISO-2022-CN);ISO-2022-CN"
+ IDS_ENC_HZ_GB2312 "C;Chinese Simplified (HZ-GB-2312);HZ-GB-2312"
+ IDS_ENC_ISO_2022_JP "C;Japanese (ISO-2022-JP);ISO-2022-JP"
+ IDS_ENC_ISO_2022_KR "C;Korean (ISO-2022-KR);ISO-2022-KR"
+ IDS_ENC_X_CHINESE_CNS "C;Chinese Traditional (CNS);x-Chinese-CNS"
IDS_ENC_JOHAB "C;Korean (Johab);Korean (Johab)"
IDS_ENC_ISO_8859_10 "B;Nordic (ISO-8859-10);ISO-8859-10"
- IDS_ENC_BIG5_HKSCS "C;Chinese Traditional (Big5HKSCS);Big5HKSCS"
+ IDS_ENC_BIG5_HKSCS "C;Chinese Traditional (Big5-HKSCS);Big5-HKSCS"
END
diff --git a/language/np3_hu_hu/encode_hu_hu.rc b/language/np3_hu_hu/encode_hu_hu.rc
index 6e132a4b1..58c536b34 100644
--- a/language/np3_hu_hu/encode_hu_hu.rc
+++ b/language/np3_hu_hu/encode_hu_hu.rc
@@ -79,9 +79,9 @@ BEGIN
IDS_ENC_ISO_8859_2 "C;Közép Európai (ISO-8859-2);ISO-8859-2"
IDS_ENC_MAC_CENTRAL_EUROP "C;Közép Európai (Mac);Mac (Central)"
IDS_ENC_WIN_1250 "C;Közép Európai (Windows-1250);Windows-1250"
- IDS_ENC_GB18030 "C;Kínai (GB18030);GB-18030"
- IDS_ENC_GBK_936 "C;kínai (GBK);GBK-936"
- IDS_ENC_GB2312_80 "C;Egyszerűsített kínai (GB2312-80);GB-2312-80"
+ IDS_ENC_GB18030 "C;Kínai (GB18030);GB18030"
+ IDS_ENC_GBK_936 "C;kínai (GBK);GBK"
+ IDS_ENC_GB2312_80 "C;Egyszerűsített kínai (GB_2312-80);GB_2312-80"
IDS_ENC_MAC_ZH_CN "C;Egyszerűsített kínai (Mac);Mac (zh-cn)"
IDS_ENC_BIG5 "C;Tradicionális kínai (Big5);Big5"
IDS_ENC_MAC_ZH_TW "C;Tradicionális kínai (Mac);Mac (zh-tw)"
@@ -115,7 +115,7 @@ BEGIN
IDS_ENC_DOS_861 "C;Izlandi (DOS-861);DOS-861"
IDS_ENC_MAC_ICELANDIC "C;Izlandi (Mac);Mac (Izlandi)"
IDS_ENC_MAC_JAPANESE "C;Japán (Mac);Mac (Japán)"
- IDS_ENC_SHIFT_JIS "C;Japán (Shift-JIS);Shift-JIS"
+ IDS_ENC_SHIFT_JIS "C;Japán (Shift_JIS);Shift_JIS"
IDS_ENC_MAC_KOREAN "C;Kóreai (Mac);Mac (Kóreai)"
IDS_ENC_WIN_949 "C;Kóreai (Windows-949);Windows-949"
IDS_ENC_ISO_8859_3 "C;Latin 3 (ISO-8859-3);ISO-8859-3"
@@ -149,16 +149,16 @@ END
STRINGTABLE
BEGIN
- IDS_ENC_EUC_JAPANESE "C;Japán (EUC);Japán (EUC)"
- IDS_ENC_EUC_KOREAN "C;Kóreai (EUC);Kóreai (EUC)"
- IDS_ENC_ISO_2022_CN "C;kínai (ISO-2022);ISO-2022-CN"
- IDS_ENC_HZ_GB2312 "C;Egyszerűsített kínai (GB2312);HZ-GB2312"
- IDS_ENC_ISO_2022_JP "C;Japán (ISO-2022);ISO-2022-JP"
- IDS_ENC_ISO_2022_KR "C;Kóreai (ISO-2022);ISO-2022-KR"
- IDS_ENC_X_CHINESE_CNS "C;Tradicionális kínai (CNS);x-chinese-cns"
+ IDS_ENC_EUC_JAPANESE "C;Japán (EUC-JP);EUC-JP"
+ IDS_ENC_EUC_KOREAN "C;Kóreai (EUC-KR);EUC-KR"
+ IDS_ENC_ISO_2022_CN "C;kínai (ISO-2022-CN);ISO-2022-CN"
+ IDS_ENC_HZ_GB2312 "C;Egyszerűsített kínai (HZ-GB-2312);HZ-GB-2312"
+ IDS_ENC_ISO_2022_JP "C;Japán (ISO-2022-JP);ISO-2022-JP"
+ IDS_ENC_ISO_2022_KR "C;Kóreai (ISO-2022-KR);ISO-2022-KR"
+ IDS_ENC_X_CHINESE_CNS "C;Tradicionális kínai (CNS);x-Chinese-CNS"
IDS_ENC_JOHAB "C;Kóreai (Johab);Kóreai (Johab)"
IDS_ENC_ISO_8859_10 "B;Skandináv (ISO-8859-10);ISO-8859-10"
- IDS_ENC_BIG5_HKSCS "C;Tradicionális kínai (Big5HKSCS);Big5HKSCS"
+ IDS_ENC_BIG5_HKSCS "C;Tradicionális kínai (Big5-HKSCS);Big5-HKSCS"
END
diff --git a/language/np3_id_id/encode_id_id.rc b/language/np3_id_id/encode_id_id.rc
index f09cbac54..871fb4370 100644
--- a/language/np3_id_id/encode_id_id.rc
+++ b/language/np3_id_id/encode_id_id.rc
@@ -79,9 +79,9 @@ BEGIN
IDS_ENC_ISO_8859_2 "C;Central European (ISO-8859-2);ISO-8859-2"
IDS_ENC_MAC_CENTRAL_EUROP "C;Central European (Mac);Mac (Central)"
IDS_ENC_WIN_1250 "C;Central European (Windows-1250);Windows-1250"
- IDS_ENC_GB18030 "C;Chinese (GB18030);GB-18030"
- IDS_ENC_GBK_936 "C;Chinese (GBK);GBK-936"
- IDS_ENC_GB2312_80 "C;Chinese Simplified (GB2312-80);GB-2312-80"
+ IDS_ENC_GB18030 "C;Chinese (GB18030);GB18030"
+ IDS_ENC_GBK_936 "C;Chinese (GBK);GBK"
+ IDS_ENC_GB2312_80 "C;Chinese Simplified (GB_2312-80);GB_2312-80"
IDS_ENC_MAC_ZH_CN "C;Chinese Simplified (Mac);Mac (zh-cn)"
IDS_ENC_BIG5 "C;Chinese Traditional (Big5);Big5"
IDS_ENC_MAC_ZH_TW "C;Chinese Traditional (Mac);Mac (zh-tw)"
@@ -115,7 +115,7 @@ BEGIN
IDS_ENC_DOS_861 "C;Icelandic (DOS-861);DOS-861"
IDS_ENC_MAC_ICELANDIC "C;Icelandic (Mac);Mac (Icelandic)"
IDS_ENC_MAC_JAPANESE "C;Japanese (Mac);Mac (Japanese)"
- IDS_ENC_SHIFT_JIS "C;Japanese (Shift-JIS);Shift-JIS"
+ IDS_ENC_SHIFT_JIS "C;Japanese (Shift_JIS);Shift_JIS"
IDS_ENC_MAC_KOREAN "C;Korean (Mac);Mac (Korean)"
IDS_ENC_WIN_949 "C;Korean (Windows-949);Windows-949"
IDS_ENC_ISO_8859_3 "C;Latin 3 (ISO-8859-3);ISO-8859-3"
@@ -149,16 +149,16 @@ END
STRINGTABLE
BEGIN
- IDS_ENC_EUC_JAPANESE "C;Japanese (EUC);Japanese (EUC)"
- IDS_ENC_EUC_KOREAN "C;Korean (EUC);Korean (EUC)"
- IDS_ENC_ISO_2022_CN "C;Chinese (ISO-2022);ISO-2022-CN"
- IDS_ENC_HZ_GB2312 "C;Chinese Simplified (GB2312);HZ-GB2312"
- IDS_ENC_ISO_2022_JP "C;Japanese (ISO-2022);ISO-2022-JP"
- IDS_ENC_ISO_2022_KR "C;Korean (ISO-2022);ISO-2022-KR"
- IDS_ENC_X_CHINESE_CNS "C;Chinese Traditional (CNS);x-chinese-cns"
+ IDS_ENC_EUC_JAPANESE "C;Japanese (EUC-JP);EUC-JP"
+ IDS_ENC_EUC_KOREAN "C;Korean (EUC-KR);EUC-KR"
+ IDS_ENC_ISO_2022_CN "C;Chinese (ISO-2022-CN);ISO-2022-CN"
+ IDS_ENC_HZ_GB2312 "C;Chinese Simplified (HZ-GB-2312);HZ-GB-2312"
+ IDS_ENC_ISO_2022_JP "C;Japanese (ISO-2022-JP);ISO-2022-JP"
+ IDS_ENC_ISO_2022_KR "C;Korean (ISO-2022-KR);ISO-2022-KR"
+ IDS_ENC_X_CHINESE_CNS "C;Chinese Traditional (CNS);x-Chinese-CNS"
IDS_ENC_JOHAB "C;Korean (Johab);Korean (Johab)"
IDS_ENC_ISO_8859_10 "B;Nordic (ISO-8859-10);ISO-8859-10"
- IDS_ENC_BIG5_HKSCS "C;Chinese Traditional (Big5HKSCS);Big5HKSCS"
+ IDS_ENC_BIG5_HKSCS "C;Chinese Traditional (Big5-HKSCS);Big5-HKSCS"
END
diff --git a/language/np3_it_it/encode_it_it.rc b/language/np3_it_it/encode_it_it.rc
index dba421927..8cc61e164 100644
--- a/language/np3_it_it/encode_it_it.rc
+++ b/language/np3_it_it/encode_it_it.rc
@@ -79,9 +79,9 @@ BEGIN
IDS_ENC_ISO_8859_2 "C;Central European (ISO-8859-2);ISO-8859-2"
IDS_ENC_MAC_CENTRAL_EUROP "C;Central European (Mac);Mac (Central)"
IDS_ENC_WIN_1250 "C;Central European (Windows-1250);Windows-1250"
- IDS_ENC_GB18030 "C;Chinese (GB18030);GB-18030"
- IDS_ENC_GBK_936 "C;Chinese (GBK);GBK-936"
- IDS_ENC_GB2312_80 "C;Chinese Simplified (GB2312-80);GB-2312-80"
+ IDS_ENC_GB18030 "C;Chinese (GB18030);GB18030"
+ IDS_ENC_GBK_936 "C;Chinese (GBK);GBK"
+ IDS_ENC_GB2312_80 "C;Chinese Simplified (GB_2312-80);GB_2312-80"
IDS_ENC_MAC_ZH_CN "C;Chinese Simplified (Mac);Mac (zh-cn)"
IDS_ENC_BIG5 "C;Chinese Traditional (Big5);Big5"
IDS_ENC_MAC_ZH_TW "C;Chinese Traditional (Mac);Mac (zh-tw)"
@@ -115,7 +115,7 @@ BEGIN
IDS_ENC_DOS_861 "C;Icelandic (DOS-861);DOS-861"
IDS_ENC_MAC_ICELANDIC "C;Icelandic (Mac);Mac (Icelandic)"
IDS_ENC_MAC_JAPANESE "C;Japanese (Mac);Mac (Japanese)"
- IDS_ENC_SHIFT_JIS "C;Japanese (Shift-JIS);Shift-JIS"
+ IDS_ENC_SHIFT_JIS "C;Japanese (Shift_JIS);Shift_JIS"
IDS_ENC_MAC_KOREAN "C;Korean (Mac);Mac (Korean)"
IDS_ENC_WIN_949 "C;Korean (Windows-949);Windows-949"
IDS_ENC_ISO_8859_3 "C;Latin 3 (ISO-8859-3);ISO-8859-3"
@@ -149,16 +149,16 @@ END
STRINGTABLE
BEGIN
- IDS_ENC_EUC_JAPANESE "C;Japanese (EUC);Japanese (EUC)"
- IDS_ENC_EUC_KOREAN "C;Korean (EUC);Korean (EUC)"
- IDS_ENC_ISO_2022_CN "C;Chinese (ISO-2022);ISO-2022-CN"
- IDS_ENC_HZ_GB2312 "C;Chinese Simplified (GB2312);HZ-GB2312"
- IDS_ENC_ISO_2022_JP "C;Japanese (ISO-2022);ISO-2022-JP"
- IDS_ENC_ISO_2022_KR "C;Korean (ISO-2022);ISO-2022-KR"
- IDS_ENC_X_CHINESE_CNS "C;Chinese Traditional (CNS);x-chinese-cns"
+ IDS_ENC_EUC_JAPANESE "C;Japanese (EUC-JP);EUC-JP"
+ IDS_ENC_EUC_KOREAN "C;Korean (EUC-KR);EUC-KR"
+ IDS_ENC_ISO_2022_CN "C;Chinese (ISO-2022-CN);ISO-2022-CN"
+ IDS_ENC_HZ_GB2312 "C;Chinese Simplified (HZ-GB-2312);HZ-GB-2312"
+ IDS_ENC_ISO_2022_JP "C;Japanese (ISO-2022-JP);ISO-2022-JP"
+ IDS_ENC_ISO_2022_KR "C;Korean (ISO-2022-KR);ISO-2022-KR"
+ IDS_ENC_X_CHINESE_CNS "C;Chinese Traditional (CNS);x-Chinese-CNS"
IDS_ENC_JOHAB "C;Korean (Johab);Korean (Johab)"
IDS_ENC_ISO_8859_10 "B;Nordic (ISO-8859-10);ISO-8859-10"
- IDS_ENC_BIG5_HKSCS "C;Chinese Traditional (Big5HKSCS);Big5HKSCS"
+ IDS_ENC_BIG5_HKSCS "C;Chinese Traditional (Big5-HKSCS);Big5-HKSCS"
END
diff --git a/language/np3_ja_jp/encode_ja_jp.rc b/language/np3_ja_jp/encode_ja_jp.rc
index 99ef31365..c88627956 100644
--- a/language/np3_ja_jp/encode_ja_jp.rc
+++ b/language/np3_ja_jp/encode_ja_jp.rc
@@ -79,9 +79,9 @@ BEGIN
IDS_ENC_ISO_8859_2 "CE;中欧 (ISO-8859-2);ISO-8859-2"
IDS_ENC_MAC_CENTRAL_EUROP "CE;中欧 (Mac);Mac (中欧)"
IDS_ENC_WIN_1250 "CE;中欧 (Windows-1250);Windows-1250"
- IDS_ENC_GB18030 "CZ;簡体字中国語 (GB18030);GB-18030"
- IDS_ENC_GBK_936 "CZ;簡体字中国語 (GBK);GBK-936"
- IDS_ENC_GB2312_80 "CZ;簡体字中国語 (GB2312-80);GB-2312-80"
+ IDS_ENC_GB18030 "CZ;簡体字中国語 (GB18030);GB18030"
+ IDS_ENC_GBK_936 "CZ;簡体字中国語 (GBK);GBK"
+ IDS_ENC_GB2312_80 "CZ;簡体字中国語 (GB_2312-80);GB_2312-80"
IDS_ENC_MAC_ZH_CN "CZ;簡体字中国語 (Mac);Mac (zh-cn)"
IDS_ENC_BIG5 "CZ;繁体字中国語 (Big5);Big5"
IDS_ENC_MAC_ZH_TW "CZ;繁体字中国語 (Mac);Mac (zh-tw)"
@@ -115,7 +115,7 @@ BEGIN
IDS_ENC_DOS_861 "CI;アイスランド語 (DOS-861);DOS-861"
IDS_ENC_MAC_ICELANDIC "CI;アイスランド語 (Mac);Mac (アイスランド)"
IDS_ENC_MAC_JAPANESE "B5;日本語 (Mac);Mac (日本)"
- IDS_ENC_SHIFT_JIS "B1;日本語 (Shift-JIS);Shift-JIS"
+ IDS_ENC_SHIFT_JIS "B1;日本語 (Shift_JIS);Shift_JIS"
IDS_ENC_MAC_KOREAN "CK;韓国語 (Mac);Mac (韓国)"
IDS_ENC_WIN_949 "CK;韓国語 (Windows-949);Windows-949"
IDS_ENC_ISO_8859_3 "CL;ラテン3 (ISO-8859-3);ISO-8859-3"
@@ -149,16 +149,16 @@ END
STRINGTABLE
BEGIN
- IDS_ENC_EUC_JAPANESE "B2;日本語 (EUC);EUC (日本)"
- IDS_ENC_EUC_KOREAN "CK;韓国語 (EUC);EUC (韓国)"
- IDS_ENC_ISO_2022_CN "CZ;繁体字中国語 (ISO-2022);ISO-2022-CN"
- IDS_ENC_HZ_GB2312 "CZ;繁体字中国語 (GB2312);HZ-GB2312"
- IDS_ENC_ISO_2022_JP "B4;日本語 (ISO-2022);ISO-2022-JP"
- IDS_ENC_ISO_2022_KR "CK;韓国語 (ISO-2022);ISO-2022-KR"
- IDS_ENC_X_CHINESE_CNS "CZ;簡体字中国語 (CNS);x-chinese-cns"
+ IDS_ENC_EUC_JAPANESE "B2;日本語 (EUC-JP);EUC-JP"
+ IDS_ENC_EUC_KOREAN "CK;韓国語 (EUC-KR);EUC-KR"
+ IDS_ENC_ISO_2022_CN "CZ;繁体字中国語 (ISO-2022-CN);ISO-2022-CN"
+ IDS_ENC_HZ_GB2312 "CZ;繁体字中国語 (HZ-GB-2312);HZ-GB-2312"
+ IDS_ENC_ISO_2022_JP "B4;日本語 (ISO-2022-JP);ISO-2022-JP"
+ IDS_ENC_ISO_2022_KR "CK;韓国語 (ISO-2022-KR);ISO-2022-KR"
+ IDS_ENC_X_CHINESE_CNS "CZ;簡体字中国語 (CNS);x-Chinese-CNS"
IDS_ENC_JOHAB "CK;韓国語 (Johab);韓国語 (Johab)"
IDS_ENC_ISO_8859_10 "CN;北欧 (ISO-8859-10);ISO-8859-10"
- IDS_ENC_BIG5_HKSCS "CZ;繁体字中国語 (Big5HKSCS);Big5HKSCS"
+ IDS_ENC_BIG5_HKSCS "CZ;繁体字中国語 (Big5-HKSCS);Big5-HKSCS"
END
diff --git a/language/np3_ko_kr/encode_ko_kr.rc b/language/np3_ko_kr/encode_ko_kr.rc
index 82c8bb8da..7f6c34630 100644
--- a/language/np3_ko_kr/encode_ko_kr.rc
+++ b/language/np3_ko_kr/encode_ko_kr.rc
@@ -79,9 +79,9 @@ BEGIN
IDS_ENC_ISO_8859_2 "C;중앙 유럽어 (ISO-8859-2);ISO-8859-2"
IDS_ENC_MAC_CENTRAL_EUROP "C;중앙 유럽어 (Mac);Mac (Central)"
IDS_ENC_WIN_1250 "C;중앙 유럽어 (Windows-1250);Windows-1250"
- IDS_ENC_GB18030 "C;중국어 간체 (GB18030);GB-18030"
- IDS_ENC_GBK_936 "C;중국어 간체 (GBK);GBK-936"
- IDS_ENC_GB2312_80 "C;중국어 간체 (GB2312-80);GB-2312-80"
+ IDS_ENC_GB18030 "C;중국어 간체 (GB18030);GB18030"
+ IDS_ENC_GBK_936 "C;중국어 간체 (GBK);GBK"
+ IDS_ENC_GB2312_80 "C;중국어 간체 (GB_2312-80);GB_2312-80"
IDS_ENC_MAC_ZH_CN "C;중국어 간체 (Mac);Mac (zh-cn)"
IDS_ENC_BIG5 "C;중국어 번체 (Big5);Big5"
IDS_ENC_MAC_ZH_TW "C;중국어 번체 (Mac);Mac (zh-tw)"
@@ -115,7 +115,7 @@ BEGIN
IDS_ENC_DOS_861 "C;아이슬란드어 (DOS-861);DOS-861"
IDS_ENC_MAC_ICELANDIC "C;아이슬란드어 (Mac);Mac (Icelandic)"
IDS_ENC_MAC_JAPANESE "C;일본어 (Mac);Mac (일본어)"
- IDS_ENC_SHIFT_JIS "C;일본어 (Shift-JIS);Shift-JIS"
+ IDS_ENC_SHIFT_JIS "C;일본어 (Shift_JIS);Shift_JIS"
IDS_ENC_MAC_KOREAN "C;한국어 (Mac);Mac (한국어)"
IDS_ENC_WIN_949 "C;한국어 (Windows-949);Windows-949"
IDS_ENC_ISO_8859_3 "C;라틴어 3 (ISO-8859-3);ISO-8859-3"
@@ -149,16 +149,16 @@ END
STRINGTABLE
BEGIN
- IDS_ENC_EUC_JAPANESE "C;일본어 (EUC);일본어 (EUC)"
- IDS_ENC_EUC_KOREAN "C;한국어 (EUC);한국어 (EUC)"
- IDS_ENC_ISO_2022_CN "C;중국어 (ISO-2022);ISO-2022-CN"
- IDS_ENC_HZ_GB2312 "C;중국어 간체 (GB2312);HZ-GB2312"
- IDS_ENC_ISO_2022_JP "C;일본어 (ISO-2022);ISO-2022-JP"
- IDS_ENC_ISO_2022_KR "C;한국어 (ISO-2022);ISO-2022-KR"
- IDS_ENC_X_CHINESE_CNS "C;중국어 번체 (CNS);x-chinese-cns"
+ IDS_ENC_EUC_JAPANESE "C;일본어 (EUC-JP);EUC-JP"
+ IDS_ENC_EUC_KOREAN "C;한국어 (EUC-KR);EUC-KR"
+ IDS_ENC_ISO_2022_CN "C;중국어 (ISO-2022-CN);ISO-2022-CN"
+ IDS_ENC_HZ_GB2312 "C;중국어 간체 (HZ-GB-2312);HZ-GB-2312"
+ IDS_ENC_ISO_2022_JP "C;일본어 (ISO-2022-JP);ISO-2022-JP"
+ IDS_ENC_ISO_2022_KR "C;한국어 (ISO-2022-KR);ISO-2022-KR"
+ IDS_ENC_X_CHINESE_CNS "C;중국어 번체 (CNS);x-Chinese-CNS"
IDS_ENC_JOHAB "C;한국어 (조합);한국어 (조합)"
IDS_ENC_ISO_8859_10 "B;북유럽어 (ISO-8859-10);ISO-8859-10"
- IDS_ENC_BIG5_HKSCS "C;중국어 번체 (Big5HKSCS);Big5HKSCS"
+ IDS_ENC_BIG5_HKSCS "C;중국어 번체 (Big5-HKSCS);Big5-HKSCS"
END
diff --git a/language/np3_nl_nl/encode_nl_nl.rc b/language/np3_nl_nl/encode_nl_nl.rc
index 030b002a4..59e53a42c 100644
--- a/language/np3_nl_nl/encode_nl_nl.rc
+++ b/language/np3_nl_nl/encode_nl_nl.rc
@@ -79,9 +79,9 @@ BEGIN
IDS_ENC_ISO_8859_2 "C;Central European (ISO-8859-2);ISO-8859-2"
IDS_ENC_MAC_CENTRAL_EUROP "C;Central European (Mac);Mac (Central)"
IDS_ENC_WIN_1250 "C;Central European (Windows-1250);Windows-1250"
- IDS_ENC_GB18030 "C;Chinese (GB18030);GB-18030"
- IDS_ENC_GBK_936 "C;Chinese (GBK);GBK-936"
- IDS_ENC_GB2312_80 "C;Chinese Simplified (GB2312-80);GB-2312-80"
+ IDS_ENC_GB18030 "C;Chinese (GB18030);GB18030"
+ IDS_ENC_GBK_936 "C;Chinese (GBK);GBK"
+ IDS_ENC_GB2312_80 "C;Chinese Simplified (GB_2312-80);GB_2312-80"
IDS_ENC_MAC_ZH_CN "C;Chinese Simplified (Mac);Mac (zh-cn)"
IDS_ENC_BIG5 "C;Chinese Traditional (Big5);Big5"
IDS_ENC_MAC_ZH_TW "C;Chinese Traditional (Mac);Mac (zh-tw)"
@@ -115,7 +115,7 @@ BEGIN
IDS_ENC_DOS_861 "C;Icelandic (DOS-861);DOS-861"
IDS_ENC_MAC_ICELANDIC "C;Icelandic (Mac);Mac (Icelandic)"
IDS_ENC_MAC_JAPANESE "C;Japanese (Mac);Mac (Japanese)"
- IDS_ENC_SHIFT_JIS "C;Japanese (Shift-JIS);Shift-JIS"
+ IDS_ENC_SHIFT_JIS "C;Japanese (Shift_JIS);Shift_JIS"
IDS_ENC_MAC_KOREAN "C;Korean (Mac);Mac (Korean)"
IDS_ENC_WIN_949 "C;Korean (Windows-949);Windows-949"
IDS_ENC_ISO_8859_3 "C;Latin 3 (ISO-8859-3);ISO-8859-3"
@@ -149,16 +149,16 @@ END
STRINGTABLE
BEGIN
- IDS_ENC_EUC_JAPANESE "C;Japanese (EUC);Japanese (EUC)"
- IDS_ENC_EUC_KOREAN "C;Korean (EUC);Korean (EUC)"
- IDS_ENC_ISO_2022_CN "C;Chinese (ISO-2022);ISO-2022-CN"
- IDS_ENC_HZ_GB2312 "C;Chinese Simplified (GB2312);HZ-GB2312"
- IDS_ENC_ISO_2022_JP "C;Japanese (ISO-2022);ISO-2022-JP"
- IDS_ENC_ISO_2022_KR "C;Korean (ISO-2022);ISO-2022-KR"
- IDS_ENC_X_CHINESE_CNS "C;Chinese Traditional (CNS);x-chinese-cns"
+ IDS_ENC_EUC_JAPANESE "C;Japanese (EUC-JP);EUC-JP"
+ IDS_ENC_EUC_KOREAN "C;Korean (EUC-KR);EUC-KR"
+ IDS_ENC_ISO_2022_CN "C;Chinese (ISO-2022-CN);ISO-2022-CN"
+ IDS_ENC_HZ_GB2312 "C;Chinese Simplified (HZ-GB-2312);HZ-GB-2312"
+ IDS_ENC_ISO_2022_JP "C;Japanese (ISO-2022-JP);ISO-2022-JP"
+ IDS_ENC_ISO_2022_KR "C;Korean (ISO-2022-KR);ISO-2022-KR"
+ IDS_ENC_X_CHINESE_CNS "C;Chinese Traditional (CNS);x-Chinese-CNS"
IDS_ENC_JOHAB "C;Korean (Johab);Korean (Johab)"
IDS_ENC_ISO_8859_10 "B;Nordic (ISO-8859-10);ISO-8859-10"
- IDS_ENC_BIG5_HKSCS "C;Chinese Traditional (Big5HKSCS);Big5HKSCS"
+ IDS_ENC_BIG5_HKSCS "C;Chinese Traditional (Big5-HKSCS);Big5-HKSCS"
END
diff --git a/language/np3_pl_pl/encode_pl_pl.rc b/language/np3_pl_pl/encode_pl_pl.rc
index dbc414dc5..5e55648b3 100644
--- a/language/np3_pl_pl/encode_pl_pl.rc
+++ b/language/np3_pl_pl/encode_pl_pl.rc
@@ -79,9 +79,9 @@ BEGIN
IDS_ENC_ISO_8859_2 "C;Środkowoeuropejski (ISO-8859-2);ISO-8859-2"
IDS_ENC_MAC_CENTRAL_EUROP "C;Środkowoeuropejski (Mac);Mac (Central)"
IDS_ENC_WIN_1250 "C;Środkowoeuropejski (Windows-1250);Windows-1250"
- IDS_ENC_GB18030 "C;Chiński (GB18030);GB-18030"
- IDS_ENC_GBK_936 "C;Chiński (GBK);GBK-936"
- IDS_ENC_GB2312_80 "C;Chiński uproszczony (GB2312-80);GB-2312-80"
+ IDS_ENC_GB18030 "C;Chiński (GB18030);GB18030"
+ IDS_ENC_GBK_936 "C;Chiński (GBK);GBK"
+ IDS_ENC_GB2312_80 "C;Chiński uproszczony (GB_2312-80);GB_2312-80"
IDS_ENC_MAC_ZH_CN "C;Chiński uproszczony (Mac);Mac (zh-cn)"
IDS_ENC_BIG5 "C;Chiński tradycyjny (Big5);Big5"
IDS_ENC_MAC_ZH_TW "C;Chiński tradycyjny (Mac);Mac (zh-tw)"
@@ -115,7 +115,7 @@ BEGIN
IDS_ENC_DOS_861 "C;Islandzki (DOS-861);DOS-861"
IDS_ENC_MAC_ICELANDIC "C;Islandzki (Mac);Mac (Icelandic)"
IDS_ENC_MAC_JAPANESE "C;Japoński (Mac);Mac (Japanese)"
- IDS_ENC_SHIFT_JIS "C;Japoński (Shift-JIS);Shift-JIS"
+ IDS_ENC_SHIFT_JIS "C;Japoński (Shift_JIS);Shift_JIS"
IDS_ENC_MAC_KOREAN "C;Koreański (Mac);Mac (Korean)"
IDS_ENC_WIN_949 "C;Koreański (Windows-949);Windows-949"
IDS_ENC_ISO_8859_3 "C;Łacina 3 (ISO-8859-3);ISO-8859-3"
@@ -149,16 +149,16 @@ END
STRINGTABLE
BEGIN
- IDS_ENC_EUC_JAPANESE "C;Japoński (EUC);Japoński (EUC)"
- IDS_ENC_EUC_KOREAN "C;Koreański (EUC);Koreański (EUC)"
- IDS_ENC_ISO_2022_CN "C;Chiński (ISO-2022);ISO-2022-CN"
- IDS_ENC_HZ_GB2312 "C;Chiński uproszczony (GB2312);HZ-GB2312"
- IDS_ENC_ISO_2022_JP "C;Japoński (ISO-2022);ISO-2022-JP"
- IDS_ENC_ISO_2022_KR "C;Koreański (ISO-2022);ISO-2022-KR"
- IDS_ENC_X_CHINESE_CNS "C;Chiński tradycyjny (CNS);x-chinese-cns"
+ IDS_ENC_EUC_JAPANESE "C;Japoński (EUC-JP);EUC-JP"
+ IDS_ENC_EUC_KOREAN "C;Koreański (EUC-KR);EUC-KR"
+ IDS_ENC_ISO_2022_CN "C;Chiński (ISO-2022-CN);ISO-2022-CN"
+ IDS_ENC_HZ_GB2312 "C;Chiński uproszczony (HZ-GB-2312);HZ-GB-2312"
+ IDS_ENC_ISO_2022_JP "C;Japoński (ISO-2022-JP);ISO-2022-JP"
+ IDS_ENC_ISO_2022_KR "C;Koreański (ISO-2022-KR);ISO-2022-KR"
+ IDS_ENC_X_CHINESE_CNS "C;Chiński tradycyjny (CNS);x-Chinese-CNS"
IDS_ENC_JOHAB "C;Koreański (Johab);Koreański (Johab)"
IDS_ENC_ISO_8859_10 "B;Nordycki (ISO-8859-10);ISO-8859-10"
- IDS_ENC_BIG5_HKSCS "C;Chiński tradycyjny (Big5HKSCS);Big5HKSCS"
+ IDS_ENC_BIG5_HKSCS "C;Chiński tradycyjny (Big5-HKSCS);Big5-HKSCS"
END
diff --git a/language/np3_pt_br/encode_pt_br.rc b/language/np3_pt_br/encode_pt_br.rc
index 31af74bde..aff971f5e 100644
--- a/language/np3_pt_br/encode_pt_br.rc
+++ b/language/np3_pt_br/encode_pt_br.rc
@@ -79,9 +79,9 @@ BEGIN
IDS_ENC_ISO_8859_2 "C;Europa Central (ISO-8859-2);ISO-8859-2"
IDS_ENC_MAC_CENTRAL_EUROP "C;Europa Central (Mac);Mac (Central)"
IDS_ENC_WIN_1250 "C;Europa Central (Windows-1250);Windows-1250"
- IDS_ENC_GB18030 "C;Chinês (GB18030);GB-18030"
- IDS_ENC_GBK_936 "C;Chinês (GBK);GBK-936"
- IDS_ENC_GB2312_80 "C;Chinês Simplificado (GB2312-80);GB-2312-80"
+ IDS_ENC_GB18030 "C;Chinês (GB18030);GB18030"
+ IDS_ENC_GBK_936 "C;Chinês (GBK);GBK"
+ IDS_ENC_GB2312_80 "C;Chinês Simplificado (GB_2312-80);GB_2312-80"
IDS_ENC_MAC_ZH_CN "C;Chinês Simplificado (Mac);Mac (zh-cn)"
IDS_ENC_BIG5 "C;Chinês Tradicional (Big5);Big5"
IDS_ENC_MAC_ZH_TW "C;Chinês Tradicional (Mac);Mac (zh-tw)"
@@ -115,7 +115,7 @@ BEGIN
IDS_ENC_DOS_861 "C;Islandês (DOS-861);DOS-861"
IDS_ENC_MAC_ICELANDIC "C;Islandês (Mac);Mac (Icelandic)"
IDS_ENC_MAC_JAPANESE "C;Japonês (Mac);Mac (Japanese)"
- IDS_ENC_SHIFT_JIS "C;Japonês (Shift-JIS);Shift-JIS"
+ IDS_ENC_SHIFT_JIS "C;Japonês (Shift_JIS);Shift_JIS"
IDS_ENC_MAC_KOREAN "C;Coreano (Mac);Mac (Korean)"
IDS_ENC_WIN_949 "C;Coreano (Windows-949);Windows-949"
IDS_ENC_ISO_8859_3 "C;Latin 3 (ISO-8859-3);ISO-8859-3"
@@ -149,16 +149,16 @@ END
STRINGTABLE
BEGIN
- IDS_ENC_EUC_JAPANESE "C;Japonês (EUC);Japanese (EUC)"
- IDS_ENC_EUC_KOREAN "C;Coreano (EUC);Korean (EUC)"
- IDS_ENC_ISO_2022_CN "C;Chinês (ISO-2022);ISO-2022-CN"
- IDS_ENC_HZ_GB2312 "C;Chinês Simplificado (GB2312);HZ-GB2312"
- IDS_ENC_ISO_2022_JP "C;Japonês (ISO-2022);ISO-2022-JP"
- IDS_ENC_ISO_2022_KR "C;Coreano (ISO-2022);ISO-2022-KR"
- IDS_ENC_X_CHINESE_CNS "C;Chinês Tradicional (CNS);x-chinese-cns"
+ IDS_ENC_EUC_JAPANESE "C;Japonês (EUC-JP);EUC-JP"
+ IDS_ENC_EUC_KOREAN "C;Coreano (EUC-KR);EUC-KR"
+ IDS_ENC_ISO_2022_CN "C;Chinês (ISO-2022-CN);ISO-2022-CN"
+ IDS_ENC_HZ_GB2312 "C;Chinês Simplificado (HZ-GB-2312);HZ-GB-2312"
+ IDS_ENC_ISO_2022_JP "C;Japonês (ISO-2022-JP);ISO-2022-JP"
+ IDS_ENC_ISO_2022_KR "C;Coreano (ISO-2022-KR);ISO-2022-KR"
+ IDS_ENC_X_CHINESE_CNS "C;Chinês Tradicional (CNS);x-Chinese-CNS"
IDS_ENC_JOHAB "C;Coreano (Johab);Korean (Johab)"
IDS_ENC_ISO_8859_10 "B;Nórdico (ISO-8859-10);ISO-8859-10"
- IDS_ENC_BIG5_HKSCS "C;Chinês Tradicional (Big5HKSCS);Big5HKSCS"
+ IDS_ENC_BIG5_HKSCS "C;Chinês Tradicional (Big5-HKSCS);Big5-HKSCS"
END
diff --git a/language/np3_pt_pt/encode_pt_pt.rc b/language/np3_pt_pt/encode_pt_pt.rc
index 6ba435f0e..9a1d12462 100644
--- a/language/np3_pt_pt/encode_pt_pt.rc
+++ b/language/np3_pt_pt/encode_pt_pt.rc
@@ -79,9 +79,9 @@ BEGIN
IDS_ENC_ISO_8859_2 "C;Europa Central (ISO-8859-2);ISO-8859-2"
IDS_ENC_MAC_CENTRAL_EUROP "C;Europa Central (Mac);Mac (Central)"
IDS_ENC_WIN_1250 "C;Europa Central (Windows-1250);Windows-1250"
- IDS_ENC_GB18030 "C;Chinês (GB18030);GB-18030"
- IDS_ENC_GBK_936 "C;Chinês (GBK);GBK-936"
- IDS_ENC_GB2312_80 "C;Chinês Simplificado (GB2312-80);GB-2312-80"
+ IDS_ENC_GB18030 "C;Chinês (GB18030);GB18030"
+ IDS_ENC_GBK_936 "C;Chinês (GBK);GBK"
+ IDS_ENC_GB2312_80 "C;Chinês Simplificado (GB_2312-80);GB_2312-80"
IDS_ENC_MAC_ZH_CN "C;Chinês Simplificado (Mac);Mac (zh-cn)"
IDS_ENC_BIG5 "C;Chinês Tradicional (Big5);Big5"
IDS_ENC_MAC_ZH_TW "C;Chinês Tradicional (Mac);Mac (zh-tw)"
@@ -115,7 +115,7 @@ BEGIN
IDS_ENC_DOS_861 "C;Islandês (DOS-861);DOS-861"
IDS_ENC_MAC_ICELANDIC "C;Islandês (Mac);Mac (Islandês)"
IDS_ENC_MAC_JAPANESE "C;Japonês (Mac);Mac (Japonês)"
- IDS_ENC_SHIFT_JIS "C;Japonês (Shift-JIS);Shift-JIS"
+ IDS_ENC_SHIFT_JIS "C;Japonês (Shift_JIS);Shift_JIS"
IDS_ENC_MAC_KOREAN "C;Coreano (Mac);Mac (Coreano)"
IDS_ENC_WIN_949 "C;Coreano (Windows-949);Windows-949"
IDS_ENC_ISO_8859_3 "C;Latin 3 (ISO-8859-3);ISO-8859-3"
@@ -149,16 +149,16 @@ END
STRINGTABLE
BEGIN
- IDS_ENC_EUC_JAPANESE "C;Japonês (EUC);Japonês (EUC)"
- IDS_ENC_EUC_KOREAN "C;Coreano (EUC);Coreano (EUC)"
- IDS_ENC_ISO_2022_CN "C;Chinês (ISO-2022);ISO-2022-CN"
- IDS_ENC_HZ_GB2312 "C;Chinês Simplificado (GB2312);HZ-GB2312"
- IDS_ENC_ISO_2022_JP "C;Japonês (ISO-2022);ISO-2022-JP"
- IDS_ENC_ISO_2022_KR "C;Coreano (ISO-2022);ISO-2022-KR"
- IDS_ENC_X_CHINESE_CNS "C;Chinês Tradicional (CNS);x-chinese-cns"
+ IDS_ENC_EUC_JAPANESE "C;Japonês (EUC-JP);EUC-JP"
+ IDS_ENC_EUC_KOREAN "C;Coreano (EUC-KR);EUC-KR"
+ IDS_ENC_ISO_2022_CN "C;Chinês (ISO-2022-CN);ISO-2022-CN"
+ IDS_ENC_HZ_GB2312 "C;Chinês Simplificado (HZ-GB-2312);HZ-GB-2312"
+ IDS_ENC_ISO_2022_JP "C;Japonês (ISO-2022-JP);ISO-2022-JP"
+ IDS_ENC_ISO_2022_KR "C;Coreano (ISO-2022-KR);ISO-2022-KR"
+ IDS_ENC_X_CHINESE_CNS "C;Chinês Tradicional (CNS);x-Chinese-CNS"
IDS_ENC_JOHAB "C;Coreano (Johab);Coreano (Johab)"
IDS_ENC_ISO_8859_10 "B;Nórdico (ISO-8859-10);ISO-8859-10"
- IDS_ENC_BIG5_HKSCS "C;Chinês Tradicional (Big5HKSCS);Big5HKSCS"
+ IDS_ENC_BIG5_HKSCS "C;Chinês Tradicional (Big5-HKSCS);Big5-HKSCS"
END
diff --git a/language/np3_ru_ru/encode_ru_ru.rc b/language/np3_ru_ru/encode_ru_ru.rc
index 1533b33af..d113f28f2 100644
--- a/language/np3_ru_ru/encode_ru_ru.rc
+++ b/language/np3_ru_ru/encode_ru_ru.rc
@@ -79,9 +79,9 @@ BEGIN
IDS_ENC_ISO_8859_2 "C;Central European (ISO-8859-2);ISO-8859-2"
IDS_ENC_MAC_CENTRAL_EUROP "C;Central European (Mac);Mac (Central)"
IDS_ENC_WIN_1250 "C;Central European (Windows-1250);Windows-1250"
- IDS_ENC_GB18030 "C;Chinese (GB18030);GB-18030"
- IDS_ENC_GBK_936 "C;Chinese (GBK);GBK-936"
- IDS_ENC_GB2312_80 "C;Chinese Simplified (GB2312-80);GB-2312-80"
+ IDS_ENC_GB18030 "C;Chinese (GB18030);GB18030"
+ IDS_ENC_GBK_936 "C;Chinese (GBK);GBK"
+ IDS_ENC_GB2312_80 "C;Chinese Simplified (GB_2312-80);GB_2312-80"
IDS_ENC_MAC_ZH_CN "C;Chinese Simplified (Mac);Mac (zh-cn)"
IDS_ENC_BIG5 "C;Chinese Traditional (Big5);Big5"
IDS_ENC_MAC_ZH_TW "C;Chinese Traditional (Mac);Mac (zh-tw)"
@@ -115,7 +115,7 @@ BEGIN
IDS_ENC_DOS_861 "C;Icelandic (DOS-861);DOS-861"
IDS_ENC_MAC_ICELANDIC "C;Icelandic (Mac);Mac (Icelandic)"
IDS_ENC_MAC_JAPANESE "C;Japanese (Mac);Mac (Japanese)"
- IDS_ENC_SHIFT_JIS "C;Japanese (Shift-JIS);Shift-JIS"
+ IDS_ENC_SHIFT_JIS "C;Japanese (Shift_JIS);Shift_JIS"
IDS_ENC_MAC_KOREAN "C;Korean (Mac);Mac (Korean)"
IDS_ENC_WIN_949 "C;Korean (Windows-949);Windows-949"
IDS_ENC_ISO_8859_3 "C;Latin 3 (ISO-8859-3);ISO-8859-3"
@@ -149,16 +149,16 @@ END
STRINGTABLE
BEGIN
- IDS_ENC_EUC_JAPANESE "C;Japanese (EUC);Japanese (EUC)"
- IDS_ENC_EUC_KOREAN "C;Korean (EUC);Korean (EUC)"
- IDS_ENC_ISO_2022_CN "C;Chinese (ISO-2022);ISO-2022-CN"
- IDS_ENC_HZ_GB2312 "C;Chinese Simplified (GB2312);HZ-GB2312"
- IDS_ENC_ISO_2022_JP "C;Japanese (ISO-2022);ISO-2022-JP"
- IDS_ENC_ISO_2022_KR "C;Korean (ISO-2022);ISO-2022-KR"
- IDS_ENC_X_CHINESE_CNS "C;Chinese Traditional (CNS);x-chinese-cns"
+ IDS_ENC_EUC_JAPANESE "C;Japanese (EUC-JP);EUC-JP"
+ IDS_ENC_EUC_KOREAN "C;Korean (EUC-KR);EUC-KR"
+ IDS_ENC_ISO_2022_CN "C;Chinese (ISO-2022-CN);ISO-2022-CN"
+ IDS_ENC_HZ_GB2312 "C;Chinese Simplified (HZ-GB-2312);HZ-GB-2312"
+ IDS_ENC_ISO_2022_JP "C;Japanese (ISO-2022-JP);ISO-2022-JP"
+ IDS_ENC_ISO_2022_KR "C;Korean (ISO-2022-KR);ISO-2022-KR"
+ IDS_ENC_X_CHINESE_CNS "C;Chinese Traditional (CNS);x-Chinese-CNS"
IDS_ENC_JOHAB "C;Korean (Johab);Korean (Johab)"
IDS_ENC_ISO_8859_10 "B;Nordic (ISO-8859-10);ISO-8859-10"
- IDS_ENC_BIG5_HKSCS "C;Chinese Traditional (Big5HKSCS);Big5HKSCS"
+ IDS_ENC_BIG5_HKSCS "C;Chinese Traditional (Big5-HKSCS);Big5-HKSCS"
END
diff --git a/language/np3_sk_sk/encode_sk_sk.rc b/language/np3_sk_sk/encode_sk_sk.rc
index 94ada9812..e7b51bf20 100644
--- a/language/np3_sk_sk/encode_sk_sk.rc
+++ b/language/np3_sk_sk/encode_sk_sk.rc
@@ -79,9 +79,9 @@ BEGIN
IDS_ENC_ISO_8859_2 "C;Central European (ISO-8859-2);ISO-8859-2"
IDS_ENC_MAC_CENTRAL_EUROP "C;Central European (Mac);Mac (Central)"
IDS_ENC_WIN_1250 "C;Central European (Windows-1250);Windows-1250"
- IDS_ENC_GB18030 "C;Chinese (GB18030);GB-18030"
- IDS_ENC_GBK_936 "C;Chinese (GBK);GBK-936"
- IDS_ENC_GB2312_80 "C;Chinese Simplified (GB2312-80);GB-2312-80"
+ IDS_ENC_GB18030 "C;Chinese (GB18030);GB18030"
+ IDS_ENC_GBK_936 "C;Chinese (GBK);GBK"
+ IDS_ENC_GB2312_80 "C;Chinese Simplified (GB_2312-80);GB_2312-80"
IDS_ENC_MAC_ZH_CN "C;Chinese Simplified (Mac);Mac (zh-cn)"
IDS_ENC_BIG5 "C;Chinese Traditional (Big5);Big5"
IDS_ENC_MAC_ZH_TW "C;Chinese Traditional (Mac);Mac (zh-tw)"
@@ -115,7 +115,7 @@ BEGIN
IDS_ENC_DOS_861 "C;Icelandic (DOS-861);DOS-861"
IDS_ENC_MAC_ICELANDIC "C;Icelandic (Mac);Mac (Icelandic)"
IDS_ENC_MAC_JAPANESE "C;Japanese (Mac);Mac (Japanese)"
- IDS_ENC_SHIFT_JIS "C;Japanese (Shift-JIS);Shift-JIS"
+ IDS_ENC_SHIFT_JIS "C;Japanese (Shift_JIS);Shift_JIS"
IDS_ENC_MAC_KOREAN "C;Korean (Mac);Mac (Korean)"
IDS_ENC_WIN_949 "C;Korean (Windows-949);Windows-949"
IDS_ENC_ISO_8859_3 "C;Latin 3 (ISO-8859-3);ISO-8859-3"
@@ -149,16 +149,16 @@ END
STRINGTABLE
BEGIN
- IDS_ENC_EUC_JAPANESE "C;Japanese (EUC);Japanese (EUC)"
- IDS_ENC_EUC_KOREAN "C;Korean (EUC);Korean (EUC)"
- IDS_ENC_ISO_2022_CN "C;Chinese (ISO-2022);ISO-2022-CN"
- IDS_ENC_HZ_GB2312 "C;Chinese Simplified (GB2312);HZ-GB2312"
- IDS_ENC_ISO_2022_JP "C;Japanese (ISO-2022);ISO-2022-JP"
- IDS_ENC_ISO_2022_KR "C;Korean (ISO-2022);ISO-2022-KR"
- IDS_ENC_X_CHINESE_CNS "C;Chinese Traditional (CNS);x-chinese-cns"
+ IDS_ENC_EUC_JAPANESE "C;Japanese (EUC-JP);EUC-JP"
+ IDS_ENC_EUC_KOREAN "C;Korean (EUC-KR);EUC-KR"
+ IDS_ENC_ISO_2022_CN "C;Chinese (ISO-2022-CN);ISO-2022-CN"
+ IDS_ENC_HZ_GB2312 "C;Chinese Simplified (HZ-GB-2312);HZ-GB-2312"
+ IDS_ENC_ISO_2022_JP "C;Japanese (ISO-2022-JP);ISO-2022-JP"
+ IDS_ENC_ISO_2022_KR "C;Korean (ISO-2022-KR);ISO-2022-KR"
+ IDS_ENC_X_CHINESE_CNS "C;Chinese Traditional (CNS);x-Chinese-CNS"
IDS_ENC_JOHAB "C;Korean (Johab);Korean (Johab)"
IDS_ENC_ISO_8859_10 "B;Nordic (ISO-8859-10);ISO-8859-10"
- IDS_ENC_BIG5_HKSCS "C;Chinese Traditional (Big5HKSCS);Big5HKSCS"
+ IDS_ENC_BIG5_HKSCS "C;Chinese Traditional (Big5-HKSCS);Big5-HKSCS"
END
diff --git a/language/np3_sv_se/encode_sv_se.rc b/language/np3_sv_se/encode_sv_se.rc
index d161ad62c..bca4a3748 100644
--- a/language/np3_sv_se/encode_sv_se.rc
+++ b/language/np3_sv_se/encode_sv_se.rc
@@ -79,9 +79,9 @@ BEGIN
IDS_ENC_ISO_8859_2 "C;Centraleuropeisk (ISO-8859-2);ISO-8859-2"
IDS_ENC_MAC_CENTRAL_EUROP "C;Centraleuropeisk (Mac);Mac (Central)"
IDS_ENC_WIN_1250 "C;Centraleuropeisk (Windows-1250);Windows-1250"
- IDS_ENC_GB18030 "C;Kinesisk (GB18030);GB-18030"
- IDS_ENC_GBK_936 "C;kinesisk (GBK);GBK-936"
- IDS_ENC_GB2312_80 "C;Förenklad kinesisk (GB2312-80);GB-2312-80"
+ IDS_ENC_GB18030 "C;Kinesisk (GB18030);GB18030"
+ IDS_ENC_GBK_936 "C;kinesisk (GBK);GBK"
+ IDS_ENC_GB2312_80 "C;Förenklad kinesisk (GB_2312-80);GB_2312-80"
IDS_ENC_MAC_ZH_CN "C;Förenklad kinesisk (Mac);Mac (zh-cn)"
IDS_ENC_BIG5 "C;Traditionell kinesisk (Big5);Big5"
IDS_ENC_MAC_ZH_TW "C;Traditionell kinesisk (Mac);Mac (zh-tw)"
@@ -115,7 +115,7 @@ BEGIN
IDS_ENC_DOS_861 "C;Islänsk (DOS-861);DOS-861"
IDS_ENC_MAC_ICELANDIC "C;Islänsk (Mac);Mac (Islänsk)"
IDS_ENC_MAC_JAPANESE "C;Japansk (Mac);Mac (Japansk)"
- IDS_ENC_SHIFT_JIS "C;Japansk (Shift-JIS);Shift-JIS"
+ IDS_ENC_SHIFT_JIS "C;Japansk (Shift_JIS);Shift_JIS"
IDS_ENC_MAC_KOREAN "C;Koreansk (Mac);Mac (Koreansk)"
IDS_ENC_WIN_949 "C;Koreansk (Windows-949);Windows-949"
IDS_ENC_ISO_8859_3 "C;Latinsk 3 (ISO-8859-3);ISO-8859-3"
@@ -149,16 +149,16 @@ END
STRINGTABLE
BEGIN
- IDS_ENC_EUC_JAPANESE "C;Japansk (EUC);Japansk (EUC)"
- IDS_ENC_EUC_KOREAN "C;Koreansk (EUC);Koreansk (EUC)"
- IDS_ENC_ISO_2022_CN "C;kinesisk (ISO-2022);ISO-2022-CN"
- IDS_ENC_HZ_GB2312 "C;Förenklad kinesisk (B2312);HZ-GB2312"
- IDS_ENC_ISO_2022_JP "C;Japansk (ISO-2022);ISO-2022-JP"
- IDS_ENC_ISO_2022_KR "C;Koreansk (ISO-2022);ISO-2022-KR"
- IDS_ENC_X_CHINESE_CNS "C;Traditionell kinesisk (CNS);x-Kinesisk-cns"
+ IDS_ENC_EUC_JAPANESE "C;Japansk (EUC-JP);EUC-JP"
+ IDS_ENC_EUC_KOREAN "C;Koreansk (EUC-KR);EUC-KR"
+ IDS_ENC_ISO_2022_CN "C;kinesisk (ISO-2022-CN);ISO-2022-CN"
+ IDS_ENC_HZ_GB2312 "C;Förenklad kinesisk (HZ-GB-2312);HZ-GB-2312"
+ IDS_ENC_ISO_2022_JP "C;Japansk (ISO-2022-JP);ISO-2022-JP"
+ IDS_ENC_ISO_2022_KR "C;Koreansk (ISO-2022-KR);ISO-2022-KR"
+ IDS_ENC_X_CHINESE_CNS "C;Traditionell kinesisk (CNS);x-Chinese-CNS"
IDS_ENC_JOHAB "C;Koreansk (Johab);Koreansk (Johab)"
IDS_ENC_ISO_8859_10 "B;Nordisk (ISO-8859-10);ISO-8859-10"
- IDS_ENC_BIG5_HKSCS "C;Traditionell Kinesisk (Big5HKSCS);Big5HKSCS"
+ IDS_ENC_BIG5_HKSCS "C;Traditionell Kinesisk (Big5-HKSCS);Big5-HKSCS"
END
diff --git a/language/np3_tr_tr/encode_tr_tr.rc b/language/np3_tr_tr/encode_tr_tr.rc
index f0f5362c9..1a19bcd6a 100644
--- a/language/np3_tr_tr/encode_tr_tr.rc
+++ b/language/np3_tr_tr/encode_tr_tr.rc
@@ -79,9 +79,9 @@ BEGIN
IDS_ENC_ISO_8859_2 "C;Central European (ISO-8859-2);ISO-8859-2"
IDS_ENC_MAC_CENTRAL_EUROP "C;Central European (Mac);Mac (Central)"
IDS_ENC_WIN_1250 "C;Central European (Windows-1250);Windows-1250"
- IDS_ENC_GB18030 "C;Chinese (GB18030);GB-18030"
- IDS_ENC_GBK_936 "C;Chinese (GBK);GBK-936"
- IDS_ENC_GB2312_80 "C;Chinese Simplified (GB2312-80);GB-2312-80"
+ IDS_ENC_GB18030 "C;Chinese (GB18030);GB18030"
+ IDS_ENC_GBK_936 "C;Chinese (GBK);GBK"
+ IDS_ENC_GB2312_80 "C;Chinese Simplified (GB_2312-80);GB_2312-80"
IDS_ENC_MAC_ZH_CN "C;Chinese Simplified (Mac);Mac (zh-cn)"
IDS_ENC_BIG5 "C;Chinese Traditional (Big5);Big5"
IDS_ENC_MAC_ZH_TW "C;Chinese Traditional (Mac);Mac (zh-tw)"
@@ -115,7 +115,7 @@ BEGIN
IDS_ENC_DOS_861 "C;Icelandic (DOS-861);DOS-861"
IDS_ENC_MAC_ICELANDIC "C;Icelandic (Mac);Mac (Icelandic)"
IDS_ENC_MAC_JAPANESE "C;Japanese (Mac);Mac (Japanese)"
- IDS_ENC_SHIFT_JIS "C;Japanese (Shift-JIS);Shift-JIS"
+ IDS_ENC_SHIFT_JIS "C;Japanese (Shift_JIS);Shift_JIS"
IDS_ENC_MAC_KOREAN "C;Korean (Mac);Mac (Korean)"
IDS_ENC_WIN_949 "C;Korean (Windows-949);Windows-949"
IDS_ENC_ISO_8859_3 "C;Latin 3 (ISO-8859-3);ISO-8859-3"
@@ -149,16 +149,16 @@ END
STRINGTABLE
BEGIN
- IDS_ENC_EUC_JAPANESE "C;Japanese (EUC);Japanese (EUC)"
- IDS_ENC_EUC_KOREAN "C;Korean (EUC);Korean (EUC)"
- IDS_ENC_ISO_2022_CN "C;Chinese (ISO-2022);ISO-2022-CN"
- IDS_ENC_HZ_GB2312 "C;Chinese Simplified (GB2312);HZ-GB2312"
- IDS_ENC_ISO_2022_JP "C;Japanese (ISO-2022);ISO-2022-JP"
- IDS_ENC_ISO_2022_KR "C;Korean (ISO-2022);ISO-2022-KR"
- IDS_ENC_X_CHINESE_CNS "C;Chinese Traditional (CNS);x-chinese-cns"
+ IDS_ENC_EUC_JAPANESE "C;Japanese (EUC-JP);EUC-JP"
+ IDS_ENC_EUC_KOREAN "C;Korean (EUC-KR);EUC-KR"
+ IDS_ENC_ISO_2022_CN "C;Chinese (ISO-2022-CN);ISO-2022-CN"
+ IDS_ENC_HZ_GB2312 "C;Chinese Simplified (HZ-GB-2312);HZ-GB-2312"
+ IDS_ENC_ISO_2022_JP "C;Japanese (ISO-2022-JP);ISO-2022-JP"
+ IDS_ENC_ISO_2022_KR "C;Korean (ISO-2022-KR);ISO-2022-KR"
+ IDS_ENC_X_CHINESE_CNS "C;Chinese Traditional (CNS);x-Chinese-CNS"
IDS_ENC_JOHAB "C;Korean (Johab);Korean (Johab)"
IDS_ENC_ISO_8859_10 "B;Nordic (ISO-8859-10);ISO-8859-10"
- IDS_ENC_BIG5_HKSCS "C;Chinese Traditional (Big5HKSCS);Big5HKSCS"
+ IDS_ENC_BIG5_HKSCS "C;Chinese Traditional (Big5-HKSCS);Big5-HKSCS"
END
diff --git a/language/np3_vi_vn/encode_vi_vn.rc b/language/np3_vi_vn/encode_vi_vn.rc
index 713ac260f..c7a36c05f 100644
--- a/language/np3_vi_vn/encode_vi_vn.rc
+++ b/language/np3_vi_vn/encode_vi_vn.rc
@@ -79,9 +79,9 @@ BEGIN
IDS_ENC_ISO_8859_2 "C;Central European (ISO-8859-2);ISO-8859-2"
IDS_ENC_MAC_CENTRAL_EUROP "C;Central European (Mac);Mac (Central)"
IDS_ENC_WIN_1250 "C;Central European (Windows-1250);Windows-1250"
- IDS_ENC_GB18030 "C;Chinese (GB18030);GB-18030"
- IDS_ENC_GBK_936 "C;Chinese (GBK);GBK-936"
- IDS_ENC_GB2312_80 "C;Chinese Simplified (GB2312-80);GB-2312-80"
+ IDS_ENC_GB18030 "C;Chinese (GB18030);GB18030"
+ IDS_ENC_GBK_936 "C;Chinese (GBK);GBK"
+ IDS_ENC_GB2312_80 "C;Chinese Simplified (GB_2312-80);GB_2312-80"
IDS_ENC_MAC_ZH_CN "C;Chinese Simplified (Mac);Mac (zh-cn)"
IDS_ENC_BIG5 "C;Chinese Traditional (Big5);Big5"
IDS_ENC_MAC_ZH_TW "C;Chinese Traditional (Mac);Mac (zh-tw)"
@@ -115,7 +115,7 @@ BEGIN
IDS_ENC_DOS_861 "C;Icelandic (DOS-861);DOS-861"
IDS_ENC_MAC_ICELANDIC "C;Icelandic (Mac);Mac (Icelandic)"
IDS_ENC_MAC_JAPANESE "C;Japanese (Mac);Mac (Japanese)"
- IDS_ENC_SHIFT_JIS "C;Japanese (Shift-JIS);Shift-JIS"
+ IDS_ENC_SHIFT_JIS "C;Japanese (Shift_JIS);Shift_JIS"
IDS_ENC_MAC_KOREAN "C;Korean (Mac);Mac (Korean)"
IDS_ENC_WIN_949 "C;Korean (Windows-949);Windows-949"
IDS_ENC_ISO_8859_3 "C;Latin 3 (ISO-8859-3);ISO-8859-3"
@@ -149,16 +149,16 @@ END
STRINGTABLE
BEGIN
- IDS_ENC_EUC_JAPANESE "C;Japanese (EUC);Japanese (EUC)"
- IDS_ENC_EUC_KOREAN "C;Korean (EUC);Korean (EUC)"
- IDS_ENC_ISO_2022_CN "C;Chinese (ISO-2022);ISO-2022-CN"
- IDS_ENC_HZ_GB2312 "C;Chinese Simplified (GB2312);HZ-GB2312"
- IDS_ENC_ISO_2022_JP "C;Japanese (ISO-2022);ISO-2022-JP"
- IDS_ENC_ISO_2022_KR "C;Korean (ISO-2022);ISO-2022-KR"
- IDS_ENC_X_CHINESE_CNS "C;Chinese Traditional (CNS);x-chinese-cns"
+ IDS_ENC_EUC_JAPANESE "C;Japanese (EUC-JP);EUC-JP"
+ IDS_ENC_EUC_KOREAN "C;Korean (EUC-KR);EUC-KR"
+ IDS_ENC_ISO_2022_CN "C;Chinese (ISO-2022-CN);ISO-2022-CN"
+ IDS_ENC_HZ_GB2312 "C;Chinese Simplified (HZ-GB-2312);HZ-GB-2312"
+ IDS_ENC_ISO_2022_JP "C;Japanese (ISO-2022-JP);ISO-2022-JP"
+ IDS_ENC_ISO_2022_KR "C;Korean (ISO-2022-KR);ISO-2022-KR"
+ IDS_ENC_X_CHINESE_CNS "C;Chinese Traditional (CNS);x-Chinese-CNS"
IDS_ENC_JOHAB "C;Korean (Johab);Korean (Johab)"
IDS_ENC_ISO_8859_10 "B;Nordic (ISO-8859-10);ISO-8859-10"
- IDS_ENC_BIG5_HKSCS "C;Chinese Traditional (Big5HKSCS);Big5HKSCS"
+ IDS_ENC_BIG5_HKSCS "C;Chinese Traditional (Big5-HKSCS);Big5-HKSCS"
END
diff --git a/language/np3_zh_cn/encode_zh_cn.rc b/language/np3_zh_cn/encode_zh_cn.rc
index a6d001147..9527e72f0 100644
--- a/language/np3_zh_cn/encode_zh_cn.rc
+++ b/language/np3_zh_cn/encode_zh_cn.rc
@@ -79,9 +79,9 @@ BEGIN
IDS_ENC_ISO_8859_2 "C;中欧 (ISO-8859-2);ISO-8859-2"
IDS_ENC_MAC_CENTRAL_EUROP "C;中欧 (Mac);Mac (Central)"
IDS_ENC_WIN_1250 "C;中欧 (Windows-1250);Windows-1250"
- IDS_ENC_GB18030 "C;简体中文 (GB18030);GB-18030"
- IDS_ENC_GBK_936 "C;简体中文 (GBK);GBK-936"
- IDS_ENC_GB2312_80 "C;简体中文 Simplified (GB2312-80);GB-2312-80"
+ IDS_ENC_GB18030 "C;简体中文 (GB18030);GB18030"
+ IDS_ENC_GBK_936 "C;简体中文 (GBK);GBK"
+ IDS_ENC_GB2312_80 "C;简体中文 Simplified (GB_2312-80);GB_2312-80"
IDS_ENC_MAC_ZH_CN "C;简体中文 (Mac);Mac (zh-cn)"
IDS_ENC_BIG5 "C;繁体中文 (Big5);Big5"
IDS_ENC_MAC_ZH_TW "C;繁体中文 (Mac);Mac (zh-tw)"
@@ -115,7 +115,7 @@ BEGIN
IDS_ENC_DOS_861 "C;冰岛语 (DOS-861);DOS-861"
IDS_ENC_MAC_ICELANDIC "C;冰岛语 (Mac);Mac (冰岛语)"
IDS_ENC_MAC_JAPANESE "C;日文 (Mac);Mac (日文)"
- IDS_ENC_SHIFT_JIS "C;日文 (Shift-JIS);Shift-JIS"
+ IDS_ENC_SHIFT_JIS "C;日文 (Shift_JIS);Shift_JIS"
IDS_ENC_MAC_KOREAN "C;韩文 (Mac);Mac (韩文)"
IDS_ENC_WIN_949 "C;韩文 (Windows-949);Windows-949"
IDS_ENC_ISO_8859_3 "C;拉丁文 3 (ISO-8859-3);ISO-8859-3"
@@ -149,16 +149,16 @@ END
STRINGTABLE
BEGIN
- IDS_ENC_EUC_JAPANESE "C;日文 (EUC);日文 (EUC)"
- IDS_ENC_EUC_KOREAN "C;韩文 (EUC);韩文 (EUC)"
- IDS_ENC_ISO_2022_CN "C;繁体中文 (ISO-2022);ISO-2022-CN"
- IDS_ENC_HZ_GB2312 "C;简体中文 (GB2312);HZ-GB2312"
- IDS_ENC_ISO_2022_JP "C;日文 (ISO-2022);ISO-2022-JP"
- IDS_ENC_ISO_2022_KR "C;韩文 (ISO-2022);ISO-2022-KR"
- IDS_ENC_X_CHINESE_CNS "C;繁体中文 (CNS);x-chinese-cns"
+ IDS_ENC_EUC_JAPANESE "C;日文 (EUC-JP);EUC-JP"
+ IDS_ENC_EUC_KOREAN "C;韩文 (EUC-KR);EUC-KR"
+ IDS_ENC_ISO_2022_CN "C;繁体中文 (ISO-2022-CN);ISO-2022-CN"
+ IDS_ENC_HZ_GB2312 "C;简体中文 (HZ-GB-2312);HZ-GB-2312"
+ IDS_ENC_ISO_2022_JP "C;日文 (ISO-2022-JP);ISO-2022-JP"
+ IDS_ENC_ISO_2022_KR "C;韩文 (ISO-2022-KR);ISO-2022-KR"
+ IDS_ENC_X_CHINESE_CNS "C;繁体中文 (CNS);x-Chinese-CNS"
IDS_ENC_JOHAB "C;韩文 (Johab);韩文 (Johab)"
IDS_ENC_ISO_8859_10 "B;北欧 (ISO-8859-10);ISO-8859-10"
- IDS_ENC_BIG5_HKSCS "C;简体中文 (Big5HKSCS);Big5HKSCS"
+ IDS_ENC_BIG5_HKSCS "C;简体中文 (Big5-HKSCS);Big5-HKSCS"
END
diff --git a/language/np3_zh_tw/encode_zh_tw.rc b/language/np3_zh_tw/encode_zh_tw.rc
index 33714b473..0bdff9ee9 100644
--- a/language/np3_zh_tw/encode_zh_tw.rc
+++ b/language/np3_zh_tw/encode_zh_tw.rc
@@ -79,9 +79,9 @@ BEGIN
IDS_ENC_ISO_8859_2 "C;中歐 (ISO-8859-2);ISO-8859-2"
IDS_ENC_MAC_CENTRAL_EUROP "C;中歐 (Mac);Mac (Central)"
IDS_ENC_WIN_1250 "C;中歐 (Windows-1250);Windows-1250"
- IDS_ENC_GB18030 "C;簡體中文 (GB18030);GB-18030"
- IDS_ENC_GBK_936 "C;簡體中文 (GBK);GBK-936"
- IDS_ENC_GB2312_80 "C;簡體中文 Simplified (GB2312-80);GB-2312-80"
+ IDS_ENC_GB18030 "C;簡體中文 (GB18030);GB18030"
+ IDS_ENC_GBK_936 "C;簡體中文 (GBK);GBK"
+ IDS_ENC_GB2312_80 "C;簡體中文 Simplified (GB_2312-80);GB_2312-80"
IDS_ENC_MAC_ZH_CN "C;簡體中文 (Mac);Mac (zh-cn)"
IDS_ENC_BIG5 "C;繁體中文 (Big5);Big5"
IDS_ENC_MAC_ZH_TW "C;繁體中文 (Mac);Mac (zh-tw)"
@@ -115,7 +115,7 @@ BEGIN
IDS_ENC_DOS_861 "C;冰島語 (DOS-861);DOS-861"
IDS_ENC_MAC_ICELANDIC "C;冰島語 (Mac);Mac (冰島語)"
IDS_ENC_MAC_JAPANESE "C;日文 (Mac);Mac (日文)"
- IDS_ENC_SHIFT_JIS "C;日文 (Shift-JIS);Shift-JIS"
+ IDS_ENC_SHIFT_JIS "C;日文 (Shift_JIS);Shift_JIS"
IDS_ENC_MAC_KOREAN "C;韓文 (Mac);Mac (韓文)"
IDS_ENC_WIN_949 "C;韓文 (Windows-949);Windows-949"
IDS_ENC_ISO_8859_3 "C;拉丁文 3 (ISO-8859-3);ISO-8859-3"
@@ -149,16 +149,16 @@ END
STRINGTABLE
BEGIN
- IDS_ENC_EUC_JAPANESE "C;日文 (EUC);日文 (EUC)"
- IDS_ENC_EUC_KOREAN "C;韓文 (EUC);韓文 (EUC)"
- IDS_ENC_ISO_2022_CN "C;繁體中文 (ISO-2022);ISO-2022-CN"
- IDS_ENC_HZ_GB2312 "C;簡體中文 (GB2312);HZ-GB2312"
- IDS_ENC_ISO_2022_JP "C;日文 (ISO-2022);ISO-2022-JP"
- IDS_ENC_ISO_2022_KR "C;韓文 (ISO-2022);ISO-2022-KR"
- IDS_ENC_X_CHINESE_CNS "C;繁體中文 (CNS);x-chinese-cns"
+ IDS_ENC_EUC_JAPANESE "C;日文 (EUC-JP);EUC-JP"
+ IDS_ENC_EUC_KOREAN "C;韓文 (EUC-KR);EUC-KR"
+ IDS_ENC_ISO_2022_CN "C;繁體中文 (ISO-2022-CN);ISO-2022-CN"
+ IDS_ENC_HZ_GB2312 "C;簡體中文 (HZ-GB-2312);HZ-GB-2312"
+ IDS_ENC_ISO_2022_JP "C;日文 (ISO-2022-JP);ISO-2022-JP"
+ IDS_ENC_ISO_2022_KR "C;韓文 (ISO-2022-KR);ISO-2022-KR"
+ IDS_ENC_X_CHINESE_CNS "C;繁體中文 (CNS);x-Chinese-CNS"
IDS_ENC_JOHAB "C;韓文 (Johab);韓文 (Johab)"
IDS_ENC_ISO_8859_10 "B;北歐 (ISO-8859-10);ISO-8859-10"
- IDS_ENC_BIG5_HKSCS "C;簡體中文 (Big5HKSCS);Big5HKSCS"
+ IDS_ENC_BIG5_HKSCS "C;簡體中文 (Big5-HKSCS);Big5-HKSCS"
END
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 745526c0c..538046462 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
Notepad3 beta
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 59baca3eb..6c66e23d2 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -8,8 +8,8 @@
#define SAPPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 20
-#define VERSION_REV 1125
-#define VERSION_BUILD 2
+#define VERSION_REV 1201
+#define VERSION_BUILD 1
#define SCINTILLA_VER 445
#define ONIGURUMA_REGEX_VER 6.9.6
#define UCHARDET_VER 2018.09.27