diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 93a97f0..f2b45e2 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -259,6 +259,7 @@
     <item msgid="5589150448475151241">"Japannees (SHIFT_JIS)"</item>
     <item msgid="7356792686950371843">"Japannees (EUC-JP)"</item>
     <item msgid="2193955365569270096">"Koreaans (EUC-KR)"</item>
+    <item>@string/pref_default_text_encoding_default_value</item>
   </string-array>
     <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Teksenkodering"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Toeganklikheid"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index e53b59e..2a7a4a0 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -259,6 +259,7 @@
     <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_dialogtitle" msgid="5508255018084978547">"ፅሁፍ በኮድ መክተት"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"ተደራሽነት"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 54050ad..f95f738 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -274,6 +274,7 @@
     <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_dialogtitle" msgid="5508255018084978547">"تشفير النص"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"إمكانية الدخول"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index d29f185..6f46a74 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -259,6 +259,7 @@
     <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_dialogtitle" msgid="5508255018084978547">"Кадыроўка тэксту"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Даступнасць"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 608c221..cdccc93 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -259,6 +259,7 @@
     <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_dialogtitle" msgid="5508255018084978547">"Текстово кодиране"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Достъпност"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 9b3afa1..16d24d0 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -259,6 +259,7 @@
     <item msgid="5589150448475151241">"Japonès (MAJ_JIS)"</item>
     <item msgid="7356792686950371843">"Japonès (EUC-JP)"</item>
     <item msgid="2193955365569270096">"Coreà (EUC-KR)"</item>
+    <item>@string/pref_default_text_encoding_default_value</item>
   </string-array>
     <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Codificació del text"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Accessibilitat"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 9f8bc5f..bbfc09c 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -259,6 +259,7 @@
     <item msgid="5589150448475151241">"Japonština (SHIFT_JIS)"</item>
     <item msgid="7356792686950371843">"Japonština (EUC-JP)"</item>
     <item msgid="2193955365569270096">"Korejština (EUC-KR)"</item>
+    <item>@string/pref_default_text_encoding_default_value</item>
   </string-array>
     <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Kódování textu"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Usnadnění"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index bff97c3..758d287 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -259,6 +259,7 @@
     <item msgid="5589150448475151241">"Japansk (SHIFT_JIS)"</item>
     <item msgid="7356792686950371843">"Japansk (EUC-JP)"</item>
     <item msgid="2193955365569270096">"Koreansk (EUC-KR)"</item>
+    <item>@string/pref_default_text_encoding_default_value</item>
   </string-array>
     <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Tekstkodning"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Tilgængelighed"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 48d261c..a7ce77d 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -259,6 +259,7 @@
     <item msgid="5589150448475151241">"Japanisch (SHIFT_JIS)"</item>
     <item msgid="7356792686950371843">"Japanisch (EUC-JP)"</item>
     <item msgid="2193955365569270096">"Koreanisch (EUC-KR)"</item>
+    <item>@string/pref_default_text_encoding_default_value</item>
   </string-array>
     <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Textcodierung"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Bedienungshilfen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index bb73bea..b12d465 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -259,6 +259,7 @@
     <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_dialogtitle" msgid="5508255018084978547">"Κωδικοποίηση κειμένου"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Προσβασιμότητα"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index a72b7bd..8aefd8b 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -260,6 +260,7 @@
     <item msgid="5589150448475151241">"Japanese (SHIFT_JIS)"</item>
     <item msgid="7356792686950371843">"Japanese (EUC-JP)"</item>
     <item msgid="2193955365569270096">"Korean (EUC-KR)"</item>
+    <item>@string/pref_default_text_encoding_default_value</item>
   </string-array>
     <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Text encoding"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Accessibility"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index b7993d0..1c4a8d1 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -259,6 +259,7 @@
     <item msgid="5589150448475151241">"Japonés (SHIFT_JIS)"</item>
     <item msgid="7356792686950371843">"Japonés (EUC-JP)"</item>
     <item msgid="2193955365569270096">"Coreano (EUC-KR)"</item>
+    <item>@string/pref_default_text_encoding_default_value</item>
   </string-array>
     <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Codificación de texto"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Accesibilidad"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index a355b2b..ca1c5bc 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -274,6 +274,7 @@
     <item msgid="5589150448475151241">"Japonés (SHIFT_JIS)"</item>
     <item msgid="7356792686950371843">"Japonés (EUC-JP)"</item>
     <item msgid="2193955365569270096">"Coreano (EUC-KR)"</item>
