From 15fbea7522b44b9a684ba38f2f3b3fdd5c5be56a Mon Sep 17 00:00:00 2001
From: "jungshik@google.com"
 <jungshik@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 16 Mar 2009 17:19:07 +0000
Subject: Change the default encoding for zh-CN to GBK from gb18030 to work
 around a few google issues (Picasa web, China's icafe)

bug=3301
Review URL: http://codereview.chromium.org/46069

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11737 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/app/resources/locale_settings_zh-CN.xtb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'chrome/app/resources')

diff --git a/chrome/app/resources/locale_settings_zh-CN.xtb b/chrome/app/resources/locale_settings_zh-CN.xtb
index 30116a0..925e022 100644
--- a/chrome/app/resources/locale_settings_zh-CN.xtb
+++ b/chrome/app/resources/locale_settings_zh-CN.xtb
@@ -3,7 +3,7 @@
 <translationbundle lang="zh-CN">
 <translation id="IDS_WEB_FONT_FAMILY">Simsun</translation>
 <translation id="IDS_ACCEPT_LANGUAGES">zh-CN,zh</translation>
-<translation id="IDS_DEFAULT_ENCODING">gb18030</translation>
+<translation id="IDS_DEFAULT_ENCODING">GBK</translation>
 <translation id="IDS_STANDARD_FONT_IS_SERIF">false</translation>
 <translation id="IDS_FIXED_FONT_FAMILY">NSimsun</translation>
 <translation id="IDS_SERIF_FONT_FAMILY">Simsun</translation>
-- 
cgit v1.1