diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 6587df4..a904978 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -20,7 +20,7 @@
     <string name="choose_upload" msgid="3649366287575002063">"Choisir le fichier à importer"</string>
     <string name="uploads_disabled" msgid="463761197575372994">"Les transferts de fichiers sont désactivés."</string>
     <string name="new_tab" msgid="7971857320679510529">"Nouvel onglet"</string>
-    <string name="new_incognito_tab" msgid="3606197964239039478">"Nouv. onglet navigation privée"</string>
+    <string name="new_incognito_tab" msgid="3606197964239039478">"Nouvel onglet navig. privée"</string>
     <string name="tab_bookmarks" msgid="2305793036003473653">"Favoris"</string>
     <string name="tab_most_visited" msgid="1077402532455000703">"Les + visités"</string>
     <string name="tab_history" msgid="1979267558744613746">"Historique"</string>
@@ -101,7 +101,7 @@
     <string name="menu_view_download" msgid="2124570321712995120">"Téléchargements"</string>
     <string name="copy_page_url" msgid="1188679152608889555">"Copier l\'URL de la page"</string>
     <string name="share_page" msgid="593756995297268343">"Partager la page"</string>
-    <string name="menu_save_snapshot" msgid="6935080344031126139">"Enregistrer pour lire hors connexion"</string>
+    <string name="menu_save_snapshot" msgid="6935080344031126139">"Enreg. pour lire hors connex."</string>
     <string name="snapshot_failed" msgid="4584580873565876033">"Échec enregistrement pour lecture hors connexion."</string>
     <string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"<xliff:g id="BOOKMARK_COUNT">%d</xliff:g> favori(s)"</string>
     <string name="contextheader_folder_empty" msgid="974171637803391651">"Dossier vide"</string>
@@ -228,9 +228,9 @@
     <string name="pref_min_font_size_value" msgid="2924708480509060209">"<xliff:g id="FONT_SIZE">%d</xliff:g> pt"</string>
     <string name="pref_text_zoom" msgid="5171056101805125497">"Mise à l\'échelle du texte"</string>
     <string name="pref_zoom_on_double_tap" msgid="902786475250741795">"Appuyer deux fois pour zoomer"</string>
-    <string name="pref_force_userscalable" msgid="5641500562399892621">"Forcer l\'activation du zoom"</string>
+    <string name="pref_force_userscalable" msgid="5641500562399892621">"Forcer activation du zoom"</string>
     <string name="pref_force_userscalable_summary" msgid="3613242300617172230">"Ignorer la demande du site Web de contrôler le zoom"</string>
-    <string name="pref_inverted_category" msgid="1280639705117152207">"Rendu de l\'écran inversé"</string>
+    <string name="pref_inverted_category" msgid="1280639705117152207">"Rendu inversé de l\'écran"</string>
     <string name="pref_inverted" msgid="7613556986776824112">"Rendu inversé"</string>
     <string name="pref_inverted_summary" msgid="7357225897413923085">"Le noir devient blanc, et inversement."</string>
     <string name="pref_inverted_contrast" msgid="8527441236225288169">"Contraste"</string>
@@ -293,7 +293,7 @@
     <string name="go_home" msgid="109129207276086793">"Page d\'accueil"</string>
     <string name="add_new_bookmark" msgid="3158497555612337238">"Ajouter un favori"</string>
     <string name="add_bookmark_short" msgid="3783984330998103735">"Ajouter"</string>
-    <string name="search_hint" msgid="4647356319916631820">"Rech. ou entrer l\'URL"</string>
+    <string name="search_hint" msgid="4647356319916631820">"Rech. ou saisir l\'URL"</string>
     <string name="search_button_text" msgid="5235226933877634410">"OK"</string>
     <string name="search_settings_description" msgid="1422401062529014107">"Favoris et historique Web"</string>
     <string name="popup_window_attempt" msgid="31565781154067629">"Autoriser ce site à ouvrir une fenêtre pop-up ?"</string>
@@ -361,7 +361,7 @@
     <string name="instant_search_label" msgid="8769284297650716935">"Google avec Recherche instantanée (Google Labs)"</string>
     <string name="preview" msgid="6450823514561689038">"Aperçu"</string>
     <string name="local_bookmarks" msgid="533816851415228520">"Favoris locaux"</string>
