Enable auto text encoding
Set locale specific text encoding for Chinese, Japanese,
Korean and keep "UTF-8" encoding as default for all other
locales.
Add "Auto detect" (localized for Chinese only) as additional
list item for "Text Encoding" list preference.
Change-Id: Ic33287f6999e2741dce57eb3fb7adc66f3fb0b9f
diff --git a/res/values-ja/donottranslate_strings.xml b/res/values-ja/donottranslate_strings.xml
deleted file mode 100644
index 026d57a..0000000
--- a/res/values-ja/donottranslate_strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
- <string name="pref_default_text_encoding_default" translatable="false">SHIFT_JIS</string>
-</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 4fff052..af5280f 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -259,7 +259,9 @@
<item msgid="5589150448475151241">"日本語（SHIFT_JIS）"</item>
<item msgid="7356792686950371843">"日本語（EUC-JP）"</item>
<item msgid="2193955365569270096">"韓国語（EUC-KR）"</item>
+ <item>@string/pref_default_text_encoding_default_value</item>
</string-array>
+ <string name="pref_default_text_encoding_default">SHIFT_JIS</string>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"テキストエンコード"</string>
<string name="pref_accessibility_title" msgid="5127836981587423215">"ユーザー補助"</string>
<string name="pref_font_size_category" msgid="6683754355084218254">"文字サイズ"</string>