diff options
| author | jungshik@google.com <jungshik@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-11 20:30:49 +0000 |
|---|---|---|
| committer | jungshik@google.com <jungshik@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-11 20:30:49 +0000 |
| commit | 1c5bf633736fa19e6e9950fc5bb4aab378803ad8 (patch) | |
| tree | e17b6ca7b18b9c28936bebcef0f58d2ef1016fb1 /chrome/app/resources/locale_settings_zh-CN.rc | |
| parent | afa5a314c7d3698c8065ba824e5700c2af211844 (diff) | |
| download | chromium_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/locale_settings_zh-CN.rc')
| -rw-r--r-- | chrome/app/resources/locale_settings_zh-CN.rc | 2 |
1 files changed, 1 insertions, 1 deletions
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" |