+    <item>@string/pref_default_text_encoding_default_value</item>
   </string-array>
     <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Codificación de texto"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Accesibilidad"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 41aac23..51b5b00 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -259,6 +259,7 @@
     <item msgid="5589150448475151241">"Jaapani keel (Shift_JIS)"</item>
     <item msgid="7356792686950371843">"Jaapani keel (EUC-JP)"</item>
     <item msgid="2193955365569270096">"Korea keel (EUC-KR)"</item>
+    <item>@string/pref_default_text_encoding_default_value</item>
   </string-array>
     <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Teksti kodeerimine"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Juurdepääsetavus"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 586515e..f93a05c 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -259,6 +259,7 @@
     <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_dialogtitle" msgid="5508255018084978547">"رمزگذاری متن"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"قابلیت دسترسی"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 356e53e..526290d 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -259,6 +259,7 @@
     <item msgid="5589150448475151241">"japani (SHIFT_JIS)"</item>
     <item msgid="7356792686950371843">"japani (EUC-JP)"</item>
     <item msgid="2193955365569270096">"korea (EUC-KR)"</item>
+    <item>@string/pref_default_text_encoding_default_value</item>
   </string-array>
     <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Tekstin koodaus"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Esteettömyys"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index b9c327a..3fd5d40 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -259,6 +259,7 @@
     <item msgid="5589150448475151241">"Japonais (SHIFT_JIS)"</item>
     <item msgid="7356792686950371843">"Japonais (EUC-JP)"</item>
     <item msgid="2193955365569270096">"Coréen (EUC-KR)"</item>
+    <item>@string/pref_default_text_encoding_default_value</item>
   </string-array>
     <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Codage du texte"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Accessibilité"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index e90817d..a312f5e 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -273,6 +273,7 @@
     <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_dialogtitle" msgid="5508255018084978547">"पाठ एन्कोडिंग"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"पहुंच-योग्यता"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 15c3da9..48fd697 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -259,6 +259,7 @@
     <item msgid="5589150448475151241">"Japanski (SHIFT_JIS)"</item>
     <item msgid="7356792686950371843">"Japanski (EUC-JP)"</item>
     <item msgid="2193955365569270096">"korejski (EUC-KR)"</item>
+    <item>@string/pref_default_text_encoding_default_value</item>
   </string-array>
     <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Kodiranje teksta"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Dostupnost"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 2325f74..942a7ae 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -259,6 +259,7 @@
     <item msgid="5589150448475151241">"Japán (SHIFT_JIS)"</item>
     <item msgid="7356792686950371843">"Japán (EUC-JP)"</item>
     <item msgid="2193955365569270096">"Koreai (EUC-KR)"</item>
+    <item>@string/pref_default_text_encoding_default_value</item>
   </string-array>
     <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Szöveg kódolása"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Kisegítő lehetőségek"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 50a6064..a7650b4 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -259,6 +259,7 @@
     <item msgid="5589150448475151241">"Jepang (SHIFT_JIS)"</item>
     <item msgid="7356792686950371843">"Jepang (EUC-JP)"</item>
     <item msgid="2193955365569270096">"Korea (EUC-KR)"</item>
+    <item>@string/pref_default_text_encoding_default_value</item>
   </string-array>
     <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Penyandiaksaraan teks"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Aksesibilitas"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 1a9512f..d38af9d 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -259,6 +259,7 @@
     <item msgid="5589150448475151241">"Giapponese (SHIFT_JIS)"</item>
     <item msgid="7356792686950371843">"Giapponese (EUC-JP)"</item>
     <item msgid="2193955365569270096">"Coreano (EUC-KR)"</item>
+    <item>@string/pref_default_text_encoding_default_value</item>
   </string-array>
     <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Codifica testo"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Accessibilità"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 011c3f0..0a67a93 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -259,6 +259,7 @@
     <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_dialogtitle" msgid="5508255018084978547">"קידוד טקסט"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"נגישות"</string>
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>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 38731f3..a21efe6 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/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">windows-949</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>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 8057b86..d72f1b4 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -259,6 +259,7 @@
     <item msgid="5589150448475151241">"Japonų (SHIFT_JIS)"</item>
     <item msgid="7356792686950371843">"Japonų (EUC-JP)"</item>
     <item msgid="2193955365569270096">"Korėjiečių (EUC-KR)"</item>
+    <item>@string/pref_default_text_encoding_default_value</item>
   </string-array>
     <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Teksto koduotė"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Pasiekiamumas"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 23ca419..3ac534d 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -259,6 +259,7 @@
     <item msgid="5589150448475151241">"Japāņu (SHIFT_JIS)"</item>
     <item msgid="7356792686950371843">"Japāņu (EUC-JP)"</item>
     <item msgid="2193955365569270096">"Korejiešu (EUC-KR)"</item>
