am 6f304cae: am 23ed73fd: am dd873d25: am b3a20816: am 5f86f1d1: am e5188530: am 9f99f739: am d2391b49: Further tighten the files that the browser can show
* commit '6f304cae570865efa4b3f1d7f6664424a603f4c7':
Further tighten the files that the browser can show
diff --git a/res/menu/browser.xml b/res/menu/browser.xml
index 9d95e88..27c0c81 100644
--- a/res/menu/browser.xml
+++ b/res/menu/browser.xml
@@ -63,9 +63,6 @@
android:id="@+id/ua_desktop_menu_id"
android:checkable="true"
android:title="@string/ua_switcher_desktop" />
- <item
- android:id="@+id/save_snapshot_menu_id"
- android:title="@string/menu_save_snapshot" />
</group>
<group
android:id="@+id/SNAPSHOT_MENU">
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 010b581..4aacf89 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -42,7 +42,7 @@
<string name="ssl_warnings_header" msgid="79744901983636370">"ለእዚህ ድረ ገፅ የደህንነት ምስክሩ ላይ ችግሮች አሉ።"</string>
<string name="ssl_continue" msgid="8031515015829358457">"ቀጥል"</string>
<string name="security_warning" msgid="6607795404322797541">"የደህንነት ቅንብሮች"</string>
- <string name="view_certificate" msgid="1472768887529093862">"ምስክሮች ዕይ"</string>
+ <string name="view_certificate" msgid="1472768887529093862">"ምስክሮች ይመልከቱ"</string>
<string name="ssl_go_back" msgid="4598951822061593819">"ወደ ኋላተመለስ"</string>
<string name="ssl_untrusted" msgid="7754507359360636447">"ይህ ምስክር ከታማኝ ቦታ አይደለም።"</string>
<string name="ssl_mismatch" msgid="3809794439740523641">"የጣቢያው ስም ከምስክር ወረቀቱ ስም ጋር አይዛመድም።"</string>
@@ -253,7 +253,7 @@
<string name="pref_extras_reset_default_title" msgid="3579760449455761762">"ነባሪዎችን ዳግም አስጀምር"</string>
<string name="pref_extras_reset_default" msgid="8904000515846202110">"ወደ ነባሪ ዳግም አስጀምር"</string>
<string name="pref_extras_reset_default_summary" msgid="4247870778270414501">"ነባሪ ቅንብሮችን እነበረበት መልስ"</string>
- <string name="pref_extras_reset_default_dlg" msgid="7922814420184322450">"ቅንጅቶችን ወደ ነባሪ ዋጋዎች ይገልበጥ?"</string>
+ <string name="pref_extras_reset_default_dlg" msgid="7922814420184322450">"ቅንብሮችን ወደ ነባሪ ዋጋዎች ይገልበጥ?"</string>
<string name="pref_development_title" msgid="3263854204533056480">"አርም"</string>
<string name="pref_default_text_encoding" msgid="5742965543955558478">"ፅሁፍ በኮድ መክተት"</string>
<string-array name="pref_default_text_encoding_choices">
@@ -280,7 +280,7 @@
<string name="pref_data_preload_title" msgid="4479320472980292873">"የቀድሞ ስቀል ውጤት ይፈልጉ"</string>
<string-array name="pref_data_preload_choices">
<item msgid="5180466923190095508">"ፈፅሞ"</item>
- <item msgid="1791664748778640002">"በWi-ፍ ላይ ብቻ"</item>
+ <item msgid="1791664748778640002">"በWi-Fi ላይ ብቻ"</item>
<item msgid="3944061253437827617">"ሁልጊዜ"</item>
</string-array>
<string name="pref_data_preload_summary" msgid="3809168910751382727">"አሳሹ አስተማማኝ የፍለጋ ውጤቶችን በዳራ ውስጥ ቀድሞ እንዲሰቅል ይፈቅዳል።"</string>
@@ -288,7 +288,7 @@
<string name="pref_link_prefetch_title" msgid="4123685219009241072">"የድረ-ገጽ ቅድመ-መጫን"</string>
<string-array name="pref_link_prefetch_choices">
<item msgid="4889781230398008031">"በፍጹም"</item>
- <item msgid="1908465963242077428">"በገመድ አልባ ላይ ብቻ"</item>
+ <item msgid="1908465963242077428">"በWi-Fi ላይ ብቻ"</item>
<item msgid="7647277566998527142">"ዘወትር"</item>
</string-array>
<string name="pref_link_prefetch_summary" msgid="6558181497993206817">"አሳሽ የተገናኙ ድረ-ገጾች በጀርባ ውስጥ ቅድሚያ እንዲጭን ይፍቀዱለት"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index ab243ed..67e0761 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -374,7 +374,7 @@
<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="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-ca/strings.xml b/res/values-ca/strings.xml
index afa967f..2622553 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -355,7 +355,7 @@
<string name="empty_bookmarks_folder" msgid="6239830231917618556">"No hi ha cap adreça d\'interès."</string>
<string name="other_bookmarks" msgid="8021889794475657319">"Altres marcadors"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
- <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Tria d\'un compte"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Selecciona un compte"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Sincronitza amb el Compte de Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2362897194870789609">"Els marcadors d\'aquest dispositiu encara no estan associats a cap Compte de Google. Afegeix aquests marcadors a un compte per desar-los. Suprimeix-los si no vols sincronitzar-los."</string>
<string name="import_bookmarks_dialog_select_add_account" msgid="7643058662272484895">"Afegeix els marcadors que hi ha actualment en aquest dispositiu i comença a sincronitzar amb un Compte de Google"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..3cd8700
--- /dev/null
+++ b/res/values-en-rIN/strings.xml
@@ -0,0 +1,402 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2007 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="application_name" msgid="1935869255545976415">"Browser"</string>
+ <string name="choose_upload" msgid="3649366287575002063">"Choose file for upload"</string>
+ <string name="uploads_disabled" msgid="463761197575372994">"File uploads are disabled."</string>
+ <string name="new_tab" msgid="7971857320679510529">"New tab"</string>
+ <string name="new_incognito_tab" msgid="3606197964239039478">"New incognito tab"</string>
+ <string name="tab_bookmarks" msgid="2305793036003473653">"Bookmarks"</string>
+ <string name="tab_most_visited" msgid="1077402532455000703">"Most visited"</string>
+ <string name="tab_history" msgid="1979267558744613746">"History"</string>
+ <string name="tab_snapshots" msgid="1449241204980265186">"Saved pages"</string>
+ <string name="added_to_bookmarks" msgid="4028710765672851635">"Added to bookmarks."</string>
+ <string name="removed_from_bookmarks" msgid="546648923924996722">"Removed from bookmarks."</string>
+ <string name="sign_in_to" msgid="5939425800148759165">"Sign in to <xliff:g id="HOSTNAME">%s1</xliff:g> \"<xliff:g id="REALM">%s2</xliff:g>\""</string>
+ <string name="username" msgid="5057566336518215922">"Name"</string>
+ <string name="password" msgid="1177138552305184404">"Password"</string>
+ <string name="action" msgid="183105774472071343">"Sign in"</string>
+ <string name="bookmarks_add_page" msgid="3093456701072617702">"Save bookmark"</string>
+ <string name="bookmarks_search" msgid="5229596268214362873">"Browser"</string>
+ <string name="cancel" msgid="3017274947407233702">"Cancel"</string>
+ <string name="ok" msgid="1509280796718850364">"OK"</string>
+ <string name="title_bar_loading" msgid="7438217780834640678">"Loading…"</string>
+ <string name="page_info" msgid="4048529256302257195">"Page info"</string>
+ <string name="page_info_view" msgid="5303490449842635158">"View page info"</string>
+ <string name="page_info_address" msgid="2222306609532903254">"Address:"</string>
+ <string name="ssl_warnings_header" msgid="79744901983636370">"There are problems with the security certificate for this site."</string>
+ <string name="ssl_continue" msgid="8031515015829358457">"Continue"</string>
+ <string name="security_warning" msgid="6607795404322797541">"Security warning"</string>
+ <string name="view_certificate" msgid="1472768887529093862">"View certificate"</string>
+ <string name="ssl_go_back" msgid="4598951822061593819">"Go back"</string>
+ <string name="ssl_untrusted" msgid="7754507359360636447">"This certificate isn\'t from a trusted authority."</string>
+ <string name="ssl_mismatch" msgid="3809794439740523641">"The name of the site doesn\'t match the name on the certificate."</string>
+ <string name="ssl_expired" msgid="5739349389499575559">"This certificate has expired."</string>
+ <string name="ssl_not_yet_valid" msgid="8193083327719048247">"This certificate isn\'t valid yet."</string>
+ <string name="ssl_date_invalid" msgid="3705563379257285534">"This certificate has an invalid date."</string>
+ <string name="ssl_invalid" msgid="9041704741505449967">"This certificate is invalid."</string>
+ <string name="ssl_unknown" msgid="5679243486524754571">"Unknown certificate error."</string>
+ <string name="stopping" msgid="4839698519340302982">"Stopping…"</string>
+ <string name="stop" msgid="5687251076030630074">"Stop"</string>
+ <string name="reload" msgid="8585220783228408062">"Refresh"</string>
+ <string name="back" msgid="8414603107175713668">"Back"</string>
+ <string name="forward" msgid="4288210890526641577">"Forward"</string>
+ <string name="save" msgid="5922311934992468496">"OK"</string>
+ <string name="do_not_save" msgid="6777633870113477714">"Cancel"</string>
+ <string name="location" msgid="3411848697912600125">"Address"</string>
+ <string name="account" msgid="5179824606448077042">"Account"</string>
+ <string name="containing_folder" msgid="6771180232953030479">"Add to"</string>
+ <string name="new_folder" msgid="7743540149088867917">"New folder"</string>
+ <string name="edit_folder" msgid="621817453133656156">"Edit folder"</string>
+ <string name="delete_folder" msgid="2046483129024501116">"Delete folder"</string>
+ <string name="no_subfolders" msgid="3303645239686962674">"No sub-folders."</string>
+ <string name="add_to_bookmarks_menu_option" msgid="4449323955122214389">"Bookmarks"</string>
+ <string name="add_to_homescreen_menu_option" msgid="1461447829242963790">"Home screen"</string>
+ <string name="add_to_other_folder_menu_option" msgid="5947586525822134105">"Other folder"</string>
+ <string name="name" msgid="5462672162695365387">"Label"</string>
+ <string name="http" msgid="2163722670597250102">"http://"</string>
+ <string name="save_to_bookmarks" msgid="1679286010089780932">"Save to bookmarks"</string>
+ <string name="bookmark_this_page" msgid="7530739804320811054">"Bookmark this page"</string>
+ <string name="remove" msgid="7820112494467011374">"Remove"</string>
+ <string name="edit_bookmark" msgid="5024089053490231905">"Edit bookmark"</string>
+ <string name="create_shortcut_bookmark" msgid="1995095662095484289">"Add shortcut to home"</string>
+ <string name="open_bookmark" msgid="8473581305759935790">"Open"</string>
+ <string name="remove_bookmark" msgid="8407495852801410891">"Delete bookmark"</string>
+ <string name="remove_from_bookmarks" msgid="4374080666576982775">"Remove from bookmarks"</string>
+ <string name="remove_history_item" msgid="5021424935726728618">"Remove from history"</string>
+ <string name="set_as_homepage" msgid="4752937379414905560">"Set as homepage"</string>
+ <string name="bookmark_saved" msgid="2766434679871317557">"Saved to bookmarks."</string>
+ <string name="bookmark_not_saved" msgid="1077732557310662080">"Couldn\'t save bookmark."</string>
+ <string name="homepage_set" msgid="8768087280310966395">"Homepage set."</string>
+ <string name="bookmark_needs_title" msgid="6245900436119218187">"Bookmark must have a name."</string>
+ <string name="bookmark_needs_url" msgid="7809876865972755158">"Bookmark must have a location."</string>
+ <string name="bookmark_url_not_valid" msgid="4917440933384496211">"This URL isn\'t valid."</string>
+ <string name="bookmark_cannot_save_url" msgid="7836064647943671126">"This URL can\'t be bookmarked."</string>
+ <string name="bookmark_page" msgid="6845189305130307274">"Bookmark last viewed page"</string>
+ <string name="bookmark_thumbnail_view" msgid="3164068314718522138">"Thumbnails"</string>
+ <string name="bookmark_list_view" msgid="7848510619500937839">"List"</string>
+ <string name="current_page" msgid="7510129573681663135">"from "</string>
+ <string name="delete_bookmark_warning" msgid="7825328496411904321">"Delete bookmark \"<xliff:g id="BOOKMARK">%s</xliff:g>\"?"</string>
+ <string name="open_all_in_new_window" msgid="455786763426575293">"Open all in new tabs"</string>
+ <string name="goto_dot" msgid="3895839050522602723">"Go"</string>
+ <string name="select_dot" msgid="6299170761900561967">"Select text"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Close other tabs"</string>
+ <string name="bookmarks" msgid="1961279134885867815">"Bookmarks"</string>
+ <string name="shortcut_bookmark" msgid="3974876480401135895">"Bookmark"</string>
+ <string name="shortcut_bookmark_title" msgid="7570786275916681296">"Choose a bookmark"</string>
+ <string name="history" msgid="2451240511251410032">"History"</string>
+ <string name="menu_view_download" msgid="2124570321712995120">"Downloads"</string>
+ <string name="copy_page_url" msgid="1188679152608889555">"Copy page URL"</string>
+ <string name="share_page" msgid="593756995297268343">"Share page"</string>
+ <string name="menu_save_snapshot" msgid="6935080344031126139">"Save for offline reading"</string>
+ <string name="saving_snapshot" msgid="1693789062351182809">"Saving…"</string>
+ <string name="snapshot_failed" msgid="4584580873565876033">"Couldn\'t save for offline reading."</string>
+ <string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"<xliff:g id="BOOKMARK_COUNT">%d</xliff:g> bookmarks"</string>
+ <string name="contextheader_folder_empty" msgid="974171637803391651">"Empty folder"</string>
+ <string name="contextmenu_openlink" msgid="7237961252214188935">"Open"</string>
+ <string name="contextmenu_openlink_newwindow" msgid="1205313604181761403">"Open in new tab"</string>
+ <string name="contextmenu_openlink_newwindow_background" msgid="4690381019116746687">"Open in new background tab"</string>
+ <string name="contextmenu_savelink" msgid="5508554930832538184">"Save link"</string>
+ <string name="contextmenu_sharelink" msgid="5392275392280130331">"Share link"</string>
+ <string name="contextmenu_copy" msgid="398860586635404030">"Copy"</string>
+ <string name="contextmenu_copylink" msgid="5153657160294534270">"Copy link URL"</string>
+ <string name="contextmenu_download_image" msgid="4243829645180686912">"Save image"</string>
+ <string name="contextmenu_view_image" msgid="3870625602053600905">"View image"</string>
+ <string name="contextmenu_set_wallpaper" msgid="3691902960115350686">"Set as wallpaper"</string>
+ <string name="contextmenu_dial_dot" msgid="5856550683415933806">"Dial…"</string>
+ <string name="contextmenu_add_contact" msgid="3183511922223645716">"Add contact"</string>
+ <string name="contextmenu_send_mail" msgid="1014513374828775660">"Send email"</string>
+ <string name="contextmenu_map" msgid="7471390435434034912">"Map"</string>
+ <string name="choosertitle_sharevia" msgid="4600490613341909086">"Share via"</string>
+ <string name="clear" msgid="7070043081700011461">"Clear"</string>
+ <string name="replace" msgid="4843033491070384047">"Replace"</string>
+ <string name="browser_bookmarks_page_bookmarks_text" msgid="6787605028726162673">"Bookmarks"</string>
+ <string name="menu_preferences" msgid="6709237687234102240">"Settings"</string>
+ <string name="pref_content_title" msgid="3834107397725342174">"Page content"</string>
+ <string name="pref_allow_apptabs" msgid="1325989799080202871">"Allow multiple tabs per app"</string>
+ <string name="pref_content_load_images" msgid="2125616852957377561">"Load images"</string>
+ <string name="pref_content_load_images_summary" msgid="5055874125248398584">"Display images on web pages"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"Block pop-ups"</string>
+ <string name="pref_content_javascript" msgid="4570972030299516843">"Enable JavaScript"</string>
+ <string name="pref_content_open_in_background" msgid="824123779725118663">"Open in background"</string>
+ <string name="pref_content_plugins" msgid="7231944644794301582">"Enable plug-ins"</string>
+ <string-array name="pref_content_plugins_choices">
+ <item msgid="6745108155096660725">"Always on"</item>
+ <item msgid="2484126708670016519">"On demand"</item>
+ <item msgid="8547442717307793863">"Off"</item>
+ </string-array>
+ <string name="pref_content_open_in_background_summary" msgid="955411158407739504">"Open new tabs behind the current tab"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"Set homepage"</string>
+ <string name="pref_content_search_engine" msgid="1620101310821644144">"Set search engine"</string>
+ <string name="pref_content_search_engine_summary" msgid="304003941861818133">"Choose a search engine"</string>
+ <string name="pref_set_homepage_to" msgid="7838684355145561242">"Set to"</string>
+ <string-array name="pref_homepage_choices">
+ <item msgid="844041670142910837">"Current page"</item>
+ <item msgid="4430498748295169195">"Blank page"</item>
+ <item msgid="5747608191946904074">"Default page"</item>
+ <item msgid="6092441301001006473">"Most-visited sites"</item>
+ <item msgid="6569304572171444894">"Other"</item>
+ </string-array>
+ <string name="pref_content_autofit" msgid="8260474534053660809">"Auto-fit pages"</string>
+ <string name="pref_content_autofit_summary" msgid="324810555822572112">"Format web pages to fit the screen"</string>
+ <string name="pref_general_title" msgid="1946872771219249323">"General"</string>
+ <string name="pref_general_sync_title" msgid="3138637035975860324">"Sync"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"Auto-fill"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"Form auto-fill"</string>
+ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Fill in web forms with a single touch"</string>
+ <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Auto-fill text"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Set up text to auto-fill in web forms"</string>
+ <string name="pref_autologin_title" msgid="4421187193809267096">"Automatic Google sign-in"</string>
+ <string name="pref_autologin_progress" msgid="8333244467048833461">"Signing in to Google sites using <xliff:g id="ID_1">%s</xliff:g>"</string>
+ <string name="autologin_bar_text" msgid="3684581827167173371">"Sign in as"</string>
+ <string name="autologin_bar_login_text" msgid="3336615320510851879">"Sign in"</string>
+ <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Hide"</string>
+ <string name="autologin_bar_error" msgid="7470001207395920811">"Couldn\'t sign in."</string>
+ <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Type the text that you want to auto-fill in web forms."</string>
+ <string name="autofill_profile_editor_name" msgid="8566130291459685955">"Full name:"</string>
+ <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"Email:"</string>
+ <string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"Company name:"</string>
+ <string name="autofill_profile_editor_address_line_1" msgid="836433242509243081">"Address line 1:"</string>
+ <string name="autofill_profile_editor_address_line_1_hint" msgid="5965659598509327172">"Street address, P.O. box, c/o"</string>
+ <string name="autofill_profile_editor_address_line_2" msgid="8194745202893822479">"Address line 2:"</string>
+ <string name="autofill_profile_editor_address_line_2_hint" msgid="8529642768127569254">"Flat, suite, unit, building, floor, etc."</string>
+ <string name="autofill_profile_editor_city" msgid="7306716145784997135">"City/Town:"</string>
+ <string name="autofill_profile_editor_state" msgid="2150403366835080407">"County/State/Province/Region:"</string>
+ <string name="autofill_profile_editor_zip_code" msgid="283668573295656671">"Postcode:"</string>
+ <string name="autofill_profile_editor_country" msgid="7234470301239156656">"Country:"</string>
+ <string name="autofill_profile_editor_phone_number" msgid="4938852821413729276">"Phone:"</string>
+ <string name="autofill_profile_editor_phone_number_invalid" msgid="6795411298467068957">"Invalid phone number."</string>
+ <string name="autofill_profile_editor_save_profile" msgid="3230301454458581157">"Save"</string>
+ <string name="autofill_profile_successful_save" msgid="5691459703493331983">"Auto-fill text saved."</string>
+ <string name="autofill_profile_successful_delete" msgid="1790262652460723127">"Auto-fill text deleted."</string>
+ <string name="autofill_profile_editor_delete_profile" msgid="3098369314558164153">"Delete"</string>
+ <string name="autofill_setup_dialog_message" msgid="7123905786076456503">"The browser can automatically complete web forms like this one. Do you want to set up your auto-fill text?"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="3288881675232206984">"You can always set up your auto-fill text from the Browser > Settings > General screen."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"Disable auto-fill"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"Privacy & security"</string>
+ <string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Clear cache"</string>
+ <string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Clear locally cached content and databases"</string>
+ <string name="pref_privacy_clear_cache_dlg" msgid="4344512581716422465">"Delete locally cached content and databases?"</string>
+ <string name="pref_privacy_cookies_title" msgid="6763274282214830526">"Cookies"</string>
+ <string name="pref_privacy_clear_cookies" msgid="3095583579133780331">"Clear all cookie data"</string>
+ <string name="pref_privacy_clear_cookies_summary" msgid="6962742063990677520">"Clear all browser cookies"</string>
+ <string name="pref_privacy_clear_cookies_dlg" msgid="1493252163164621278">"Delete all cookies?"</string>
+ <string name="pref_privacy_clear_history" msgid="8723795508825198477">"Clear history"</string>
+ <string name="pref_privacy_clear_history_summary" msgid="6868501330708940734">"Clear the browser navigation history"</string>
+ <string name="pref_privacy_clear_history_dlg" msgid="6934317391642846227">"Delete the browser navigation history?"</string>
+ <string name="pref_privacy_formdata_title" msgid="6549813837982050424">"Form data"</string>
+ <string name="pref_privacy_clear_form_data" msgid="4232668196344383987">"Clear form data"</string>
+ <string name="pref_privacy_clear_form_data_summary" msgid="7702091143640546200">"Clear all the saved form data"</string>
+ <string name="pref_privacy_clear_form_data_dlg" msgid="8205626042241338983">"Delete all saved form data?"</string>
+ <string name="pref_privacy_clear_passwords" msgid="4750234112289277480">"Clear passwords"</string>
+ <string name="pref_privacy_clear_passwords_summary" msgid="8856782718942903335">"Clear all saved passwords"</string>
+ <string name="pref_privacy_clear_passwords_dlg" msgid="5836576259947160045">"Delete all saved passwords?"</string>
+ <string name="pref_privacy_location_title" msgid="7458378016606081067">"Location"</string>
+ <string name="pref_privacy_enable_geolocation" msgid="1395040170290765686">"Enable location"</string>
+ <string name="pref_privacy_enable_geolocation_summary" msgid="8437020934664306205">"Allow sites to request access to your location"</string>
+ <string name="pref_privacy_clear_geolocation_access" msgid="6649680770030042980">"Clear location access"</string>
+ <string name="pref_privacy_clear_geolocation_access_summary" msgid="7750143359497314679">"Clear location access for all websites"</string>
+ <string name="pref_privacy_clear_geolocation_access_dlg" msgid="3190928760598034346">"Clear website location access?"</string>
+ <string name="pref_security_passwords_title" msgid="5734190542383756711">"Passwords"</string>
+ <string name="pref_security_remember_passwords" msgid="6492957683454529549">"Remember passwords"</string>
+ <string name="pref_security_remember_passwords_summary" msgid="256388703356349137">"Save usernames and passwords for websites"</string>
+ <string name="pref_security_save_form_data" msgid="1213669802810198893">"Remember form data"</string>
+ <string name="pref_security_save_form_data_summary" msgid="4994074685153708026">"Remember data that I type in forms for later use"</string>
+ <string name="pref_security_show_security_warning" msgid="8901135676266754559">"Show security warnings"</string>
+ <string name="pref_security_show_security_warning_summary" msgid="5260098316025397525">"Show warning if there is a problem with a site\'s security"</string>
+ <string name="pref_security_accept_cookies" msgid="3201367661925047989">"Accept cookies"</string>
+ <string name="pref_security_accept_cookies_summary" msgid="1907951236154433751">"Allow sites to save and read cookie data"</string>
+ <string-array name="pref_text_size_choices">
+ <item msgid="4952686548944739548">"Tiny"</item>
+ <item msgid="1950030433642671460">"Small"</item>
+ <item msgid="4338347520133294584">"Normal"</item>
+ <item msgid="5043128215356351184">"Large"</item>
+ <item msgid="7201512237890458902">"Huge"</item>
+ </string-array>
+ <string name="pref_min_font_size" msgid="8811125835817449131">"Minimum font size"</string>
+ <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">"Text scaling"</string>
+ <string name="pref_zoom_on_double_tap" msgid="902786475250741795">"Zoom on double-tap"</string>
+ <string name="pref_force_userscalable" msgid="5641500562399892621">"Force enable zoom"</string>
+ <string name="pref_force_userscalable_summary" msgid="3613242300617172230">"Override a website\'s request to control zoom behaviour"</string>
+ <string name="pref_inverted_category" msgid="1280639705117152207">"Inverted screen rendering"</string>
+ <string name="pref_inverted" msgid="7613556986776824112">"Inverted rendering"</string>
+ <string name="pref_inverted_summary" msgid="7357225897413923085">"Black becomes white and vice versa"</string>
+ <string name="pref_inverted_contrast" msgid="8527441236225288169">"Contrast"</string>
+ <string name="pref_default_zoom" msgid="8076142259097187395">"Default zoom"</string>
+ <string-array name="pref_default_zoom_choices">
+ <item msgid="549583171195154919">"Far"</item>
+ <item msgid="5619034257768161024">"Medium"</item>
+ <item msgid="3840999588443167001">"Close"</item>
+ </string-array>
+ <string name="pref_default_zoom_dialogtitle" msgid="6095974367125109021">"Default zoom"</string>
+ <string name="pref_content_load_page" msgid="2219810141690955452">"Open pages in overview"</string>
+ <string name="pref_content_load_page_summary" msgid="9168803276420332955">"Show overview of newly opened pages"</string>
+ <string name="pref_extras_title" msgid="7075456173747370647">"Advanced"</string>
+ <string name="pref_extras_website_settings" msgid="67866640052455549">"Website settings"</string>
+ <string name="pref_extras_website_settings_summary" msgid="1656771443223494406">"Advanced settings for individual websites"</string>
+ <string name="pref_extras_reset_default_title" msgid="3579760449455761762">"Reset defaults"</string>
+ <string name="pref_extras_reset_default" msgid="8904000515846202110">"Reset to default"</string>
+ <string name="pref_extras_reset_default_summary" msgid="4247870778270414501">"Restore default settings"</string>
+ <string name="pref_extras_reset_default_dlg" msgid="7922814420184322450">"Revert settings to default values?"</string>
+ <string name="pref_development_title" msgid="3263854204533056480">"Debug"</string>
+ <string name="pref_default_text_encoding" msgid="5742965543955558478">"Text encoding"</string>
+ <string-array name="pref_default_text_encoding_choices">
+ <item msgid="7275223955790513818">"Latin-1 (ISO-8859-1)"</item>
+ <item msgid="2456597866837587140">"Unicode (UTF-8)"</item>
+ <item msgid="6122474363777211732">"Chinese (GBK)"</item>
+ <item msgid="373372275931607040">"Chinese (Big 5)"</item>
+ <item msgid="891615911084608570">"Japanese (ISO-2022-JP)"</item>
+ <item msgid="5589150448475151241">"Japanese (SHIFT_JIS)"</item>
+ <item msgid="7356792686950371843">"Japanese (EUC-JP)"</item>
+ <item msgid="2193955365569270096">"Korean (EUC-KR)"</item>
+ </string-array>
+ <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Text encoding"</string>
+ <string name="pref_accessibility_title" msgid="5127836981587423215">"Accessibility"</string>
+ <string name="pref_font_size_category" msgid="6683754355084218254">"Text size"</string>
+ <string name="pref_lab_title" msgid="5571091610359629423">"Labs"</string>
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"Quick controls"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="3149664132600968775">"Slide thumb from the left or right edge to open quick controls and hide app and URL bars"</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Google Instant"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Use Google Instant when you use Google Search, to show results as you type (this can increase data use)."</string>
+ <string name="pref_lab_fullscreen" msgid="8173609016657987973">"Full screen"</string>
+ <string name="pref_lab_fullscreen_summary" msgid="7694738112219376740">"Use full-screen mode to hide the status bar"</string>
+ <string name="pref_data_title" msgid="7255058703417796578">"Bandwidth management"</string>
+ <string name="pref_data_preload_title" msgid="4479320472980292873">"Search result preloading"</string>
+ <string-array name="pref_data_preload_choices">
+ <item msgid="5180466923190095508">"Never"</item>
+ <item msgid="1791664748778640002">"Only on Wi-Fi"</item>
+ <item msgid="3944061253437827617">"Always"</item>
+ </string-array>
+ <string name="pref_data_preload_summary" msgid="3809168910751382727">"Allow the browser to preload high-confidence search results in the background"</string>
+ <string name="pref_data_preload_dialogtitle" msgid="8421297746110796536">"Search result preloading"</string>
+ <string name="pref_link_prefetch_title" msgid="4123685219009241072">"Webpage preloading"</string>
+ <string-array name="pref_link_prefetch_choices">
+ <item msgid="4889781230398008031">"Never"</item>
+ <item msgid="1908465963242077428">"Only on Wi-Fi"</item>
+ <item msgid="7647277566998527142">"Always"</item>
+ </string-array>
+ <string name="pref_link_prefetch_summary" msgid="6558181497993206817">"Allow browser to preload linked webpages in the background"</string>
+ <string name="pref_link_prefetch_dialogtitle" msgid="3804646141622839765">"Webpage preloading"</string>
+ <string name="browserFrameNetworkErrorLabel" msgid="8102515020625680714">"Connection problem"</string>
+ <string name="browserFrameFileErrorLabel" msgid="4703792279852977350">"File problem"</string>
+ <string name="browserFrameFormResubmitLabel" msgid="2385512101948178841"></string>
+ <string name="browserFrameFormResubmitMessage" msgid="5244059279866705254">"The page that you are trying to view contains data that has already been submitted (\"POSTDATA\"). If you resend the data, any action that the form on the page carried out (such as a search or online purchase) will be repeated."</string>
+ <string name="loadSuspendedTitle" msgid="6453376579109644551">"No connection"</string>
+ <string name="loadSuspended" msgid="3843343290039218668">"The browser can\'t load this page because there\'s no Internet connection."</string>
+ <string name="clear_history" msgid="5998307092715979619">"Clear history"</string>
+ <string name="browser_history" msgid="2979476257919939232">"Recently visited pages"</string>
+ <string name="empty_history" msgid="7013369425484218985">"No browser history."</string>
+ <string name="go_home" msgid="109129207276086793">"Homepage"</string>
+ <string name="add_new_bookmark" msgid="3158497555612337238">"Add bookmark"</string>
+ <string name="add_bookmark_short" msgid="3783984330998103735">"Add"</string>
+ <string name="search_hint" msgid="4647356319916631820">"Search or type URL"</string>
+ <string name="search_button_text" msgid="5235226933877634410">"Go"</string>
+ <string name="search_settings_description" msgid="1422401062529014107">"Bookmarks and web history"</string>
+ <string name="popup_window_attempt" msgid="31565781154067629">"Allow this site to open a pop-up window?"</string>
+ <string name="allow" msgid="1157313689171991335">"Allow"</string>
+ <string name="block" msgid="9172175889884707800">"Block"</string>
+ <string name="too_many_windows_dialog_title" msgid="5709782301477380438">"Tab limit reached"</string>
+ <string name="too_many_windows_dialog_message" msgid="3644234634638290304">"Can\'t open a new tab until you close one."</string>
+ <string name="too_many_subwindows_dialog_title" msgid="3805453941587725944">"Pop-up already open"</string>
+ <string name="too_many_subwindows_dialog_message" msgid="2164725447981195556">"Only one pop-up can be open at a time."</string>
+ <string name="download_no_sdcard_dlg_title" product="nosdcard" msgid="56777245081568508">"USB storage unavailable"</string>
+ <string name="download_no_sdcard_dlg_title" product="default" msgid="605904452159416792">"No SD card"</string>
+ <string name="download_no_sdcard_dlg_msg" product="nosdcard" msgid="3144652102051031721">"USB storage is required to download <xliff:g id="FILENAME">%s</xliff:g>."</string>
+ <string name="download_no_sdcard_dlg_msg" product="default" msgid="2616399456116301518">"An SD card is required to download <xliff:g id="FILENAME">%s</xliff:g>."</string>
+ <string name="download_sdcard_busy_dlg_title" product="nosdcard" msgid="8081445664689818973">"USB storage unavailable"</string>
+ <string name="download_sdcard_busy_dlg_title" product="default" msgid="6877712666046917741">"SD card unavailable"</string>
+ <string name="download_sdcard_busy_dlg_msg" product="nosdcard" msgid="8412543086906716875">"The USB storage is busy. To allow downloads, touch Turn Off USB Storage in the notification."</string>
+ <string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"The SD card is busy. To allow downloads, select \"Turn off USB storage\" in the notification."</string>
+ <string name="cannot_download" msgid="8150552478556798780">"Can only download \"http\" or \"https\" URLs."</string>
+ <string name="download_pending" msgid="2599683668575349559">"Starting download…"</string>
+ <string name="search_the_web" msgid="6046130189241962337">"Search the web"</string>
+ <string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Browser storage full"</string>
+ <string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Touch to free up space."</string>
+ <string name="webstorage_clear_data_title" msgid="689484577124333977">"Clear stored data"</string>
+ <string name="webstorage_clear_data_dialog_message" msgid="6200681632891775881">"Delete all data stored by this website?"</string>
+ <string name="webstorage_clear_data_dialog_ok_button" msgid="6682570951259237542">"OK"</string>
+ <string name="webstorage_clear_data_dialog_cancel_button" msgid="2028867751958942762">"Cancel"</string>
+ <string name="webstorage_origin_summary_mb_stored" msgid="1985885826292236210">"MB stored on your phone"</string>
+ <string name="loading_video" msgid="7886324933131962321">"Loading video…"</string>
+ <string name="geolocation_permissions_prompt_message" msgid="356796102004052471">"<xliff:g id="WEBSITE_ORIGIN">%s</xliff:g> wants to know your location"</string>
+ <string name="geolocation_permissions_prompt_share" msgid="9084486342048347976">"Share location"</string>
+ <string name="geolocation_permissions_prompt_dont_share" msgid="6303025160237860300">"Decline"</string>
+ <string name="geolocation_permissions_prompt_remember" msgid="3118526300707348308">"Remember preference"</string>
+ <string name="geolocation_permissions_prompt_toast_allowed" msgid="7201417941112726112">"This site can access your location. Change this on the Settings > Advanced > Website screen."</string>
+ <string name="geolocation_permissions_prompt_toast_disallowed" msgid="156443445797377409">"This site cannot access your location. Change this on the Settings > Advanced > Website screen."</string>
+ <string name="geolocation_settings_page_title" msgid="1745477985097536528">"Clear location access"</string>
+ <string name="geolocation_settings_page_summary_allowed" msgid="9180251524290811398">"This site can currently access your location"</string>
+ <string name="geolocation_settings_page_summary_not_allowed" msgid="7941769772784366199">"This site can\'t currently access your location"</string>
+ <string name="geolocation_settings_page_dialog_message" msgid="8772923416296868537">"Clear location access for this website?"</string>
+ <string name="geolocation_settings_page_dialog_ok_button" msgid="2113465477131017852">"OK"</string>
+ <string name="geolocation_settings_page_dialog_cancel_button" msgid="7941036504673409747">"Cancel"</string>
+ <string name="website_settings_clear_all" msgid="8739804325997655980">"Clear all"</string>
+ <string name="website_settings_clear_all_dialog_message" msgid="1551164275687475061">"Delete all website data and location permission?"</string>
+ <string name="website_settings_clear_all_dialog_ok_button" msgid="7858504776529106243">"OK"</string>
+ <string name="website_settings_clear_all_dialog_cancel_button" msgid="1896757051856611674">"Cancel"</string>
+ <string name="progress_dialog_setting_wallpaper" msgid="2031391201442335889">"Setting wallpaper..."</string>
+ <string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Bookmarks"</string>
+ <string name="empty_bookmarks_folder" msgid="6239830231917618556">"No bookmarks"</string>
+ <string name="other_bookmarks" msgid="8021889794475657319">"Other Bookmarks"</string>
+ <string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Choose account"</string>
+ <string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Sync with Google account"</string>
+ <string name="import_bookmarks_dialog_description" msgid="2362897194870789609">"Bookmarks on this device are not yet associated with a Google account. Save these bookmarks by adding them to an account. Delete these bookmarks if you don\'t want to sync them."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="7643058662272484895">"Add bookmarks currently on this device and begin syncing with Google Account"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="4333848003180415516">"Delete bookmarks currently on this device and begin syncing with Google account"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="2204771572755630570">"Delete bookmarks currently on this device and begin syncing bookmarks with <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>?"</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="8942794112340838111">"Add bookmarks currently on this device and begin syncing bookmarks with <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>?"</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Delete bookmarks"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Next"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Previous"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Cancel"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Done"</string>
+ <string name="import_bookmarks_dialog_add" msgid="1743359725294101189">"Add bookmarks to Google Account"</string>
+ <string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Add your Android bookmarks to bookmarks for <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
+ <string name="menu_share_url" msgid="5851814357333739700">"Share"</string>
+ <string name="max_tabs_warning" msgid="4122034303809457570">"No more tabs available"</string>
+ <string name="instant_search_label" msgid="8769284297650716935">"Google with Instant (Labs)"</string>
+ <string name="preview" msgid="6450823514561689038">"Preview"</string>
+ <string name="local_bookmarks" msgid="533816851415228520">"Local"</string>
+ <string name="ua_switcher_desktop" msgid="220097077327558435">"Request desktop site"</string>
+ <string name="permission_preload_label" msgid="4856971662337877316">"Preload results"</string>
+ <string name="empty_snapshots_folder" msgid="7675378008107026013">"No saved pages."</string>
+ <string name="remove_snapshot" msgid="1624447424544976849">"Delete saved page"</string>
+ <string name="snapshot_go_live" msgid="1209542802541168497">"Go live"</string>
+ <string name="accessibility_button_back" msgid="6194680634245279407">"Go back"</string>
+ <string name="accessibility_button_forward" msgid="1236827218480658168">"Go forwards"</string>
+ <string name="accessibility_button_refresh" msgid="1023441396241841313">"Refresh page"</string>
+ <string name="accessibility_button_stop" msgid="6793644120043222148">"Stop page loading"</string>
+ <string name="accessibility_button_addbookmark" msgid="4787844912630006181">"Bookmark page"</string>
+ <string name="accessibility_button_search" msgid="5357014102136055376">"Search"</string>
+ <string name="accessibility_button_voice" msgid="152016375096083337">"Start voice search"</string>
+ <string name="accessibility_button_bookmarks" msgid="7435055677299151649">"Bookmarks"</string>
+ <string name="accessibility_button_closetab" msgid="6954807842756927737">"Close tab"</string>
+ <string name="accessibility_button_newtab" msgid="4116986240706315748">"Open new tab"</string>
+ <string name="accessibility_button_newincognitotab" msgid="5254901889040012964">"Open new incognito tab"</string>
+ <string name="accessibility_button_clear" msgid="6943152307986161598">"Clear input"</string>
+ <string name="accessibility_button_uaswitch" msgid="6286804719724282339">"Switch user agent"</string>
+ <string name="accessibility_button_go" msgid="1182818872083055958">"Go"</string>
+ <string name="accessibility_button_navscreen" msgid="9142904748728713075">"Page manager"</string>
+ <string name="accessibility_button_more" msgid="3054251446394224216">"More options"</string>
+ <string name="accessibility_state_incognito" msgid="5786038488425202355">"Incognito page"</string>
+ <string name="accessibility_state_frozen" msgid="8041539250447035570">"Save page"</string>
+ <string name="accessibility_transition_navscreen" msgid="2734915619351519547">"Tab management"</string>
+ <string name="accessibility_button_bookmarks_folder_up" msgid="9179389954714270505">"Previous folder"</string>
+</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 47cc73b..2a17544 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -66,7 +66,7 @@
<string name="delete_folder" msgid="2046483129024501116">"Eliminar carpeta"</string>
<string name="no_subfolders" msgid="3303645239686962674">"No hay subcarpetas."</string>
<string name="add_to_bookmarks_menu_option" msgid="4449323955122214389">"Marcadores"</string>
- <string name="add_to_homescreen_menu_option" msgid="1461447829242963790">"Escritorio"</string>
+ <string name="add_to_homescreen_menu_option" msgid="1461447829242963790">"Pantalla de inicio"</string>
<string name="add_to_other_folder_menu_option" msgid="5947586525822134105">"Otra carpeta"</string>
<string name="name" msgid="5462672162695365387">"Nombre"</string>
<string name="http" msgid="2163722670597250102">"http://"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
new file mode 100644
index 0000000..6645165
--- /dev/null
+++ b/res/values-et-rEE/strings.xml
@@ -0,0 +1,402 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2007 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="application_name" msgid="1935869255545976415">"Brauser"</string>
+ <string name="choose_upload" msgid="3649366287575002063">"Valige fail üleslaadimiseks"</string>
+ <string name="uploads_disabled" msgid="463761197575372994">"Failide üleslaadimised on keelatud."</string>
+ <string name="new_tab" msgid="7971857320679510529">"Uus vaheleht"</string>
+ <string name="new_incognito_tab" msgid="3606197964239039478">"Uus inkognitovaheleht"</string>
+ <string name="tab_bookmarks" msgid="2305793036003473653">"Järjehoidjad"</string>
+ <string name="tab_most_visited" msgid="1077402532455000703">"Enim külastatud"</string>
+ <string name="tab_history" msgid="1979267558744613746">"Ajalugu"</string>
+ <string name="tab_snapshots" msgid="1449241204980265186">"Salvestatud lehed"</string>
+ <string name="added_to_bookmarks" msgid="4028710765672851635">"Lisatud järjehoidjatesse"</string>
+ <string name="removed_from_bookmarks" msgid="546648923924996722">"Järjehoidjatest eemaldatud"</string>
+ <string name="sign_in_to" msgid="5939425800148759165">"Logige sisse saidile <xliff:g id="HOSTNAME">%s1</xliff:g> „<xliff:g id="REALM">%s2</xliff:g>”"</string>
+ <string name="username" msgid="5057566336518215922">"Nimi"</string>
+ <string name="password" msgid="1177138552305184404">"Parool"</string>
+ <string name="action" msgid="183105774472071343">"Logi sisse"</string>
+ <string name="bookmarks_add_page" msgid="3093456701072617702">"Järjehoidja salvestamine"</string>
+ <string name="bookmarks_search" msgid="5229596268214362873">"Brauser"</string>
+ <string name="cancel" msgid="3017274947407233702">"Tühista"</string>
+ <string name="ok" msgid="1509280796718850364">"OK"</string>
+ <string name="title_bar_loading" msgid="7438217780834640678">"Laadimine ..."</string>
+ <string name="page_info" msgid="4048529256302257195">"Lehe teave"</string>
+ <string name="page_info_view" msgid="5303490449842635158">"Kuva lehe teave"</string>
+ <string name="page_info_address" msgid="2222306609532903254">"Aadress:"</string>
+ <string name="ssl_warnings_header" msgid="79744901983636370">"Selle saidi turvasertifikaadiga on probleeme."</string>
+ <string name="ssl_continue" msgid="8031515015829358457">"Jätka"</string>
+ <string name="security_warning" msgid="6607795404322797541">"Turvahoiatus"</string>
+ <string name="view_certificate" msgid="1472768887529093862">"Kuva sertifikaat"</string>
+ <string name="ssl_go_back" msgid="4598951822061593819">"Mine tagasi"</string>
+ <string name="ssl_untrusted" msgid="7754507359360636447">"See sertifikaat ei pärine usaldusväärselt asutuselt."</string>
+ <string name="ssl_mismatch" msgid="3809794439740523641">"Saidi nimi ei vasta sertifikaadil olevale nimele."</string>
+ <string name="ssl_expired" msgid="5739349389499575559">"See sertifikaat on aegunud."</string>
+ <string name="ssl_not_yet_valid" msgid="8193083327719048247">"See sertifikaat pole veel kehtiv."</string>
+ <string name="ssl_date_invalid" msgid="3705563379257285534">"Sellel sertifikaadil on kehtetu kuupäev."</string>
+ <string name="ssl_invalid" msgid="9041704741505449967">"See sertifikaat on kehtetu."</string>
+ <string name="ssl_unknown" msgid="5679243486524754571">"Tundmatu sertifikaadiviga."</string>
+ <string name="stopping" msgid="4839698519340302982">"Peatumine ..."</string>
+ <string name="stop" msgid="5687251076030630074">"Peata"</string>
+ <string name="reload" msgid="8585220783228408062">"Värskenda"</string>
+ <string name="back" msgid="8414603107175713668">"Tagasi"</string>
+ <string name="forward" msgid="4288210890526641577">"Edasta"</string>
+ <string name="save" msgid="5922311934992468496">"OK"</string>
+ <string name="do_not_save" msgid="6777633870113477714">"Tühista"</string>
+ <string name="location" msgid="3411848697912600125">"Aadress"</string>
+ <string name="account" msgid="5179824606448077042">"Konto"</string>
+ <string name="containing_folder" msgid="6771180232953030479">"Lisa asukohta"</string>
+ <string name="new_folder" msgid="7743540149088867917">"Uus kaust"</string>
+ <string name="edit_folder" msgid="621817453133656156">"Kausta muutmine"</string>
+ <string name="delete_folder" msgid="2046483129024501116">"Kausta kustutamine"</string>
+ <string name="no_subfolders" msgid="3303645239686962674">"Alamkaustu pole."</string>
+ <string name="add_to_bookmarks_menu_option" msgid="4449323955122214389">"Järjehoidjad"</string>
+ <string name="add_to_homescreen_menu_option" msgid="1461447829242963790">"Avaekraan"</string>
+ <string name="add_to_other_folder_menu_option" msgid="5947586525822134105">"Muu kaust"</string>
+ <string name="name" msgid="5462672162695365387">"Silt"</string>
+ <string name="http" msgid="2163722670597250102">"http://"</string>
+ <string name="save_to_bookmarks" msgid="1679286010089780932">"Salvesta järjehoidjatesse."</string>
+ <string name="bookmark_this_page" msgid="7530739804320811054">"Lehe järjehoidjatesse lisamine"</string>
+ <string name="remove" msgid="7820112494467011374">"Eemalda"</string>
+ <string name="edit_bookmark" msgid="5024089053490231905">"Muuda järjehoidjat"</string>
+ <string name="create_shortcut_bookmark" msgid="1995095662095484289">"Lisa otsetee avalehele"</string>
+ <string name="open_bookmark" msgid="8473581305759935790">"Ava"</string>
+ <string name="remove_bookmark" msgid="8407495852801410891">"Kustuta järjehoidja"</string>
+ <string name="remove_from_bookmarks" msgid="4374080666576982775">"Eemalda järjehoidjatest"</string>
+ <string name="remove_history_item" msgid="5021424935726728618">"Eemalda ajaloost"</string>
+ <string name="set_as_homepage" msgid="4752937379414905560">"Määra avaleheks"</string>
+ <string name="bookmark_saved" msgid="2766434679871317557">"Salvestatud järjehoidjatesse."</string>
+ <string name="bookmark_not_saved" msgid="1077732557310662080">"Järjehoidjat ei saanud salvestada."</string>
+ <string name="homepage_set" msgid="8768087280310966395">"Avaleht määratud."</string>
+ <string name="bookmark_needs_title" msgid="6245900436119218187">"Järjehoidjal peab olema nimi."</string>
+ <string name="bookmark_needs_url" msgid="7809876865972755158">"Järjehoidjal peab olema asukoht."</string>
+ <string name="bookmark_url_not_valid" msgid="4917440933384496211">"URL on kehtetu."</string>
+ <string name="bookmark_cannot_save_url" msgid="7836064647943671126">"Seda URL-i ei saa järjehoidjatesse lisada."</string>
+ <string name="bookmark_page" msgid="6845189305130307274">"Lisa viimati vaadatud leht järjehoidjatesse"</string>
+ <string name="bookmark_thumbnail_view" msgid="3164068314718522138">"Pisipildid"</string>
+ <string name="bookmark_list_view" msgid="7848510619500937839">"Loend"</string>
+ <string name="current_page" msgid="7510129573681663135">"allikast "</string>
+ <string name="delete_bookmark_warning" msgid="7825328496411904321">"Kustutada järjehoidja „<xliff:g id="BOOKMARK">%s</xliff:g>”?"</string>
+ <string name="open_all_in_new_window" msgid="455786763426575293">"Ava kõik uutel vahelehtedel"</string>
+ <string name="goto_dot" msgid="3895839050522602723">"Mine"</string>
+ <string name="select_dot" msgid="6299170761900561967">"Valige tekst"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Sule teised vahekaardid"</string>
+ <string name="bookmarks" msgid="1961279134885867815">"Järjehoidjad"</string>
+ <string name="shortcut_bookmark" msgid="3974876480401135895">"Järjehoidja"</string>
+ <string name="shortcut_bookmark_title" msgid="7570786275916681296">"Järjehoidja valimine"</string>
+ <string name="history" msgid="2451240511251410032">"Ajalugu"</string>
+ <string name="menu_view_download" msgid="2124570321712995120">"Allalaadimised"</string>
+ <string name="copy_page_url" msgid="1188679152608889555">"Kopeeri lehe URL"</string>
+ <string name="share_page" msgid="593756995297268343">"Jaga lehte"</string>
+ <string name="menu_save_snapshot" msgid="6935080344031126139">"Salvesta offlainis lugemiseks"</string>
+ <string name="saving_snapshot" msgid="1693789062351182809">"Salvestamine ..."</string>
+ <string name="snapshot_failed" msgid="4584580873565876033">"Võrguühenduseta lugemiseks salvestam. ebaõnnestus."</string>
+ <string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"<xliff:g id="BOOKMARK_COUNT">%d</xliff:g> järjehoidjat"</string>
+ <string name="contextheader_folder_empty" msgid="974171637803391651">"Tühi kaust"</string>
+ <string name="contextmenu_openlink" msgid="7237961252214188935">"Ava"</string>
+ <string name="contextmenu_openlink_newwindow" msgid="1205313604181761403">"Ava uuel vahelehel"</string>
+ <string name="contextmenu_openlink_newwindow_background" msgid="4690381019116746687">"Ava uuel taustavahelehel"</string>
+ <string name="contextmenu_savelink" msgid="5508554930832538184">"Salvesta link"</string>
+ <string name="contextmenu_sharelink" msgid="5392275392280130331">"Jaga linki"</string>
+ <string name="contextmenu_copy" msgid="398860586635404030">"Kopeeri"</string>
+ <string name="contextmenu_copylink" msgid="5153657160294534270">"Kopeeri lingi URL"</string>
+ <string name="contextmenu_download_image" msgid="4243829645180686912">"Salvesta kujutis"</string>
+ <string name="contextmenu_view_image" msgid="3870625602053600905">"Kuva kujutis"</string>
+ <string name="contextmenu_set_wallpaper" msgid="3691902960115350686">"Määra taustapildiks"</string>
+ <string name="contextmenu_dial_dot" msgid="5856550683415933806">"Valimine ..."</string>
+ <string name="contextmenu_add_contact" msgid="3183511922223645716">"Lisa kontakt"</string>
+ <string name="contextmenu_send_mail" msgid="1014513374828775660">"Saada meil"</string>
+ <string name="contextmenu_map" msgid="7471390435434034912">"Kaart"</string>
+ <string name="choosertitle_sharevia" msgid="4600490613341909086">"Jaga rakendusega:"</string>
+ <string name="clear" msgid="7070043081700011461">"Kustuta"</string>
+ <string name="replace" msgid="4843033491070384047">"Asenda"</string>
+ <string name="browser_bookmarks_page_bookmarks_text" msgid="6787605028726162673">"Järjehoidjad"</string>
+ <string name="menu_preferences" msgid="6709237687234102240">"Seaded"</string>
+ <string name="pref_content_title" msgid="3834107397725342174">"Lehe sisu"</string>
+ <string name="pref_allow_apptabs" msgid="1325989799080202871">"Luba mitu vahekaarti rakenduse kohta"</string>
+ <string name="pref_content_load_images" msgid="2125616852957377561">"Laadi kujutisi"</string>
+ <string name="pref_content_load_images_summary" msgid="5055874125248398584">"Kuva kujutised veebilehtedel"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"Blokeeri hüpikaknad"</string>
+ <string name="pref_content_javascript" msgid="4570972030299516843">"Luba JavaScript"</string>
+ <string name="pref_content_open_in_background" msgid="824123779725118663">"Ava taustal"</string>
+ <string name="pref_content_plugins" msgid="7231944644794301582">"Luba pistikprogrammid"</string>
+ <string-array name="pref_content_plugins_choices">
+ <item msgid="6745108155096660725">"Alati"</item>
+ <item msgid="2484126708670016519">"Nõudluses"</item>
+ <item msgid="8547442717307793863">"Väljas"</item>
+ </string-array>
+ <string name="pref_content_open_in_background_summary" msgid="955411158407739504">"Uute vahelehtede avamine praeguse taga"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"Määra avaleheks"</string>
+ <string name="pref_content_search_engine" msgid="1620101310821644144">"Määra otsingumootor"</string>
+ <string name="pref_content_search_engine_summary" msgid="304003941861818133">"Valige otsingumootor"</string>
+ <string name="pref_set_homepage_to" msgid="7838684355145561242">"Sea avaleheks"</string>
+ <string-array name="pref_homepage_choices">
+ <item msgid="844041670142910837">"Praegune leht"</item>
+ <item msgid="4430498748295169195">"Tühi leht"</item>
+ <item msgid="5747608191946904074">"Vaikeleht"</item>
+ <item msgid="6092441301001006473">"Enim külastatavad saidid"</item>
+ <item msgid="6569304572171444894">"Muu"</item>
+ </string-array>
+ <string name="pref_content_autofit" msgid="8260474534053660809">"Sobita lehed automaatselt"</string>
+ <string name="pref_content_autofit_summary" msgid="324810555822572112">"Veebilehtede vormindamine ekraanile sobitumiseks"</string>
+ <string name="pref_general_title" msgid="1946872771219249323">"Üldine"</string>
+ <string name="pref_general_sync_title" msgid="3138637035975860324">"Sünkroonimine"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"Andmetega automaatselt täitmine"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"Täida vorm automaatselt"</string>
+ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Täitke veebivorme ühe puudutusega"</string>
+ <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Automaatse täitmise tekst"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Seadistage tekst, mida soovite automaatselt lisada veebivormidesse."</string>
+ <string name="pref_autologin_title" msgid="4421187193809267096">"Auto. sisselogimine Google\'isse"</string>
+ <string name="pref_autologin_progress" msgid="8333244467048833461">"Google\'i saitidele sisselogimine, kasutades kontot <xliff:g id="ID_1">%s</xliff:g>"</string>
+ <string name="autologin_bar_text" msgid="3684581827167173371">"Logi sisse kasutajanimega"</string>
+ <string name="autologin_bar_login_text" msgid="3336615320510851879">"Logi sisse"</string>
+ <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Peida"</string>
+ <string name="autologin_bar_error" msgid="7470001207395920811">"Sisselogimine ebaõnnestus"</string>
+ <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Tippige tekst, mida soovite automaatselt lisada veebivormidesse."</string>
+ <string name="autofill_profile_editor_name" msgid="8566130291459685955">"Täisnimi:"</string>
+ <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"E-post:"</string>
+ <string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"Ettevõtte nimi:"</string>
+ <string name="autofill_profile_editor_address_line_1" msgid="836433242509243081">"Aadressirida 1:"</string>
+ <string name="autofill_profile_editor_address_line_1_hint" msgid="5965659598509327172">"Tänav, postkast, vahendaja"</string>
+ <string name="autofill_profile_editor_address_line_2" msgid="8194745202893822479">"Aadressirida 2:"</string>
+ <string name="autofill_profile_editor_address_line_2_hint" msgid="8529642768127569254">"Korter, sviit, üksus, maja, korrus jne"</string>
+ <string name="autofill_profile_editor_city" msgid="7306716145784997135">"Linn/alev:"</string>
+ <string name="autofill_profile_editor_state" msgid="2150403366835080407">"Osariik/maakond/piirkond:"</string>
+ <string name="autofill_profile_editor_zip_code" msgid="283668573295656671">"Sihtnumber:"</string>
+ <string name="autofill_profile_editor_country" msgid="7234470301239156656">"Riik:"</string>
+ <string name="autofill_profile_editor_phone_number" msgid="4938852821413729276">"Telefon:"</string>
+ <string name="autofill_profile_editor_phone_number_invalid" msgid="6795411298467068957">"Kehtetu telefoninumber."</string>
+ <string name="autofill_profile_editor_save_profile" msgid="3230301454458581157">"Salvesta"</string>
+ <string name="autofill_profile_successful_save" msgid="5691459703493331983">"Automaatse täitmise tekst on salvestatud."</string>
+ <string name="autofill_profile_successful_delete" msgid="1790262652460723127">"Automaatse täitmise tekst kustutatud."</string>
+ <string name="autofill_profile_editor_delete_profile" msgid="3098369314558164153">"Kustuta"</string>
+ <string name="autofill_setup_dialog_message" msgid="7123905786076456503">"Brauser suudab selliseid veebivorme automaatselt täita. Kas soovite seadistada teksti automaatse täitmise?"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="3288881675232206984">"Automaatse täitmise teksti saate alati seadistada, tehes valikud Brauser > Seaded > Üldine kuva."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"Keela automaatne täitmine"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"Privaatsus ja turvalisus"</string>
+ <string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Tühjenda vahemälu"</string>
+ <string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Kustuta kohalikult vahemällu talletatud sisu ja andmebaasid"</string>
+ <string name="pref_privacy_clear_cache_dlg" msgid="4344512581716422465">"Kas kustutada kohalikku vahemällu talletatud sisu ja andmebaasid?"</string>
+ <string name="pref_privacy_cookies_title" msgid="6763274282214830526">"Küpsised"</string>
+ <string name="pref_privacy_clear_cookies" msgid="3095583579133780331">"Kustuta kõik küpsiseandmed"</string>
+ <string name="pref_privacy_clear_cookies_summary" msgid="6962742063990677520">"Kustuta kõik brauseri küpsised"</string>
+ <string name="pref_privacy_clear_cookies_dlg" msgid="1493252163164621278">"Kas kustutada kõik küpsised?"</string>
+ <string name="pref_privacy_clear_history" msgid="8723795508825198477">"Kustuta ajalugu"</string>
+ <string name="pref_privacy_clear_history_summary" msgid="6868501330708940734">"Kustuta brauseri navigeerimisajalugu"</string>
+ <string name="pref_privacy_clear_history_dlg" msgid="6934317391642846227">"Kas kustutada brauseri navigeerimisajalugu?"</string>
+ <string name="pref_privacy_formdata_title" msgid="6549813837982050424">"Vormi andmed"</string>
+ <string name="pref_privacy_clear_form_data" msgid="4232668196344383987">"Kustuta vormi andmed"</string>
+ <string name="pref_privacy_clear_form_data_summary" msgid="7702091143640546200">"Kustuta kõik salvestatud vormiandmed"</string>
+ <string name="pref_privacy_clear_form_data_dlg" msgid="8205626042241338983">"Kas kustutada kõik salvestatud vormiandmed?"</string>
+ <string name="pref_privacy_clear_passwords" msgid="4750234112289277480">"Kustuta paroolid"</string>
+ <string name="pref_privacy_clear_passwords_summary" msgid="8856782718942903335">"Kustuta kõik salvestatud paroolid"</string>
+ <string name="pref_privacy_clear_passwords_dlg" msgid="5836576259947160045">"Kas kustutada kõik salvestatud paroolid?"</string>
+ <string name="pref_privacy_location_title" msgid="7458378016606081067">"Asukoht"</string>
+ <string name="pref_privacy_enable_geolocation" msgid="1395040170290765686">"Luba asukoht"</string>
+ <string name="pref_privacy_enable_geolocation_summary" msgid="8437020934664306205">"Luba saitidel taotleda juurdepääsu teie asukohale"</string>
+ <string name="pref_privacy_clear_geolocation_access" msgid="6649680770030042980">"Kustuta asukoha juurdepääs"</string>
+ <string name="pref_privacy_clear_geolocation_access_summary" msgid="7750143359497314679">"Kustuta kõikide veebisaitide asukoha juurdepääs"</string>
+ <string name="pref_privacy_clear_geolocation_access_dlg" msgid="3190928760598034346">"Kas kustutada veebisaidi asukoha juurdepääs?"</string>
+ <string name="pref_security_passwords_title" msgid="5734190542383756711">"Paroolid"</string>
+ <string name="pref_security_remember_passwords" msgid="6492957683454529549">"Pea paroolid meeles"</string>
+ <string name="pref_security_remember_passwords_summary" msgid="256388703356349137">"Salvesta veebisaitidel olevad kasutajanimed ja paroolid"</string>
+ <string name="pref_security_save_form_data" msgid="1213669802810198893">"Pidage meeles vormi andmed"</string>
+ <string name="pref_security_save_form_data_summary" msgid="4994074685153708026">"Pea minu vormides sisestatavad andmed hilisemaks kasutamiseks meeles"</string>
+ <string name="pref_security_show_security_warning" msgid="8901135676266754559">"Näita turvahoiatusi"</string>
+ <string name="pref_security_show_security_warning_summary" msgid="5260098316025397525">"Näita hoiatust, kui saidi turvalisusega on probleeme"</string>
+ <string name="pref_security_accept_cookies" msgid="3201367661925047989">"Nõustu küpsistega"</string>
+ <string name="pref_security_accept_cookies_summary" msgid="1907951236154433751">"Luba saitidel salvestada ja lugeda küpsiseandmeid"</string>
+ <string-array name="pref_text_size_choices">
+ <item msgid="4952686548944739548">"Pisike"</item>
+ <item msgid="1950030433642671460">"Väike"</item>
+ <item msgid="4338347520133294584">"Tavaline"</item>
+ <item msgid="5043128215356351184">"Suur"</item>
+ <item msgid="7201512237890458902">"Väga suur"</item>
+ </string-array>
+ <string name="pref_min_font_size" msgid="8811125835817449131">"Fondi miinimumsuurus"</string>
+ <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">"Teksti skaleerimine"</string>
+ <string name="pref_zoom_on_double_tap" msgid="902786475250741795">"Suumi topeltpuudutusel"</string>
+ <string name="pref_force_userscalable" msgid="5641500562399892621">"Suumi jõuga lubamine"</string>
+ <string name="pref_force_userscalable_summary" msgid="3613242300617172230">"Alistada saidi taotlus suumi juht.?"</string>
+ <string name="pref_inverted_category" msgid="1280639705117152207">"Ekraani pööratud esitus"</string>
+ <string name="pref_inverted" msgid="7613556986776824112">"Negatiivesitus"</string>
+ <string name="pref_inverted_summary" msgid="7357225897413923085">"Must muutub valgeks ja vastupidi"</string>
+ <string name="pref_inverted_contrast" msgid="8527441236225288169">"Kontrast"</string>
+ <string name="pref_default_zoom" msgid="8076142259097187395">"Vaikesuum"</string>
+ <string-array name="pref_default_zoom_choices">
+ <item msgid="549583171195154919">"Kaugele"</item>
+ <item msgid="5619034257768161024">"Keskmine"</item>
+ <item msgid="3840999588443167001">"Sule"</item>
+ </string-array>
+ <string name="pref_default_zoom_dialogtitle" msgid="6095974367125109021">"Vaikesuum"</string>
+ <string name="pref_content_load_page" msgid="2219810141690955452">"Ava lehed ülevaates"</string>
+ <string name="pref_content_load_page_summary" msgid="9168803276420332955">"Kuva just avatud lehtede ülevaade"</string>
+ <string name="pref_extras_title" msgid="7075456173747370647">"Täpsemad"</string>
+ <string name="pref_extras_website_settings" msgid="67866640052455549">"Veebisaidi seaded"</string>
+ <string name="pref_extras_website_settings_summary" msgid="1656771443223494406">"Individuaalsete veebisaitide täpsemad seaded"</string>
+ <string name="pref_extras_reset_default_title" msgid="3579760449455761762">"Vaikeseadete lähtestamine"</string>
+ <string name="pref_extras_reset_default" msgid="8904000515846202110">"Lähtesta vaikeseadetele"</string>
+ <string name="pref_extras_reset_default_summary" msgid="4247870778270414501">"Taasta vaikeseaded"</string>
+ <string name="pref_extras_reset_default_dlg" msgid="7922814420184322450">"Kas taastada seaded vaikeväärtustele?"</string>
+ <string name="pref_development_title" msgid="3263854204533056480">"Silumine"</string>
+ <string name="pref_default_text_encoding" msgid="5742965543955558478">"Teksti kodeerimine"</string>
+ <string-array name="pref_default_text_encoding_choices">
+ <item msgid="7275223955790513818">"Ladina-1 (ISO-8859-1)"</item>
+ <item msgid="2456597866837587140">"Unicode (UTF-8)"</item>
+ <item msgid="6122474363777211732">"Hiina keel (GBK)"</item>
+ <item msgid="373372275931607040">"Hiina keel (Big5)"</item>
+ <item msgid="891615911084608570">"Jaapani keel (ISO-2022-JP)"</item>
+ <item msgid="5589150448475151241">"Jaapani keel (Shift_JIS)"</item>
+ <item msgid="7356792686950371843">"Jaapani keel (EUC-JP)"</item>
+ <item msgid="2193955365569270096">"Korea keel (EUC-KR)"</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>
+ <string name="pref_font_size_category" msgid="6683754355084218254">"Teksti suurus"</string>
+ <string name="pref_lab_title" msgid="5571091610359629423">"Laborid"</string>
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"Kiirnupud"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="3149664132600968775">"Kiirn. avamiseks, rak. ja URL-riba peitmiseks libistage pöidlaga v või p serval."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Google Instant"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Kui kasutate Google Searchi, siis kasutage ka Google Instanti tulemuste nägemiseks tippimise ajal (see võib suurendada andmemahtu)."</string>
+ <string name="pref_lab_fullscreen" msgid="8173609016657987973">"Täisekraan"</string>
+ <string name="pref_lab_fullscreen_summary" msgid="7694738112219376740">"Kasutage täisekraanrežiimi olekuriba peitmiseks"</string>
+ <string name="pref_data_title" msgid="7255058703417796578">"Ribalaiuse haldus"</string>
+ <string name="pref_data_preload_title" msgid="4479320472980292873">"Otsingutulemuse eellaadimine"</string>
+ <string-array name="pref_data_preload_choices">
+ <item msgid="5180466923190095508">"Mitte kunagi"</item>
+ <item msgid="1791664748778640002">"Ainult WiFi puhul"</item>
+ <item msgid="3944061253437827617">"Alati"</item>
+ </string-array>
+ <string name="pref_data_preload_summary" msgid="3809168910751382727">"Lubage brauseril väga usaldusväärseid otsingutulemusi taustal eellaadida"</string>
+ <string name="pref_data_preload_dialogtitle" msgid="8421297746110796536">"Otsingutulemuse eellaadimine"</string>
+ <string name="pref_link_prefetch_title" msgid="4123685219009241072">"Veebilehe eellaadimine"</string>
+ <string-array name="pref_link_prefetch_choices">
+ <item msgid="4889781230398008031">"Mitte kunagi"</item>
+ <item msgid="1908465963242077428">"Ainult WiFi puhul"</item>
+ <item msgid="7647277566998527142">"Alati"</item>
+ </string-array>
+ <string name="pref_link_prefetch_summary" msgid="6558181497993206817">"Lubage brauseril lingitud veebilehti taustal eellaadida"</string>
+ <string name="pref_link_prefetch_dialogtitle" msgid="3804646141622839765">"Veebilehe eellaadimine"</string>
+ <string name="browserFrameNetworkErrorLabel" msgid="8102515020625680714">"Ühenduse probleem"</string>
+ <string name="browserFrameFileErrorLabel" msgid="4703792279852977350">"Faili probleem"</string>
+ <string name="browserFrameFormResubmitLabel" msgid="2385512101948178841"></string>
+ <string name="browserFrameFormResubmitMessage" msgid="5244059279866705254">"Leht, mida soovite vaadata, sisaldab juba saadetud andmeid („POSTDATA”). Kui saadate andmed uuesti, korratakse kõiki lehe vormil olevaid toiminguid (nt otsing või võrguost)."</string>
+ <string name="loadSuspendedTitle" msgid="6453376579109644551">"Ühendus puudub"</string>
+ <string name="loadSuspended" msgid="3843343290039218668">"Brauser ei saa seda lehte laadida, kuna puudub Interneti-ühendus."</string>
+ <string name="clear_history" msgid="5998307092715979619">"Kustuta ajalugu"</string>
+ <string name="browser_history" msgid="2979476257919939232">"Hiljuti külastatud lehed"</string>
+ <string name="empty_history" msgid="7013369425484218985">"Brauseri ajalugu puudub."</string>
+ <string name="go_home" msgid="109129207276086793">"Avaleht"</string>
+ <string name="add_new_bookmark" msgid="3158497555612337238">"Lisa järjehoidja"</string>
+ <string name="add_bookmark_short" msgid="3783984330998103735">"Lisa"</string>
+ <string name="search_hint" msgid="4647356319916631820">"Otsige või sisestage URL"</string>
+ <string name="search_button_text" msgid="5235226933877634410">"Mine"</string>
+ <string name="search_settings_description" msgid="1422401062529014107">"Järjehoidjad ja veebiajalugu"</string>
+ <string name="popup_window_attempt" msgid="31565781154067629">"Kas lubada saidil avada hüpikaken?"</string>
+ <string name="allow" msgid="1157313689171991335">"Luba"</string>
+ <string name="block" msgid="9172175889884707800">"Blokeeri"</string>
+ <string name="too_many_windows_dialog_title" msgid="5709782301477380438">"Vahelehtede piir on saavutatud"</string>
+ <string name="too_many_windows_dialog_message" msgid="3644234634638290304">"Uut vahekaarti ei saa avada seni, kuni te ühe sulgete."</string>
+ <string name="too_many_subwindows_dialog_title" msgid="3805453941587725944">"Hüpik on juba avatud"</string>
+ <string name="too_many_subwindows_dialog_message" msgid="2164725447981195556">"Korraga saab avada ainult ühe hüpiku."</string>
+ <string name="download_no_sdcard_dlg_title" product="nosdcard" msgid="56777245081568508">"USB-seade pole saadaval"</string>
+ <string name="download_no_sdcard_dlg_title" product="default" msgid="605904452159416792">"SD-kaart puudub"</string>
+ <string name="download_no_sdcard_dlg_msg" product="nosdcard" msgid="3144652102051031721">"Faili <xliff:g id="FILENAME">%s</xliff:g> allalaadimiseks on vajalik USB-mäluseade."</string>
+ <string name="download_no_sdcard_dlg_msg" product="default" msgid="2616399456116301518">"Faili <xliff:g id="FILENAME">%s</xliff:g> allalaadimiseks on vajalik SD-kaart."</string>
+ <string name="download_sdcard_busy_dlg_title" product="nosdcard" msgid="8081445664689818973">"USB-seade pole saadaval"</string>
+ <string name="download_sdcard_busy_dlg_title" product="default" msgid="6877712666046917741">"SD-kaart pole saadaval"</string>
+ <string name="download_sdcard_busy_dlg_msg" product="nosdcard" msgid="8412543086906716875">"USB-mäluseade on hõivatud. Allalaadimiste lubamiseks puudutage teatises käsku „Lülita USB-mäluseade välja”."</string>
+ <string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"SD-kaart on hõivatud. Allalaadimiste lubamiseks valige teatises käsk „Lülita USB-mäluseade välja”."</string>
+ <string name="cannot_download" msgid="8150552478556798780">"Alla laadida saab ainult protokolli „http” või „https” sisaldavaid URL-e."</string>
+ <string name="download_pending" msgid="2599683668575349559">"Allalaadimise alustamine ..."</string>
+ <string name="search_the_web" msgid="6046130189241962337">"Otsige veebist"</string>
+ <string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Brauseri maht täis"</string>
+ <string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Puudutage vaba ruumi loomiseks."</string>
+ <string name="webstorage_clear_data_title" msgid="689484577124333977">"Kustuta talletatud andmed"</string>
+ <string name="webstorage_clear_data_dialog_message" msgid="6200681632891775881">"Kas kustutada kõik selle veebisaidi salvestatud andmed?"</string>
+ <string name="webstorage_clear_data_dialog_ok_button" msgid="6682570951259237542">"OK"</string>
+ <string name="webstorage_clear_data_dialog_cancel_button" msgid="2028867751958942762">"Tühista"</string>
+ <string name="webstorage_origin_summary_mb_stored" msgid="1985885826292236210">"MB talletatud teie telefoni"</string>
+ <string name="loading_video" msgid="7886324933131962321">"Video laadimine ..."</string>
+ <string name="geolocation_permissions_prompt_message" msgid="356796102004052471">"<xliff:g id="WEBSITE_ORIGIN">%s</xliff:g> tahab teada teie asukohta"</string>
+ <string name="geolocation_permissions_prompt_share" msgid="9084486342048347976">"Asukoha jagamine"</string>
+ <string name="geolocation_permissions_prompt_dont_share" msgid="6303025160237860300">"Keeldu"</string>
+ <string name="geolocation_permissions_prompt_remember" msgid="3118526300707348308">"Pea eelistus meeles"</string>
+ <string name="geolocation_permissions_prompt_toast_allowed" msgid="7201417941112726112">"Sellel saidil puudub juurdepääs teie asukohale. Seda saate muuta järgmiste valikute abil: Seaded &gt Täpsem &gt Veebisaidi kuva."</string>
+ <string name="geolocation_permissions_prompt_toast_disallowed" msgid="156443445797377409">"Sellel saidil puudub juurdepääs teie asukohale. Seda saate muuta järgmiste valikute abil: Seaded -> Täpsem -> Veebisaidi kuva."</string>
+ <string name="geolocation_settings_page_title" msgid="1745477985097536528">"Kustuta asukoha juurdepääs"</string>
+ <string name="geolocation_settings_page_summary_allowed" msgid="9180251524290811398">"Sellel saidil on praegu juurdepääs teie asukohale"</string>
+ <string name="geolocation_settings_page_summary_not_allowed" msgid="7941769772784366199">"Sellel saidil puudub praegu juurdepääs teie asukohale"</string>
+ <string name="geolocation_settings_page_dialog_message" msgid="8772923416296868537">"Kustuta selle veebisaidi asukoha juurdepääs"</string>
+ <string name="geolocation_settings_page_dialog_ok_button" msgid="2113465477131017852">"OK"</string>
+ <string name="geolocation_settings_page_dialog_cancel_button" msgid="7941036504673409747">"Tühista"</string>
+ <string name="website_settings_clear_all" msgid="8739804325997655980">"Kustuta kõik"</string>
+ <string name="website_settings_clear_all_dialog_message" msgid="1551164275687475061">"Kas kustutada kõik veebilehe andmed ja asukoha õigused?"</string>
+ <string name="website_settings_clear_all_dialog_ok_button" msgid="7858504776529106243">"OK"</string>
+ <string name="website_settings_clear_all_dialog_cancel_button" msgid="1896757051856611674">"Tühista"</string>
+ <string name="progress_dialog_setting_wallpaper" msgid="2031391201442335889">"Taustapildi seadmine ..."</string>
+ <string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Järjehoidjad"</string>
+ <string name="empty_bookmarks_folder" msgid="6239830231917618556">"Järjehoidjaid pole"</string>
+ <string name="other_bookmarks" msgid="8021889794475657319">"Muud järjehoidjad"</string>
+ <string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Konto valimine"</string>
+ <string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Sünkroonige Google\'i kontoga"</string>
+ <string name="import_bookmarks_dialog_description" msgid="2362897194870789609">"Selle seadme järjehoidjad ei ole veel ühegi Google\'i kontoga seotud. Salvestage järjehoidjad, lisades need kontole. Kui te ei soovi järjehoidjaid sünkroonida, kustutage need."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="7643058662272484895">"Lisage praegu seadmes olevad järjehoidjad ja alustage sünkroonimist Google\'i kontoga"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="4333848003180415516">"Kas kustutada praegu seadmes olevad järjehoidjad ja alustada järjehoidjate sünkroonimist Google\'i kontoga?"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="2204771572755630570">"Kas kustutada praegu seadmes olevad järjehoidjad ja alustada järjehoidjate sünkroonimist kontoga <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>?"</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="8942794112340838111">"Kas lisada praegu seadmes olevad järjehoidjad ja alustada järjehoidjate sünkroonimist kontoga <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>?"</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Kustuta järjehoidjad"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Järgmine"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Eelmine"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Tühista"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Valmis"</string>
+ <string name="import_bookmarks_dialog_add" msgid="1743359725294101189">"Lisa järjehoidjad Google\'i kontole"</string>
+ <string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Lisage Androidi järjehoidjad konto <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g> järjehoidjatesse"</string>
+ <string name="menu_share_url" msgid="5851814357333739700">"Jagamine"</string>
+ <string name="max_tabs_warning" msgid="4122034303809457570">"Rohkem vahelehti pole saadaval"</string>
+ <string name="instant_search_label" msgid="8769284297650716935">"Google koos Instantiga (Labs)"</string>
+ <string name="preview" msgid="6450823514561689038">"Eelvaade"</string>
+ <string name="local_bookmarks" msgid="533816851415228520">"Kohalikud"</string>
+ <string name="ua_switcher_desktop" msgid="220097077327558435">"Taotle saidi arvutiversiooni"</string>
+ <string name="permission_preload_label" msgid="4856971662337877316">"Tulemuste eellaadimine"</string>
+ <string name="empty_snapshots_folder" msgid="7675378008107026013">"Salvestatud lehti ei ole."</string>
+ <string name="remove_snapshot" msgid="1624447424544976849">"Kustuta salvestatud leht"</string>
+ <string name="snapshot_go_live" msgid="1209542802541168497">"Ava originaal"</string>
+ <string name="accessibility_button_back" msgid="6194680634245279407">"Mine tagasi"</string>
+ <string name="accessibility_button_forward" msgid="1236827218480658168">"Mine edasi"</string>
+ <string name="accessibility_button_refresh" msgid="1023441396241841313">"Värskenda lehte"</string>
+ <string name="accessibility_button_stop" msgid="6793644120043222148">"Peata lehe laadimine"</string>
+ <string name="accessibility_button_addbookmark" msgid="4787844912630006181">"Lisa leht järjehoidjatesse"</string>
+ <string name="accessibility_button_search" msgid="5357014102136055376">"Otsing"</string>
+ <string name="accessibility_button_voice" msgid="152016375096083337">"Alusta häälotsingut"</string>
+ <string name="accessibility_button_bookmarks" msgid="7435055677299151649">"Järjehoidjad"</string>
+ <string name="accessibility_button_closetab" msgid="6954807842756927737">"Sule vaheleht"</string>
+ <string name="accessibility_button_newtab" msgid="4116986240706315748">"Ava uus vaheleht"</string>
+ <string name="accessibility_button_newincognitotab" msgid="5254901889040012964">"Ava uus incognito vaheleht"</string>
+ <string name="accessibility_button_clear" msgid="6943152307986161598">"Tühista sisestus"</string>
+ <string name="accessibility_button_uaswitch" msgid="6286804719724282339">"Vaheta kasutajaagenti"</string>
+ <string name="accessibility_button_go" msgid="1182818872083055958">"Mine"</string>
+ <string name="accessibility_button_navscreen" msgid="9142904748728713075">"Lehe haldur"</string>
+ <string name="accessibility_button_more" msgid="3054251446394224216">"Rohkem valikuid"</string>
+ <string name="accessibility_state_incognito" msgid="5786038488425202355">"Incognito leht"</string>
+ <string name="accessibility_state_frozen" msgid="8041539250447035570">"Salvestatud leht"</string>
+ <string name="accessibility_transition_navscreen" msgid="2734915619351519547">"Vahelehtede haldamine"</string>
+ <string name="accessibility_button_bookmarks_folder_up" msgid="9179389954714270505">"Eelmine kaust"</string>
+</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index d056245..2bc6561 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -61,7 +61,7 @@
<string name="location" msgid="3411848697912600125">"آدرس"</string>
<string name="account" msgid="5179824606448077042">"حساب"</string>
<string name="containing_folder" msgid="6771180232953030479">"افزودن به"</string>
- <string name="new_folder" msgid="7743540149088867917">"پوشه جدید"</string>
+ <string name="new_folder" msgid="7743540149088867917">"پوشهٔ جدید"</string>
<string name="edit_folder" msgid="621817453133656156">"ویرایشگر پوشه"</string>
<string name="delete_folder" msgid="2046483129024501116">"حذف پوشه"</string>
<string name="no_subfolders" msgid="3303645239686962674">"پوشه فرعی وجود ندارد."</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index bf1ea78..32e1f58 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -255,7 +255,7 @@
<string name="pref_extras_reset_default_summary" msgid="4247870778270414501">"Rétablir les paramètres par défaut"</string>
<string name="pref_extras_reset_default_dlg" msgid="7922814420184322450">"Rétablir les valeurs par défaut ?"</string>
<string name="pref_development_title" msgid="3263854204533056480">"Débogage"</string>
- <string name="pref_default_text_encoding" msgid="5742965543955558478">"Codage du texte"</string>
+ <string name="pref_default_text_encoding" msgid="5742965543955558478">"Encodage du texte"</string>
<string-array name="pref_default_text_encoding_choices">
<item msgid="7275223955790513818">"Latin-1 (ISO-8859-1)"</item>
<item msgid="2456597866837587140">"Unicode (UTF-8)"</item>
@@ -266,7 +266,7 @@
<item msgid="7356792686950371843">"Japonais (EUC-JP)"</item>
<item msgid="2193955365569270096">"Coréen (EUC-KR)"</item>
</string-array>
- <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Codage du texte"</string>
+ <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Encodage du texte"</string>
<string name="pref_accessibility_title" msgid="5127836981587423215">"Accessibilité"</string>
<string name="pref_font_size_category" msgid="6683754355084218254">"Taille de la police"</string>
<string name="pref_lab_title" msgid="5571091610359629423">"Labs"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 629006f..6679bae 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -107,7 +107,7 @@
<string name="saving_snapshot" msgid="1693789062351182809">"सहेजा जा रहा है…"</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>
+ <string name="contextheader_folder_empty" msgid="974171637803391651">"खाली फ़ोल्डर"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"खोलें"</string>
<string name="contextmenu_openlink_newwindow" msgid="1205313604181761403">"नए टैब में खोलें"</string>
<string name="contextmenu_openlink_newwindow_background" msgid="4690381019116746687">"नए पृष्ठभूमि टैब में खोलें"</string>
@@ -129,8 +129,8 @@
<string name="menu_preferences" msgid="6709237687234102240">"सेटिंग"</string>
<string name="pref_content_title" msgid="3834107397725342174">"पृष्ठ सामग्री"</string>
<string name="pref_allow_apptabs" msgid="1325989799080202871">"हर एप्लि. हेतु एकाधिक टैब की अनुमति दें"</string>
- <string name="pref_content_load_images" msgid="2125616852957377561">"छवियां लोड करें"</string>
- <string name="pref_content_load_images_summary" msgid="5055874125248398584">"वेब पृष्ठों पर छवियां दिखाएं"</string>
+ <string name="pref_content_load_images" msgid="2125616852957377561">"चित्र लोड करें"</string>
+ <string name="pref_content_load_images_summary" msgid="5055874125248398584">"वेब पृष्ठों पर चित्र दिखाएं"</string>
<string name="pref_content_block_popups" msgid="4158524847764470895">"पॉप-अप अवरुद्ध करें"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"JavaScript सक्षम करें"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"पृष्ठभूमि में खोलें"</string>
@@ -356,7 +356,7 @@
<string name="other_bookmarks" msgid="8021889794475657319">"अन्य बुकमार्क"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
<string name="account_chooser_dialog_title" msgid="3314204833188808194">"खाता चुनें"</string>
- <string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Google खाते से सिंक करें"</string>
+ <string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Google खाते से समन्वयन करें"</string>
<string name="import_bookmarks_dialog_description" msgid="2362897194870789609">"इस उपकरण के बुकमार्क अभी तक किसी Google खाते से संबद्ध नहीं हैं. इन बुकमार्क को किसी खाते में जोड़कर सहेजें. यदि आप इन बुकमार्क को समन्वयित करना नहीं चाहते हैं तो उन्हें हटा दें."</string>
<string name="import_bookmarks_dialog_select_add_account" msgid="7643058662272484895">"इस उपकरण पर वर्तमान में मौजूद बुकमार्क जोड़ें और Google खाते के साथ समन्वयित करना प्रारंभ करें"</string>
<string name="import_bookmarks_dialog_delete_select_account" msgid="4333848003180415516">"इस उपकरण पर वर्तमान में मौजूद बुकमार्क हटाएं और Google खाते के साथ समन्वयित करना प्रारंभ करें"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index c7a76ae..fe2aad6 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -171,9 +171,9 @@
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"Nama lengkap:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"Email:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"Nama perusahaan:"</string>
- <string name="autofill_profile_editor_address_line_1" msgid="836433242509243081">"Baris alamat 1:"</string>
+ <string name="autofill_profile_editor_address_line_1" msgid="836433242509243081">"Alamat baris 1:"</string>
<string name="autofill_profile_editor_address_line_1_hint" msgid="5965659598509327172">"Alamat jalan, P.O. box, c/o"</string>
- <string name="autofill_profile_editor_address_line_2" msgid="8194745202893822479">"Baris alamat 2:"</string>
+ <string name="autofill_profile_editor_address_line_2" msgid="8194745202893822479">"Alamat baris 2:"</string>
<string name="autofill_profile_editor_address_line_2_hint" msgid="8529642768127569254">"Apartemen, suite, unit, bangunan, lantai, dll."</string>
<string name="autofill_profile_editor_city" msgid="7306716145784997135">"Kota:"</string>
<string name="autofill_profile_editor_state" msgid="2150403366835080407">"Negara Bagian/Provinsi/Daerah:"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
new file mode 100644
index 0000000..68a2f61
--- /dev/null
+++ b/res/values-ms-rMY/strings.xml
@@ -0,0 +1,402 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2007 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="application_name" msgid="1935869255545976415">"Penyemak imbas"</string>
+ <string name="choose_upload" msgid="3649366287575002063">"Pilih fail untuk dimuat naik"</string>
+ <string name="uploads_disabled" msgid="463761197575372994">"Muat naik fail dilumpuhkan."</string>
+ <string name="new_tab" msgid="7971857320679510529">"Tab baharu"</string>
+ <string name="new_incognito_tab" msgid="3606197964239039478">"Tab penyamaran baru"</string>
+ <string name="tab_bookmarks" msgid="2305793036003473653">"Penanda halaman"</string>
+ <string name="tab_most_visited" msgid="1077402532455000703">"Yang paling kerap dilawati"</string>
+ <string name="tab_history" msgid="1979267558744613746">"Sejarah"</string>
+ <string name="tab_snapshots" msgid="1449241204980265186">"Halaman disimpan"</string>
+ <string name="added_to_bookmarks" msgid="4028710765672851635">"Ditambahkan pada penanda halaman."</string>
+ <string name="removed_from_bookmarks" msgid="546648923924996722">"Dialih keluar daripada penanda halaman."</string>
+ <string name="sign_in_to" msgid="5939425800148759165">"Log masuk ke \"<xliff:g id="REALM">%s2</xliff:g>\" <xliff:g id="HOSTNAME">%s1</xliff:g>"</string>
+ <string name="username" msgid="5057566336518215922">"Nama"</string>
+ <string name="password" msgid="1177138552305184404">"Kata laluan"</string>
+ <string name="action" msgid="183105774472071343">"Log masuk"</string>
+ <string name="bookmarks_add_page" msgid="3093456701072617702">"Simpan penanda halaman"</string>
+ <string name="bookmarks_search" msgid="5229596268214362873">"Penyemak imbas"</string>
+ <string name="cancel" msgid="3017274947407233702">"Batal"</string>
+ <string name="ok" msgid="1509280796718850364">"OK"</string>
+ <string name="title_bar_loading" msgid="7438217780834640678">"Memuatkan..."</string>
+ <string name="page_info" msgid="4048529256302257195">"Maklumat halaman"</string>
+ <string name="page_info_view" msgid="5303490449842635158">"Lihat maklumat halaman"</string>
+ <string name="page_info_address" msgid="2222306609532903254">"Alamat:"</string>
+ <string name="ssl_warnings_header" msgid="79744901983636370">"Terdapat masalah dengan sijil keselamatan untuk tapak ini."</string>
+ <string name="ssl_continue" msgid="8031515015829358457">"Teruskan"</string>
+ <string name="security_warning" msgid="6607795404322797541">"Amaran keselamatan"</string>
+ <string name="view_certificate" msgid="1472768887529093862">"Lihat sijil"</string>
+ <string name="ssl_go_back" msgid="4598951822061593819">"Kembali"</string>
+ <string name="ssl_untrusted" msgid="7754507359360636447">"Sijil ini bukan daripada pihak berkuasa yang dipercayai."</string>
+ <string name="ssl_mismatch" msgid="3809794439740523641">"Nama tapak tidak sepadan dengan nama pada sijil."</string>
+ <string name="ssl_expired" msgid="5739349389499575559">"Sijil ini telah tamat tempoh."</string>
+ <string name="ssl_not_yet_valid" msgid="8193083327719048247">"Sijil ini belum lagi sah."</string>
+ <string name="ssl_date_invalid" msgid="3705563379257285534">"Sijil ini mempunyai tarikh yang tidak sah."</string>
+ <string name="ssl_invalid" msgid="9041704741505449967">"Sijil ini tidak sah."</string>
+ <string name="ssl_unknown" msgid="5679243486524754571">"Ralat sijil tidak diketahui."</string>
+ <string name="stopping" msgid="4839698519340302982">"Menghentikan…"</string>
+ <string name="stop" msgid="5687251076030630074">"Henti"</string>
+ <string name="reload" msgid="8585220783228408062">"Muat semula"</string>
+ <string name="back" msgid="8414603107175713668">"Kembali"</string>
+ <string name="forward" msgid="4288210890526641577">"Ke hadapan"</string>
+ <string name="save" msgid="5922311934992468496">"OK"</string>
+ <string name="do_not_save" msgid="6777633870113477714">"Batal"</string>
+ <string name="location" msgid="3411848697912600125">"Alamat"</string>
+ <string name="account" msgid="5179824606448077042">"Akaun"</string>
+ <string name="containing_folder" msgid="6771180232953030479">"Tambah ke"</string>
+ <string name="new_folder" msgid="7743540149088867917">"Folder baru"</string>
+ <string name="edit_folder" msgid="621817453133656156">"Edit folder"</string>
+ <string name="delete_folder" msgid="2046483129024501116">"Padamkan folder"</string>
+ <string name="no_subfolders" msgid="3303645239686962674">"Tiada subfolder."</string>
+ <string name="add_to_bookmarks_menu_option" msgid="4449323955122214389">"Penanda halaman"</string>
+ <string name="add_to_homescreen_menu_option" msgid="1461447829242963790">"Skrin utama"</string>
+ <string name="add_to_other_folder_menu_option" msgid="5947586525822134105">"Folder lain"</string>
+ <string name="name" msgid="5462672162695365387">"Label"</string>
+ <string name="http" msgid="2163722670597250102">"http://"</string>
+ <string name="save_to_bookmarks" msgid="1679286010089780932">"Disimpan pada penanda halaman"</string>
+ <string name="bookmark_this_page" msgid="7530739804320811054">"Menanda halaman laman ini"</string>
+ <string name="remove" msgid="7820112494467011374">"Alih keluar"</string>
+ <string name="edit_bookmark" msgid="5024089053490231905">"Edit penanda halaman"</string>
+ <string name="create_shortcut_bookmark" msgid="1995095662095484289">"Tambah pintasan ke laman utama"</string>
+ <string name="open_bookmark" msgid="8473581305759935790">"Buka"</string>
+ <string name="remove_bookmark" msgid="8407495852801410891">"Padam penanda halaman"</string>
+ <string name="remove_from_bookmarks" msgid="4374080666576982775">"Alih keluar daripada penanda halaman"</string>
+ <string name="remove_history_item" msgid="5021424935726728618">"Alih keluar daripada sejarah"</string>
+ <string name="set_as_homepage" msgid="4752937379414905560">"Tetapkan sebagai halaman utama"</string>
+ <string name="bookmark_saved" msgid="2766434679871317557">"Disimpan ke penanda halaman."</string>
+ <string name="bookmark_not_saved" msgid="1077732557310662080">"Tidak dapat menyimpan penanda halaman."</string>
+ <string name="homepage_set" msgid="8768087280310966395">"Halaman utama sudah ditetapkan."</string>
+ <string name="bookmark_needs_title" msgid="6245900436119218187">"Penanda halaman mesti mempunyai nama."</string>
+ <string name="bookmark_needs_url" msgid="7809876865972755158">"Penanda halaman mesti mempunyai lokasi."</string>
+ <string name="bookmark_url_not_valid" msgid="4917440933384496211">"URL ini tidak sah."</string>
+ <string name="bookmark_cannot_save_url" msgid="7836064647943671126">"URL ini tidak boleh ditandakan halamannya."</string>
+ <string name="bookmark_page" msgid="6845189305130307274">"Tandakan halaman yang terakhir dilihat"</string>
+ <string name="bookmark_thumbnail_view" msgid="3164068314718522138">"Lakaran kenit"</string>
+ <string name="bookmark_list_view" msgid="7848510619500937839">"Senarai"</string>
+ <string name="current_page" msgid="7510129573681663135">"dari "</string>
+ <string name="delete_bookmark_warning" msgid="7825328496411904321">"Padamkan penanda halaman \"<xliff:g id="BOOKMARK">%s</xliff:g>\"?"</string>
+ <string name="open_all_in_new_window" msgid="455786763426575293">"Buka semua dalam tab baru"</string>
+ <string name="goto_dot" msgid="3895839050522602723">"Pergi"</string>
+ <string name="select_dot" msgid="6299170761900561967">"Pilih teks"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Tutup tab lain"</string>
+ <string name="bookmarks" msgid="1961279134885867815">"Penanda halaman"</string>
+ <string name="shortcut_bookmark" msgid="3974876480401135895">"Penanda halaman"</string>
+ <string name="shortcut_bookmark_title" msgid="7570786275916681296">"Pilih penanda halaman"</string>
+ <string name="history" msgid="2451240511251410032">"Sejarah"</string>
+ <string name="menu_view_download" msgid="2124570321712995120">"Muat turun"</string>
+ <string name="copy_page_url" msgid="1188679152608889555">"Salin URL halaman"</string>
+ <string name="share_page" msgid="593756995297268343">"Kongsi halaman"</string>
+ <string name="menu_save_snapshot" msgid="6935080344031126139">"Simpan untuk pembacaan di luar talian"</string>
+ <string name="saving_snapshot" msgid="1693789062351182809">"Menyimpan..."</string>
+ <string name="snapshot_failed" msgid="4584580873565876033">"Tidak dapat disimpan untuk pembacaan di luar talian."</string>
+ <string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"<xliff:g id="BOOKMARK_COUNT">%d</xliff:g> penanda halaman"</string>
+ <string name="contextheader_folder_empty" msgid="974171637803391651">"Folder kosong"</string>
+ <string name="contextmenu_openlink" msgid="7237961252214188935">"Buka"</string>
+ <string name="contextmenu_openlink_newwindow" msgid="1205313604181761403">"Buka dalam tab baru"</string>
+ <string name="contextmenu_openlink_newwindow_background" msgid="4690381019116746687">"Buka dalam tab latar belakang baru"</string>
+ <string name="contextmenu_savelink" msgid="5508554930832538184">"Simpan pautan"</string>
+ <string name="contextmenu_sharelink" msgid="5392275392280130331">"Kongsi pautan"</string>
+ <string name="contextmenu_copy" msgid="398860586635404030">"Salin"</string>
+ <string name="contextmenu_copylink" msgid="5153657160294534270">"Salin URL pautan"</string>
+ <string name="contextmenu_download_image" msgid="4243829645180686912">"Simpan imej"</string>
+ <string name="contextmenu_view_image" msgid="3870625602053600905">"Papar imej"</string>
+ <string name="contextmenu_set_wallpaper" msgid="3691902960115350686">"Tetapkan sebagai kertas dinding"</string>
+ <string name="contextmenu_dial_dot" msgid="5856550683415933806">"Dail..."</string>
+ <string name="contextmenu_add_contact" msgid="3183511922223645716">"Tambah kenalan"</string>
+ <string name="contextmenu_send_mail" msgid="1014513374828775660">"Hantar e-mel"</string>
+ <string name="contextmenu_map" msgid="7471390435434034912">"Peta"</string>
+ <string name="choosertitle_sharevia" msgid="4600490613341909086">"Kongsi melalui"</string>
+ <string name="clear" msgid="7070043081700011461">"Padam bersih"</string>
+ <string name="replace" msgid="4843033491070384047">"Gantikan"</string>
+ <string name="browser_bookmarks_page_bookmarks_text" msgid="6787605028726162673">"Penanda halaman"</string>
+ <string name="menu_preferences" msgid="6709237687234102240">"Tetapan"</string>
+ <string name="pref_content_title" msgid="3834107397725342174">"Kandungan halaman"</string>
+ <string name="pref_allow_apptabs" msgid="1325989799080202871">"Benarkan tab berbilang untuk setiap apl"</string>
+ <string name="pref_content_load_images" msgid="2125616852957377561">"Muatkan imej"</string>
+ <string name="pref_content_load_images_summary" msgid="5055874125248398584">"Paparkan imej di halaman web"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"Sekat pop timbul"</string>
+ <string name="pref_content_javascript" msgid="4570972030299516843">"Dayakan JavaScript"</string>
+ <string name="pref_content_open_in_background" msgid="824123779725118663">"Buka di latar belakang"</string>
+ <string name="pref_content_plugins" msgid="7231944644794301582">"Dayakan pemalam"</string>
+ <string-array name="pref_content_plugins_choices">
+ <item msgid="6745108155096660725">"Sentiasa hidup"</item>
+ <item msgid="2484126708670016519">"Atas permintaan"</item>
+ <item msgid="8547442717307793863">"Mati"</item>
+ </string-array>
+ <string name="pref_content_open_in_background_summary" msgid="955411158407739504">"Buka tab baharu di belakang tab semasa"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"Tetapkan halaman utama"</string>
+ <string name="pref_content_search_engine" msgid="1620101310821644144">"Tetapkan enjin carian"</string>
+ <string name="pref_content_search_engine_summary" msgid="304003941861818133">"Pilih enjin carian"</string>
+ <string name="pref_set_homepage_to" msgid="7838684355145561242">"Tetapkan pada"</string>
+ <string-array name="pref_homepage_choices">
+ <item msgid="844041670142910837">"Halaman semasa"</item>
+ <item msgid="4430498748295169195">"Halaman kosong"</item>
+ <item msgid="5747608191946904074">"Halaman lalai"</item>
+ <item msgid="6092441301001006473">"Tapak yang paling kerap dilawati"</item>
+ <item msgid="6569304572171444894">"Lain-lain"</item>
+ </string-array>
+ <string name="pref_content_autofit" msgid="8260474534053660809">"Muat auto halaman"</string>
+ <string name="pref_content_autofit_summary" msgid="324810555822572112">"Formatkan halaman web agar padan dengan saiz skrin"</string>
+ <string name="pref_general_title" msgid="1946872771219249323">"Umum"</string>
+ <string name="pref_general_sync_title" msgid="3138637035975860324">"Penyegerakan"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"Auto isi"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"Auto isi borang"</string>
+ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Mengisi borang web dengan satu sentuhan"</string>
+ <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Teks auto isi"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Sediakan teks untuk auto isi borang web"</string>
+ <string name="pref_autologin_title" msgid="4421187193809267096">"Log masuk Google automatik"</string>
+ <string name="pref_autologin_progress" msgid="8333244467048833461">"Melog masuk ke dalam tapak Google menggunakan <xliff:g id="ID_1">%s</xliff:g>"</string>
+ <string name="autologin_bar_text" msgid="3684581827167173371">"Log masuk sebagai"</string>
+ <string name="autologin_bar_login_text" msgid="3336615320510851879">"Log masuk"</string>
+ <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Sembunyikn"</string>
+ <string name="autologin_bar_error" msgid="7470001207395920811">"Tidak dapat melog masuk."</string>
+ <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Taipkan teks yang anda ingin auto isi pada borang web."</string>
+ <string name="autofill_profile_editor_name" msgid="8566130291459685955">"Nama penuh:"</string>
+ <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"E-mel:"</string>
+ <string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"Nama syarikat:"</string>
+ <string name="autofill_profile_editor_address_line_1" msgid="836433242509243081">"Alamat baris 1:"</string>
+ <string name="autofill_profile_editor_address_line_1_hint" msgid="5965659598509327172">"Alamat jalan, P.S, d/a"</string>
+ <string name="autofill_profile_editor_address_line_2" msgid="8194745202893822479">"Alamat baris 2:"</string>
+ <string name="autofill_profile_editor_address_line_2_hint" msgid="8529642768127569254">"Pangsapuri, suite, unit, bangunan, tingkat, dll."</string>
+ <string name="autofill_profile_editor_city" msgid="7306716145784997135">"Bandar/Pekan:"</string>
+ <string name="autofill_profile_editor_state" msgid="2150403366835080407">"Negeri/Daerah/Wilayah:"</string>
+ <string name="autofill_profile_editor_zip_code" msgid="283668573295656671">"Poskod:"</string>
+ <string name="autofill_profile_editor_country" msgid="7234470301239156656">"Negara:"</string>
+ <string name="autofill_profile_editor_phone_number" msgid="4938852821413729276">"Telefon:"</string>
+ <string name="autofill_profile_editor_phone_number_invalid" msgid="6795411298467068957">"Nombor telefon tidak sah."</string>
+ <string name="autofill_profile_editor_save_profile" msgid="3230301454458581157">"Simpan"</string>
+ <string name="autofill_profile_successful_save" msgid="5691459703493331983">"Teks auto isi disimpan."</string>
+ <string name="autofill_profile_successful_delete" msgid="1790262652460723127">"Teks auto-isi dipadamkan."</string>
+ <string name="autofill_profile_editor_delete_profile" msgid="3098369314558164153">"Padam"</string>
+ <string name="autofill_setup_dialog_message" msgid="7123905786076456503">"Penyemak imbas boleh melengkapkan borang web seperti ini secara automatik. Adakah anda ingin menyediakan teks auto-isi anda?"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="3288881675232206984">"Anda boleh menyediakan teks auto-isi anda daripada skrin Penyemak Imbas > Tetapan > Umum."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"Lumpuhkan auto isi"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"Privasi & keselamatan"</string>
+ <string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Padam bersih cache"</string>
+ <string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Padam bersih kandungan tercache dan pangkalan data setempat"</string>
+ <string name="pref_privacy_clear_cache_dlg" msgid="4344512581716422465">"Padamkan kandungan tercache dan pangkalan data tempatan?"</string>
+ <string name="pref_privacy_cookies_title" msgid="6763274282214830526">"Kuki"</string>
+ <string name="pref_privacy_clear_cookies" msgid="3095583579133780331">"Padam bersih semua data kuki"</string>
+ <string name="pref_privacy_clear_cookies_summary" msgid="6962742063990677520">"Padam bersih semua kuki penyemak imbas"</string>
+ <string name="pref_privacy_clear_cookies_dlg" msgid="1493252163164621278">"Padamkan semua kuki?"</string>
+ <string name="pref_privacy_clear_history" msgid="8723795508825198477">"Padam bersih sejarah"</string>
+ <string name="pref_privacy_clear_history_summary" msgid="6868501330708940734">"Padam bersih sejarah navigasi penyemak imbas"</string>
+ <string name="pref_privacy_clear_history_dlg" msgid="6934317391642846227">"Padamkan sejarah navigasi penyemak imbas?"</string>
+ <string name="pref_privacy_formdata_title" msgid="6549813837982050424">"Data borang"</string>
+ <string name="pref_privacy_clear_form_data" msgid="4232668196344383987">"Padam bersih data borang"</string>
+ <string name="pref_privacy_clear_form_data_summary" msgid="7702091143640546200">"Kosongkan semua data borang yang disimpan"</string>
+ <string name="pref_privacy_clear_form_data_dlg" msgid="8205626042241338983">"Padamkan semua data borang yang disimpan?"</string>
+ <string name="pref_privacy_clear_passwords" msgid="4750234112289277480">"Padam bersih kata laluan"</string>
+ <string name="pref_privacy_clear_passwords_summary" msgid="8856782718942903335">"Padam bersih semua kata laluan yang disimpan"</string>
+ <string name="pref_privacy_clear_passwords_dlg" msgid="5836576259947160045">"Padamkan semua kata laluan yang disimpan?"</string>
+ <string name="pref_privacy_location_title" msgid="7458378016606081067">"Lokasi"</string>
+ <string name="pref_privacy_enable_geolocation" msgid="1395040170290765686">"Dayakan lokasi"</string>
+ <string name="pref_privacy_enable_geolocation_summary" msgid="8437020934664306205">"Benarkan tapak meminta akses ke lokasi anda"</string>
+ <string name="pref_privacy_clear_geolocation_access" msgid="6649680770030042980">"Padam bersih akses lokasi"</string>
+ <string name="pref_privacy_clear_geolocation_access_summary" msgid="7750143359497314679">"Padam bersih akses lokasi bagi semua tapak web"</string>
+ <string name="pref_privacy_clear_geolocation_access_dlg" msgid="3190928760598034346">"Padamkan akses lokasi laman web?"</string>
+ <string name="pref_security_passwords_title" msgid="5734190542383756711">"Kata laluan"</string>
+ <string name="pref_security_remember_passwords" msgid="6492957683454529549">"Ingat kata laluan"</string>
+ <string name="pref_security_remember_passwords_summary" msgid="256388703356349137">"Simpan nama pengguna dan kata laluan untuk tapak web"</string>
+ <string name="pref_security_save_form_data" msgid="1213669802810198893">"Ingat data borang"</string>
+ <string name="pref_security_save_form_data_summary" msgid="4994074685153708026">"Ingat data yang saya taipkan dalam borang untuk kegunaan akan datang"</string>
+ <string name="pref_security_show_security_warning" msgid="8901135676266754559">"Tunjukkan amaran keselamatan"</string>
+ <string name="pref_security_show_security_warning_summary" msgid="5260098316025397525">"Tunjukkan amaran jika terdapat masalah dengan keselamatan tapak"</string>
+ <string name="pref_security_accept_cookies" msgid="3201367661925047989">"Terima kuki"</string>
+ <string name="pref_security_accept_cookies_summary" msgid="1907951236154433751">"Benarkan tapak menyimpan dan membaca data kuki"</string>
+ <string-array name="pref_text_size_choices">
+ <item msgid="4952686548944739548">"Sangat kecil"</item>
+ <item msgid="1950030433642671460">"Kecil"</item>
+ <item msgid="4338347520133294584">"Biasa"</item>
+ <item msgid="5043128215356351184">"Besar"</item>
+ <item msgid="7201512237890458902">"Sangat Besar"</item>
+ </string-array>
+ <string name="pref_min_font_size" msgid="8811125835817449131">"Saiz fon minimum"</string>
+ <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">"Penskalaan teks"</string>
+ <string name="pref_zoom_on_double_tap" msgid="902786475250741795">"Zum pada ketik dua kali"</string>
+ <string name="pref_force_userscalable" msgid="5641500562399892621">"Paksa dayakan zum"</string>
+ <string name="pref_force_userscalable_summary" msgid="3613242300617172230">"Tolak permintaan laman web untuk mengawal kelakuan zum"</string>
+ <string name="pref_inverted_category" msgid="1280639705117152207">"Pemaparan skrin songsang"</string>
+ <string name="pref_inverted" msgid="7613556986776824112">"Pemaparan songsang"</string>
+ <string name="pref_inverted_summary" msgid="7357225897413923085">"Hitam menjadi putih dan sebaliknya"</string>
+ <string name="pref_inverted_contrast" msgid="8527441236225288169">"Kontras"</string>
+ <string name="pref_default_zoom" msgid="8076142259097187395">"Zum lalai"</string>
+ <string-array name="pref_default_zoom_choices">
+ <item msgid="549583171195154919">"Jauh"</item>
+ <item msgid="5619034257768161024">"Sederhana"</item>
+ <item msgid="3840999588443167001">"Dekat"</item>
+ </string-array>
+ <string name="pref_default_zoom_dialogtitle" msgid="6095974367125109021">"Zum lalai"</string>
+ <string name="pref_content_load_page" msgid="2219810141690955452">"Buka halaman dalam gambaran keseluruhan"</string>
+ <string name="pref_content_load_page_summary" msgid="9168803276420332955">"Tunjukkan gambaran keseluruhan halaman-halaman yang baru dibuka"</string>
+ <string name="pref_extras_title" msgid="7075456173747370647">"Terperinci"</string>
+ <string name="pref_extras_website_settings" msgid="67866640052455549">"Tetapan tapak web"</string>
+ <string name="pref_extras_website_settings_summary" msgid="1656771443223494406">"Tetapan terperinci untuk tapak web individu"</string>
+ <string name="pref_extras_reset_default_title" msgid="3579760449455761762">"Tetapkan semula lalai"</string>
+ <string name="pref_extras_reset_default" msgid="8904000515846202110">"Tetapkan semula kepada lalai"</string>
+ <string name="pref_extras_reset_default_summary" msgid="4247870778270414501">"Memulihkan ke tetapan lalai"</string>
+ <string name="pref_extras_reset_default_dlg" msgid="7922814420184322450">"Kembalikan tetapan kepada nilai lalai?"</string>
+ <string name="pref_development_title" msgid="3263854204533056480">"Nyahpepijat"</string>
+ <string name="pref_default_text_encoding" msgid="5742965543955558478">"Pengekodan teks"</string>
+ <string-array name="pref_default_text_encoding_choices">
+ <item msgid="7275223955790513818">"Latin-1 (ISO-8859-1)"</item>
+ <item msgid="2456597866837587140">"Unikod (UTF-8)"</item>
+ <item msgid="6122474363777211732">"Cina (GBK)"</item>
+ <item msgid="373372275931607040">"Cina (Big5)"</item>
+ <item msgid="891615911084608570">"Jepun (ISO-2022-JP)"</item>
+ <item msgid="5589150448475151241">"Jepun (Shift_JIS)"</item>
+ <item msgid="7356792686950371843">"Jepun (EUC-JP)"</item>
+ <item msgid="2193955365569270096">"Korea (EUC-KR)"</item>
+ </string-array>
+ <string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Pengekodan teks"</string>
+ <string name="pref_accessibility_title" msgid="5127836981587423215">"Kebolehaksesan"</string>
+ <string name="pref_font_size_category" msgid="6683754355084218254">"Saiz teks"</string>
+ <string name="pref_lab_title" msgid="5571091610359629423">"Makmal"</string>
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"Kawalan pantas"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="3149664132600968775">"Luncurkan ibu jari dari tepi kiri atau kanan untuk membuka kawalan cepat dan menyembunyikan aplikasi serta bar URL."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Google Instant"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Guna Google Instant bila anda guna Carian Google, utk tunjuk hasil bila anda menaip (boleh menambah penggunaan data)."</string>
+ <string name="pref_lab_fullscreen" msgid="8173609016657987973">"Skrin penuh"</string>
+ <string name="pref_lab_fullscreen_summary" msgid="7694738112219376740">"Gunakan mod skrin penuh untuk menyembunyikan bar status"</string>
+ <string name="pref_data_title" msgid="7255058703417796578">"Pengurusan lebar jalur"</string>
+ <string name="pref_data_preload_title" msgid="4479320472980292873">"Hasil carian sedang dipramuat"</string>
+ <string-array name="pref_data_preload_choices">
+ <item msgid="5180466923190095508">"Jangan sekali-kali"</item>
+ <item msgid="1791664748778640002">"Hanya di Wi-Fi"</item>
+ <item msgid="3944061253437827617">"Sentiasa"</item>
+ </string-array>
+ <string name="pref_data_preload_summary" msgid="3809168910751382727">"Benarkan penyemak imbas untuk mempramuat hasil carian berkeyakinan tinggi di latar belakang"</string>
+ <string name="pref_data_preload_dialogtitle" msgid="8421297746110796536">"Hasil carian sedang dipramuat"</string>
+ <string name="pref_link_prefetch_title" msgid="4123685219009241072">"Pramuat halaman web"</string>
+ <string-array name="pref_link_prefetch_choices">
+ <item msgid="4889781230398008031">"Jangan sekali-kali"</item>
+ <item msgid="1908465963242077428">"Hanya di Wi-Fi"</item>
+ <item msgid="7647277566998527142">"Sentiasa"</item>
+ </string-array>
+ <string name="pref_link_prefetch_summary" msgid="6558181497993206817">"Benarkan penyemak imbas mempramuat halaman web dikaitkan di latar belakang"</string>
+ <string name="pref_link_prefetch_dialogtitle" msgid="3804646141622839765">"Pramuat halaman web"</string>
+ <string name="browserFrameNetworkErrorLabel" msgid="8102515020625680714">"Masalah sambungan"</string>
+ <string name="browserFrameFileErrorLabel" msgid="4703792279852977350">"Masalah fail"</string>
+ <string name="browserFrameFormResubmitLabel" msgid="2385512101948178841"></string>
+ <string name="browserFrameFormResubmitMessage" msgid="5244059279866705254">"Halaman yang anda cuba lihat mengandungi data yang telah dihantar (\"POSTDATA\"). Jika anda menghantar semula data, sebarang tindakan yang dilakukan oleh borang pada halaman (seperti membuat carian atau pembelian dalam talian) akan diulang."</string>
+ <string name="loadSuspendedTitle" msgid="6453376579109644551">"Tiada sambungan"</string>
+ <string name="loadSuspended" msgid="3843343290039218668">"Penyemak imbas tidak dapat memuatkan halaman ini kerana tiada sambungan internet."</string>
+ <string name="clear_history" msgid="5998307092715979619">"Padam bersih sejarah"</string>
+ <string name="browser_history" msgid="2979476257919939232">"Halaman baru dilawati"</string>
+ <string name="empty_history" msgid="7013369425484218985">"Tiada sejarah penyemak imbas."</string>
+ <string name="go_home" msgid="109129207276086793">"Halaman utama"</string>
+ <string name="add_new_bookmark" msgid="3158497555612337238">"Tambah penanda halaman"</string>
+ <string name="add_bookmark_short" msgid="3783984330998103735">"Tambah"</string>
+ <string name="search_hint" msgid="4647356319916631820">"Buat carian atau taipkan URL"</string>
+ <string name="search_button_text" msgid="5235226933877634410">"Pergi"</string>
+ <string name="search_settings_description" msgid="1422401062529014107">"Penanda halaman dan sejarah web"</string>
+ <string name="popup_window_attempt" msgid="31565781154067629">"Benarkan tapak ini membuka tetingkap pop timbul?"</string>
+ <string name="allow" msgid="1157313689171991335">"Benarkan"</string>
+ <string name="block" msgid="9172175889884707800">"Sekat"</string>
+ <string name="too_many_windows_dialog_title" msgid="5709782301477380438">"Had tab dicapai"</string>
+ <string name="too_many_windows_dialog_message" msgid="3644234634638290304">"Tidak boleh membuka tab baharu sehingga anda menutup satu tab."</string>
+ <string name="too_many_subwindows_dialog_title" msgid="3805453941587725944">"Pop-up sudah terbuka"</string>
+ <string name="too_many_subwindows_dialog_message" msgid="2164725447981195556">"Hanya satu pop-timbul boleh dibuka pada satu masa."</string>
+ <string name="download_no_sdcard_dlg_title" product="nosdcard" msgid="56777245081568508">"Storan USB tidak tersedia"</string>
+ <string name="download_no_sdcard_dlg_title" product="default" msgid="605904452159416792">"Tiada kad SD"</string>
+ <string name="download_no_sdcard_dlg_msg" product="nosdcard" msgid="3144652102051031721">"Storan USB diperlukan untuk memuat turun <xliff:g id="FILENAME">%s</xliff:g>."</string>
+ <string name="download_no_sdcard_dlg_msg" product="default" msgid="2616399456116301518">"Kad SD diperlukan untuk memuat turun <xliff:g id="FILENAME">%s</xliff:g>."</string>
+ <string name="download_sdcard_busy_dlg_title" product="nosdcard" msgid="8081445664689818973">"Storan USB tidak tersedia"</string>
+ <string name="download_sdcard_busy_dlg_title" product="default" msgid="6877712666046917741">"Kad SD tidak tersedia"</string>
+ <string name="download_sdcard_busy_dlg_msg" product="nosdcard" msgid="8412543086906716875">"Storan USB sibuk. Untuk membenarkan muat turun, sentuh Matikan Storan USB dalam pemberitahuan."</string>
+ <string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"Kad SD sibuk. Untuk membenarkan muat turun, sentuh \"Matikan Storan USB\" dalam pemberitahuan."</string>
+ <string name="cannot_download" msgid="8150552478556798780">"Boleh memuat turun URL \"http\" atau \"https\" sahaja."</string>
+ <string name="download_pending" msgid="2599683668575349559">"Memulakan muat turun ..."</string>
+ <string name="search_the_web" msgid="6046130189241962337">"Cari di web"</string>
+ <string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Storan penyemak imbas penuh"</string>
+ <string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Sentuh untuk mengosongkan ruang."</string>
+ <string name="webstorage_clear_data_title" msgid="689484577124333977">"Padam bersih data yang disimpan"</string>
+ <string name="webstorage_clear_data_dialog_message" msgid="6200681632891775881">"Padamkan semua data yang disimpan oleh laman web ini?"</string>
+ <string name="webstorage_clear_data_dialog_ok_button" msgid="6682570951259237542">"OK"</string>
+ <string name="webstorage_clear_data_dialog_cancel_button" msgid="2028867751958942762">"Batal"</string>
+ <string name="webstorage_origin_summary_mb_stored" msgid="1985885826292236210">"MB disimpan pada telefon anda"</string>
+ <string name="loading_video" msgid="7886324933131962321">"Memuatkan video…"</string>
+ <string name="geolocation_permissions_prompt_message" msgid="356796102004052471">"<xliff:g id="WEBSITE_ORIGIN">%s</xliff:g> mahu mengetahui lokasi anda"</string>
+ <string name="geolocation_permissions_prompt_share" msgid="9084486342048347976">"Kongsi lokasi"</string>
+ <string name="geolocation_permissions_prompt_dont_share" msgid="6303025160237860300">"Tolak"</string>
+ <string name="geolocation_permissions_prompt_remember" msgid="3118526300707348308">"Ingat pilihan"</string>
+ <string name="geolocation_permissions_prompt_toast_allowed" msgid="7201417941112726112">"Tapak ini boleh mengakses lokasi anda. Tukarkannya pada skrin Tetapan > Lanjutan > Laman Web."</string>
+ <string name="geolocation_permissions_prompt_toast_disallowed" msgid="156443445797377409">"Tapak ini tidak boleh mengakses lokasi anda. Tukarkannya pada skrin Tetapan > Lanjutan > Laman web."</string>
+ <string name="geolocation_settings_page_title" msgid="1745477985097536528">"Padam bersih akses lokasi"</string>
+ <string name="geolocation_settings_page_summary_allowed" msgid="9180251524290811398">"Tapak ini boleh mengakses lokasi anda pada masa ini"</string>
+ <string name="geolocation_settings_page_summary_not_allowed" msgid="7941769772784366199">"Tapak ini tidak boleh mengakses lokasi anda pada masa ini"</string>
+ <string name="geolocation_settings_page_dialog_message" msgid="8772923416296868537">"Padamkan akses lokasi untuk laman web ini?"</string>
+ <string name="geolocation_settings_page_dialog_ok_button" msgid="2113465477131017852">"OK"</string>
+ <string name="geolocation_settings_page_dialog_cancel_button" msgid="7941036504673409747">"Batal"</string>
+ <string name="website_settings_clear_all" msgid="8739804325997655980">"Padam bersih semua"</string>
+ <string name="website_settings_clear_all_dialog_message" msgid="1551164275687475061">"Padamkan semua kebenaran data dan lokasi web?"</string>
+ <string name="website_settings_clear_all_dialog_ok_button" msgid="7858504776529106243">"OK"</string>
+ <string name="website_settings_clear_all_dialog_cancel_button" msgid="1896757051856611674">"Batal"</string>
+ <string name="progress_dialog_setting_wallpaper" msgid="2031391201442335889">"Menetapkan kertas dinding…"</string>
+ <string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Penanda halaman"</string>
+ <string name="empty_bookmarks_folder" msgid="6239830231917618556">"Tiada penanda halaman."</string>
+ <string name="other_bookmarks" msgid="8021889794475657319">"Penanda Halaman Lain"</string>
+ <string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Pilih akaun"</string>
+ <string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Segerakkan dengan akaun Google"</string>
+ <string name="import_bookmarks_dialog_description" msgid="2362897194870789609">"Penanda halaman pada peranti ini belum lagi dikaitkan dengan akaun Google. Simpan penanda halaman ini dengan menambahkannya pada akaun. Padamkan penanda halaman ini jika anda tidak mahu menyegerakkannya."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="7643058662272484895">"Tambahkan penanda halaman yang ada pada peranti ini pada masa ini dan mulakan penyegerakan dengan akaun Google"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="4333848003180415516">"Padamkan penanda halaman yang ada pada peranti ini pada masa ini dan mulakan penyegerakan dengan akaun Google"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="2204771572755630570">"Padamkan penanda halaman yang ada pada peranti ini pada masa ini dan mulakan penyegerakan penanda halaman dengan <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>?"</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="8942794112340838111">"Tambahkan penanda halaman yang ada pada peranti ini buat masa ini dan mulakan penyegerakan penanda halaman dengan <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>?"</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Padam penanda halaman"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Seterusnya"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Sebelumnya"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Batal"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Selesai"</string>
+ <string name="import_bookmarks_dialog_add" msgid="1743359725294101189">"Tambahkan penanda halaman pada Akaun Google"</string>
+ <string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Tambah penanda halaman Android anda ke penanda halaman untuk <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
+ <string name="menu_share_url" msgid="5851814357333739700">"Kongsi"</string>
+ <string name="max_tabs_warning" msgid="4122034303809457570">"Tiada lagi tab yang sedia"</string>
+ <string name="instant_search_label" msgid="8769284297650716935">"Google dengan Instant (Makmal)"</string>
+ <string name="preview" msgid="6450823514561689038">"Pratonton"</string>
+ <string name="local_bookmarks" msgid="533816851415228520">"Tempatan"</string>
+ <string name="ua_switcher_desktop" msgid="220097077327558435">"Minta tapak versi komputer meja"</string>
+ <string name="permission_preload_label" msgid="4856971662337877316">"Pramuat hasil"</string>
+ <string name="empty_snapshots_folder" msgid="7675378008107026013">"Tiada halaman disimpan."</string>
+ <string name="remove_snapshot" msgid="1624447424544976849">"Padamkan halaman disimpan"</string>
+ <string name="snapshot_go_live" msgid="1209542802541168497">"Muatkn siaran lngsng"</string>
+ <string name="accessibility_button_back" msgid="6194680634245279407">"Kembali"</string>
+ <string name="accessibility_button_forward" msgid="1236827218480658168">"Pergi ke depan"</string>
+ <string name="accessibility_button_refresh" msgid="1023441396241841313">"Memuat semula halaman"</string>
+ <string name="accessibility_button_stop" msgid="6793644120043222148">"Menghentikan pemuatan halaman"</string>
+ <string name="accessibility_button_addbookmark" msgid="4787844912630006181">"Menanda halaman halaman"</string>
+ <string name="accessibility_button_search" msgid="5357014102136055376">"Mencari"</string>
+ <string name="accessibility_button_voice" msgid="152016375096083337">"Memulakan carian suara"</string>
+ <string name="accessibility_button_bookmarks" msgid="7435055677299151649">"Penanda halaman"</string>
+ <string name="accessibility_button_closetab" msgid="6954807842756927737">"Menutup tab"</string>
+ <string name="accessibility_button_newtab" msgid="4116986240706315748">"Membuka tab baru"</string>
+ <string name="accessibility_button_newincognitotab" msgid="5254901889040012964">"Membuka tab incognito baru"</string>
+ <string name="accessibility_button_clear" msgid="6943152307986161598">"Mengosongkan input"</string>
+ <string name="accessibility_button_uaswitch" msgid="6286804719724282339">"Menukar ejen pengguna"</string>
+ <string name="accessibility_button_go" msgid="1182818872083055958">"Menjalankan"</string>
+ <string name="accessibility_button_navscreen" msgid="9142904748728713075">"Pengurus halaman"</string>
+ <string name="accessibility_button_more" msgid="3054251446394224216">"Lagi pilihan"</string>
+ <string name="accessibility_state_incognito" msgid="5786038488425202355">"Halaman incognito"</string>
+ <string name="accessibility_state_frozen" msgid="8041539250447035570">"Halaman disimpan"</string>
+ <string name="accessibility_transition_navscreen" msgid="2734915619351519547">"Pengurusan tab"</string>
+ <string name="accessibility_button_bookmarks_folder_up" msgid="9179389954714270505">"Folder sebelumnya"</string>
+</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 24c85e8..702a671 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -111,8 +111,8 @@
<string name="contextmenu_openlink" msgid="7237961252214188935">"Åpne"</string>
<string name="contextmenu_openlink_newwindow" msgid="1205313604181761403">"Åpne i ny fane"</string>
<string name="contextmenu_openlink_newwindow_background" msgid="4690381019116746687">"Åpne i ny bakgrunnsfane"</string>
- <string name="contextmenu_savelink" msgid="5508554930832538184">"Lagre kobling"</string>
- <string name="contextmenu_sharelink" msgid="5392275392280130331">"Del kobling"</string>
+ <string name="contextmenu_savelink" msgid="5508554930832538184">"Lagre denne linken"</string>
+ <string name="contextmenu_sharelink" msgid="5392275392280130331">"Del denne linken"</string>
<string name="contextmenu_copy" msgid="398860586635404030">"Kopier"</string>
<string name="contextmenu_copylink" msgid="5153657160294534270">"Kopier koblingsadresse"</string>
<string name="contextmenu_download_image" msgid="4243829645180686912">"Lagre bilde"</string>
@@ -387,7 +387,7 @@
<string name="accessibility_button_search" msgid="5357014102136055376">"Søk"</string>
<string name="accessibility_button_voice" msgid="152016375096083337">"Start talesøk"</string>
<string name="accessibility_button_bookmarks" msgid="7435055677299151649">"Bokmerker"</string>
- <string name="accessibility_button_closetab" msgid="6954807842756927737">"Lukk fane"</string>
+ <string name="accessibility_button_closetab" msgid="6954807842756927737">"Lukk fanen"</string>
<string name="accessibility_button_newtab" msgid="4116986240706315748">"Åpne ny fane"</string>
<string name="accessibility_button_newincognitotab" msgid="5254901889040012964">"Åpne ny inkognitofane"</string>
<string name="accessibility_button_clear" msgid="6943152307986161598">"Tøm inndata"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 1f3a85e..be93fd9 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -280,7 +280,7 @@
<string name="pref_data_preload_title" msgid="4479320472980292873">"Zoekresultaten vooraf laden"</string>
<string-array name="pref_data_preload_choices">
<item msgid="5180466923190095508">"Nooit"</item>
- <item msgid="1791664748778640002">"Alleen voor Wi-Fi"</item>
+ <item msgid="1791664748778640002">"Alleen voor wifi"</item>
<item msgid="3944061253437827617">"Altijd"</item>
</string-array>
<string name="pref_data_preload_summary" msgid="3809168910751382727">"Browser toestaan resultaten met hoog betrouwbaarheidsniveau vooraf te laden"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 77b0cae..674af3f 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -70,7 +70,7 @@
<string name="add_to_other_folder_menu_option" msgid="5947586525822134105">"Outra pasta"</string>
<string name="name" msgid="5462672162695365387">"Etiqueta"</string>
<string name="http" msgid="2163722670597250102">"http://"</string>
- <string name="save_to_bookmarks" msgid="1679286010089780932">"Guardado nos marcadores"</string>
+ <string name="save_to_bookmarks" msgid="1679286010089780932">"Guardar nos marcadores"</string>
<string name="bookmark_this_page" msgid="7530739804320811054">"Adicionar esta página aos marcadores"</string>
<string name="remove" msgid="7820112494467011374">"Remover"</string>
<string name="edit_bookmark" msgid="5024089053490231905">"Editar marcador"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 0b78675..018fd75 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -350,7 +350,7 @@
<string name="website_settings_clear_all_dialog_message" msgid="1551164275687475061">"Excluir todos os dados de sites e permissões de localização?"</string>
<string name="website_settings_clear_all_dialog_ok_button" msgid="7858504776529106243">"OK"</string>
<string name="website_settings_clear_all_dialog_cancel_button" msgid="1896757051856611674">"Cancelar"</string>
- <string name="progress_dialog_setting_wallpaper" msgid="2031391201442335889">"Definindo papel de parede..."</string>
+ <string name="progress_dialog_setting_wallpaper" msgid="2031391201442335889">"Definindo plano de fundo..."</string>
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Favoritos"</string>
<string name="empty_bookmarks_folder" msgid="6239830231917618556">"Não há favoritos."</string>
<string name="other_bookmarks" msgid="8021889794475657319">"Outros favoritos"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 7832ad4..e8a74e5 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -296,7 +296,7 @@
<string name="browserFrameNetworkErrorLabel" msgid="8102515020625680714">"Проблем са везом"</string>
<string name="browserFrameFileErrorLabel" msgid="4703792279852977350">"Проблем са датотеком"</string>
<string name="browserFrameFormResubmitLabel" msgid="2385512101948178841"></string>
- <string name="browserFrameFormResubmitMessage" msgid="5244059279866705254">"Страница коју покушавате да видите садржи већ послате податке („POSTDATA“). Уколико их поново пошаљете, све радње које је образац на страници обавио (нпр. претрага или куповина на мрежи) биће поновљене."</string>
+ <string name="browserFrameFormResubmitMessage" msgid="5244059279866705254">"Страница коју покушавате да видите садржи већ послате податке („POSTDATA“). Ако их поново пошаљете, све радње које је образац на страници обавио (нпр. претрага или куповина на мрежи) биће поновљене."</string>
<string name="loadSuspendedTitle" msgid="6453376579109644551">"Веза није успостављена"</string>
<string name="loadSuspended" msgid="3843343290039218668">"Прегледач не може да учита ову страницу зато што не постоји веза са Интернетом."</string>
<string name="clear_history" msgid="5998307092715979619">"Обриши историју"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 9ea7532..58fe8bc 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -142,8 +142,8 @@
</string-array>
<string name="pref_content_open_in_background_summary" msgid="955411158407739504">"Fungua vichupo vipya nyuma ya hiki cha sasa"</string>
<string name="pref_content_homepage" msgid="3324574611613105696">"Weka ukurasa wa kwanza"</string>
- <string name="pref_content_search_engine" msgid="1620101310821644144">"Weka injini tafuti"</string>
- <string name="pref_content_search_engine_summary" msgid="304003941861818133">"Chagua injini tafuti"</string>
+ <string name="pref_content_search_engine" msgid="1620101310821644144">"Weka mtambo wa kutafuta"</string>
+ <string name="pref_content_search_engine_summary" msgid="304003941861818133">"Chagua mtambo wa kutafuta"</string>
<string name="pref_set_homepage_to" msgid="7838684355145561242">"Weka kwa"</string>
<string-array name="pref_homepage_choices">
<item msgid="844041670142910837">"Ukurasa uliopo"</item>
@@ -249,9 +249,9 @@
<string name="pref_content_load_page_summary" msgid="9168803276420332955">"Onyesha muhtasari wa kurasa mpya zilizofunguliwa"</string>
<string name="pref_extras_title" msgid="7075456173747370647">"Mahiri"</string>
<string name="pref_extras_website_settings" msgid="67866640052455549">"Mipangilio ya tovuti"</string>
- <string name="pref_extras_website_settings_summary" msgid="1656771443223494406">"Mipangilio mahiri kwa wavuti mahsusi"</string>
+ <string name="pref_extras_website_settings_summary" msgid="1656771443223494406">"Mipangilio ya kina ya wavuti mahsusi"</string>
<string name="pref_extras_reset_default_title" msgid="3579760449455761762">"Weka chaguo-msingi upya"</string>
- <string name="pref_extras_reset_default" msgid="8904000515846202110">"Weka upya kwa chaguo-msingi"</string>
+ <string name="pref_extras_reset_default" msgid="8904000515846202110">"Rudisha kwenye chaguo-msingi"</string>
<string name="pref_extras_reset_default_summary" msgid="4247870778270414501">"Rejesha mipangilio chaguo-msingi"</string>
<string name="pref_extras_reset_default_dlg" msgid="7922814420184322450">"Batilisha mipangilio iwe thamani mbadala?"</string>
<string name="pref_development_title" msgid="3263854204533056480">"Tatua"</string>
@@ -338,8 +338,8 @@
<string name="geolocation_permissions_prompt_share" msgid="9084486342048347976">"Shiriki mahali"</string>
<string name="geolocation_permissions_prompt_dont_share" msgid="6303025160237860300">"Kataa"</string>
<string name="geolocation_permissions_prompt_remember" msgid="3118526300707348308">"Kumbuka mapendeleo"</string>
- <string name="geolocation_permissions_prompt_toast_allowed" msgid="7201417941112726112">"Tovuti hii inaweza kufikia eneo lako. Badilisha hii kwa skrini ya Settings > Advanced &gt Website."</string>
- <string name="geolocation_permissions_prompt_toast_disallowed" msgid="156443445797377409">"Tovuti hii haiwezi kufikia eneo lako. Badilisha hii kwenye skrini ya Mipangilio > Advanced > Website."</string>
+ <string name="geolocation_permissions_prompt_toast_allowed" msgid="7201417941112726112">"Tovuti hii haiwezi kufikia mahali ulipo. Badilisha hili kwenye Skrini > Ya Kina > ya Wavuti katika Mipangilio."</string>
+ <string name="geolocation_permissions_prompt_toast_disallowed" msgid="156443445797377409">"Tovuti hii haiwezi kufikia mahali ulipo. Badilisha hili kwenye Skrini > Ya Kina > ya Wavuti katika Mipangilio."</string>
<string name="geolocation_settings_page_title" msgid="1745477985097536528">"Futa ufikiaji mahali"</string>
<string name="geolocation_settings_page_summary_allowed" msgid="9180251524290811398">"Tovuti hii kwa sasa inaweza kufikia mahali ulipo"</string>
<string name="geolocation_settings_page_summary_not_allowed" msgid="7941769772784366199">"Tovuti hii kwa sasa haiwezi kufikia mahali ulipo"</string>
@@ -366,7 +366,7 @@
<string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Ifuatayo"</string>
<string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Iliyotangulia"</string>
<string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Ghairi"</string>
- <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Kwisha"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Nimemaliza"</string>
<string name="import_bookmarks_dialog_add" msgid="1743359725294101189">"Ongeza alamisho kwenye akaunti ya Google"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Ongeza alamamisho zako za Android kwa alamisho za <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
<string name="menu_share_url" msgid="5851814357333739700">"Shiriki"</string>
@@ -385,7 +385,7 @@
<string name="accessibility_button_stop" msgid="6793644120043222148">"Komesha upakiaji ukurasa"</string>
<string name="accessibility_button_addbookmark" msgid="4787844912630006181">"Alamisha ukurasa"</string>
<string name="accessibility_button_search" msgid="5357014102136055376">"Tafuta"</string>
- <string name="accessibility_button_voice" msgid="152016375096083337">"Anzisha utafutaji wa sauti"</string>
+ <string name="accessibility_button_voice" msgid="152016375096083337">"Anza kutafuta kwa kutamka"</string>
<string name="accessibility_button_bookmarks" msgid="7435055677299151649">"Alamisho"</string>
<string name="accessibility_button_closetab" msgid="6954807842756927737">"Funga kichupo"</string>
<string name="accessibility_button_newtab" msgid="4116986240706315748">"Fungua kichupo kipya"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index c997ae8..8524887 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -280,7 +280,7 @@
<string name="pref_data_preload_title" msgid="4479320472980292873">"การโหลดผลการค้นหาล่วงหน้า"</string>
<string-array name="pref_data_preload_choices">
<item msgid="5180466923190095508">"ไม่เลย"</item>
- <item msgid="1791664748778640002">"Wi-Fi เท่านั้น"</item>
+ <item msgid="1791664748778640002">"WiFi เท่านั้น"</item>
<item msgid="3944061253437827617">"ทุกครั้ง"</item>
</string-array>
<string name="pref_data_preload_summary" msgid="3809168910751382727">"อนุญาตให้เบราว์เซอร์โหลดผลการค้นหาที่เชื่อถือได้สูงก่อนล่วงหน้าในเบื้องหลัง"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 578c237..a28d1af 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -280,7 +280,7 @@
<string name="pref_data_preload_title" msgid="4479320472980292873">"搜索结果预加载"</string>
<string-array name="pref_data_preload_choices">
<item msgid="5180466923190095508">"永不"</item>
- <item msgid="1791664748778640002">"仅限 Wi-Fi"</item>
+ <item msgid="1791664748778640002">"仅限 WLAN"</item>
<item msgid="3944061253437827617">"始终"</item>
</string-array>
<string name="pref_data_preload_summary" msgid="3809168910751382727">"允许浏览器在后台预加载相关度高的搜索结果"</string>
@@ -288,7 +288,7 @@
<string name="pref_link_prefetch_title" msgid="4123685219009241072">"网页预加载"</string>
<string-array name="pref_link_prefetch_choices">
<item msgid="4889781230398008031">"永不"</item>
- <item msgid="1908465963242077428">"仅限 Wi-Fi"</item>
+ <item msgid="1908465963242077428">"仅限 WLAN"</item>
<item msgid="7647277566998527142">"始终"</item>
</string-array>
<string name="pref_link_prefetch_summary" msgid="6558181497993206817">"允许浏览器在后台预加载链接的网页"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..1f3d532
--- /dev/null
+++ b/res/values-zh-rHK/strings.xml
@@ -0,0 +1,402 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2007 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="application_name" msgid="1935869255545976415">"瀏覽器"</string>
+ <string name="choose_upload" msgid="3649366287575002063">"選擇要上載的檔案"</string>
+ <string name="uploads_disabled" msgid="463761197575372994">"檔案上傳功能已停用。"</string>
+ <string name="new_tab" msgid="7971857320679510529">"新標籤頁"</string>
+ <string name="new_incognito_tab" msgid="3606197964239039478">"新無痕式分頁"</string>
+ <string name="tab_bookmarks" msgid="2305793036003473653">"書籤"</string>
+ <string name="tab_most_visited" msgid="1077402532455000703">"最常造訪"</string>
+ <string name="tab_history" msgid="1979267558744613746">"記錄"</string>
+ <string name="tab_snapshots" msgid="1449241204980265186">"已儲存的網頁"</string>
+ <string name="added_to_bookmarks" msgid="4028710765672851635">"已加入書籤。"</string>
+ <string name="removed_from_bookmarks" msgid="546648923924996722">"已從書籤中移除。"</string>
+ <string name="sign_in_to" msgid="5939425800148759165">"登入 <xliff:g id="HOSTNAME">%s1</xliff:g>「<xliff:g id="REALM">%s2</xliff:g>」"</string>
+ <string name="username" msgid="5057566336518215922">"名稱"</string>
+ <string name="password" msgid="1177138552305184404">"密碼"</string>
+ <string name="action" msgid="183105774472071343">"登入"</string>
+ <string name="bookmarks_add_page" msgid="3093456701072617702">"儲存書籤"</string>
+ <string name="bookmarks_search" msgid="5229596268214362873">"瀏覽器"</string>
+ <string name="cancel" msgid="3017274947407233702">"取消"</string>
+ <string name="ok" msgid="1509280796718850364">"確定"</string>
+ <string name="title_bar_loading" msgid="7438217780834640678">"載入中…"</string>
+ <string name="page_info" msgid="4048529256302257195">"網頁資訊"</string>
+ <string name="page_info_view" msgid="5303490449842635158">"檢視網頁資訊"</string>
+ <string name="page_info_address" msgid="2222306609532903254">"地址："</string>
+ <string name="ssl_warnings_header" msgid="79744901983636370">"這個網站的安全憑證發生問題。"</string>
+ <string name="ssl_continue" msgid="8031515015829358457">"繼續"</string>
+ <string name="security_warning" msgid="6607795404322797541">"安全性警告"</string>
+ <string name="view_certificate" msgid="1472768887529093862">"查看憑證"</string>
+ <string name="ssl_go_back" msgid="4598951822061593819">"返回"</string>
+ <string name="ssl_untrusted" msgid="7754507359360636447">"這個憑證並非由受信任的權威機構發出。"</string>
+ <string name="ssl_mismatch" msgid="3809794439740523641">"網站名稱與憑證上的名稱不相符。"</string>
+ <string name="ssl_expired" msgid="5739349389499575559">"這個憑證已過期。"</string>
+ <string name="ssl_not_yet_valid" msgid="8193083327719048247">"這個憑證尚未生效。"</string>
+ <string name="ssl_date_invalid" msgid="3705563379257285534">"此憑證的日期無效。"</string>
+ <string name="ssl_invalid" msgid="9041704741505449967">"此憑證是無效的。"</string>
+ <string name="ssl_unknown" msgid="5679243486524754571">"不明的憑證錯誤。"</string>
+ <string name="stopping" msgid="4839698519340302982">"正在停止..."</string>
+ <string name="stop" msgid="5687251076030630074">"停止"</string>
+ <string name="reload" msgid="8585220783228408062">"重新整理"</string>
+ <string name="back" msgid="8414603107175713668">"返回"</string>
+ <string name="forward" msgid="4288210890526641577">"轉寄"</string>
+ <string name="save" msgid="5922311934992468496">"確定"</string>
+ <string name="do_not_save" msgid="6777633870113477714">"取消"</string>
+ <string name="location" msgid="3411848697912600125">"網址"</string>
+ <string name="account" msgid="5179824606448077042">"帳戶"</string>
+ <string name="containing_folder" msgid="6771180232953030479">"新增至"</string>
+ <string name="new_folder" msgid="7743540149088867917">"新資料夾"</string>
+ <string name="edit_folder" msgid="621817453133656156">"編輯資料夾"</string>
+ <string name="delete_folder" msgid="2046483129024501116">"刪除資料夾"</string>
+ <string name="no_subfolders" msgid="3303645239686962674">"沒有子資料夾。"</string>
+ <string name="add_to_bookmarks_menu_option" msgid="4449323955122214389">"書籤"</string>
+ <string name="add_to_homescreen_menu_option" msgid="1461447829242963790">"主畫面"</string>
+ <string name="add_to_other_folder_menu_option" msgid="5947586525822134105">"其他資料夾…"</string>
+ <string name="name" msgid="5462672162695365387">"書籤名稱"</string>
+ <string name="http" msgid="2163722670597250102">"http://"</string>
+ <string name="save_to_bookmarks" msgid="1679286010089780932">"儲存至書籤"</string>
+ <string name="bookmark_this_page" msgid="7530739804320811054">"將這個網頁加入書籤"</string>
+ <string name="remove" msgid="7820112494467011374">"移除"</string>
+ <string name="edit_bookmark" msgid="5024089053490231905">"編輯書籤"</string>
+ <string name="create_shortcut_bookmark" msgid="1995095662095484289">"新增捷徑至主畫面"</string>
+ <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="set_as_homepage" msgid="4752937379414905560">"設為首頁"</string>
+ <string name="bookmark_saved" msgid="2766434679871317557">"已儲存至書籤。"</string>
+ <string name="bookmark_not_saved" msgid="1077732557310662080">"無法儲存書籤。"</string>
+ <string name="homepage_set" msgid="8768087280310966395">"已設定為首頁。"</string>
+ <string name="bookmark_needs_title" msgid="6245900436119218187">"必須輸入書籤名稱。"</string>
+ <string name="bookmark_needs_url" msgid="7809876865972755158">"書籤位置不得留空。"</string>
+ <string name="bookmark_url_not_valid" msgid="4917440933384496211">"這個網址無效。"</string>
+ <string name="bookmark_cannot_save_url" msgid="7836064647943671126">"無法將這個網址加入書籤。"</string>
+ <string name="bookmark_page" msgid="6845189305130307274">"將最後瀏覽的網頁加入書籤"</string>
+ <string name="bookmark_thumbnail_view" msgid="3164068314718522138">"縮圖"</string>
+ <string name="bookmark_list_view" msgid="7848510619500937839">"列表"</string>
+ <string name="current_page" msgid="7510129573681663135">"來源： "</string>
+ <string name="delete_bookmark_warning" msgid="7825328496411904321">"刪除書籤「<xliff:g id="BOOKMARK">%s</xliff:g>」？"</string>
+ <string name="open_all_in_new_window" msgid="455786763426575293">"在新分頁開啟所有書籤"</string>
+ <string name="goto_dot" msgid="3895839050522602723">"開始"</string>
+ <string name="select_dot" msgid="6299170761900561967">"選取文字"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"關閉其他標籤頁"</string>
+ <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="menu_view_download" msgid="2124570321712995120">"下載"</string>
+ <string name="copy_page_url" msgid="1188679152608889555">"複製網頁網址"</string>
+ <string name="share_page" msgid="593756995297268343">"分享網頁"</string>
+ <string name="menu_save_snapshot" msgid="6935080344031126139">"儲存網頁以供離線閱讀"</string>
+ <string name="saving_snapshot" msgid="1693789062351182809">"正在儲存…"</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>
+ <string name="contextmenu_openlink" msgid="7237961252214188935">"開啟"</string>
+ <string name="contextmenu_openlink_newwindow" msgid="1205313604181761403">"在新分頁開啟"</string>
+ <string name="contextmenu_openlink_newwindow_background" msgid="4690381019116746687">"在新背景分頁開啟"</string>
+ <string name="contextmenu_savelink" msgid="5508554930832538184">"儲存連結"</string>
+ <string name="contextmenu_sharelink" msgid="5392275392280130331">"分享連結"</string>
+ <string name="contextmenu_copy" msgid="398860586635404030">"複製"</string>
+ <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_dial_dot" msgid="5856550683415933806">"撥號..."</string>
+ <string name="contextmenu_add_contact" msgid="3183511922223645716">"新增聯絡人"</string>
+ <string name="contextmenu_send_mail" msgid="1014513374828775660">"發送電子郵件"</string>
+ <string name="contextmenu_map" msgid="7471390435434034912">"地圖"</string>
+ <string name="choosertitle_sharevia" msgid="4600490613341909086">"分享方式："</string>
+ <string name="clear" msgid="7070043081700011461">"清除"</string>
+ <string name="replace" msgid="4843033491070384047">"取代"</string>
+ <string name="browser_bookmarks_page_bookmarks_text" msgid="6787605028726162673">"書籤"</string>
+ <string name="menu_preferences" msgid="6709237687234102240">"設定"</string>
+ <string name="pref_content_title" msgid="3834107397725342174">"網頁內容"</string>
+ <string name="pref_allow_apptabs" msgid="1325989799080202871">"允許每個應用程式開啟多個標籤頁"</string>
+ <string name="pref_content_load_images" msgid="2125616852957377561">"載入圖片"</string>
+ <string name="pref_content_load_images_summary" msgid="5055874125248398584">"顯示網頁上的圖片"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"封鎖彈出式視窗"</string>
+ <string name="pref_content_javascript" msgid="4570972030299516843">"啟用 JavaScript"</string>
+ <string name="pref_content_open_in_background" msgid="824123779725118663">"在背景中開啟"</string>
+ <string name="pref_content_plugins" msgid="7231944644794301582">"啟用外掛程式"</string>
+ <string-array name="pref_content_plugins_choices">
+ <item msgid="6745108155096660725">"永遠開啟"</item>
+ <item msgid="2484126708670016519">"隨選"</item>
+ <item msgid="8547442717307793863">"關閉"</item>
+ </string-array>
+ <string name="pref_content_open_in_background_summary" msgid="955411158407739504">"在目前標籤頁的後面開啟新頁"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"設定首頁"</string>
+ <string name="pref_content_search_engine" msgid="1620101310821644144">"設定搜尋引擎"</string>
+ <string name="pref_content_search_engine_summary" msgid="304003941861818133">"請選擇搜尋引擎"</string>
+ <string name="pref_set_homepage_to" msgid="7838684355145561242">"設定為"</string>
+ <string-array name="pref_homepage_choices">
+ <item msgid="844041670142910837">"目前網頁"</item>
+ <item msgid="4430498748295169195">"空白頁"</item>
+ <item msgid="5747608191946904074">"預設網頁"</item>
+ <item msgid="6092441301001006473">"最常瀏覽網站"</item>
+ <item msgid="6569304572171444894">"其他"</item>
+ </string-array>
+ <string name="pref_content_autofit" msgid="8260474534053660809">"自動調整網頁"</string>
+ <string name="pref_content_autofit_summary" msgid="324810555822572112">"配合屏幕大小調整網頁版面"</string>
+ <string name="pref_general_title" msgid="1946872771219249323">"一般設定"</string>
+ <string name="pref_general_sync_title" msgid="3138637035975860324">"Google 同步處理"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"自動填入"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"表格自動填入"</string>
+ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"輕觸一下即可填妥網上表格"</string>
+ <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"自動填入文字"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"設定要在網上表格中自動填入的文字"</string>
+ <string name="pref_autologin_title" msgid="4421187193809267096">"自動登入 Google"</string>
+ <string name="pref_autologin_progress" msgid="8333244467048833461">"正使用 <xliff:g id="ID_1">%s</xliff:g> 登入 Google 網站"</string>
+ <string name="autologin_bar_text" msgid="3684581827167173371">"登入身分"</string>
+ <string name="autologin_bar_login_text" msgid="3336615320510851879">"登入"</string>
+ <string name="autologin_bar_hide_text" msgid="3629355974385859580">"隱藏"</string>
+ <string name="autologin_bar_error" msgid="7470001207395920811">"無法登入。"</string>
+ <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"輸入您要在網上表格中自動填入的文字。"</string>
+ <string name="autofill_profile_editor_name" msgid="8566130291459685955">"全名："</string>
+ <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">"街道名稱、郵政信箱、代收人"</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>
+ <string name="autofill_profile_editor_state" msgid="2150403366835080407">"州/省/地區："</string>
+ <string name="autofill_profile_editor_zip_code" msgid="283668573295656671">"郵遞區號："</string>
+ <string name="autofill_profile_editor_country" msgid="7234470301239156656">"國家/地區："</string>
+ <string name="autofill_profile_editor_phone_number" msgid="4938852821413729276">"電話："</string>
+ <string name="autofill_profile_editor_phone_number_invalid" msgid="6795411298467068957">"電話號碼無效。"</string>
+ <string name="autofill_profile_editor_save_profile" msgid="3230301454458581157">"儲存"</string>
+ <string name="autofill_profile_successful_save" msgid="5691459703493331983">"已儲存自動填入文字。"</string>
+ <string name="autofill_profile_successful_delete" msgid="1790262652460723127">"已刪除自動填入文字。"</string>
+ <string name="autofill_profile_editor_delete_profile" msgid="3098369314558164153">"刪除"</string>
+ <string name="autofill_setup_dialog_message" msgid="7123905786076456503">"瀏覽器可以自動填寫這類網上表格，您要設定自動填入文字嗎？"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="3288881675232206984">"您隨時可以前往 [瀏覽器] > [設定] > [一般] 畫面設定自動填入文字。"</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"停用自動填入功能"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"私隱權與安全性"</string>
+ <string name="pref_privacy_clear_cache" msgid="3380316479925886998">"清除快取"</string>
+ <string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"清除本機快取內容與資料庫"</string>
+ <string name="pref_privacy_clear_cache_dlg" msgid="4344512581716422465">"刪除本機快取內容和資料庫？"</string>
+ <string name="pref_privacy_cookies_title" msgid="6763274282214830526">"Cookie"</string>
+ <string name="pref_privacy_clear_cookies" msgid="3095583579133780331">"清除所有 Cookie 數據"</string>
+ <string name="pref_privacy_clear_cookies_summary" msgid="6962742063990677520">"清除所有瀏覽器 Cookie"</string>
+ <string name="pref_privacy_clear_cookies_dlg" msgid="1493252163164621278">"刪除所有 Cookie？"</string>
+ <string name="pref_privacy_clear_history" msgid="8723795508825198477">"清除記錄"</string>
+ <string name="pref_privacy_clear_history_summary" msgid="6868501330708940734">"清除瀏覽器瀏覽記錄"</string>
+ <string name="pref_privacy_clear_history_dlg" msgid="6934317391642846227">"刪除瀏覽器的瀏覽記錄？"</string>
+ <string name="pref_privacy_formdata_title" msgid="6549813837982050424">"表單資料"</string>
+ <string name="pref_privacy_clear_form_data" msgid="4232668196344383987">"清除表單資料"</string>
+ <string name="pref_privacy_clear_form_data_summary" msgid="7702091143640546200">"清除所有已儲存的表格資料"</string>
+ <string name="pref_privacy_clear_form_data_dlg" msgid="8205626042241338983">"刪除所有已儲存的表格資料？"</string>
+ <string name="pref_privacy_clear_passwords" msgid="4750234112289277480">"清除密碼"</string>
+ <string name="pref_privacy_clear_passwords_summary" msgid="8856782718942903335">"清除所有儲存的密碼"</string>
+ <string name="pref_privacy_clear_passwords_dlg" msgid="5836576259947160045">"刪除所有已儲存的密碼？"</string>
+ <string name="pref_privacy_location_title" msgid="7458378016606081067">"位置資訊"</string>
+ <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_dlg" msgid="3190928760598034346">"清除網站的位置資訊存取權？"</string>
+ <string name="pref_security_passwords_title" msgid="5734190542383756711">"密碼"</string>
+ <string name="pref_security_remember_passwords" msgid="6492957683454529549">"記住密碼"</string>
+ <string name="pref_security_remember_passwords_summary" msgid="256388703356349137">"儲存網站的用戶名稱和密碼"</string>
+ <string name="pref_security_save_form_data" msgid="1213669802810198893">"儲存表單資料"</string>
+ <string name="pref_security_save_form_data_summary" msgid="4994074685153708026">"記住我輸入表單中的資料，方便稍後使用"</string>
+ <string name="pref_security_show_security_warning" msgid="8901135676266754559">"顯示安全性警告"</string>
+ <string name="pref_security_show_security_warning_summary" msgid="5260098316025397525">"在網站的安全有問題時顯示警告"</string>
+ <string name="pref_security_accept_cookies" msgid="3201367661925047989">"接受 Cookie"</string>
+ <string name="pref_security_accept_cookies_summary" msgid="1907951236154433751">"允許網站存取 Cookie 數據"</string>
+ <string-array name="pref_text_size_choices">
+ <item msgid="4952686548944739548">"極小"</item>
+ <item msgid="1950030433642671460">"小"</item>
+ <item msgid="4338347520133294584">"標準"</item>
+ <item msgid="5043128215356351184">"大"</item>
+ <item msgid="7201512237890458902">"最大"</item>
+ </string-array>
+ <string name="pref_min_font_size" msgid="8811125835817449131">"最小字型大小"</string>
+ <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">"文字比例"</string>
+ <string name="pref_zoom_on_double_tap" msgid="902786475250741795">"輕按兩下即可縮放"</string>
+ <string name="pref_force_userscalable" msgid="5641500562399892621">"強制啟用縮放功能"</string>
+ <string name="pref_force_userscalable_summary" msgid="3613242300617172230">"覆寫網站的控制縮放行為要求"</string>
+ <string name="pref_inverted_category" msgid="1280639705117152207">"畫面色彩反轉"</string>
+ <string name="pref_inverted" msgid="7613556986776824112">"色彩反轉"</string>
+ <string name="pref_inverted_summary" msgid="7357225897413923085">"黑色轉換成白色，反之亦然"</string>
+ <string name="pref_inverted_contrast" msgid="8527441236225288169">"對比"</string>
+ <string name="pref_default_zoom" msgid="8076142259097187395">"預設縮放"</string>
+ <string-array name="pref_default_zoom_choices">
+ <item msgid="549583171195154919">"遠"</item>
+ <item msgid="5619034257768161024">"中"</item>
+ <item msgid="3840999588443167001">"關閉"</item>
+ </string-array>
+ <string name="pref_default_zoom_dialogtitle" msgid="6095974367125109021">"預設縮放"</string>
+ <string name="pref_content_load_page" msgid="2219810141690955452">"以總覽模式開啟網頁"</string>
+ <string name="pref_content_load_page_summary" msgid="9168803276420332955">"顯示新開啟網頁的總覽畫面"</string>
+ <string name="pref_extras_title" msgid="7075456173747370647">"進階設定"</string>
+ <string name="pref_extras_website_settings" msgid="67866640052455549">"網站設定"</string>
+ <string name="pref_extras_website_settings_summary" msgid="1656771443223494406">"個別網站的進階設定"</string>
+ <string name="pref_extras_reset_default_title" msgid="3579760449455761762">"重設為預設值"</string>
+ <string name="pref_extras_reset_default" msgid="8904000515846202110">"重設回預設值"</string>
+ <string name="pref_extras_reset_default_summary" msgid="4247870778270414501">"還原預設設定"</string>
+ <string name="pref_extras_reset_default_dlg" msgid="7922814420184322450">"將設定回復預設值？"</string>
+ <string name="pref_development_title" msgid="3263854204533056480">"除錯"</string>
+ <string name="pref_default_text_encoding" msgid="5742965543955558478">"文字編碼"</string>
+ <string-array name="pref_default_text_encoding_choices">
+ <item msgid="7275223955790513818">"Latin-1 (ISO-8859-1)"</item>
+ <item msgid="2456597866837587140">"Unicode (UTF-8)"</item>
+ <item msgid="6122474363777211732">"中文 (GBK)"</item>
+ <item msgid="373372275931607040">"中文 (Big5)"</item>
+ <item msgid="891615911084608570">"日文 (ISO-2022-JP)"</item>
+ <item msgid="5589150448475151241">"日文 (SHIFT_JIS)"</item>
+ <item msgid="7356792686950371843">"日文 (EUC-JP)"</item>
+ <item msgid="2193955365569270096">"韓文 (EUC-KR)"</item>
+ </string-array>
+ <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>
+ <string name="pref_lab_title" msgid="5571091610359629423">"實驗室"</string>
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"快速控制介面"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="3149664132600968775">"由左側或右側邊緣滑動姆指，即可開啟快速控制介面並隱藏應用程式和網址列"</string>
+ <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_data_title" msgid="7255058703417796578">"頻寬管理"</string>
+ <string name="pref_data_preload_title" msgid="4479320472980292873">"預先載入搜尋結果"</string>
+ <string-array name="pref_data_preload_choices">
+ <item msgid="5180466923190095508">"永不"</item>
+ <item msgid="1791664748778640002">"僅在連接 Wi-Fi 網絡時"</item>
+ <item msgid="3944061253437827617">"總是"</item>
+ </string-array>
+ <string name="pref_data_preload_summary" msgid="3809168910751382727">"允許瀏覽器在背景預先載入可信度高的搜尋結果"</string>
+ <string name="pref_data_preload_dialogtitle" msgid="8421297746110796536">"預先載入搜尋結果"</string>
+ <string name="pref_link_prefetch_title" msgid="4123685219009241072">"網頁預先載入"</string>
+ <string-array name="pref_link_prefetch_choices">
+ <item msgid="4889781230398008031">"永不"</item>
+ <item msgid="1908465963242077428">"僅在連接 Wi-Fi 網絡時"</item>
+ <item msgid="7647277566998527142">"一律"</item>
+ </string-array>
+ <string name="pref_link_prefetch_summary" msgid="6558181497993206817">"允許瀏覽器在背景預先載入已連結的網頁"</string>
+ <string name="pref_link_prefetch_dialogtitle" msgid="3804646141622839765">"網頁預先載入"</string>
+ <string name="browserFrameNetworkErrorLabel" msgid="8102515020625680714">"連線問題"</string>
+ <string name="browserFrameFileErrorLabel" msgid="4703792279852977350">"檔案問題"</string>
+ <string name="browserFrameFormResubmitLabel" msgid="2385512101948178841"></string>
+ <string name="browserFrameFormResubmitMessage" msgid="5244059279866705254">"您要瀏覽的網頁包含已提交的資料 (「POSTDATA」)，如要重新傳送資料，將會重複執行該頁表格上的操作 (例如搜尋或網上購物)。"</string>
+ <string name="loadSuspendedTitle" msgid="6453376579109644551">"無連線"</string>
+ <string name="loadSuspended" msgid="3843343290039218668">"沒有互聯網連線，因此瀏覽器無法載入這個網頁。"</string>
+ <string name="clear_history" msgid="5998307092715979619">"清除記錄"</string>
+ <string name="browser_history" msgid="2979476257919939232">"最近瀏覽的網頁"</string>
+ <string name="empty_history" msgid="7013369425484218985">"沒有瀏覽器記錄。"</string>
+ <string name="go_home" msgid="109129207276086793">"主頁"</string>
+ <string name="add_new_bookmark" msgid="3158497555612337238">"新增書籤"</string>
+ <string name="add_bookmark_short" msgid="3783984330998103735">"加入"</string>
+ <string name="search_hint" msgid="4647356319916631820">"搜尋或輸入網址"</string>
+ <string name="search_button_text" msgid="5235226933877634410">"開始"</string>
+ <string name="search_settings_description" msgid="1422401062529014107">"書籤與網頁記錄"</string>
+ <string name="popup_window_attempt" msgid="31565781154067629">"允許這個網站開啟彈出式視窗？"</string>
+ <string name="allow" msgid="1157313689171991335">"允許"</string>
+ <string name="block" msgid="9172175889884707800">"封鎖"</string>
+ <string name="too_many_windows_dialog_title" msgid="5709782301477380438">"已達分頁數上限"</string>
+ <string name="too_many_windows_dialog_message" msgid="3644234634638290304">"您必須關閉一個標籤頁，才能開啟新頁。"</string>
+ <string name="too_many_subwindows_dialog_title" msgid="3805453941587725944">"彈出式視窗已開啟"</string>
+ <string name="too_many_subwindows_dialog_message" msgid="2164725447981195556">"一次只能開啟一個彈出式視窗。"</string>
+ <string name="download_no_sdcard_dlg_title" product="nosdcard" msgid="56777245081568508">"沒有可用的 USB 儲存裝置"</string>
+ <string name="download_no_sdcard_dlg_title" product="default" msgid="605904452159416792">"沒有 SD 卡"</string>
+ <string name="download_no_sdcard_dlg_msg" product="nosdcard" msgid="3144652102051031721">"您必須接上 USB 儲存裝置，才能下載 <xliff:g id="FILENAME">%s</xliff:g>。"</string>
+ <string name="download_no_sdcard_dlg_msg" product="default" msgid="2616399456116301518">"您必須插入 SD 記憶卡，才能下載 <xliff:g id="FILENAME">%s</xliff:g>。"</string>
+ <string name="download_sdcard_busy_dlg_title" product="nosdcard" msgid="8081445664689818973">"沒有可用的 USB 儲存裝置"</string>
+ <string name="download_sdcard_busy_dlg_title" product="default" msgid="6877712666046917741">"無法使用 SD 卡"</string>
+ <string name="download_sdcard_busy_dlg_msg" product="nosdcard" msgid="8412543086906716875">"USB 儲存裝置忙碌中。如要允許下載，請輕觸通知中的 [關閉 USB 儲存裝置]。"</string>
+ <string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"SD 記憶卡忙碌中。如要允許下載，請輕觸通知中的 [關閉 USB 儲存裝置]。"</string>
+ <string name="cannot_download" msgid="8150552478556798780">"僅可下載「http」或「https」網址的檔案。"</string>
+ <string name="download_pending" msgid="2599683668575349559">"正在開始下載..."</string>
+ <string name="search_the_web" msgid="6046130189241962337">"搜尋網頁"</string>
+ <string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"瀏覽器儲存空間已滿"</string>
+ <string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"輕觸即可騰出儲存空間。"</string>
+ <string name="webstorage_clear_data_title" msgid="689484577124333977">"清除儲存的資料"</string>
+ <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="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>
+ <string name="geolocation_permissions_prompt_dont_share" msgid="6303025160237860300">"拒絕"</string>
+ <string name="geolocation_permissions_prompt_remember" msgid="3118526300707348308">"記住偏好設定"</string>
+ <string name="geolocation_permissions_prompt_toast_allowed" msgid="7201417941112726112">"這個網站可以存取您的位置資訊，您可以前往 [設定] > [進階] > [網站] 畫面更改這項設定。"</string>
+ <string name="geolocation_permissions_prompt_toast_disallowed" msgid="156443445797377409">"這個網站無法存取您的位置資訊，您可以前往 [設定] -> [進階] -> [網站] 畫面更改這項設定。"</string>
+ <string name="geolocation_settings_page_title" msgid="1745477985097536528">"清除位置資訊存取權"</string>
+ <string name="geolocation_settings_page_summary_allowed" msgid="9180251524290811398">"此網站目前可以存取您的位置資訊"</string>
+ <string name="geolocation_settings_page_summary_not_allowed" msgid="7941769772784366199">"這個網站目前無法存取您的位置資訊"</string>
+ <string name="geolocation_settings_page_dialog_message" msgid="8772923416296868537">"清除這個網站的位置資訊存取權？"</string>
+ <string name="geolocation_settings_page_dialog_ok_button" msgid="2113465477131017852">"確定"</string>
+ <string name="geolocation_settings_page_dialog_cancel_button" msgid="7941036504673409747">"取消"</string>
+ <string name="website_settings_clear_all" msgid="8739804325997655980">"全部清除"</string>
+ <string name="website_settings_clear_all_dialog_message" msgid="1551164275687475061">"刪除所有網站資料和位置存取權限？"</string>
+ <string name="website_settings_clear_all_dialog_ok_button" msgid="7858504776529106243">"確定"</string>
+ <string name="website_settings_clear_all_dialog_cancel_button" msgid="1896757051856611674">"取消"</string>
+ <string name="progress_dialog_setting_wallpaper" msgid="2031391201442335889">"正在設定桌布…"</string>
+ <string name="defaultBookmarksUpButton" msgid="2303951020715704735">"書籤"</string>
+ <string name="empty_bookmarks_folder" msgid="6239830231917618556">"無書籤。"</string>
+ <string name="other_bookmarks" msgid="8021889794475657319">"其他書籤"</string>
+ <string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"選擇帳戶"</string>
+ <string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"與 Google 帳戶保持同步"</string>
+ <string name="import_bookmarks_dialog_description" msgid="2362897194870789609">"這部裝置上的書籤尚未與 Google 帳戶建立關聯。您可將這些書籤加到帳戶中加以儲存；如果您不想保持同步，只需刪除書籤即可。"</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="7643058662272484895">"新增這部裝置上現有的書籤，並開始與 Google 帳戶同步"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="4333848003180415516">"刪除這部裝置上現有的書籤，並開始與 Google 帳戶同步"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="2204771572755630570">"要刪除這部裝置上現有的書籤，並開始與 <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g> 的書籤同步嗎？"</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="8942794112340838111">"要新增這部裝置上現有的書籤，並開始與 <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g> 的書籤同步嗎？"</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"刪除書籤"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"下一頁"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"上一頁"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"取消"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"完成"</string>
+ <string name="import_bookmarks_dialog_add" msgid="1743359725294101189">"將書籤加到 Google 帳戶"</string>
+ <string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"將您的 Android 書籤加入 <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g> 的書籤"</string>
+ <string name="menu_share_url" msgid="5851814357333739700">"分享"</string>
+ <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="permission_preload_label" msgid="4856971662337877316">"預先載入結果"</string>
+ <string name="empty_snapshots_folder" msgid="7675378008107026013">"沒有已儲存的網頁。"</string>
+ <string name="remove_snapshot" msgid="1624447424544976849">"刪除已儲存的頁面"</string>
+ <string name="snapshot_go_live" msgid="1209542802541168497">"實況播出"</string>
+ <string name="accessibility_button_back" msgid="6194680634245279407">"返回"</string>
+ <string name="accessibility_button_forward" msgid="1236827218480658168">"往前"</string>
+ <string name="accessibility_button_refresh" msgid="1023441396241841313">"重新整理頁面"</string>
+ <string name="accessibility_button_stop" msgid="6793644120043222148">"停止載入網頁"</string>
+ <string name="accessibility_button_addbookmark" msgid="4787844912630006181">"將網頁加入書籤"</string>
+ <string name="accessibility_button_search" msgid="5357014102136055376">"搜尋中"</string>
+ <string name="accessibility_button_voice" msgid="152016375096083337">"開始語音搜索"</string>
+ <string name="accessibility_button_bookmarks" msgid="7435055677299151649">"書籤"</string>
+ <string name="accessibility_button_closetab" msgid="6954807842756927737">"關閉分頁"</string>
+ <string name="accessibility_button_newtab" msgid="4116986240706315748">"開新分頁"</string>
+ <string name="accessibility_button_newincognitotab" msgid="5254901889040012964">"開啟新的無痕式分頁"</string>
+ <string name="accessibility_button_clear" msgid="6943152307986161598">"清除輸入"</string>
+ <string name="accessibility_button_uaswitch" msgid="6286804719724282339">"切換用戶代理"</string>
+ <string name="accessibility_button_go" msgid="1182818872083055958">"前往"</string>
+ <string name="accessibility_button_navscreen" msgid="9142904748728713075">"網頁管理人"</string>
+ <string name="accessibility_button_more" msgid="3054251446394224216">"更多選項"</string>
+ <string name="accessibility_state_incognito" msgid="5786038488425202355">"無痕式頁面"</string>
+ <string name="accessibility_state_frozen" msgid="8041539250447035570">"儲存網頁"</string>
+ <string name="accessibility_transition_navscreen" msgid="2734915619351519547">"標籤管理"</string>
+ <string name="accessibility_button_bookmarks_folder_up" msgid="9179389954714270505">"上一個資料夾"</string>
+</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 0dda47e..62e5715 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -23,7 +23,7 @@
<string name="new_incognito_tab" msgid="3606197964239039478">"新無痕式分頁"</string>
<string name="tab_bookmarks" msgid="2305793036003473653">"書籤"</string>
<string name="tab_most_visited" msgid="1077402532455000703">"最常造訪"</string>
- <string name="tab_history" msgid="1979267558744613746">"記錄"</string>
+ <string name="tab_history" msgid="1979267558744613746">"紀錄"</string>
<string name="tab_snapshots" msgid="1449241204980265186">"已儲存的網頁"</string>
<string name="added_to_bookmarks" msgid="4028710765672851635">"已加入書籤。"</string>
<string name="removed_from_bookmarks" msgid="546648923924996722">"已從書籤中移除。"</string>
@@ -78,7 +78,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>
@@ -99,7 +99,7 @@
<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">"複製網頁網址"</string>
<string name="share_page" msgid="593756995297268343">"分享網頁"</string>
@@ -196,9 +196,9 @@
<string name="pref_privacy_clear_cookies" msgid="3095583579133780331">"清除所有 Cookie"</string>
<string name="pref_privacy_clear_cookies_summary" msgid="6962742063990677520">"清除瀏覽器中所有 Cookie"</string>
<string name="pref_privacy_clear_cookies_dlg" msgid="1493252163164621278">"刪除所有 Cookie？"</string>
- <string name="pref_privacy_clear_history" msgid="8723795508825198477">"清除記錄"</string>
- <string name="pref_privacy_clear_history_summary" msgid="6868501330708940734">"清除瀏覽記錄"</string>
- <string name="pref_privacy_clear_history_dlg" msgid="6934317391642846227">"刪除瀏覽器的瀏覽記錄？"</string>
+ <string name="pref_privacy_clear_history" msgid="8723795508825198477">"清除紀錄"</string>
+ <string name="pref_privacy_clear_history_summary" msgid="6868501330708940734">"清除瀏覽紀錄"</string>
+ <string name="pref_privacy_clear_history_dlg" msgid="6934317391642846227">"刪除瀏覽器的瀏覽紀錄？"</string>
<string name="pref_privacy_formdata_title" msgid="6549813837982050424">"表單資料"</string>
<string name="pref_privacy_clear_form_data" msgid="4232668196344383987">"清除表單資料"</string>
<string name="pref_privacy_clear_form_data_summary" msgid="7702091143640546200">"清除所有已儲存的表單資料"</string>
@@ -299,9 +299,9 @@
<string name="browserFrameFormResubmitMessage" msgid="5244059279866705254">"您要瀏覽的網頁包含已提交的資料 (「POSTDATA」)。如果您重新傳送資料，系統將重複執行該網頁表單上的作業 (例如搜尋或線上購物)。"</string>
<string name="loadSuspendedTitle" msgid="6453376579109644551">"無網路連線"</string>
<string name="loadSuspended" msgid="3843343290039218668">"沒有網際網路連線，因此瀏覽器無法載入這個網頁。"</string>
- <string name="clear_history" msgid="5998307092715979619">"清除記錄"</string>
+ <string name="clear_history" msgid="5998307092715979619">"清除紀錄"</string>
<string name="browser_history" msgid="2979476257919939232">"最近瀏覽的頁面"</string>
- <string name="empty_history" msgid="7013369425484218985">"沒有瀏覽器記錄。"</string>
+ <string name="empty_history" msgid="7013369425484218985">"沒有瀏覽器紀錄。"</string>
<string name="go_home" msgid="109129207276086793">"首頁"</string>
<string name="add_new_bookmark" msgid="3158497555612337238">"新增書籤"</string>
<string name="add_bookmark_short" msgid="3783984330998103735">"新增"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 1320460..e2d5881 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -100,7 +100,7 @@
<string name="shortcut_bookmark" msgid="3974876480401135895">"Ibhukimakhi"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Khetha ibhukumaka"</string>
<string name="history" msgid="2451240511251410032">"Umlando"</string>
- <string name="menu_view_download" msgid="2124570321712995120">"Okulayishiwe"</string>
+ <string name="menu_view_download" msgid="2124570321712995120">"Okulandiwe"</string>
<string name="copy_page_url" msgid="1188679152608889555">"Kopisha i-url yekhasi"</string>
<string name="share_page" msgid="593756995297268343">"Yabelana ngekhasi"</string>
<string name="menu_save_snapshot" msgid="6935080344031126139">"Gcina ukufunda ungaxhumekile kwi-inthanethi"</string>
@@ -180,13 +180,13 @@
<string name="autofill_profile_editor_zip_code" msgid="283668573295656671">"Ikhodi ye-Zip:"</string>
<string name="autofill_profile_editor_country" msgid="7234470301239156656">"Izwe:"</string>
<string name="autofill_profile_editor_phone_number" msgid="4938852821413729276">"Ifoni:"</string>
- <string name="autofill_profile_editor_phone_number_invalid" msgid="6795411298467068957">"Inombolo yocingo engalungile"</string>
+ <string name="autofill_profile_editor_phone_number_invalid" msgid="6795411298467068957">"Inombolo yefoni engalungile"</string>
<string name="autofill_profile_editor_save_profile" msgid="3230301454458581157">"Londoloza"</string>
<string name="autofill_profile_successful_save" msgid="5691459703493331983">"Ukuzifakekela kombhalo kulondoloziwe."</string>
<string name="autofill_profile_successful_delete" msgid="1790262652460723127">"Ukuzifakekela kwamagama kususiwe."</string>
<string name="autofill_profile_editor_delete_profile" msgid="3098369314558164153">"Susa"</string>
<string name="autofill_setup_dialog_message" msgid="7123905786076456503">"Isiphequluli singaqedela amafomu ewebhu afana laleli. Ufuna ukusetha umbhalo wakho wokuqedela ngokuzenzakalela?"</string>
- <string name="autofill_setup_dialog_negative_toast" msgid="3288881675232206984">"Ungakwazi njalo ukuthi usethe ukuzifakekela kombhalo usuka Esipheqululini > Izisetho > Iskrini esijwayelekile."</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="3288881675232206984">"Ungakwazi njalo ukuthi usethe ukuzifakekela kombhalo usuka Esipheqululini; Izilungiselelosetho; Iskrini esijwayelekile."</string>
<string name="disable_autofill" msgid="8305901059849400354">"Khubaza ukufaka-okuzenzakalelayo"</string>
<string name="pref_privacy_security_title" msgid="3480313968942160914">"Ubumfihlo nokuvikela"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Sula inqolobane"</string>
@@ -253,7 +253,7 @@
<string name="pref_extras_reset_default_title" msgid="3579760449455761762">"Setha kabusha okumisiwe"</string>
<string name="pref_extras_reset_default" msgid="8904000515846202110">"Setha kabusha kube okumisiwe"</string>
<string name="pref_extras_reset_default_summary" msgid="4247870778270414501">"Buyisela esimweni izilungiselelo ezizenzakalelayo"</string>
- <string name="pref_extras_reset_default_dlg" msgid="7922814420184322450">"Buyisela izisetho kokumisiwe?"</string>
+ <string name="pref_extras_reset_default_dlg" msgid="7922814420184322450">"Buyela kuzilungiselelo zokumisiwe?"</string>
<string name="pref_development_title" msgid="3263854204533056480">"Lungisa amaphutha"</string>
<string name="pref_default_text_encoding" msgid="5742965543955558478">"Umbhalo wekhodi wokubhaliwe"</string>
<string-array name="pref_default_text_encoding_choices">
@@ -324,7 +324,7 @@
<string name="download_sdcard_busy_dlg_msg" product="nosdcard" msgid="8412543086906716875">"Ukulondolozwa kwe-USB simatasa. Ukuvumela ukulanda, khetha \"Vala isitoreji se-USB\' kwisaziso."</string>
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"Ikhadi le-SD limatasa. Ukuvumela ukulanda, khetha \"Vala ukulondoloza nge-USB\" kwisaziso."</string>
<string name="cannot_download" msgid="8150552478556798780">"Ingalayisha kuphela ama-URL e-\"http\" noma ama-\"https\"."</string>
- <string name="download_pending" msgid="2599683668575349559">"Iqalisa ukulayisha..."</string>
+ <string name="download_pending" msgid="2599683668575349559">"Iqalisa ukulanda..."</string>
<string name="search_the_web" msgid="6046130189241962337">"Sesha iwebhu"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Ukulondoloza isiphequluli kugcwele"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Thinta ukuvula iskhala."</string>
@@ -343,7 +343,7 @@
<string name="geolocation_settings_page_title" msgid="1745477985097536528">"Sula ukufinyelela indawo"</string>
<string name="geolocation_settings_page_summary_allowed" msgid="9180251524290811398">"Le sayithi okwamanje ingafinyelela kundawo yakho"</string>
<string name="geolocation_settings_page_summary_not_allowed" msgid="7941769772784366199">"Le sayithi ayikwazi okwamanje ukufinyelela kundawo yakho"</string>
- <string name="geolocation_settings_page_dialog_message" msgid="8772923416296868537">"Susa izisetho zendawo zalewebusayithi?"</string>
+ <string name="geolocation_settings_page_dialog_message" msgid="8772923416296868537">"Susa ukufinyelela kwendawo kule webusayithi?"</string>
<string name="geolocation_settings_page_dialog_ok_button" msgid="2113465477131017852">"KULUNGILE"</string>
<string name="geolocation_settings_page_dialog_cancel_button" msgid="7941036504673409747">"Khansela"</string>
<string name="website_settings_clear_all" msgid="8739804325997655980">"Sula konke"</string>
diff --git a/res/xml/general_preferences.xml b/res/xml/general_preferences.xml
index 6f42d3d..d2b9c51 100644
--- a/res/xml/general_preferences.xml
+++ b/res/xml/general_preferences.xml
@@ -29,11 +29,6 @@
android:defaultValue="true"
/>
- <PreferenceScreen
- android:fragment="com.android.browser.AutoFillSettingsFragment"
- android:key="autofill_profile"
- android:title="@string/pref_autofill_profile_editor"
- android:summary="@string/pref_autofill_profile_editor_summary" />
</PreferenceCategory>
</PreferenceScreen>
diff --git a/src/com/android/browser/AutoFillProfileDatabase.java b/src/com/android/browser/AutoFillProfileDatabase.java
index 9666926..3bd9dac 100644
--- a/src/com/android/browser/AutoFillProfileDatabase.java
+++ b/src/com/android/browser/AutoFillProfileDatabase.java
@@ -22,7 +22,6 @@
import android.database.sqlite.SQLiteOpenHelper;
import android.provider.BaseColumns;
import android.util.Log;
-import android.webkit.WebSettingsClassic.AutoFillProfile;
public class AutoFillProfileDatabase {
@@ -95,34 +94,6 @@
return writable ? mOpenHelper.getWritableDatabase() : mOpenHelper.getReadableDatabase();
}
- public void addOrUpdateProfile(final int id, AutoFillProfile profile) {
- final String sql = "INSERT OR REPLACE INTO " + PROFILES_TABLE_NAME + " ("
- + Profiles._ID + ","
- + Profiles.FULL_NAME + ","
- + Profiles.EMAIL_ADDRESS + ","
- + Profiles.COMPANY_NAME + ","
- + Profiles.ADDRESS_LINE_1 + ","
- + Profiles.ADDRESS_LINE_2 + ","
- + Profiles.CITY + ","
- + Profiles.STATE + ","
- + Profiles.ZIP_CODE + ","
- + Profiles.COUNTRY + ","
- + Profiles.PHONE_NUMBER
- + ") VALUES (?,?,?,?,?,?,?,?,?,?,?);";
- final Object[] params = { id,
- profile.getFullName(),
- profile.getEmailAddress(),
- profile.getCompanyName(),
- profile.getAddressLine1(),
- profile.getAddressLine2(),
- profile.getCity(),
- profile.getState(),
- profile.getZipCode(),
- profile.getCountry(),
- profile.getPhoneNumber() };
- getDatabase(true).execSQL(sql, params);
- }
-
public Cursor getProfile(int id) {
final String[] cols = {
Profiles.FULL_NAME,
diff --git a/src/com/android/browser/AutoFillSettingsFragment.java b/src/com/android/browser/AutoFillSettingsFragment.java
deleted file mode 100644
index 68b325e..0000000
--- a/src/com/android/browser/AutoFillSettingsFragment.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.browser;
-
-import android.app.Fragment;
-import android.content.Context;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.util.Log;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.View.OnClickListener;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.inputmethod.InputMethodManager;
-import android.webkit.WebSettingsClassic.AutoFillProfile;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.Toast;
-
-public class AutoFillSettingsFragment extends Fragment {
-
- private static final String LOGTAG = "AutoFillSettingsFragment";
-
- private EditText mFullNameEdit;
- private EditText mEmailEdit;
- private EditText mCompanyEdit;
- private EditText mAddressLine1Edit;
- private EditText mAddressLine2Edit;
- private EditText mCityEdit;
- private EditText mStateEdit;
- private EditText mZipEdit;
- private EditText mCountryEdit;
- private EditText mPhoneEdit;
-
- private MenuItem mSaveMenuItem;
-
- private boolean mInitialised;
-
- // Used to display toast after DB interactions complete.
- private Handler mHandler;
- private BrowserSettings mSettings;
-
- private final static int PROFILE_SAVED_MSG = 100;
- private final static int PROFILE_DELETED_MSG = 101;
-
- // For now we support just one profile so it's safe to hardcode the
- // id to 1 here. In the future this unique identifier will be set
- // dynamically.
- private int mUniqueId = 1;
-
- private class PhoneNumberValidator implements TextWatcher {
- // Keep in sync with kPhoneNumberLength in chrome/browser/autofill/phone_number.cc
- private static final int PHONE_NUMBER_LENGTH = 7;
- private static final String PHONE_NUMBER_SEPARATORS_REGEX = "[\\s\\.\\(\\)-]";
-
- public void afterTextChanged(Editable s) {
- String phoneNumber = s.toString();
- int phoneNumberLength = phoneNumber.length();
-
- // Strip out any phone number separators.
- phoneNumber = phoneNumber.replaceAll(PHONE_NUMBER_SEPARATORS_REGEX, "");
-
- int strippedPhoneNumberLength = phoneNumber.length();
-
- if (phoneNumberLength > 0 && strippedPhoneNumberLength < PHONE_NUMBER_LENGTH) {
- mPhoneEdit.setError(getResources().getText(
- R.string.autofill_profile_editor_phone_number_invalid));
- } else {
- mPhoneEdit.setError(null);
- }
-
- updateSaveMenuItemState();
- }
-
- public void beforeTextChanged(CharSequence s, int start, int count, int after) {
- }
-
- public void onTextChanged(CharSequence s, int start, int before, int count) {
- }
- }
-
- private class FieldChangedListener implements TextWatcher {
- public void afterTextChanged(Editable s) {
- updateSaveMenuItemState();
- }
-
- public void beforeTextChanged(CharSequence s, int start, int count, int after) {
- }
-
- public void onTextChanged(CharSequence s, int start, int before, int count) {
- }
-
- }
-
- private TextWatcher mFieldChangedListener = new FieldChangedListener();
-
- public AutoFillSettingsFragment() {
- mHandler = new Handler() {
- @Override
- public void handleMessage(Message msg) {
- Context c = getActivity();
- switch (msg.what) {
- case PROFILE_SAVED_MSG:
- if (c != null) {
- Toast.makeText(c, R.string.autofill_profile_successful_save,
- Toast.LENGTH_SHORT).show();
- closeEditor();
- }
- break;
-
- case PROFILE_DELETED_MSG:
- if (c != null) {
- Toast.makeText(c, R.string.autofill_profile_successful_delete,
- Toast.LENGTH_SHORT).show();
- }
- break;
- }
- }
- };
- }
-
- @Override
- public void onCreate(Bundle savedState) {
- super.onCreate(savedState);
- setHasOptionsMenu(true);
- mSettings = BrowserSettings.getInstance();
- }
-
- @Override
- public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
- inflater.inflate(R.menu.autofill_profile_editor, menu);
- mSaveMenuItem = menu.findItem(R.id.autofill_profile_editor_save_profile_menu_id);
- updateSaveMenuItemState();
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case R.id.autofill_profile_editor_delete_profile_menu_id:
- // Clear the UI.
- mFullNameEdit.setText("");
- mEmailEdit.setText("");
- mCompanyEdit.setText("");
- mAddressLine1Edit.setText("");
- mAddressLine2Edit.setText("");
- mCityEdit.setText("");
- mStateEdit.setText("");
- mZipEdit.setText("");
- mCountryEdit.setText("");
- mPhoneEdit.setText("");
-
- // Update browser settings and native with a null profile. This will
- // trigger the current profile to get deleted from the DB.
- mSettings.setAutoFillProfile(null,
- mHandler.obtainMessage(PROFILE_DELETED_MSG));
- updateSaveMenuItemState();
- return true;
-
- case R.id.autofill_profile_editor_save_profile_menu_id:
- AutoFillProfile newProfile = new AutoFillProfile(
- mUniqueId,
- mFullNameEdit.getText().toString(),
- mEmailEdit.getText().toString(),
- mCompanyEdit.getText().toString(),
- mAddressLine1Edit.getText().toString(),
- mAddressLine2Edit.getText().toString(),
- mCityEdit.getText().toString(),
- mStateEdit.getText().toString(),
- mZipEdit.getText().toString(),
- mCountryEdit.getText().toString(),
- mPhoneEdit.getText().toString());
-
- mSettings.setAutoFillProfile(newProfile,
- mHandler.obtainMessage(PROFILE_SAVED_MSG));
- return true;
-
- default:
- return false;
- }
- }
-
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container,
- Bundle savedInstanceState) {
- View v = inflater.inflate(R.layout.autofill_settings_fragment, container, false);
-
- mFullNameEdit = (EditText)v.findViewById(R.id.autofill_profile_editor_name_edit);
- mEmailEdit = (EditText)v.findViewById(R.id.autofill_profile_editor_email_address_edit);
- mCompanyEdit = (EditText)v.findViewById(R.id.autofill_profile_editor_company_name_edit);
- mAddressLine1Edit = (EditText)v.findViewById(
- R.id.autofill_profile_editor_address_line_1_edit);
- mAddressLine2Edit = (EditText)v.findViewById(
- R.id.autofill_profile_editor_address_line_2_edit);
- mCityEdit = (EditText)v.findViewById(R.id.autofill_profile_editor_city_edit);
- mStateEdit = (EditText)v.findViewById(R.id.autofill_profile_editor_state_edit);
- mZipEdit = (EditText)v.findViewById(R.id.autofill_profile_editor_zip_code_edit);
- mCountryEdit = (EditText)v.findViewById(R.id.autofill_profile_editor_country_edit);
- mPhoneEdit = (EditText)v.findViewById(R.id.autofill_profile_editor_phone_number_edit);
-
- mFullNameEdit.addTextChangedListener(mFieldChangedListener);
- mEmailEdit.addTextChangedListener(mFieldChangedListener);
- mCompanyEdit.addTextChangedListener(mFieldChangedListener);
- mAddressLine1Edit.addTextChangedListener(mFieldChangedListener);
- mAddressLine2Edit.addTextChangedListener(mFieldChangedListener);
- mCityEdit.addTextChangedListener(mFieldChangedListener);
- mStateEdit.addTextChangedListener(mFieldChangedListener);
- mZipEdit.addTextChangedListener(mFieldChangedListener);
- mCountryEdit.addTextChangedListener(mFieldChangedListener);
- mPhoneEdit.addTextChangedListener(new PhoneNumberValidator());
-
- // Populate the text boxes with any pre existing AutoFill data.
- AutoFillProfile activeProfile = mSettings.getAutoFillProfile();
- if (activeProfile != null) {
- mFullNameEdit.setText(activeProfile.getFullName());
- mEmailEdit.setText(activeProfile.getEmailAddress());
- mCompanyEdit.setText(activeProfile.getCompanyName());
- mAddressLine1Edit.setText(activeProfile.getAddressLine1());
- mAddressLine2Edit.setText(activeProfile.getAddressLine2());
- mCityEdit.setText(activeProfile.getCity());
- mStateEdit.setText(activeProfile.getState());
- mZipEdit.setText(activeProfile.getZipCode());
- mCountryEdit.setText(activeProfile.getCountry());
- mPhoneEdit.setText(activeProfile.getPhoneNumber());
- }
-
- mInitialised = true;
-
- updateSaveMenuItemState();
-
- return v;
- }
-
- private void updateSaveMenuItemState() {
- if (mSaveMenuItem == null) {
- return;
- }
-
- if (!mInitialised) {
- mSaveMenuItem.setEnabled(false);
- return;
- }
-
- boolean currentState = mSaveMenuItem.isEnabled();
- boolean newState = (mFullNameEdit.getText().toString().length() > 0 ||
- mEmailEdit.getText().toString().length() > 0 ||
- mCompanyEdit.getText().toString().length() > 0 ||
- mAddressLine1Edit.getText().toString().length() > 0 ||
- mAddressLine2Edit.getText().toString().length() > 0 ||
- mCityEdit.getText().toString().length() > 0 ||
- mStateEdit.getText().toString().length() > 0 ||
- mZipEdit.getText().toString().length() > 0 ||
- mCountryEdit.getText().toString().length() > 0) &&
- mPhoneEdit.getError() == null;
-
- if (currentState != newState) {
- mSaveMenuItem.setEnabled(newState);
- }
- }
-
- private void closeEditor() {
- // Hide the IME if the user wants to close while an EditText has focus
- InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(
- Context.INPUT_METHOD_SERVICE);
- imm.hideSoftInputFromWindow(getView().getWindowToken(), 0);
- if (getFragmentManager().getBackStackEntryCount() > 0) {
- getFragmentManager().popBackStack();
- } else {
- getActivity().finish();
- }
- }
-}
diff --git a/src/com/android/browser/AutofillHandler.java b/src/com/android/browser/AutofillHandler.java
deleted file mode 100644
index 5b0320d..0000000
--- a/src/com/android/browser/AutofillHandler.java
+++ /dev/null
@@ -1,283 +0,0 @@
-
-/*
- * Copyright (C) 2011 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.
- */
-
-package com.android.browser;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.Message;
-import android.preference.PreferenceManager;
-import android.provider.ContactsContract;
-import android.util.Log;
-import android.webkit.WebSettingsClassic.AutoFillProfile;
-
-import java.util.concurrent.CountDownLatch;
-
-public class AutofillHandler {
-
- private AutoFillProfile mAutoFillProfile;
- // Default to zero. In the case no profile is set up, the initial
- // value will come from the AutoFillSettingsFragment when the user
- // creates a profile. Otherwise, we'll read the ID of the last used
- // profile from the prefs db.
- private int mAutoFillActiveProfileId;
- private static final int NO_AUTOFILL_PROFILE_SET = 0;
-
- private CountDownLatch mLoaded = new CountDownLatch(1);
- private Context mContext;
-
- private static final String LOGTAG = "AutofillHandler";
-
- public AutofillHandler(Context context) {
- mContext = context.getApplicationContext();
- }
-
- /**
- * Load settings from the browser app's database. It is performed in
- * an AsyncTask as it involves plenty of slow disk IO.
- * NOTE: Strings used for the preferences must match those specified
- * in the various preference XML files.
- */
- public void asyncLoadFromDb() {
- // Run the initial settings load in an AsyncTask as it hits the
- // disk multiple times through SharedPreferences and SQLite. We
- // need to be certain though that this has completed before we start
- // to load pages though, so in the worst case we will block waiting
- // for it to finish in BrowserActivity.onCreate().
- new LoadFromDb().start();
- }
-
- private void waitForLoad() {
- try {
- mLoaded.await();
- } catch (InterruptedException e) {
- Log.w(LOGTAG, "Caught exception while waiting for AutofillProfile to load.");
- }
- }
-
- private class LoadFromDb extends Thread {
-
- @Override
- public void run() {
- // Note the lack of synchronization over mAutoFillActiveProfileId and
- // mAutoFillProfile here. This is because we control all other access
- // to these members through the public functions of this class, and they
- // all wait for this thread via the mLoaded CountDownLatch.
-
- SharedPreferences p = PreferenceManager.getDefaultSharedPreferences(mContext);
-
- // Read the last active AutoFill profile id.
- mAutoFillActiveProfileId = p.getInt(
- PreferenceKeys.PREF_AUTOFILL_ACTIVE_PROFILE_ID,
- mAutoFillActiveProfileId);
-
- // Load the autofill profile data from the database. We use a database separate
- // to the browser preference DB to make it easier to support multiple profiles
- // and switching between them. Note that this may block startup if this DB lookup
- // is extremely slow. We do this to ensure that if there's a profile set, the
- // user never sees the "setup Autofill" option.
- AutoFillProfileDatabase autoFillDb = AutoFillProfileDatabase.getInstance(mContext);
- Cursor c = autoFillDb.getProfile(mAutoFillActiveProfileId);
-
- if (c.getCount() > 0) {
- c.moveToFirst();
-
- String fullName = c.getString(c.getColumnIndex(
- AutoFillProfileDatabase.Profiles.FULL_NAME));
- String email = c.getString(c.getColumnIndex(
- AutoFillProfileDatabase.Profiles.EMAIL_ADDRESS));
- String company = c.getString(c.getColumnIndex(
- AutoFillProfileDatabase.Profiles.COMPANY_NAME));
- String addressLine1 = c.getString(c.getColumnIndex(
- AutoFillProfileDatabase.Profiles.ADDRESS_LINE_1));
- String addressLine2 = c.getString(c.getColumnIndex(
- AutoFillProfileDatabase.Profiles.ADDRESS_LINE_2));
- String city = c.getString(c.getColumnIndex(
- AutoFillProfileDatabase.Profiles.CITY));
- String state = c.getString(c.getColumnIndex(
- AutoFillProfileDatabase.Profiles.STATE));
- String zip = c.getString(c.getColumnIndex(
- AutoFillProfileDatabase.Profiles.ZIP_CODE));
- String country = c.getString(c.getColumnIndex(
- AutoFillProfileDatabase.Profiles.COUNTRY));
- String phone = c.getString(c.getColumnIndex(
- AutoFillProfileDatabase.Profiles.PHONE_NUMBER));
- mAutoFillProfile = new AutoFillProfile(mAutoFillActiveProfileId,
- fullName, email, company, addressLine1, addressLine2, city,
- state, zip, country, phone);
- }
- c.close();
- autoFillDb.close();
-
- // At this point we've loaded the profile if there was one, so let any thread
- // waiting on initialization continue.
- mLoaded.countDown();
-
- // Synchronization note: strictly speaking, it's possible that mAutoFillProfile
- // may get a value after we check below, but that's OK. This check is only an
- // optimisation, and we do a proper synchronized check further down when it comes
- // to actually setting the inferred profile.
- if (mAutoFillProfile == null) {
- // We did not load a profile from disk. Try to infer one from the user's
- // "me" contact.
- final Uri profileUri = Uri.withAppendedPath(ContactsContract.Profile.CONTENT_URI,
- ContactsContract.Contacts.Data.CONTENT_DIRECTORY);
- String name = getContactField(profileUri,
- ContactsContract.CommonDataKinds.StructuredName.DISPLAY_NAME,
- ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE);
- // Only attempt to read other data and set a profile if we could successfully
- // get a name.
- if (name != null) {
- String email = getContactField(profileUri,
- ContactsContract.CommonDataKinds.Email.ADDRESS,
- ContactsContract.CommonDataKinds.Email.CONTENT_ITEM_TYPE);
- String phone = getContactField(profileUri,
- ContactsContract.CommonDataKinds.Phone.NUMBER,
- ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE);
- String company = getContactField(profileUri,
- ContactsContract.CommonDataKinds.Organization.COMPANY,
- ContactsContract.CommonDataKinds.Organization.CONTENT_ITEM_TYPE);
-
- // Can't easily get structured postal address information (even using
- // CommonDataKinds.StructuredPostal) so omit prepopulating that for now.
- // When querying structured postal data, it often all comes back as a string
- // inside the "street" field.
-
- synchronized(AutofillHandler.this) {
- // Only use this profile if one hasn't been set inbetween the
- // inital import and this thread getting to this point.
- if (mAutoFillProfile == null) {
- setAutoFillProfile(new AutoFillProfile(1, name, email, company,
- null, null, null, null, null, null, phone), null);
- }
- }
- }
- }
- }
-
- private String getContactField(Uri uri, String field, String itemType) {
- String result = null;
-
- Cursor c = mContext.getContentResolver().query(uri, new String[] { field },
- ContactsContract.Data.MIMETYPE + "=?", new String[] { itemType }, null);
-
- if (c == null) {
- return null;
- }
-
- try {
- // Just use the first returned value if we get more than one.
- if (c.moveToFirst()) {
- result = c.getString(0);
- }
- } finally {
- c.close();
- }
- return result;
- }
- }
-
- public synchronized void setAutoFillProfile(AutoFillProfile profile, Message msg) {
- waitForLoad();
- int profileId = NO_AUTOFILL_PROFILE_SET;
- if (profile != null) {
- profileId = profile.getUniqueId();
- // Update the AutoFill DB with the new profile.
- new SaveProfileToDbTask(msg).execute(profile);
- } else {
- // Delete the current profile.
- if (mAutoFillProfile != null) {
- new DeleteProfileFromDbTask(msg).execute(mAutoFillProfile.getUniqueId());
- }
- }
- // Make sure we set mAutoFillProfile before calling setActiveAutoFillProfileId
- // Calling setActiveAutoFillProfileId will trigger an update of WebViews
- // which will expect a new profile to be set
- mAutoFillProfile = profile;
- setActiveAutoFillProfileId(profileId);
- }
-
- public synchronized AutoFillProfile getAutoFillProfile() {
- waitForLoad();
- return mAutoFillProfile;
- }
-
- private synchronized void setActiveAutoFillProfileId(int activeProfileId) {
- mAutoFillActiveProfileId = activeProfileId;
- Editor ed = PreferenceManager.
- getDefaultSharedPreferences(mContext).edit();
- ed.putInt(PreferenceKeys.PREF_AUTOFILL_ACTIVE_PROFILE_ID, activeProfileId);
- ed.apply();
- }
-
- private abstract class AutoFillProfileDbTask<T> extends AsyncTask<T, Void, Void> {
- AutoFillProfileDatabase mAutoFillProfileDb;
- Message mCompleteMessage;
-
- public AutoFillProfileDbTask(Message msg) {
- mCompleteMessage = msg;
- }
-
- @Override
- protected void onPostExecute(Void result) {
- if (mCompleteMessage != null) {
- mCompleteMessage.sendToTarget();
- }
- mAutoFillProfileDb.close();
- }
-
- @Override
- abstract protected Void doInBackground(T... values);
- }
-
-
- private class SaveProfileToDbTask extends AutoFillProfileDbTask<AutoFillProfile> {
- public SaveProfileToDbTask(Message msg) {
- super(msg);
- }
-
- @Override
- protected Void doInBackground(AutoFillProfile... values) {
- mAutoFillProfileDb = AutoFillProfileDatabase.getInstance(mContext);
- synchronized (AutofillHandler.this) {
- assert mAutoFillActiveProfileId != NO_AUTOFILL_PROFILE_SET;
- AutoFillProfile newProfile = values[0];
- mAutoFillProfileDb.addOrUpdateProfile(mAutoFillActiveProfileId, newProfile);
- }
- return null;
- }
- }
-
- private class DeleteProfileFromDbTask extends AutoFillProfileDbTask<Integer> {
- public DeleteProfileFromDbTask(Message msg) {
- super(msg);
- }
-
- @Override
- protected Void doInBackground(Integer... values) {
- mAutoFillProfileDb = AutoFillProfileDatabase.getInstance(mContext);
- int id = values[0];
- assert id > 0;
- mAutoFillProfileDb.dropProfile(id);
- return null;
- }
- }
-}
diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index 3ba3182..6b10459 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -46,7 +46,6 @@
import android.view.inputmethod.InputMethodManager;
import android.webkit.WebChromeClient;
import android.webkit.WebView;
-import android.webkit.WebViewClassic;
import android.widget.FrameLayout;
import android.widget.ImageButton;
import android.widget.LinearLayout;
diff --git a/src/com/android/browser/BrowserPreferencesPage.java b/src/com/android/browser/BrowserPreferencesPage.java
index 6e6da17..9b538e0 100644
--- a/src/com/android/browser/BrowserPreferencesPage.java
+++ b/src/com/android/browser/BrowserPreferencesPage.java
@@ -25,7 +25,10 @@
import com.android.browser.preferences.BandwidthPreferencesFragment;
import com.android.browser.preferences.DebugPreferencesFragment;
+import java.util.Arrays;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
public class BrowserPreferencesPage extends PreferenceActivity {
@@ -98,4 +101,16 @@
return intent;
}
+ private static final Set<String> sKnownFragments = new HashSet<String>(Arrays.asList(
+ "com.android.browser.preferences.GeneralPreferencesFragment",
+ "com.android.browser.preferences.PrivacySecurityPreferencesFragment",
+ "com.android.browser.preferences.AccessibilityPreferencesFragment",
+ "com.android.browser.preferences.AdvancedPreferencesFragment",
+ "com.android.browser.preferences.BandwidthPreferencesFragment",
+ "com.android.browser.preferences.LabPreferencesFragment"));
+
+ @Override
+ protected boolean isValidFragment(String fragmentName) {
+ return sKnownFragments.contains(fragmentName);
+ }
}
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 95afa71..ed44394 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -38,8 +38,6 @@
import android.webkit.WebSettings.PluginState;
import android.webkit.WebSettings.TextSize;
import android.webkit.WebSettings.ZoomDensity;
-import android.webkit.WebSettingsClassic;
-import android.webkit.WebSettingsClassic.AutoFillProfile;
import android.webkit.WebStorage;
import android.webkit.WebView;
import android.webkit.WebViewDatabase;
@@ -111,7 +109,6 @@
private LinkedList<WeakReference<WebSettings>> mManagedSettings;
private Controller mController;
private WebStorageSizeManager mWebStorageSizeManager;
- private AutofillHandler mAutofillHandler;
private WeakHashMap<WebSettings, String> mCustomUserAgents;
private static boolean sInitialized = false;
private boolean mNeedsSharedSync = true;
@@ -140,10 +137,8 @@
private BrowserSettings(Context context) {
mContext = context.getApplicationContext();
mPrefs = PreferenceManager.getDefaultSharedPreferences(mContext);
- mAutofillHandler = new AutofillHandler(mContext);
mManagedSettings = new LinkedList<WeakReference<WebSettings>>();
mCustomUserAgents = new WeakHashMap<WebSettings, String>();
- mAutofillHandler.asyncLoadFromDb();
BackgroundHandler.execute(mSetup);
}
@@ -277,31 +272,6 @@
} else {
settings.setUserAgentString(USER_AGENTS[getUserAgent()]);
}
-
- if (!(settings instanceof WebSettingsClassic)) return;
-
- WebSettingsClassic settingsClassic = (WebSettingsClassic) settings;
- settingsClassic.setHardwareAccelSkiaEnabled(isSkiaHardwareAccelerated());
- settingsClassic.setShowVisualIndicator(enableVisualIndicator());
- settingsClassic.setForceUserScalable(forceEnableUserScalable());
- settingsClassic.setDoubleTapZoom(getDoubleTapZoom());
- settingsClassic.setAutoFillEnabled(isAutofillEnabled());
- settingsClassic.setAutoFillProfile(getAutoFillProfile());
-
- boolean useInverted = useInvertedRendering();
- settingsClassic.setProperty(WebViewProperties.gfxInvertedScreen,
- useInverted ? "true" : "false");
- if (useInverted) {
- settingsClassic.setProperty(WebViewProperties.gfxInvertedScreenContrast,
- Float.toString(getInvertedContrast()));
- }
-
- if (isDebugEnabled()) {
- settingsClassic.setProperty(WebViewProperties.gfxEnableCpuUploadPath,
- enableCpuUploadPath() ? "true" : "false");
- }
-
- settingsClassic.setLinkPrefetchEnabled(mLinkPrefetchAllowed);
}
/**
@@ -335,19 +305,6 @@
// origin policy for file access
settings.setAllowUniversalAccessFromFileURLs(false);
settings.setAllowFileAccessFromFileURLs(false);
-
- if (!(settings instanceof WebSettingsClassic)) return;
-
- WebSettingsClassic settingsClassic = (WebSettingsClassic) settings;
- settingsClassic.setPageCacheCapacity(getPageCacheCapacity());
- // WebView should be preserving the memory as much as possible.
- // However, apps like browser wish to turn on the performance mode which
- // would require more memory.
- // TODO: We need to dynamically allocate/deallocate temporary memory for
- // apps which are trying to use minimal memory. Currently, double
- // buffering is always turned on, which is unnecessary.
- settingsClassic.setProperty(WebViewProperties.gfxUseMinimalMemory, "false");
- settingsClassic.setWorkersEnabled(true); // This only affects V8.
}
private void syncSharedSettings() {
@@ -523,19 +480,6 @@
updateSearchEngine(false);
}
- public AutoFillProfile getAutoFillProfile() {
- return mAutofillHandler.getAutoFillProfile();
- }
-
- public void setAutoFillProfile(AutoFillProfile profile, Message msg) {
- mAutofillHandler.setAutoFillProfile(profile, msg);
- // Auto-fill will reuse the same profile ID when making edits to the profile,
- // so we need to force a settings sync (otherwise the SharedPreferences
- // manager will optimise out the call to onSharedPreferenceChanged(), as
- // it thinks nothing has changed).
- syncManagedSettings();
- }
-
public void toggleDebugSettings() {
setDebugEnabled(!isDebugEnabled());
}
diff --git a/src/com/android/browser/BrowserWebView.java b/src/com/android/browser/BrowserWebView.java
index 99e0587..3e3672c 100644
--- a/src/com/android/browser/BrowserWebView.java
+++ b/src/com/android/browser/BrowserWebView.java
@@ -22,9 +22,7 @@
import android.view.View;
import android.webkit.WebChromeClient;
import android.webkit.WebStorage;
-import android.webkit.WebStorageClassic;
import android.webkit.WebView;
-import android.webkit.WebViewClassic;
import android.webkit.WebViewClient;
import java.util.Map;
@@ -32,7 +30,7 @@
/**
* Manage WebView scroll events
*/
-public class BrowserWebView extends WebView implements WebViewClassic.TitleBarDelegate {
+public class BrowserWebView extends WebView {
public interface OnScrollChangedListener {
void onScrollChanged(int l, int t, int oldl, int oldt);
@@ -80,11 +78,6 @@
super(context);
}
- public static boolean isClassic() {
- // Using WebStorage for convenience of access in a static method.
- return WebStorage.getInstance() instanceof WebStorageClassic;
- }
-
@Override
public void setWebChromeClient(WebChromeClient client) {
mWebChromeClient = client;
@@ -109,18 +102,10 @@
mTitleBar = title;
}
- // From TitleBarDelegate
- @Override
public int getTitleHeight() {
return (mTitleBar != null) ? mTitleBar.getEmbeddedHeight() : 0;
}
- // From TitleBarDelegate
- @Override
- public void onSetEmbeddedTitleBar(final View title) {
- // TODO: Remove this method; it is never invoked.
- }
-
public boolean hasTitleBar() {
return (mTitleBar != null);
}
diff --git a/src/com/android/browser/BrowserWebViewFactory.java b/src/com/android/browser/BrowserWebViewFactory.java
index 66d9e78..f976b07 100644
--- a/src/com/android/browser/BrowserWebViewFactory.java
+++ b/src/com/android/browser/BrowserWebViewFactory.java
@@ -65,6 +65,9 @@
// settings
final BrowserSettings s = BrowserSettings.getInstance();
s.startManagingSettings(w.getSettings());
+
+ // Remote Web Debugging is always enabled
+ WebView.setWebContentsDebuggingEnabled(true);
}
}
diff --git a/src/com/android/browser/ComboViewActivity.java b/src/com/android/browser/ComboViewActivity.java
index 91d574e..7053c9b 100644
--- a/src/com/android/browser/ComboViewActivity.java
+++ b/src/com/android/browser/ComboViewActivity.java
@@ -71,14 +71,6 @@
mTabsAdapter = new TabsAdapter(this, mViewPager);
mTabsAdapter.addTab(bar.newTab().setText(R.string.tab_bookmarks),
BrowserBookmarksPage.class, args);
- if (BrowserWebView.isClassic()) {
- // TODO: history page should be able to work in Classic mode, but there's some
- // provider name conflict. (Snapshot would never work in that mode though).
- mTabsAdapter.addTab(bar.newTab().setText(R.string.tab_history),
- BrowserHistoryPage.class, args);
- mTabsAdapter.addTab(bar.newTab().setText(R.string.tab_snapshots),
- BrowserSnapshotPage.class, args);
- }
if (savedInstanceState != null) {
bar.setSelectedNavigationItem(
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 7b7fcd4..2d716a8 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -78,7 +78,6 @@
import android.webkit.WebIconDatabase;
import android.webkit.WebSettings;
import android.webkit.WebView;
-import android.webkit.WebViewClassic;
import android.widget.Toast;
import com.android.browser.IntentHandler.UrlData;
@@ -131,7 +130,6 @@
final static int COMBO_VIEW = 1;
final static int PREFERENCES_PAGE = 3;
final static int FILE_SELECTED = 4;
- final static int AUTOFILL_SETUP = 5;
final static int VOICE_RESULT = 6;
private final static int WAKELOCK_TIMEOUT = 5 * 60 * 1000; // 5 minutes
@@ -260,7 +258,6 @@
@Override
public void start(final Intent intent) {
- if (BrowserWebView.isClassic()) WebViewClassic.setShouldMonitorWebCoreThread();
// mCrashRecoverHandler has any previously saved state.
mCrashRecoveryHandler.startRecovery(intent);
}
@@ -356,9 +353,6 @@
}
// Read JavaScript flags if it exists.
String jsFlags = getSettings().getJsEngineFlags();
- if (jsFlags.trim().length() != 0 && BrowserWebView.isClassic()) {
- WebViewClassic.fromWebView(getCurrentWebView()).setJsFlags(jsFlags);
- }
if (intent != null
&& BrowserActivity.ACTION_SHOW_BOOKMARKS.equals(intent.getAction())) {
bookmarksOrHistoryPicker(ComboViews.Bookmarks);
@@ -1166,15 +1160,6 @@
if (null == mUploadHandler) break;
mUploadHandler.onResult(resultCode, intent);
break;
- case AUTOFILL_SETUP:
- // Determine whether a profile was actually set up or not
- // and if so, send the message back to the WebTextView to
- // fill the form with the new profile.
- if (getSettings().getAutoFillProfile() != null) {
- mAutoFillSetupMessage.sendToTarget();
- mAutoFillSetupMessage = null;
- }
- break;
case COMBO_VIEW:
if (intent == null || resultCode != Activity.RESULT_OK) {
break;
@@ -1196,12 +1181,8 @@
long id = intent.getLongExtra(
ComboViewActivity.EXTRA_OPEN_SNAPSHOT, -1);
if (id >= 0) {
- if (BrowserWebView.isClassic()) {
- createNewSnapshotTab(id, true);
- } else {
- Toast.makeText(mActivity, "Snapshot Tab requires WebViewClassic",
- Toast.LENGTH_LONG).show();
- }
+ Toast.makeText(mActivity, "Snapshot Tab no longer supported",
+ Toast.LENGTH_LONG).show();
}
}
break;
@@ -1323,15 +1304,6 @@
menu.setGroupVisible(R.id.ANCHOR_MENU,
type == WebView.HitTestResult.SRC_ANCHOR_TYPE
|| type == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE);
- boolean hitText = type == WebView.HitTestResult.SRC_ANCHOR_TYPE
- || type == WebView.HitTestResult.PHONE_TYPE
- || type == WebView.HitTestResult.EMAIL_TYPE
- || type == WebView.HitTestResult.GEO_TYPE;
- menu.setGroupVisible(R.id.SELECT_TEXT_MENU, hitText);
- if (hitText) {
- menu.findItem(R.id.select_text_menu_id)
- .setOnMenuItemClickListener(new SelectText(webview));
- }
// Setup custom handling depending on the type
switch (type) {
case WebView.HitTestResult.PHONE_TYPE:
@@ -1648,12 +1620,6 @@
findOnPage();
break;
- case R.id.save_snapshot_menu_id:
- final Tab source = getTabControl().getCurrentTab();
- if (source == null) break;
- new SaveSnapshotTask(source).execute();
- break;
-
case R.id.page_info_menu_id:
showPageInfo();
break;
@@ -1719,69 +1685,6 @@
return true;
}
- private class SaveSnapshotTask extends AsyncTask<Void, Void, Long>
- implements OnCancelListener {
-
- private Tab mTab;
- private Dialog mProgressDialog;
- private ContentValues mValues;
-
- private SaveSnapshotTask(Tab tab) {
- mTab = tab;
- }
-
- @Override
- protected void onPreExecute() {
- CharSequence message = mActivity.getText(R.string.saving_snapshot);
- mProgressDialog = ProgressDialog.show(mActivity, null, message,
- true, true, this);
- mValues = mTab.createSnapshotValues();
- }
-
- @Override
- protected Long doInBackground(Void... params) {
- if (!mTab.saveViewState(mValues)) {
- return null;
- }
- if (isCancelled()) {
- String path = mValues.getAsString(Snapshots.VIEWSTATE_PATH);
- File file = mActivity.getFileStreamPath(path);
- if (!file.delete()) {
- file.deleteOnExit();
- }
- return null;
- }
- final ContentResolver cr = mActivity.getContentResolver();
- Uri result = cr.insert(Snapshots.CONTENT_URI, mValues);
- if (result == null) {
- return null;
- }
- long id = ContentUris.parseId(result);
- return id;
- }
-
- @Override
- protected void onPostExecute(Long id) {
- if (isCancelled()) {
- return;
- }
- mProgressDialog.dismiss();
- if (id == null) {
- Toast.makeText(mActivity, R.string.snapshot_failed,
- Toast.LENGTH_SHORT).show();
- return;
- }
- Bundle b = new Bundle();
- b.putLong(BrowserSnapshotPage.EXTRA_ANIMATE_ID, id);
- mUi.showComboView(ComboViews.Snapshots, b);
- }
-
- @Override
- public void onCancel(DialogInterface dialog) {
- cancel(true);
- }
- }
-
@Override
public void toggleUserAgent() {
WebView web = getCurrentWebView();
@@ -2250,25 +2153,6 @@
}
}
- private static class SelectText implements OnMenuItemClickListener {
- private WebViewClassic mWebView;
-
- @Override
- public boolean onMenuItemClick(MenuItem item) {
- if (mWebView != null) {
- return mWebView.selectText();
- }
- return false;
- }
-
- public SelectText(WebView webView) {
- if (BrowserWebView.isClassic()) {
- mWebView = WebViewClassic.fromWebView(webView);
- }
- }
-
- }
-
/********************** TODO: UI stuff *****************************/
// these methods have been copied, they still need to be cleaned up
@@ -2457,21 +2341,6 @@
return tab;
}
- @Override
- public SnapshotTab createNewSnapshotTab(long snapshotId, boolean setActive) {
- SnapshotTab tab = null;
- if (mTabControl.canCreateNewTab()) {
- tab = mTabControl.createSnapshotTab(snapshotId);
- addTab(tab);
- if (setActive) {
- setActiveTab(tab);
- }
- } else {
- mUi.showMaxTabsWarning();
- }
- return tab;
- }
-
/**
* @param tab the tab to switch to
* @return boolean True if we successfully switched to a different tab. If
@@ -2744,19 +2613,7 @@
return true;
}
break;
- case KeyEvent.KEYCODE_A:
- if (ctrl && BrowserWebView.isClassic()) {
- WebViewClassic.fromWebView(webView).selectAll();
- return true;
- }
- break;
// case KeyEvent.KEYCODE_B: // menu
- case KeyEvent.KEYCODE_C:
- if (ctrl && BrowserWebView.isClassic()) {
- WebViewClassic.fromWebView(webView).copySelection();
- return true;
- }
- break;
// case KeyEvent.KEYCODE_D: // menu
// case KeyEvent.KEYCODE_E: // in Chrome: puts '?' in URL bar
// case KeyEvent.KEYCODE_F: // menu
@@ -2835,18 +2692,6 @@
}
@Override
- public void setupAutoFill(Message message) {
- // Open the settings activity at the AutoFill profile fragment so that
- // the user can create a new profile. When they return, we will dispatch
- // the message so that we can autofill the form using their new profile.
- Intent intent = new Intent(mActivity, BrowserPreferencesPage.class);
- intent.putExtra(PreferenceActivity.EXTRA_SHOW_FRAGMENT,
- AutoFillSettingsFragment.class.getName());
- mAutoFillSetupMessage = message;
- mActivity.startActivityForResult(intent, AUTOFILL_SETUP);
- }
-
- @Override
public boolean onSearchRequested() {
mUi.editUrl(false, true);
return true;
diff --git a/src/com/android/browser/IntentHandler.java b/src/com/android/browser/IntentHandler.java
index 7107a9e..1b8dfc7 100644
--- a/src/com/android/browser/IntentHandler.java
+++ b/src/com/android/browser/IntentHandler.java
@@ -179,25 +179,6 @@
}
}
} else {
- if (BrowserWebView.isClassic() && !urlData.isEmpty()
- && urlData.mUrl.startsWith("about:debug")) {
- if ("about:debug.dom".equals(urlData.mUrl)) {
- current.getWebViewClassic().dumpDomTree(false);
- } else if ("about:debug.dom.file".equals(urlData.mUrl)) {
- current.getWebViewClassic().dumpDomTree(true);
- } else if ("about:debug.render".equals(urlData.mUrl)) {
- current.getWebViewClassic().dumpRenderTree(false);
- } else if ("about:debug.render.file".equals(urlData.mUrl)) {
- current.getWebViewClassic().dumpRenderTree(true);
- } else if ("about:debug.display".equals(urlData.mUrl)) {
- current.getWebViewClassic().dumpDisplayTree();
- } else if ("about:debug.nav".equals(urlData.mUrl)) {
- current.getWebView().debugDump();
- } else {
- mSettings.toggleDebugSettings();
- }
- return;
- }
// Get rid of the subwindow if it exists
mController.dismissSubWindow(current);
// If the current Tab is being used as an application tab,
diff --git a/src/com/android/browser/KeyChainLookup.java b/src/com/android/browser/KeyChainLookup.java
deleted file mode 100644
index 4d5f694..0000000
--- a/src/com/android/browser/KeyChainLookup.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 201 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.
- */
-
-package com.android.browser;
-
-import android.content.Context;
-import android.os.AsyncTask;
-import android.security.KeyChain;
-import android.security.KeyChainException;
-import android.webkit.ClientCertRequestHandler;
-import java.security.PrivateKey;
-import java.security.cert.X509Certificate;
-
-final class KeyChainLookup extends AsyncTask<Void, Void, Void> {
- private final Context mContext;
- private final ClientCertRequestHandler mHandler;
- private final String mAlias;
- KeyChainLookup(Context context, ClientCertRequestHandler handler, String alias) {
- mContext = context.getApplicationContext();
- mHandler = handler;
- mAlias = alias;
- }
- @Override protected Void doInBackground(Void... params) {
- PrivateKey privateKey;
- X509Certificate[] certificateChain;
- try {
- privateKey = KeyChain.getPrivateKey(mContext, mAlias);
- certificateChain = KeyChain.getCertificateChain(mContext, mAlias);
- } catch (InterruptedException e) {
- mHandler.ignore();
- return null;
- } catch (KeyChainException e) {
- mHandler.ignore();
- return null;
- }
- mHandler.proceed(privateKey, certificateChain);
- return null;
- }
-}
diff --git a/src/com/android/browser/NetworkStateHandler.java b/src/com/android/browser/NetworkStateHandler.java
index 9201f0f..618fde5 100644
--- a/src/com/android/browser/NetworkStateHandler.java
+++ b/src/com/android/browser/NetworkStateHandler.java
@@ -24,7 +24,6 @@
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.webkit.WebView;
-import android.webkit.WebViewClassic;
import com.android.browser.BrowserSettings;
@@ -114,8 +113,5 @@
private void sendNetworkType(String type, String subtype) {
WebView w = mController.getCurrentWebView();
- if (w != null && BrowserWebView.isClassic()) {
- WebViewClassic.fromWebView(w).setNetworkType(type, subtype);
- }
}
}
diff --git a/src/com/android/browser/PreloadController.java b/src/com/android/browser/PreloadController.java
index 881f19e..acd9709 100644
--- a/src/com/android/browser/PreloadController.java
+++ b/src/com/android/browser/PreloadController.java
@@ -246,11 +246,6 @@
}
@Override
- public void setupAutoFill(Message message) {
- if (LOGD_ENABLED) Log.d(LOGTAG, "setupAutoFill()");
- }
-
- @Override
public void bookmarkedStatusHasChanged(Tab tab) {
if (LOGD_ENABLED) Log.d(LOGTAG, "bookmarkedStatusHasChanged()");
}
diff --git a/src/com/android/browser/SnapshotBar.java b/src/com/android/browser/SnapshotBar.java
deleted file mode 100644
index 51e1226..0000000
--- a/src/com/android/browser/SnapshotBar.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Copyright (C) 2011 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.
- */
-package com.android.browser;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.os.Handler;
-import android.os.Message;
-import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewConfiguration;
-import android.view.ViewPropertyAnimator;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.PopupMenu.OnMenuItemClickListener;
-import android.widget.TextView;
-
-import com.android.browser.UI.ComboViews;
-
-import java.text.DateFormat;
-import java.util.Date;
-
-public class SnapshotBar extends LinearLayout implements OnClickListener {
-
- private static final int MSG_SHOW_TITLE = 1;
- private static final long DURATION_SHOW_DATE = BaseUi.HIDE_TITLEBAR_DELAY;
-
- private ImageView mFavicon;
- private TextView mDate;
- private TextView mTitle;
- private View mBookmarks;
- private TitleBar mTitleBar;
- private View mTabSwitcher;
- private View mOverflowMenu;
- private View mToggleContainer;
- private boolean mIsAnimating;
- private ViewPropertyAnimator mTitleAnimator, mDateAnimator;
- private float mAnimRadius = 20f;
-
- public SnapshotBar(Context context) {
- super(context);
- }
-
- public SnapshotBar(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- public SnapshotBar(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
- }
-
- public void setTitleBar(TitleBar titleBar) {
- mTitleBar = titleBar;
- setFavicon(null);
- }
-
- private Handler mHandler = new Handler() {
- @Override
- public void handleMessage(Message msg) {
- if (msg.what == MSG_SHOW_TITLE) {
- mIsAnimating = false;
- showTitle();
- mTitleBar.getUi().showTitleBarForDuration();
- }
- }
- };
-
- @Override
- protected void onFinishInflate() {
- super.onFinishInflate();
- mFavicon = (ImageView) findViewById(R.id.favicon);
- mDate = (TextView) findViewById(R.id.date);
- mTitle = (TextView) findViewById(R.id.title);
- mBookmarks = findViewById(R.id.all_btn);
- mTabSwitcher = findViewById(R.id.tab_switcher);
- mOverflowMenu = findViewById(R.id.more);
- mToggleContainer = findViewById(R.id.toggle_container);
-
- if (mBookmarks != null) {
- mBookmarks.setOnClickListener(this);
- }
- if (mTabSwitcher != null) {
- mTabSwitcher.setOnClickListener(this);
- }
- if (mOverflowMenu != null) {
- mOverflowMenu.setOnClickListener(this);
- boolean showMenu = !ViewConfiguration.get(getContext())
- .hasPermanentMenuKey();
- mOverflowMenu.setVisibility(showMenu ? VISIBLE : GONE);
- }
- if (mToggleContainer != null) {
- mToggleContainer.setOnClickListener(this);
- resetAnimation();
- }
- }
-
- @Override
- protected void onLayout(boolean changed, int l, int t, int r, int b) {
- super.onLayout(changed, l, t, r, b);
- if (mToggleContainer != null) {
- mAnimRadius = mToggleContainer.getHeight() / 2f;
- }
- }
-
- void resetAnimation() {
- if (mToggleContainer == null) {
- // No animation needed/used
- return;
- }
- if (mTitleAnimator != null) {
- mTitleAnimator.cancel();
- mTitleAnimator = null;
- }
- if (mDateAnimator != null) {
- mDateAnimator.cancel();
- mDateAnimator = null;
- }
- mIsAnimating = false;
- mHandler.removeMessages(MSG_SHOW_TITLE);
- mTitle.setAlpha(1f);
- mTitle.setTranslationY(0f);
- mTitle.setRotationX(0f);
- mDate.setAlpha(0f);
- mDate.setTranslationY(-mAnimRadius);
- mDate.setRotationX(90f);
- }
-
- private void showDate() {
- mTitleAnimator = mTitle.animate()
- .alpha(0f)
- .translationY(mAnimRadius)
- .rotationX(-90f);
- mDateAnimator = mDate.animate()
- .alpha(1f)
- .translationY(0f)
- .rotationX(0f);
- }
-
- private void showTitle() {
- mTitleAnimator = mTitle.animate()
- .alpha(1f)
- .translationY(0f)
- .rotationX(0f);
- mDateAnimator = mDate.animate()
- .alpha(0f)
- .translationY(-mAnimRadius)
- .rotationX(90f);
- }
-
- @Override
- public void onClick(View v) {
- if (mBookmarks == v) {
- mTitleBar.getUiController().bookmarksOrHistoryPicker(ComboViews.Bookmarks);
- } else if (mTabSwitcher == v) {
- ((PhoneUi) mTitleBar.getUi()).toggleNavScreen();
- } else if (mOverflowMenu == v) {
- NavigationBarBase navBar = mTitleBar.getNavigationBar();
- if (navBar instanceof NavigationBarPhone) {
- ((NavigationBarPhone)navBar).showMenu(mOverflowMenu);
- }
- } else if (mToggleContainer == v && !mIsAnimating) {
- mIsAnimating = true;
- showDate();
- mTitleBar.getUi().showTitleBar();
- Message m = mHandler.obtainMessage(MSG_SHOW_TITLE);
- mHandler.sendMessageDelayed(m, DURATION_SHOW_DATE);
- }
- }
-
- public void onTabDataChanged(Tab tab) {
- if (!tab.isSnapshot()) return;
- SnapshotTab snapshot = (SnapshotTab) tab;
- DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.LONG);
- mDate.setText(dateFormat.format(new Date(snapshot.getDateCreated())));
- String title = snapshot.getTitle();
- if (TextUtils.isEmpty(title)) {
- title = UrlUtils.stripUrl(snapshot.getUrl());
- }
- mTitle.setText(title);
- setFavicon(tab.getFavicon());
- resetAnimation();
- }
-
- public void setFavicon(Bitmap icon) {
- if (mFavicon == null) return;
- mFavicon.setImageDrawable(mTitleBar.getUi().getFaviconDrawable(icon));
- }
-
- public boolean isAnimating() {
- return mIsAnimating;
- }
-
-}
diff --git a/src/com/android/browser/SnapshotTab.java b/src/com/android/browser/SnapshotTab.java
deleted file mode 100644
index e14f095..0000000
--- a/src/com/android/browser/SnapshotTab.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * Copyright (C) 2011 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.
- */
-package com.android.browser;
-
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.graphics.BitmapFactory;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.util.Log;
-import android.webkit.WebView;
-import android.webkit.WebViewClassic;
-
-import com.android.browser.provider.SnapshotProvider.Snapshots;
-
-import java.io.ByteArrayInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.util.Map;
-import java.util.zip.GZIPInputStream;
-
-
-public class SnapshotTab extends Tab {
-
- private static final String LOGTAG = "SnapshotTab";
-
- private long mSnapshotId;
- private LoadData mLoadTask;
- private WebViewFactory mWebViewFactory;
- private int mBackgroundColor;
- private long mDateCreated;
- private boolean mIsLive;
-
- public SnapshotTab(WebViewController wvcontroller, long snapshotId) {
- super(wvcontroller, null, null);
- mSnapshotId = snapshotId;
- mWebViewFactory = mWebViewController.getWebViewFactory();
- WebView web = mWebViewFactory.createWebView(false);
- setWebView(web);
- loadData();
- }
-
- @Override
- void putInForeground() {
- if (getWebView() == null) {
- WebView web = mWebViewFactory.createWebView(false);
- if (mBackgroundColor != 0) {
- web.setBackgroundColor(mBackgroundColor);
- }
- setWebView(web);
- loadData();
- }
- super.putInForeground();
- }
-
- @Override
- void putInBackground() {
- if (getWebView() == null) return;
- super.putInBackground();
- }
-
- void loadData() {
- if (mLoadTask == null) {
- mLoadTask = new LoadData(this, mContext);
- mLoadTask.execute();
- }
- }
-
- @Override
- void addChildTab(Tab child) {
- if (mIsLive) {
- super.addChildTab(child);
- } else {
- throw new IllegalStateException("Snapshot tabs cannot have child tabs!");
- }
- }
-
- @Override
- public boolean isSnapshot() {
- return !mIsLive;
- }
-
- public long getSnapshotId() {
- return mSnapshotId;
- }
-
- @Override
- public ContentValues createSnapshotValues() {
- if (mIsLive) {
- return super.createSnapshotValues();
- }
- return null;
- }
-
- @Override
- public Bundle saveState() {
- if (mIsLive) {
- return super.saveState();
- }
- return null;
- }
-
- public long getDateCreated() {
- return mDateCreated;
- }
-
- @Override
- public void loadUrl(String url, Map<String, String> headers) {
- if (!mIsLive) {
- mIsLive = true;
- getWebViewClassic().clearViewState();
- }
- super.loadUrl(url, headers);
- }
-
- @Override
- public boolean canGoBack() {
- return super.canGoBack() || mIsLive;
- }
-
- @Override
- public boolean canGoForward() {
- return mIsLive && super.canGoForward();
- }
-
- @Override
- public void goBack() {
- if (super.canGoBack()) {
- super.goBack();
- } else {
- mIsLive = false;
- getWebView().stopLoading();
- loadData();
- }
- }
-
- static class LoadData extends AsyncTask<Void, Void, Cursor> {
-
- static final String[] PROJECTION = new String[] {
- Snapshots._ID, // 0
- Snapshots.URL, // 1
- Snapshots.TITLE, // 2
- Snapshots.FAVICON, // 3
- Snapshots.VIEWSTATE, // 4
- Snapshots.BACKGROUND, // 5
- Snapshots.DATE_CREATED, // 6
- Snapshots.VIEWSTATE_PATH, // 7
- };
- static final int SNAPSHOT_ID = 0;
- static final int SNAPSHOT_URL = 1;
- static final int SNAPSHOT_TITLE = 2;
- static final int SNAPSHOT_FAVICON = 3;
- static final int SNAPSHOT_VIEWSTATE = 4;
- static final int SNAPSHOT_BACKGROUND = 5;
- static final int SNAPSHOT_DATE_CREATED = 6;
- static final int SNAPSHOT_VIEWSTATE_PATH = 7;
-
- private SnapshotTab mTab;
- private ContentResolver mContentResolver;
- private Context mContext;
-
- public LoadData(SnapshotTab t, Context context) {
- mTab = t;
- mContentResolver = context.getContentResolver();
- mContext = context;
- }
-
- @Override
- protected Cursor doInBackground(Void... params) {
- long id = mTab.mSnapshotId;
- Uri uri = ContentUris.withAppendedId(Snapshots.CONTENT_URI, id);
- return mContentResolver.query(uri, PROJECTION, null, null, null);
- }
-
- private InputStream getInputStream(Cursor c) throws FileNotFoundException {
- String path = c.getString(SNAPSHOT_VIEWSTATE_PATH);
- if (!TextUtils.isEmpty(path)) {
- return mContext.openFileInput(path);
- }
- byte[] data = c.getBlob(SNAPSHOT_VIEWSTATE);
- ByteArrayInputStream bis = new ByteArrayInputStream(data);
- return bis;
- }
-
- @Override
- protected void onPostExecute(Cursor result) {
- try {
- if (result.moveToFirst()) {
- mTab.mCurrentState.mTitle = result.getString(SNAPSHOT_TITLE);
- mTab.mCurrentState.mUrl = result.getString(SNAPSHOT_URL);
- byte[] favicon = result.getBlob(SNAPSHOT_FAVICON);
- if (favicon != null) {
- mTab.mCurrentState.mFavicon = BitmapFactory
- .decodeByteArray(favicon, 0, favicon.length);
- }
- WebViewClassic web = mTab.getWebViewClassic();
- if (web != null) {
- InputStream ins = getInputStream(result);
- GZIPInputStream stream = new GZIPInputStream(ins);
- web.loadViewState(stream);
- }
- mTab.mBackgroundColor = result.getInt(SNAPSHOT_BACKGROUND);
- mTab.mDateCreated = result.getLong(SNAPSHOT_DATE_CREATED);
- mTab.mWebViewController.onPageFinished(mTab);
- }
- } catch (Exception e) {
- Log.w(LOGTAG, "Failed to load view state, closing tab", e);
- mTab.mWebViewController.closeTab(mTab);
- } finally {
- if (result != null) {
- result.close();
- }
- mTab.mLoadTask = null;
- }
- }
-
- }
-
- @Override
- protected void persistThumbnail() {
- if (mIsLive) {
- super.persistThumbnail();
- }
- }
-}
diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index d4fd751..5d564a1 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -47,7 +47,6 @@
import android.view.View;
import android.view.ViewStub;
import android.webkit.BrowserDownloadListener;
-import android.webkit.ClientCertRequestHandler;
import android.webkit.ConsoleMessage;
import android.webkit.GeolocationPermissions;
import android.webkit.HttpAuthHandler;
@@ -62,9 +61,7 @@
import android.webkit.WebStorage;
import android.webkit.WebView;
import android.webkit.WebView.PictureListener;
-import android.webkit.WebViewClassic;
import android.webkit.WebViewClient;
-import android.webkit.WebViewClientClassicExt;
import android.widget.CheckBox;
import android.widget.Toast;
@@ -327,7 +324,7 @@
// WebViewClient implementation for the main WebView
// -------------------------------------------------------------------------
- private final WebViewClientClassicExt mWebViewClient = new WebViewClientClassicExt() {
+ private final WebViewClient mWebViewClient = new WebViewClient() {
private Message mDontResend;
private Message mResend;
@@ -563,56 +560,7 @@
}
}
- /**
- * Called when an SSL error occurred while loading a resource, but the
- * WebView but chose to proceed anyway based on a decision retained
- * from a previous response to onReceivedSslError(). We update our
- * security state to reflect this.
- */
- @Override
- public void onProceededAfterSslError(WebView view, SslError error) {
- handleProceededAfterSslError(error);
- }
-
- /**
- * Displays client certificate request to the user.
- */
- @Override
- public void onReceivedClientCertRequest(final WebView view,
- final ClientCertRequestHandler handler, final String host_and_port) {
- if (!mInForeground) {
- handler.ignore();
- return;
- }
- int colon = host_and_port.lastIndexOf(':');
- String host;
- int port;
- if (colon == -1) {
- host = host_and_port;
- port = -1;
- } else {
- String portString = host_and_port.substring(colon + 1);
- try {
- port = Integer.parseInt(portString);
- host = host_and_port.substring(0, colon);
- } catch (NumberFormatException e) {
- host = host_and_port;
- port = -1;
- }
- }
- KeyChain.choosePrivateKeyAlias(
- mWebViewController.getActivity(), new KeyChainAliasCallback() {
- @Override public void alias(String alias) {
- if (alias == null) {
- handler.cancel();
- return;
- }
- new KeyChainLookup(mContext, handler, alias).execute();
- }
- }, null, null, host, port, null);
- }
-
- /**
+ /**
* Handles an HTTP authentication request.
*
* @param handler The authentication handler
@@ -1028,39 +976,6 @@
mWebViewController.getVisitedHistory(callback);
}
- @Override
- public void setupAutoFill(Message message) {
- // Prompt the user to set up their profile.
- final Message msg = message;
- AlertDialog.Builder builder = new AlertDialog.Builder(mContext);
- LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(
- Context.LAYOUT_INFLATER_SERVICE);
- final View layout = inflater.inflate(R.layout.setup_autofill_dialog, null);
-
- builder.setView(layout)
- .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int id) {
- CheckBox disableAutoFill = (CheckBox) layout.findViewById(
- R.id.setup_autofill_dialog_disable_autofill);
-
- if (disableAutoFill.isChecked()) {
- // Disable autofill and show a toast with how to turn it on again.
- mSettings.setAutofillEnabled(false);
- Toast.makeText(mContext,
- R.string.autofill_setup_dialog_negative_toast,
- Toast.LENGTH_LONG).show();
- } else {
- // Take user to the AutoFill profile editor. When they return,
- // we will send the message that we pass here which will trigger
- // the form to get filled out with their new profile.
- mWebViewController.setupAutoFill(msg);
- }
- }
- })
- .setNegativeButton(R.string.cancel, null)
- .show();
- }
};
// -------------------------------------------------------------------------
@@ -1069,12 +984,12 @@
// Subclass of WebViewClient used in subwindows to notify the main
// WebViewClient of certain WebView activities.
- private static class SubWindowClient extends WebViewClientClassicExt {
+ private static class SubWindowClient extends WebViewClient {
// The main WebViewClient.
- private final WebViewClientClassicExt mClient;
+ private final WebViewClient mClient;
private final WebViewController mController;
- SubWindowClient(WebViewClientClassicExt client, WebViewController controller) {
+ SubWindowClient(WebViewClient client, WebViewController controller) {
mClient = client;
mController = controller;
}
@@ -1100,11 +1015,6 @@
mClient.onReceivedSslError(view, handler, error);
}
@Override
- public void onReceivedClientCertRequest(WebView view,
- ClientCertRequestHandler handler, String host_and_port) {
- mClient.onReceivedClientCertRequest(view, handler, host_and_port);
- }
- @Override
public void onReceivedHttpAuthRequest(WebView view,
HttpAuthHandler handler, String host, String realm) {
mClient.onReceivedHttpAuthRequest(view, handler, host, realm);
@@ -1314,9 +1224,6 @@
// does a redirect after a period of time. The user could have
// switched to another tab while waiting for the download to start.
mMainView.setDownloadListener(mDownloadListener);
- if (BrowserWebView.isClassic()) {
- getWebViewClassic().setWebBackForwardListClient(mWebBackForwardListClient);
- }
TabControl tc = mWebViewController.getTabControl();
if (tc != null && tc.getOnThumbnailUpdatedListener() != null) {
mMainView.setPictureListener(this);
@@ -1552,18 +1459,6 @@
return mMainView;
}
- /**
- * Return the underlying WebViewClassic implementation. As with getWebView,
- * this maybe null for background tabs.
- * @return The main WebView of this tab.
- */
- WebViewClassic getWebViewClassic() {
- if (!BrowserWebView.isClassic()) {
- return null;
- }
- return WebViewClassic.fromWebView(mMainView);
- }
-
void setViewContainer(View container) {
mContainer = container;
}
@@ -1845,63 +1740,14 @@
* Must be called on the UI thread
*/
public ContentValues createSnapshotValues() {
- WebViewClassic web = getWebViewClassic();
- if (web == null) return null;
- ContentValues values = new ContentValues();
- values.put(Snapshots.TITLE, mCurrentState.mTitle);
- values.put(Snapshots.URL, mCurrentState.mUrl);
- values.put(Snapshots.BACKGROUND, web.getPageBackgroundColor());
- values.put(Snapshots.DATE_CREATED, System.currentTimeMillis());
- values.put(Snapshots.FAVICON, compressBitmap(getFavicon()));
- Bitmap screenshot = Controller.createScreenshot(mMainView,
- Controller.getDesiredThumbnailWidth(mContext),
- Controller.getDesiredThumbnailHeight(mContext));
- values.put(Snapshots.THUMBNAIL, compressBitmap(screenshot));
- return values;
+ return null;
}
/**
* Probably want to call this on a background thread
*/
public boolean saveViewState(ContentValues values) {
- WebViewClassic web = getWebViewClassic();
- if (web == null) return false;
- String path = UUID.randomUUID().toString();
- SaveCallback callback = new SaveCallback();
- OutputStream outs = null;
- try {
- outs = mContext.openFileOutput(path, Context.MODE_PRIVATE);
- GZIPOutputStream stream = new GZIPOutputStream(outs);
- synchronized (callback) {
- web.saveViewState(stream, callback);
- callback.wait();
- }
- stream.flush();
- stream.close();
- } catch (Exception e) {
- Log.w(LOGTAG, "Failed to save view state", e);
- if (outs != null) {
- try {
- outs.close();
- } catch (IOException ignore) {}
- }
- File file = mContext.getFileStreamPath(path);
- if (file.exists() && !file.delete()) {
- file.deleteOnExit();
- }
- return false;
- }
- File savedFile = mContext.getFileStreamPath(path);
- if (!callback.mResult) {
- if (!savedFile.delete()) {
- savedFile.deleteOnExit();
- }
- return false;
- }
- long size = savedFile.length();
- values.put(Snapshots.VIEWSTATE_PATH, path);
- values.put(Snapshots.VIEWSTATE_SIZE, size);
- return true;
+ return false;
}
public byte[] compressBitmap(Bitmap bitmap) {
diff --git a/src/com/android/browser/TabControl.java b/src/com/android/browser/TabControl.java
index 150ece0..8cb500d 100644
--- a/src/com/android/browser/TabControl.java
+++ b/src/com/android/browser/TabControl.java
@@ -216,12 +216,6 @@
return createNewTab(false);
}
- SnapshotTab createSnapshotTab(long snapshotId) {
- SnapshotTab t = new SnapshotTab(mController, snapshotId);
- mTabs.add(t);
- return t;
- }
-
/**
* Remove the parent child relationships from all tabs.
*/
@@ -670,7 +664,7 @@
// Display the new current tab
mCurrentTab = mTabs.indexOf(newTab);
WebView mainView = newTab.getWebView();
- boolean needRestore = !newTab.isSnapshot() && (mainView == null);
+ boolean needRestore = mainView == null;
if (needRestore) {
// Same work as in createNewTab() except don't do new Tab()
mainView = createNewWebView();
diff --git a/src/com/android/browser/TitleBar.java b/src/com/android/browser/TitleBar.java
index a0cc857..83c6626 100644
--- a/src/com/android/browser/TitleBar.java
+++ b/src/com/android/browser/TitleBar.java
@@ -53,7 +53,6 @@
private AutologinBar mAutoLogin;
private NavigationBarBase mNavBar;
private boolean mUseQuickControls;
- private SnapshotBar mSnapshotBar;
//state
private boolean mShowing;
@@ -91,16 +90,6 @@
mAutoLogin.setTitleBar(this);
}
- private void inflateSnapshotBar() {
- if (mSnapshotBar != null) {
- return;
- }
-
- ViewStub stub = (ViewStub) findViewById(R.id.snapshotbar_stub);
- mSnapshotBar = (SnapshotBar) stub.inflate();
- mSnapshotBar.setTitleBar(this);
- }
-
@Override
protected void onConfigurationChanged(Configuration config) {
super.onConfigurationChanged(config);
@@ -119,14 +108,10 @@
}
private void setFixedTitleBar() {
- boolean isFixed = !mUseQuickControls
- && !mContext.getResources().getBoolean(R.bool.hide_title);
- isFixed |= mAccessibilityManager.isEnabled();
- isFixed |= !BrowserWebView.isClassic();
// If getParent() returns null, we are initializing
ViewGroup parent = (ViewGroup)getParent();
- if (mIsFixedTitleBar == isFixed && parent != null) return;
- mIsFixedTitleBar = isFixed;
+ if (mIsFixedTitleBar && parent != null) return;
+ mIsFixedTitleBar = true;
setSkipTitleBarAnimations(true);
show();
setSkipTitleBarAnimations(false);
@@ -365,9 +350,7 @@
}
public boolean wantsToBeVisible() {
- return inAutoLogin()
- || (mSnapshotBar != null && mSnapshotBar.getVisibility() == View.VISIBLE
- && mSnapshotBar.isAnimating());
+ return inAutoLogin();
}
private boolean inAutoLogin() {
@@ -419,20 +402,7 @@
}
public void onTabDataChanged(Tab tab) {
- if (mSnapshotBar != null) {
- mSnapshotBar.onTabDataChanged(tab);
- }
-
- if (tab.isSnapshot()) {
- inflateSnapshotBar();
- mSnapshotBar.setVisibility(VISIBLE);
- mNavBar.setVisibility(GONE);
- } else {
- if (mSnapshotBar != null) {
- mSnapshotBar.setVisibility(GONE);
- }
- mNavBar.setVisibility(VISIBLE);
- }
+ mNavBar.setVisibility(VISIBLE);
}
public void onScrollChanged() {
diff --git a/src/com/android/browser/UiController.java b/src/com/android/browser/UiController.java
index 683e473..f00f1a2 100644
--- a/src/com/android/browser/UiController.java
+++ b/src/com/android/browser/UiController.java
@@ -91,8 +91,6 @@
boolean onOptionsItemSelected(MenuItem item);
- SnapshotTab createNewSnapshotTab(long snapshotId, boolean setActive);
-
void loadUrl(Tab tab, String url);
void setBlockEvents(boolean block);
diff --git a/src/com/android/browser/UrlUtils.java b/src/com/android/browser/UrlUtils.java
index e24000c..16b670b 100644
--- a/src/com/android/browser/UrlUtils.java
+++ b/src/com/android/browser/UrlUtils.java
@@ -33,6 +33,7 @@
"(" + // begin group for schema
"(?:http|https|file):\\/\\/" +
"|(?:inline|data|about|javascript):" +
+ "|(?:.*:.*@)" +
")" +
"(.*)" );
diff --git a/src/com/android/browser/WebViewController.java b/src/com/android/browser/WebViewController.java
index e814ff9..498f8e7 100644
--- a/src/com/android/browser/WebViewController.java
+++ b/src/com/android/browser/WebViewController.java
@@ -111,8 +111,6 @@
void closeTab(Tab tab);
- void setupAutoFill(Message message);
-
void bookmarkedStatusHasChanged(Tab tab);
void showAutoLogin(Tab tab);
diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index df7a586..0d9b00e 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -32,7 +32,6 @@
import android.view.Menu;
import android.view.MenuItem;
import android.webkit.WebView;
-import android.webkit.WebViewClassic;
import java.util.List;
@@ -117,9 +116,6 @@
void stopWebViewScrolling() {
BrowserWebView web = (BrowserWebView) mUiController.getCurrentWebView();
- if (web != null && BrowserWebView.isClassic()) {
- WebViewClassic.fromWebView(web).stopScroll();
- }
}
@Override
diff --git a/src/com/android/browser/preferences/GeneralPreferencesFragment.java b/src/com/android/browser/preferences/GeneralPreferencesFragment.java
index c018474..26fb05f 100644
--- a/src/com/android/browser/preferences/GeneralPreferencesFragment.java
+++ b/src/com/android/browser/preferences/GeneralPreferencesFragment.java
@@ -198,17 +198,4 @@
}
return null;
}
-
- @Override
- public void onResume() {
- super.onResume();
-
- refreshUi();
- }
-
- void refreshUi() {
- PreferenceScreen autoFillSettings =
- (PreferenceScreen)findPreference(PreferenceKeys.PREF_AUTOFILL_PROFILE);
- autoFillSettings.setDependency(PreferenceKeys.PREF_AUTOFILL_ENABLED);
- }
}
diff --git a/src/com/android/browser/preferences/InvertedContrastPreview.java b/src/com/android/browser/preferences/InvertedContrastPreview.java
index 2b8ad47..988f64a 100644
--- a/src/com/android/browser/preferences/InvertedContrastPreview.java
+++ b/src/com/android/browser/preferences/InvertedContrastPreview.java
@@ -19,8 +19,6 @@
import android.content.Context;
import android.text.TextUtils;
import android.util.AttributeSet;
-import android.webkit.WebSettingsClassic;
-import android.webkit.WebViewClassic;
import com.android.browser.BrowserSettings;
import com.android.browser.BrowserWebView;
@@ -76,17 +74,6 @@
@Override
protected void updatePreview(boolean forceReload) {
- if (mWebView == null || !BrowserWebView.isClassic()) return;
-
- WebSettingsClassic ws = WebViewClassic.fromWebView(mWebView).getSettings();
- BrowserSettings bs = BrowserSettings.getInstance();
- ws.setProperty(WebViewProperties.gfxInvertedScreen,
- bs.useInvertedRendering() ? "true" : "false");
- ws.setProperty(WebViewProperties.gfxInvertedScreenContrast,
- Float.toString(bs.getInvertedContrast()));
- if (forceReload) {
- mWebView.loadData(mHtml, "text/html", null);
- }
}
}
diff --git a/tests/src/com/android/browser/PopularUrlsTest.java b/tests/src/com/android/browser/PopularUrlsTest.java
deleted file mode 100644
index 566d74b..0000000
--- a/tests/src/com/android/browser/PopularUrlsTest.java
+++ /dev/null
@@ -1,583 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.browser;
-
-import android.app.Instrumentation;
-import android.content.Intent;
-import android.net.Uri;
-import android.net.http.SslError;
-import android.os.Environment;
-import android.provider.Browser;
-import android.test.ActivityInstrumentationTestCase2;
-import android.text.TextUtils;
-import android.util.Log;
-import android.webkit.ClientCertRequestHandler;
-import android.webkit.DownloadListener;
-import android.webkit.HttpAuthHandler;
-import android.webkit.JsPromptResult;
-import android.webkit.JsResult;
-import android.webkit.SslErrorHandler;
-import android.webkit.WebView;
-import android.webkit.WebViewClassic;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-/**
- *
- * Iterates over a list of URLs from a file and outputs the time to load each.
- */
-public class PopularUrlsTest extends ActivityInstrumentationTestCase2<BrowserActivity> {
-
- private final static String TAG = "PopularUrlsTest";
- private final static String newLine = System.getProperty("line.separator");
- private final static String sInputFile = "popular_urls.txt";
- private final static String sOutputFile = "test_output.txt";
- private final static String sStatusFile = "test_status.txt";
- private final static File sExternalStorage = Environment.getExternalStorageDirectory();
-
- private final static int PERF_LOOPCOUNT = 10;
- private final static int STABILITY_LOOPCOUNT = 1;
- private final static int PAGE_LOAD_TIMEOUT = 120000; // 2 minutes
-
- private BrowserActivity mActivity = null;
- private Controller mController = null;
- private Instrumentation mInst = null;
- private CountDownLatch mLatch = new CountDownLatch(1);
- private RunStatus mStatus;
- private boolean pageLoadFinishCalled, pageProgressFull;
-
- public PopularUrlsTest() {
- super(BrowserActivity.class);
- }
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
- Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse("about:blank"));
- i.putExtra(Controller.NO_CRASH_RECOVERY, true);
- setActivityIntent(i);
- mActivity = getActivity();
- mController = mActivity.getController();
- mInst = getInstrumentation();
- mInst.waitForIdleSync();
-
- mStatus = RunStatus.load();
- }
-
- @Override
- protected void tearDown() throws Exception {
- if (mStatus != null) {
- mStatus.cleanUp();
- }
-
- super.tearDown();
- }
-
- BufferedReader getInputStream() throws FileNotFoundException {
- return getInputStream(sInputFile);
- }
-
- BufferedReader getInputStream(String inputFile) throws FileNotFoundException {
- FileReader fileReader = new FileReader(new File(sExternalStorage, inputFile));
- BufferedReader bufferedReader = new BufferedReader(fileReader);
-
- return bufferedReader;
- }
-
- OutputStreamWriter getOutputStream() throws IOException {
- return getOutputStream(sOutputFile);
- }
-
- OutputStreamWriter getOutputStream(String outputFile) throws IOException {
- return new FileWriter(new File(sExternalStorage, outputFile), mStatus.getIsRecovery());
- }
-
- /**
- * Gets the browser ready for testing by starting the application
- * and wrapping the WebView's helper clients.
- */
- void setUpBrowser() {
- mInst.runOnMainSync(new Runnable() {
- @Override
- public void run() {
- setupBrowserInternal();
- }
- });
- }
-
- void setupBrowserInternal() {
- Tab tab = mController.getTabControl().getCurrentTab();
- WebView webView = tab.getWebView();
-
- webView.setWebChromeClient(new TestWebChromeClient(
- WebViewClassic.fromWebView(webView).getWebChromeClient()) {
-
- @Override
- public void onProgressChanged(WebView view, int newProgress) {
- super.onProgressChanged(view, newProgress);
- if (newProgress >= 100) {
- if (!pageProgressFull) {
- // void duplicate calls
- pageProgressFull = true;
- if (pageLoadFinishCalled) {
- //reset latch and move forward only if both indicators are true
- resetLatch();
- }
- }
- }
- }
-
- /**
- * Dismisses and logs Javascript alerts.
- */
- @Override
- public boolean onJsAlert(WebView view, String url, String message,
- JsResult result) {
- String logMsg = String.format("JS Alert '%s' received from %s", message, url);
- Log.w(TAG, logMsg);
- result.confirm();
-
- return true;
- }
-
- /**
- * Confirms and logs Javascript alerts.
- */
- @Override
- public boolean onJsConfirm(WebView view, String url, String message,
- JsResult result) {
- String logMsg = String.format("JS Confirmation '%s' received from %s",
- message, url);
- Log.w(TAG, logMsg);
- result.confirm();
-
- return true;
- }
-
- /**
- * Confirms and logs Javascript alerts, providing the default value.
- */
- @Override
- public boolean onJsPrompt(WebView view, String url, String message,
- String defaultValue, JsPromptResult result) {
- String logMsg = String.format("JS Prompt '%s' received from %s; " +
- "Giving default value '%s'", message, url, defaultValue);
- Log.w(TAG, logMsg);
- result.confirm(defaultValue);
-
- return true;
- }
-
- /*
- * Skip the unload confirmation
- */
- @Override
- public boolean onJsBeforeUnload(
- WebView view, String url, String message, JsResult result) {
- result.confirm();
- return true;
- }
- });
-
- webView.setWebViewClient(new TestWebViewClient(
- WebViewClassic.fromWebView(webView).getWebViewClient()) {
-
- /**
- * Bypasses and logs errors.
- */
- @Override
- public void onReceivedError(WebView view, int errorCode,
- String description, String failingUrl) {
- String message = String.format("Error '%s' (%d) loading url: %s",
- description, errorCode, failingUrl);
- Log.w(TAG, message);
- }
-
- /**
- * Ignores and logs SSL errors.
- */
- @Override
- public void onReceivedSslError(WebView view, SslErrorHandler handler,
- SslError error) {
- Log.w(TAG, "SSL error: " + error);
- handler.proceed();
- }
-
- /**
- * Ignores and logs SSL client certificate requests.
- */
- @Override
- public void onReceivedClientCertRequest(WebView view, ClientCertRequestHandler handler,
- String host_and_port) {
- Log.w(TAG, "SSL client certificate request: " + host_and_port);
- handler.cancel();
- }
-
- /**
- * Ignores http auth with dummy username and password
- */
- @Override
- public void onReceivedHttpAuthRequest(WebView view, HttpAuthHandler handler,
- String host, String realm) {
- handler.proceed("user", "passwd");
- }
-
- /* (non-Javadoc)
- * @see com.android.browser.TestWebViewClient#onPageFinished(android.webkit.WebView, java.lang.String)
- */
- @Override
- public void onPageFinished(WebView view, String url) {
- super.onPageFinished(view, url);
- if (!pageLoadFinishCalled) {
- pageLoadFinishCalled = true;
- if (pageProgressFull) {
- //reset latch and move forward only if both indicators are true
- resetLatch();
- }
- }
- }
-
- @Override
- public boolean shouldOverrideUrlLoading(WebView view, String url) {
- if (!(url.startsWith("http://") || url.startsWith("https://"))) {
- Log.v(TAG, String.format("suppressing non-http url scheme: %s", url));
- return true;
- }
- return super.shouldOverrideUrlLoading(view, url);
- }
- });
-
- webView.setDownloadListener(new DownloadListener() {
-
- @Override
- public void onDownloadStart(String url, String userAgent, String contentDisposition,
- String mimetype, long contentLength) {
- Log.v(TAG, String.format("Download request ignored: %s", url));
- }
- });
- }
-
- void resetLatch() {
- if (mLatch.getCount() != 1) {
- Log.w(TAG, "Expecting latch to be 1, but it's not!");
- } else {
- mLatch.countDown();
- }
- }
-
- void resetForNewPage() {
- mLatch = new CountDownLatch(1);
- pageLoadFinishCalled = false;
- pageProgressFull = false;
- }
-
- void waitForLoad() throws InterruptedException {
- boolean timedout = !mLatch.await(PAGE_LOAD_TIMEOUT, TimeUnit.MILLISECONDS);
- if (timedout) {
- Log.w(TAG, "page timeout. trying to stop.");
- // try to stop page load
- mInst.runOnMainSync(new Runnable(){
- public void run() {
- mController.getTabControl().getCurrentTab().getWebView().stopLoading();
- }
- });
- // try to wait for count down latch again
- timedout = !mLatch.await(5000, TimeUnit.MILLISECONDS);
- if (timedout) {
- throw new RuntimeException("failed to stop timedout site, is browser pegged?");
- }
- }
- }
-
- private static class RunStatus {
- private File mFile;
- private int iteration;
- private int page;
- private String url;
- private boolean isRecovery;
- private boolean allClear;
-
- private RunStatus(File file) throws IOException {
- mFile = file;
- FileReader input = null;
- BufferedReader reader = null;
- isRecovery = false;
- allClear = false;
- iteration = 0;
- page = 0;
- try {
- input = new FileReader(mFile);
- isRecovery = true;
- reader = new BufferedReader(input);
- String line = reader.readLine();
- if (line == null)
- return;
- iteration = Integer.parseInt(line);
- line = reader.readLine();
- if (line == null)
- return;
- page = Integer.parseInt(line);
- } catch (FileNotFoundException ex) {
- return;
- } catch (NumberFormatException nfe) {
- Log.wtf(TAG, "unexpected data in status file, will start from begining");
- return;
- } finally {
- try {
- if (reader != null) {
- reader.close();
- }
- } finally {
- if (input != null) {
- input.close();
- }
- }
- }
- }
-
- public static RunStatus load() throws IOException {
- return load(sStatusFile);
- }
-
- public static RunStatus load(String file) throws IOException {
- return new RunStatus(new File(sExternalStorage, file));
- }
-
- public void write() throws IOException {
- FileWriter output = null;
- if (mFile.exists()) {
- mFile.delete();
- }
- try {
- output = new FileWriter(mFile);
- output.write(iteration + newLine);
- output.write(page + newLine);
- output.write(url + newLine);
- } finally {
- if (output != null) {
- output.close();
- }
- }
- }
-
- public void cleanUp() {
- // only perform cleanup when allClear flag is set
- // i.e. when the test was not interrupted by a Java crash
- if (mFile.exists() && allClear) {
- mFile.delete();
- }
- }
-
- public void resetPage() {
- page = 0;
- }
-
- public void incrementPage() {
- ++page;
- allClear = true;
- }
-
- public void incrementIteration() {
- ++iteration;
- }
-
- public int getPage() {
- return page;
- }
-
- public int getIteration() {
- return iteration;
- }
-
- public boolean getIsRecovery() {
- return isRecovery;
- }
-
- public void setUrl(String url) {
- this.url = url;
- allClear = false;
- }
- }
-
- /**
- * Loops over a list of URLs, points the browser to each one, and records the time elapsed.
- *
- * @param input the reader from which to get the URLs.
- * @param writer the writer to which to output the results.
- * @param clearCache determines whether the cache is cleared before loading each page
- * @param loopCount the number of times to loop through the list of pages
- * @throws IOException unable to read from input or write to writer.
- * @throws InterruptedException the thread was interrupted waiting for the page to load.
- */
- void loopUrls(BufferedReader input, OutputStreamWriter writer,
- boolean clearCache, int loopCount)
- throws IOException, InterruptedException {
- Tab tab = mController.getTabControl().getCurrentTab();
- WebView webView = tab.getWebView();
-
- List<String> pages = new LinkedList<String>();
-
- String page;
- while (null != (page = input.readLine())) {
- if (!TextUtils.isEmpty(page)) {
- pages.add(page);
- }
- }
-
- Iterator<String> iterator = pages.iterator();
- for (int i = 0; i < mStatus.getPage(); ++i) {
- iterator.next();
- }
-
- if (mStatus.getIsRecovery()) {
- Log.e(TAG, "Recovering after crash: " + iterator.next());
- mStatus.incrementPage();
- }
-
- while (mStatus.getIteration() < loopCount) {
- if (clearCache) {
- clearCacheUiThread(webView, true);
- }
- while(iterator.hasNext()) {
- page = iterator.next();
- mStatus.setUrl(page);
- mStatus.write();
- Log.i(TAG, "start: " + page);
- Uri uri = Uri.parse(page);
- final Intent intent = new Intent(Intent.ACTION_VIEW, uri);
- intent.putExtra(Browser.EXTRA_APPLICATION_ID,
- getInstrumentation().getTargetContext().getPackageName());
-
- long startTime = System.currentTimeMillis();
- resetForNewPage();
- mInst.runOnMainSync(new Runnable() {
-
- public void run() {
- mActivity.onNewIntent(intent);
- }
-
- });
- waitForLoad();
- long stopTime = System.currentTimeMillis();
-
- String url = getUrlUiThread(webView);
- Log.i(TAG, "finish: " + url);
-
- if (writer != null) {
- writer.write(page + "|" + (stopTime - startTime) + newLine);
- writer.flush();
- }
-
- mStatus.incrementPage();
- }
- mStatus.incrementIteration();
- mStatus.resetPage();
- iterator = pages.iterator();
- }
- }
-
- public void testLoadPerformance() throws IOException, InterruptedException {
- setUpBrowser();
-
- OutputStreamWriter writer = getOutputStream();
- try {
- BufferedReader bufferedReader = getInputStream();
- try {
- loopUrls(bufferedReader, writer, true, PERF_LOOPCOUNT);
- } finally {
- if (bufferedReader != null) {
- bufferedReader.close();
- }
- }
- } catch (FileNotFoundException fnfe) {
- Log.e(TAG, fnfe.getMessage(), fnfe);
- fail("Test environment not setup correctly");
- } finally {
- if (writer != null) {
- writer.close();
- }
- }
- }
-
- public void testStability() throws IOException, InterruptedException {
- setUpBrowser();
-
- BufferedReader bufferedReader = getInputStream();
- try {
- loopUrls(bufferedReader, null, true, STABILITY_LOOPCOUNT);
- } catch (FileNotFoundException fnfe) {
- Log.e(TAG, fnfe.getMessage(), fnfe);
- fail("Test environment not setup correctly");
- } finally {
- if (bufferedReader != null) {
- bufferedReader.close();
- }
- }
- }
-
- private void clearCacheUiThread(final WebView webView, final boolean includeDiskFiles) {
- Runnable runner = new Runnable() {
-
- @Override
- public void run() {
- webView.clearCache(includeDiskFiles);
- }
- };
- getInstrumentation().runOnMainSync(runner);
- }
-
- private String getUrlUiThread(final WebView webView) {
- WebViewUrlGetter urlGetter = new WebViewUrlGetter(webView);
- getInstrumentation().runOnMainSync(urlGetter);
- return urlGetter.getUrl();
- }
-
- private class WebViewUrlGetter implements Runnable {
-
- private WebView mWebView;
- private String mUrl;
-
- public WebViewUrlGetter(WebView webView) {
- mWebView = webView;
- }
-
- @Override
- public void run() {
- mUrl = null;
- mUrl = mWebView.getUrl();
- }
-
- public String getUrl() {
- if (mUrl != null) {
- return mUrl;
- } else
- throw new IllegalStateException("url has not been fetched yet");
- }
- }
-}
diff --git a/tests/src/com/android/browser/TestWebViewClient.java b/tests/src/com/android/browser/TestWebViewClient.java
index 6ab40dd..7159a7e 100644
--- a/tests/src/com/android/browser/TestWebViewClient.java
+++ b/tests/src/com/android/browser/TestWebViewClient.java
@@ -20,12 +20,10 @@
import android.net.http.SslError;
import android.os.Message;
import android.view.KeyEvent;
-import android.webkit.ClientCertRequestHandler;
import android.webkit.HttpAuthHandler;
import android.webkit.SslErrorHandler;
import android.webkit.WebView;
import android.webkit.WebViewClient;
-import android.webkit.WebViewClientClassicExt;
/**
*
@@ -34,7 +32,7 @@
* Wraps around existing client so that specific methods can be overridden if needed.
*
*/
-abstract class TestWebViewClient extends WebViewClientClassicExt {
+abstract class TestWebViewClient extends WebViewClient {
private WebViewClient mWrappedClient;
@@ -104,17 +102,6 @@
/** {@inheritDoc} */
@Override
- public void onReceivedClientCertRequest(WebView view, ClientCertRequestHandler handler,
- String host_and_port) {
- if (mWrappedClient instanceof WebViewClientClassicExt) {
- ((WebViewClientClassicExt) mWrappedClient).onReceivedClientCertRequest(view, handler, host_and_port);
- } else {
- super.onReceivedClientCertRequest(view, handler, host_and_port);
- }
- }
-
- /** {@inheritDoc} */
- @Override
public void onReceivedHttpAuthRequest(WebView view,
HttpAuthHandler handler, String host, String realm) {
mWrappedClient.onReceivedHttpAuthRequest(view, handler, host, realm);
