summaryrefslogtreecommitdiffstats
path: root/chrome/app/resources
diff options
context:
space:
mode:
authorjungshik@google.com <jungshik@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-11 20:30:49 +0000
committerjungshik@google.com <jungshik@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-11 20:30:49 +0000
commit1c5bf633736fa19e6e9950fc5bb4aab378803ad8 (patch)
treee17b6ca7b18b9c28936bebcef0f58d2ef1016fb1 /chrome/app/resources
parentafa5a314c7d3698c8065ba824e5700c2af211844 (diff)
downloadchromium_src-1c5bf633736fa19e6e9950fc5bb4aab378803ad8.zip
chromium_src-1c5bf633736fa19e6e9950fc5bb4aab378803ad8.tar.gz
chromium_src-1c5bf633736fa19e6e9950fc5bb4aab378803ad8.tar.bz2
A follow-up to a recent unforking of WebCore/platform/text/TextCodecICU.cpp (r6540).
Up to now, we canonicalized to EUC-KR, TIS-620 and GB2312, but with unforking, we'd better canonicalize to windows-949, windows-874 and GBK. Another change is necessary in Webkit (Document.cpp), which I'll do it while unforking it. BUG=3703 Review URL: http://codereview.chromium.org/13645 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6817 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/resources')
-rw-r--r--chrome/app/resources/locale_settings_ko.rc4
-rw-r--r--chrome/app/resources/locale_settings_th.rc4
-rw-r--r--chrome/app/resources/locale_settings_zh-CN.rc2
3 files changed, 5 insertions, 5 deletions
diff --git a/chrome/app/resources/locale_settings_ko.rc b/chrome/app/resources/locale_settings_ko.rc
index 4d13253..a5ef5d4 100644
--- a/chrome/app/resources/locale_settings_ko.rc
+++ b/chrome/app/resources/locale_settings_ko.rc
@@ -4,7 +4,7 @@ STRINGTABLE
BEGIN
IDS_WEB_FONT_FAMILY "Gulim"
IDS_ACCEPT_LANGUAGES "ko-KR,ko,en-US,en"
- IDS_DEFAULT_ENCODING "EUC-KR"
+ IDS_DEFAULT_ENCODING "windows-949"
IDS_STANDARD_FONT_IS_SERIF "false"
IDS_FIXED_FONT_FAMILY "Gulimche"
IDS_SERIF_FONT_FAMILY "Batang"
@@ -55,7 +55,7 @@ BEGIN
IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=ko"
IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
- IDS_STATIC_ENCODING_LIST "EUC-KR"
+ IDS_STATIC_ENCODING_LIST "windows-949"
IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/ko/welcome.html"
IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=ko"
IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=ko"
diff --git a/chrome/app/resources/locale_settings_th.rc b/chrome/app/resources/locale_settings_th.rc
index e9ac7e7..5bc88bbc 100644
--- a/chrome/app/resources/locale_settings_th.rc
+++ b/chrome/app/resources/locale_settings_th.rc
@@ -4,7 +4,7 @@ STRINGTABLE
BEGIN
IDS_WEB_FONT_FAMILY "tahoma"
IDS_ACCEPT_LANGUAGES "th-TH,th"
- IDS_DEFAULT_ENCODING "TIS-620"
+ IDS_DEFAULT_ENCODING "windows-874"
IDS_STANDARD_FONT_IS_SERIF "true"
IDS_FIXED_FONT_FAMILY "tahoma"
IDS_SERIF_FONT_FAMILY "tahoma"
@@ -55,7 +55,7 @@ BEGIN
IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=th"
IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
- IDS_STATIC_ENCODING_LIST "TIS-620"
+ IDS_STATIC_ENCODING_LIST "windows-874"
IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/th/welcome.html"
IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=th"
IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=th"
diff --git a/chrome/app/resources/locale_settings_zh-CN.rc b/chrome/app/resources/locale_settings_zh-CN.rc
index fccba1e2..0cc2113 100644
--- a/chrome/app/resources/locale_settings_zh-CN.rc
+++ b/chrome/app/resources/locale_settings_zh-CN.rc
@@ -55,7 +55,7 @@ BEGIN
IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12"
IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=zh-CN"
IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport"
- IDS_STATIC_ENCODING_LIST "GB2312,gb18030"
+ IDS_STATIC_ENCODING_LIST "GBK,gb18030"
IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/zh-CN/welcome.html"
IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=zh-CN"
IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=zh-CN"