+    <item>@string/pref_default_text_encoding_default_value</item>
   </string-array>
     <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Teksta kodējums"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Pieejamība"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 39f7970..4ae138b 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -259,6 +259,7 @@
     <item msgid="5589150448475151241">"Jepun (Shift_JIS)"</item>
     <item msgid="7356792686950371843">"Jepun (EUC-JP)"</item>
     <item msgid="2193955365569270096">"Korea (EUC-KR)"</item>
+    <item>@string/pref_default_text_encoding_default_value</item>
   </string-array>
     <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Pengekodan teks"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Kebolehaksesan"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index b5f7adb..75155c6 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -259,6 +259,7 @@
     <item msgid="5589150448475151241">"Japansk (SHIFT_JIS)"</item>
     <item msgid="7356792686950371843">"Japansk (EUC-JP)"</item>
     <item msgid="2193955365569270096">"Koreansk (EUC-KR)"</item>
+    <item>@string/pref_default_text_encoding_default_value</item>
   </string-array>
     <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Tekstkoding"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Tilgjengelighet"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 0e29079..92692a1 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -259,6 +259,7 @@
     <item msgid="5589150448475151241">"Japans (SHIFT_JIS)"</item>
     <item msgid="7356792686950371843">"Japans (EUC-JP)"</item>
     <item msgid="2193955365569270096">"Koreaans (EUC-KR)"</item>
+    <item>@string/pref_default_text_encoding_default_value</item>
   </string-array>
     <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Tekstcodering"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Toegankelijkheid"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index c3a81f5..e886f49 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -259,6 +259,7 @@
     <item msgid="5589150448475151241">"japoński (SHIFT_JIS)"</item>
     <item msgid="7356792686950371843">"japoński (EUC-JP)"</item>
     <item msgid="2193955365569270096">"koreański (EUC-KR)"</item>
+    <item>@string/pref_default_text_encoding_default_value</item>
   </string-array>
     <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Kodowanie tekstu"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Ułatwienia dostępu"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 4652a37..99fe864 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -259,6 +259,7 @@
     <item msgid="5589150448475151241">"Japonês (SHIFT_JIS)"</item>
     <item msgid="7356792686950371843">"Japonês (EUC-JP)"</item>
     <item msgid="2193955365569270096">"Coreano (EUC-KR)"</item>
+    <item>@string/pref_default_text_encoding_default_value</item>
   </string-array>
     <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Codificação do texto"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Acessibilidade"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index e8d34bf..606cdae 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -259,6 +259,7 @@
     <item msgid="5589150448475151241">"Japonês (SHIFT_JIS)"</item>
     <item msgid="7356792686950371843">"Japonês (EUC-JP)"</item>
     <item msgid="2193955365569270096">"Coreano (EUC-KR)"</item>
+    <item>@string/pref_default_text_encoding_default_value</item>
   </string-array>
     <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Codificação de texto"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Acessibilidade"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 5b60a2e..e9d337f 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -367,6 +367,7 @@
     <item msgid="5589150448475151241">"Giapunais (SHIFT_JIS)"</item>
     <item msgid="7356792686950371843">"Giapunais (EUC-JP)"</item>
     <item msgid="2193955365569270096">"Corean (EUC-KR)"</item>
+    <item>@string/pref_default_text_encoding_default_value</item>
   </string-array>
     <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Codaziun dal text"</string>
     <!-- no translation found for pref_accessibility_title (5127836981587423215) -->
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 27ec866..2520ca9 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -259,6 +259,7 @@
     <item msgid="5589150448475151241">"Japoneză (SHIFT_JIS)"</item>
     <item msgid="7356792686950371843">"Japoneză (EUC-JP)"</item>
     <item msgid="2193955365569270096">"Coreeană (EUC-KR)"</item>
+    <item>@string/pref_default_text_encoding_default_value</item>
   </string-array>
     <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Codificare text"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Accesibilitate"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index faf0731..58de60f 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -273,6 +273,7 @@
     <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_dialogtitle" msgid="5508255018084978547">"Кодировка текста"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Специальные возможности"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index af3de35..ce09816 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -259,6 +259,7 @@
     <item msgid="5589150448475151241">"Japončina (SHIFT_JIS)"</item>
     <item msgid="7356792686950371843">"Japončina (EUC-JP)"</item>
     <item msgid="2193955365569270096">"Kórejčina (EUC–KR)"</item>