-    <string name="ua_switcher_desktop" msgid="220097077327558435">"Demander la version pour ordinateur du site"</string>
+    <string name="ua_switcher_desktop" msgid="220097077327558435">"Voir version ordinateur"</string>
     <string name="permission_preload_label" msgid="4856971662337877316">"Précharger les résultats"</string>
     <string name="empty_snapshots_folder" msgid="7675378008107026013">"Aucune page enregistrée"</string>
     <string name="remove_snapshot" msgid="1624447424544976849">"Supprimer la page enregistrée"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index f563efc..da23ac4 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -77,7 +77,7 @@
     <string name="open_bookmark" msgid="8473581305759935790">"열기"</string>
     <string name="remove_bookmark" msgid="8407495852801410891">"북마크 삭제"</string>
     <string name="remove_from_bookmarks" msgid="4374080666576982775">"북마크에서 삭제"</string>
-    <string name="remove_history_item" msgid="5021424935726728618">"기록에서 삭제"</string>
+    <string name="remove_history_item" msgid="5021424935726728618">"방문기록에서 삭제"</string>
     <string name="set_as_homepage" msgid="4752937379414905560">"홈페이지로 설정"</string>
     <string name="bookmark_saved" msgid="2766434679871317557">"북마크에 저장되었습니다."</string>
     <string name="bookmark_not_saved" msgid="1077732557310662080">"북마크를 저장하지 못했습니다."</string>
@@ -97,11 +97,11 @@
     <string name="bookmarks" msgid="1961279134885867815">"북마크"</string>
     <string name="shortcut_bookmark" msgid="3974876480401135895">"북마크"</string>
     <string name="shortcut_bookmark_title" msgid="7570786275916681296">"북마크 선택"</string>
-    <string name="history" msgid="2451240511251410032">"기록"</string>
+    <string name="history" msgid="2451240511251410032">"방문 기록"</string>
     <string name="menu_view_download" msgid="2124570321712995120">"다운로드"</string>
     <string name="copy_page_url" msgid="1188679152608889555">"페이지 URL 복사"</string>
     <string name="share_page" msgid="593756995297268343">"페이지 공유"</string>
-    <string name="menu_save_snapshot" msgid="6935080344031126139">"오프라인 읽기용으로 저장"</string>
+    <string name="menu_save_snapshot" msgid="6935080344031126139">"오프라인 보기로 저장"</string>
     <string name="snapshot_failed" msgid="4584580873565876033">"오프라인 읽기용으로 저장하지 못했습니다."</string>
     <string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"북마크 <xliff:g id="BOOKMARK_COUNT">%d</xliff:g>개"</string>
     <string name="contextheader_folder_empty" msgid="974171637803391651">"빈 폴더"</string>
@@ -145,7 +145,7 @@
     <item msgid="844041670142910837">"현재 페이지"</item>
     <item msgid="4430498748295169195">"빈 페이지"</item>
     <item msgid="5747608191946904074">"기본 페이지"</item>
-    <item msgid="6092441301001006473">"자주 방문한 사이트"</item>
+    <item msgid="6092441301001006473">"자주 방문한 페이지"</item>
     <item msgid="6569304572171444894">"기타"</item>
   </string-array>
     <string name="pref_content_autofit" msgid="8260474534053660809">"페이지 자동 맞춤"</string>
@@ -168,7 +168,7 @@
     <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"이메일:"</string>
     <string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"회사 이름:"</string>
     <string name="autofill_profile_editor_address_line_1" msgid="836433242509243081">"주소 입력란 1:"</string>
-    <string name="autofill_profile_editor_address_line_1_hint" msgid="5965659598509327172">"번지, 사서함, c/o"</string>
+    <string name="autofill_profile_editor_address_line_1_hint" msgid="5965659598509327172">"번지, 사서함"</string>
     <string name="autofill_profile_editor_address_line_2" msgid="8194745202893822479">"주소 입력란 2:"</string>
     <string name="autofill_profile_editor_address_line_2_hint" msgid="8529642768127569254">"아파트, 동, 호수, 층 등"</string>
     <string name="autofill_profile_editor_city" msgid="7306716145784997135">"구/군/시:"</string>