+    <item>@string/pref_default_text_encoding_default_value</item>
   </string-array>
     <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Kódovanie textu"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Zjednodušenie"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 45d4746..502f028 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -259,6 +259,7 @@
     <item msgid="5589150448475151241">"Japonščina (SHIFT_JIS)"</item>
     <item msgid="7356792686950371843">"Japonščina (EUC-JP)"</item>
     <item msgid="2193955365569270096">"Korejščina (EUC-KR)"</item>
+    <item>@string/pref_default_text_encoding_default_value</item>
   </string-array>
     <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Kodiranje besedila"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Nastavitve za osebe s posebnimi potrebami"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 507128b..1ae16e6 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -259,6 +259,7 @@
     <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_dialogtitle" msgid="5508255018084978547">"Кодирање текста"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Приступачност"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 4d72e15..1303c77 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -259,6 +259,7 @@
     <item msgid="5589150448475151241">"Japansk (SHIFT_JIS)"</item>
     <item msgid="7356792686950371843">"Japansk (EUC-JP)"</item>
     <item msgid="2193955365569270096">"koreanska (EUC-KR)"</item>
+    <item>@string/pref_default_text_encoding_default_value</item>
   </string-array>
     <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Textkodning"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Tillgänglighet"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 9db3dba..02ba0a2 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -259,6 +259,7 @@
     <item msgid="5589150448475151241">"Kijapani (SHIFT_JIS)"</item>
     <item msgid="7356792686950371843">"Kijapani (EUC-JP)"</item>
     <item msgid="2193955365569270096">"Kikorea (EUC-KR)"</item>
+    <item>@string/pref_default_text_encoding_default_value</item>
   </string-array>
     <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Usimbaji maandishi"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Ufikiaji"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 6f4b510..94c8ec2 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -273,6 +273,7 @@
     <item msgid="5589150448475151241">"Japanese (SHIFT_JIS)"</item>
     <item msgid="7356792686950371843">"Japanese (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_dialogtitle" msgid="5508255018084978547">"การเข้ารหัสข้อความ"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"การเข้าถึง"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index cc7b050..3ddd901 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -274,6 +274,7 @@
     <item msgid="5589150448475151241">"Japanese (SHIFT_JIS)"</item>
     <item msgid="7356792686950371843">"Japanese (EUC-JP)"</item>
     <item msgid="2193955365569270096">"Korean (EUC-KR)"</item>
+    <item>@string/pref_default_text_encoding_default_value</item>
   </string-array>
     <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Pag-encode ng teksto"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Pagiging Naa-access"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 96c1906..52e64fa 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -273,6 +273,7 @@
     <item msgid="5589150448475151241">"Japonca (SHIFT_JIS)"</item>
     <item msgid="7356792686950371843">"Japonca (EUC-JP)"</item>
     <item msgid="2193955365569270096">"Korece (EUC-KR)"</item>
+    <item>@string/pref_default_text_encoding_default_value</item>
   </string-array>
     <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Metin kodlama"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Erişilebilirlik"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 73fdd3d..245c248 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -259,6 +259,7 @@
     <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_dialogtitle" msgid="5508255018084978547">"Кодування тексту"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Доступність"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index c3b3b08..5df5269 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -273,6 +273,7 @@
     <item msgid="5589150448475151241">"Tiếng Nhật (SHIFT_JIS)"</item>
     <item msgid="7356792686950371843">"Tiếng Nhật (EUC-JP)"</item>
     <item msgid="2193955365569270096">"Tiếng Hàn (EUC-KR)"</item>
+    <item>@string/pref_default_text_encoding_default_value</item>
   </string-array>
     <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Mã hóa văn bản"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Hỗ trợ truy cập"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index ef53343..1cb4191 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -280,7 +280,9 @@
     <item msgid="5589150448475151241">"日语 (SHIFT_JIS)"</item>
     <item msgid="7356792686950371843">"日语 (EUC-JP)"</item>
     <item msgid="2193955365569270096">"韩语 (EUC-KR)"</item>
+    <item>"自动识别"</item>
   </string-array>
+    <string name="pref_default_text_encoding_default">GBK</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>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index e57d78c..ebbd5af 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -276,7 +276,9 @@
     <item msgid="5589150448475151241">"日文 (SHIFT_JIS)"</item>
     <item msgid="7356792686950371843">"日文 (EUC-JP)"</item>
     <item msgid="2193955365569270096">"韓文 (EUC-KR)"</item>
+    <item>"自動識別"</item>
   </string-array>