@@ -206,7 +206,7 @@
     <string name="pref_privacy_enable_geolocation" msgid="1395040170290765686">"위치 정보 사용"</string>
     <string name="pref_privacy_enable_geolocation_summary" msgid="8437020934664306205">"사이트의 위치 정보 액세스 요청 허용"</string>
     <string name="pref_privacy_clear_geolocation_access" msgid="6649680770030042980">"위치 정보 액세스 삭제"</string>
-    <string name="pref_privacy_clear_geolocation_access_summary" msgid="7750143359497314679">"모든 웹사이트의 위치 정보 액세스 삭제"</string>
+    <string name="pref_privacy_clear_geolocation_access_summary" msgid="7750143359497314679">"모든 웹사이트에서 위치 정보 액세스가 삭제됩니다."</string>
     <string name="pref_privacy_clear_geolocation_access_dlg" msgid="3190928760598034346">"웹사이트의 위치 정보 액세스를 삭제하시겠습니까?"</string>
     <string name="pref_security_passwords_title" msgid="5734190542383756711">"비밀번호"</string>
     <string name="pref_security_remember_passwords" msgid="6492957683454529549">"비밀번호 저장"</string>
@@ -271,7 +271,7 @@
     <string name="pref_use_instant_search" msgid="1119176077760723740">"Google 순간 검색"</string>
     <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Google 검색을 사용할 때 Google 순간 검색을 사용하면 입력하는 동안 결과가 표시됩니다(데이터 사용이 증가될 수 있음)."</string>
     <string name="pref_lab_fullscreen" msgid="8173609016657987973">"전체화면"</string>
-    <string name="pref_lab_fullscreen_summary" msgid="7694738112219376740">"전체화면 모드를 사용하여 상태 표시줄을 숨깁니다."</string>
+    <string name="pref_lab_fullscreen_summary" msgid="7694738112219376740">"전체화면 모드를 사용하여 상태 표시줄 숨김"</string>
     <string name="pref_data_title" msgid="7255058703417796578">"대역폭 관리"</string>
     <string name="pref_data_preload_title" msgid="4479320472980292873">"검색결과 미리 로드"</string>
   <string-array name="pref_data_preload_choices">
@@ -320,7 +320,7 @@
     <string name="webstorage_clear_data_dialog_message" msgid="6200681632891775881">"웹사이트에 저장된 모든 데이터를 삭제하시겠습니까?"</string>
     <string name="webstorage_clear_data_dialog_ok_button" msgid="6682570951259237542">"확인"</string>
     <string name="webstorage_clear_data_dialog_cancel_button" msgid="2028867751958942762">"취소"</string>
-    <string name="webstorage_origin_summary_mb_stored" msgid="1985885826292236210">"휴대전화에 저장된 용량(MB)"</string>
+    <string name="webstorage_origin_summary_mb_stored" msgid="1985885826292236210">"MB 저장됨"</string>
     <string name="loading_video" msgid="7886324933131962321">"동영상 로드 중…"</string>
     <string name="geolocation_permissions_prompt_message" msgid="356796102004052471">"<xliff:g id="WEBSITE_ORIGIN">%s</xliff:g>에서 사용자의 위치를 확인하려고 합니다."</string>
     <string name="geolocation_permissions_prompt_share" msgid="9084486342048347976">"위치 공유"</string>
@@ -360,8 +360,8 @@
     <string name="max_tabs_warning" msgid="4122034303809457570">"탭이 더 이상 없습니다."</string>
     <string name="instant_search_label" msgid="8769284297650716935">"Google 순간 검색(실험실)"</string>
     <string name="preview" msgid="6450823514561689038">"미리보기"</string>
-    <string name="local_bookmarks" msgid="533816851415228520">"로컬"</string>
-    <string name="ua_switcher_desktop" msgid="220097077327558435">"데스크톱 사이트 요청"</string>
+    <string name="local_bookmarks" msgid="533816851415228520">"로컬 기기"</string>
+    <string name="ua_switcher_desktop" msgid="220097077327558435">"데스크톱 버전으로 보기"</string>
     <string name="permission_preload_label" msgid="4856971662337877316">"결과 미리 로드"</string>
     <string name="empty_snapshots_folder" msgid="7675378008107026013">"저장된 페이지가 없습니다."</string>
     <string name="remove_snapshot" msgid="1624447424544976849">"저장된 페이지 삭제"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 4288452..a013500 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -114,7 +114,7 @@
     <string name="contextmenu_copylink" msgid="5153657160294534270">"复制链接网址"</string>
     <string name="contextmenu_download_image" msgid="4243829645180686912">"保存图片"</string>
     <string name="contextmenu_view_image" msgid="3870625602053600905">"查看图片"</string>