+    <string name="pref_default_text_encoding_default">Big5</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>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 1762a96..f77a80d 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -264,7 +264,9 @@
     <item msgid="5589150448475151241">"日文 (SHIFT_JIS)"</item>
     <item msgid="7356792686950371843">"日文 (EUC-JP)"</item>
     <item msgid="2193955365569270096">"韓文 (EUC-KR)"</item>
+    <item>"自動識別"</item>
   </string-array>
+    <string name="pref_default_text_encoding_default">Big5</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>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 87620e1..0b52bfd 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -259,6 +259,7 @@
     <item msgid="5589150448475151241">"isi-Japanese (SHIFT_JIS)"</item>
     <item msgid="7356792686950371843">"isi-Japanese (EUC-JP)"</item>
     <item msgid="2193955365569270096">"isi-Korean (EUC-KR)"</item>
+    <item>@string/pref_default_text_encoding_default_value</item>
   </string-array>
     <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Umbhalo wekhodi wokubhaliwe"</string>
     <string name="pref_accessibility_title" msgid="5127836981587423215">"Ukufinyeleleka"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0a4814e..89df52d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -602,6 +602,8 @@
     <string name="pref_development_reset_prelogin" translatable="false">Reset prelogin</string>
     <!-- Settings screen, setting option name -->
     <string name="pref_default_text_encoding">Text encoding</string>
+    <!--SWE TODO: localize this for all languages -->
+    <string name="pref_default_text_encoding_default_value" translatable="false">Auto detect</string>
     <!-- Options in the Default encoding dialog box -->
     <string-array name="pref_default_text_encoding_choices">
         <item>Latin-1 (ISO-8859-1)</item>
@@ -613,6 +615,7 @@
         <item>Japanese (EUC-JP)</item>
         <!-- No need to translate a EUC-KR part, and there is no string length limits. -->
         <item>Korean (EUC-KR)</item>
+        <item>@string/pref_default_text_encoding_default_value</item>
         <!-- TODO: We should add a lot more encodings.  -->
     </string-array>
     <!-- Dialog box title -->
@@ -627,8 +630,9 @@
         <item>SHIFT_JIS</item>
         <item>EUC-JP</item>
         <item>EUC-KR</item>
+        <item>auto</item>
     </string-array>
-    <string name="pref_default_text_encoding_default" translatable="false">UTF-8</string>
+    <string name="pref_default_text_encoding_default">UTF-8</string>
     <!-- Title for accessibility settings [CHAR LIMIT=25] -->
     <string name="pref_accessibility_title">Accessibility</string>
     <!-- Font size settings category under accessibility settings [CHAR LIMIT=50] -->
diff --git a/res/xml/general_preferences.xml b/res/xml/general_preferences.xml
index 361afde..f229197 100644
--- a/res/xml/general_preferences.xml
+++ b/res/xml/general_preferences.xml
@@ -167,6 +167,15 @@
             <PreferenceScreen
                 android:key="download_path_setting_screen"
                 android:title="@string/pref_download_path_setting_screen_title"/>
+
+            <ListPreference
+                android:defaultValue="@string/pref_default_text_encoding_default"
+                android:dialogTitle="@string/pref_default_text_encoding_dialogtitle"
+                android:entries="@array/pref_default_text_encoding_choices"
+                android:entryValues="@array/pref_default_text_encoding_values"
+                android:key="default_text_encoding"
+                android:title="@string/pref_default_text_encoding" />
+
         </PreferenceScreen>
 
 
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 4d7bc55..975ae89 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -211,7 +211,7 @@
             sFactoryResetUrl = mContext.getResources().getString(R.string.homepage_base);
 
             if (!mPrefs.contains(PREF_DEFAULT_TEXT_ENCODING)) {
-                mPrefs.edit().putString(PREF_DEFAULT_TEXT_ENCODING, "UTF-8").apply();
+                mPrefs.edit().putString(PREF_DEFAULT_TEXT_ENCODING, "auto").apply();
             }
 
             if (sFactoryResetUrl.indexOf("{CID}") != -1) {
@@ -776,7 +776,11 @@
     }
 
     public String getDefaultTextEncoding() {
-        return mPrefs.getString(PREF_DEFAULT_TEXT_ENCODING, null);
+        String autoDetect = mPrefs.getString(PREF_DEFAULT_TEXT_ENCODING, "auto");
+        if(autoDetect.equalsIgnoreCase("auto")) {
+            return mContext.getResources().getString(R.string.pref_default_text_encoding_default);
+        }
+        return autoDetect;
     }
 
     // -----------------------------