-    <string name="contextmenu_set_wallpaper" msgid="3691902960115350686">"设置为壁纸"</string>
+    <string name="contextmenu_set_wallpaper" msgid="3691902960115350686">"设为壁纸"</string>
     <string name="contextmenu_dial_dot" msgid="5856550683415933806">"拨打…"</string>
     <string name="contextmenu_add_contact" msgid="3183511922223645716">"添加联系人"</string>
     <string name="contextmenu_send_mail" msgid="1014513374828775660">"发送电子邮件"</string>
diff --git a/src/com/android/browser/preferences/AccessibilityPreferencesFragment.java b/src/com/android/browser/preferences/AccessibilityPreferencesFragment.java
index c07c184..364d337 100644
--- a/src/com/android/browser/preferences/AccessibilityPreferencesFragment.java
+++ b/src/com/android/browser/preferences/AccessibilityPreferencesFragment.java
@@ -20,6 +20,7 @@
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.PreferenceFragment;
+import android.webkit.WebView;
 
 import com.android.browser.BrowserSettings;
 import com.android.browser.PreferenceKeys;
@@ -31,10 +32,13 @@
         implements Preference.OnPreferenceChangeListener {
 
     NumberFormat mFormat;
+    // Used to pause/resume timers, which are required for WebViewPreview
+    WebView mControlWebView;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        mControlWebView = new WebView(getActivity());
         addPreferencesFromResource(R.xml.accessibility_preferences);
         BrowserSettings settings = BrowserSettings.getInstance();
         mFormat = NumberFormat.getPercentInstance();
@@ -53,6 +57,25 @@
         updateInvertedContrastSummary(e, (int) (settings.getInvertedContrast() * 100));
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        mControlWebView.resumeTimers();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mControlWebView.pauseTimers();
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        mControlWebView.destroy();
+        mControlWebView = null;
+    }
+
     void updateMinFontSummary(Preference pref, int minFontSize) {
         Context c = getActivity();
         pref.setSummary(c.getString(R.string.pref_min_font_size_value, minFontSize));
diff --git a/src/com/android/browser/preferences/FontSizePreview.java b/src/com/android/browser/preferences/FontSizePreview.java
index 9a0c3d7..91ecb00 100644
--- a/src/com/android/browser/preferences/FontSizePreview.java
+++ b/src/com/android/browser/preferences/FontSizePreview.java
@@ -25,11 +25,10 @@
 
 import com.android.browser.BrowserSettings;
 import com.android.browser.R;
-import com.android.browser.WebViewProperties;
 
 public class FontSizePreview extends WebViewPreview {
 
-    static final String HTML_FORMAT = "<html><head><style type=\"text/css\">p { margin: 2px auto;}</style><body><p style=\"font-size: 4pt\">%s</p><p style=\"font-size: 8pt\">%s</p><p style=\"font-size: 10pt\">%s</p><p style=\"font-size: 14pt\">%s</p><p style=\"font-size: 18pt\">%s</p></body></html>";
+    static final String HTML_FORMAT = "<!DOCTYPE html><html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"><style type=\"text/css\">p { margin: 2px auto;}</style><body><p style=\"font-size: 4pt\">%s</p><p style=\"font-size: 8pt\">%s</p><p style=\"font-size: 10pt\">%s</p><p style=\"font-size: 14pt\">%s</p><p style=\"font-size: 18pt\">%s</p></body></html>";
 
     String mHtml;
 
@@ -62,7 +61,7 @@
         BrowserSettings bs = BrowserSettings.getInstance();
         ws.setMinimumFontSize(bs.getMinimumFontSize());
         ws.setTextZoom(bs.getTextZoom());
-        mWebView.loadData(mHtml, "text/html", null);
+        mWebView.loadDataWithBaseURL(null, mHtml, "text/html", "utf-8", null);
     }
 
     @Override