summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res/values-af/strings.xml1
-rw-r--r--res/values-am/strings.xml1
-rw-r--r--res/values-ar/strings.xml1
-rw-r--r--res/values-be/strings.xml1
-rw-r--r--res/values-bg/strings.xml1
-rw-r--r--res/values-ca/strings.xml1
-rw-r--r--res/values-cs/strings.xml1
-rw-r--r--res/values-da/strings.xml1
-rw-r--r--res/values-de/strings.xml3
-rw-r--r--res/values-el/strings.xml1
-rw-r--r--res/values-en-rGB/strings.xml3
-rw-r--r--res/values-es-rUS/strings.xml1
-rw-r--r--res/values-es/strings.xml1
-rw-r--r--res/values-et/strings.xml1
-rw-r--r--res/values-fa/strings.xml3
-rw-r--r--res/values-fi/strings.xml1
-rw-r--r--res/values-fr/strings.xml1
-rw-r--r--res/values-hi/strings.xml1
-rw-r--r--res/values-hr/strings.xml1
-rw-r--r--res/values-hu/strings.xml1
-rw-r--r--res/values-in/strings.xml1
-rw-r--r--res/values-it/strings.xml1
-rw-r--r--res/values-iw/strings.xml1
-rw-r--r--res/values-ja/strings.xml1
-rw-r--r--res/values-ko/strings.xml1
-rw-r--r--res/values-lt/strings.xml1
-rw-r--r--res/values-lv/strings.xml1
-rw-r--r--res/values-ms/strings.xml1
-rw-r--r--res/values-nb/strings.xml1
-rw-r--r--res/values-nl/strings.xml11
-rw-r--r--res/values-pl/strings.xml1
-rw-r--r--res/values-pt-rPT/strings.xml1
-rw-r--r--res/values-pt/strings.xml1
-rw-r--r--res/values-rm/strings.xml2
-rw-r--r--res/values-ro/strings.xml65
-rw-r--r--res/values-ru/strings.xml1
-rw-r--r--res/values-sk/strings.xml1
-rw-r--r--res/values-sl/strings.xml1
-rw-r--r--res/values-sr/strings.xml9
-rw-r--r--res/values-sv/strings.xml3
-rw-r--r--res/values-sw/strings.xml33
-rw-r--r--res/values-th/strings.xml1
-rw-r--r--res/values-tl/strings.xml1
-rw-r--r--res/values-tr/strings.xml1
-rw-r--r--res/values-uk/strings.xml3
-rw-r--r--res/values-vi/strings.xml1
-rw-r--r--res/values-zh-rCN/strings.xml7
-rw-r--r--res/values-zh-rTW/strings.xml5
-rw-r--r--res/values-zu/strings.xml1
-rw-r--r--src/com/android/browser/BaseUi.java4
-rw-r--r--src/com/android/browser/BrowserSettings.java59
-rw-r--r--src/com/android/browser/BrowserWebView.java32
-rw-r--r--src/com/android/browser/ComboViewActivity.java12
-rw-r--r--src/com/android/browser/Controller.java21
-rw-r--r--src/com/android/browser/IntentHandler.java2
-rw-r--r--src/com/android/browser/NetworkStateHandler.java2
-rw-r--r--src/com/android/browser/PageDialogsHandler.java5
-rw-r--r--src/com/android/browser/Tab.java7
-rw-r--r--src/com/android/browser/TitleBar.java1
-rw-r--r--src/com/android/browser/XLargeUi.java2
-rw-r--r--src/com/android/browser/preferences/InvertedContrastPreview.java3
61 files changed, 221 insertions, 113 deletions
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index d6b6a12..592d2bd 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -31,6 +31,7 @@
<string name="username" msgid="5057566336518215922">"Naam"</string>
<string name="password" msgid="1177138552305184404">"Wagwoord"</string>
<string name="action" msgid="183105774472071343">"Meld aan"</string>
+ <string name="bookmarks_add_page" msgid="3093456701072617702">"Stoor boekmerk"</string>
<string name="bookmarks_search" msgid="5229596268214362873">"Blaaier"</string>
<string name="cancel" msgid="3017274947407233702">"Kanselleer"</string>
<string name="ok" msgid="1509280796718850364">"OK"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index e1ee9c3..010b581 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -31,6 +31,7 @@
<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>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 94a1337..ab243ed 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -31,6 +31,7 @@
<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>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 53cea04..74ca2d7 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -31,6 +31,7 @@
<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>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 3c541e9..1c59490 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -31,6 +31,7 @@
<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">"OK"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index fbd6ba9..afa967f 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -31,6 +31,7 @@
<string name="username" msgid="5057566336518215922">"Nom"</string>
<string name="password" msgid="1177138552305184404">"Contrasenya"</string>
<string name="action" msgid="183105774472071343">"Inicia la sessió"</string>
+ <string name="bookmarks_add_page" msgid="3093456701072617702">"Desa l\'adreça d\'interès"</string>
<string name="bookmarks_search" msgid="5229596268214362873">"Navegador"</string>
<string name="cancel" msgid="3017274947407233702">"Cancel·la"</string>
<string name="ok" msgid="1509280796718850364">"D\'acord"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index dfb15c9..6e1becd 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -31,6 +31,7 @@
<string name="username" msgid="5057566336518215922">"Jméno"</string>
<string name="password" msgid="1177138552305184404">"Heslo"</string>
<string name="action" msgid="183105774472071343">"Přihlásit se"</string>
+ <string name="bookmarks_add_page" msgid="3093456701072617702">"Uložit záložku"</string>
<string name="bookmarks_search" msgid="5229596268214362873">"Prohlížeč"</string>
<string name="cancel" msgid="3017274947407233702">"Zrušit"</string>
<string name="ok" msgid="1509280796718850364">"OK"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 555fb47..c83dcfb 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -31,6 +31,7 @@
<string name="username" msgid="5057566336518215922">"Navn"</string>
<string name="password" msgid="1177138552305184404">"Adgangskode"</string>
<string name="action" msgid="183105774472071343">"Log ind"</string>
+ <string name="bookmarks_add_page" msgid="3093456701072617702">"Gem bogmærke"</string>
<string name="bookmarks_search" msgid="5229596268214362873">"Browser"</string>
<string name="cancel" msgid="3017274947407233702">"Annuller"</string>
<string name="ok" msgid="1509280796718850364">"OK"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 371a7ff..663a47f 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -31,6 +31,7 @@
<string name="username" msgid="5057566336518215922">"Name"</string>
<string name="password" msgid="1177138552305184404">"Passwort"</string>
<string name="action" msgid="183105774472071343">"Anmelden"</string>
+ <string name="bookmarks_add_page" msgid="3093456701072617702">"Als Lesezeichen speichern"</string>
<string name="bookmarks_search" msgid="5229596268214362873">"Browser"</string>
<string name="cancel" msgid="3017274947407233702">"Abbrechen"</string>
<string name="ok" msgid="1509280796718850364">"OK"</string>
@@ -101,7 +102,7 @@
<string name="history" msgid="2451240511251410032">"Verlauf"</string>
<string name="menu_view_download" msgid="2124570321712995120">"Downloads"</string>
<string name="copy_page_url" msgid="1188679152608889555">"Seiten-URL kopieren"</string>
- <string name="share_page" msgid="593756995297268343">"Seitenlink teilen"</string>
+ <string name="share_page" msgid="593756995297268343">"Seite teilen"</string>
<string name="menu_save_snapshot" msgid="6935080344031126139">"Für Offline-Lesen speichern"</string>
<string name="saving_snapshot" msgid="1693789062351182809">"Wird gespeichert…"</string>
<string name="snapshot_failed" msgid="4584580873565876033">"Speichern für Offline-Lesen fehlgeschlagen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 3775693..cdfe907 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -31,6 +31,7 @@
<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">"Internet"</string>
<string name="cancel" msgid="3017274947407233702">"Ακύρωση"</string>
<string name="ok" msgid="1509280796718850364">"OK"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index c3a3175..3cd8700 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -31,6 +31,7 @@
<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>
@@ -287,7 +288,7 @@
<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 WiFi"</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>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 5deb2a9..f84cbae 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -31,6 +31,7 @@
<string name="username" msgid="5057566336518215922">"Nombre"</string>
<string name="password" msgid="1177138552305184404">"Contraseña"</string>
<string name="action" msgid="183105774472071343">"Iniciar sesión"</string>
+ <string name="bookmarks_add_page" msgid="3093456701072617702">"Guardar marcador"</string>
<string name="bookmarks_search" msgid="5229596268214362873">"Navegador"</string>
<string name="cancel" msgid="3017274947407233702">"Cancelar"</string>
<string name="ok" msgid="1509280796718850364">"Aceptar"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 4f68788..47cc73b 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -31,6 +31,7 @@
<string name="username" msgid="5057566336518215922">"Nombre"</string>
<string name="password" msgid="1177138552305184404">"Contraseña"</string>
<string name="action" msgid="183105774472071343">"Iniciar sesión"</string>
+ <string name="bookmarks_add_page" msgid="3093456701072617702">"Guardar marcador"</string>
<string name="bookmarks_search" msgid="5229596268214362873">"Navegador"</string>
<string name="cancel" msgid="3017274947407233702">"Cancelar"</string>
<string name="ok" msgid="1509280796718850364">"Aceptar"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 0cf77fd..6645165 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -31,6 +31,7 @@
<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>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 851c977..d056245 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -31,6 +31,7 @@
<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>
@@ -306,7 +307,7 @@
<string name="add_bookmark_short" msgid="3783984330998103735">"افزودن"</string>
<string name="search_hint" msgid="4647356319916631820">"جستجو یا تایپ URL"</string>
<string name="search_button_text" msgid="5235226933877634410">"برو"</string>
- <string name="search_settings_description" msgid="1422401062529014107">"نشاک ها و سابقه وب"</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>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 324244e..74ec8ed 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -31,6 +31,7 @@
<string name="username" msgid="5057566336518215922">"Nimi"</string>
<string name="password" msgid="1177138552305184404">"Salasana"</string>
<string name="action" msgid="183105774472071343">"Kirjaudu sisään"</string>
+ <string name="bookmarks_add_page" msgid="3093456701072617702">"Tallenna kirjanmerkkeihin"</string>
<string name="bookmarks_search" msgid="5229596268214362873">"Selain"</string>
<string name="cancel" msgid="3017274947407233702">"Peruuta"</string>
<string name="ok" msgid="1509280796718850364">"OK"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 9632db1..bf1ea78 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -31,6 +31,7 @@
<string name="username" msgid="5057566336518215922">"Nom"</string>
<string name="password" msgid="1177138552305184404">"Mot de passe"</string>
<string name="action" msgid="183105774472071343">"Se connecter"</string>
+ <string name="bookmarks_add_page" msgid="3093456701072617702">"Ajouter aux favoris"</string>
<string name="bookmarks_search" msgid="5229596268214362873">"Navigateur"</string>
<string name="cancel" msgid="3017274947407233702">"Annuler"</string>
<string name="ok" msgid="1509280796718850364">"OK"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index ae23d04..629006f 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -31,6 +31,7 @@
<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>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 1da9111..c5883cd 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -31,6 +31,7 @@
<string name="username" msgid="5057566336518215922">"Ime"</string>
<string name="password" msgid="1177138552305184404">"Zaporka"</string>
<string name="action" msgid="183105774472071343">"Prijava"</string>
+ <string name="bookmarks_add_page" msgid="3093456701072617702">"Spremanje oznake"</string>
<string name="bookmarks_search" msgid="5229596268214362873">"Preglednik"</string>
<string name="cancel" msgid="3017274947407233702">"Odustani"</string>
<string name="ok" msgid="1509280796718850364">"U redu"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index dac8dbd..050848a 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -31,6 +31,7 @@
<string name="username" msgid="5057566336518215922">"Név"</string>
<string name="password" msgid="1177138552305184404">"Jelszó"</string>
<string name="action" msgid="183105774472071343">"Bejelentkezés"</string>
+ <string name="bookmarks_add_page" msgid="3093456701072617702">"Könyvjelző mentése"</string>
<string name="bookmarks_search" msgid="5229596268214362873">"Böngésző"</string>
<string name="cancel" msgid="3017274947407233702">"Mégse"</string>
<string name="ok" msgid="1509280796718850364">"OK"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 89d6a22..c7a76ae 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -31,6 +31,7 @@
<string name="username" msgid="5057566336518215922">"Nama"</string>
<string name="password" msgid="1177138552305184404">"Sandi"</string>
<string name="action" msgid="183105774472071343">"Masuk"</string>
+ <string name="bookmarks_add_page" msgid="3093456701072617702">"Simpan bookmark"</string>
<string name="bookmarks_search" msgid="5229596268214362873">"Browser"</string>
<string name="cancel" msgid="3017274947407233702">"Batal"</string>
<string name="ok" msgid="1509280796718850364">"Oke"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 91632f9..740c57d 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -31,6 +31,7 @@
<string name="username" msgid="5057566336518215922">"Nome"</string>
<string name="password" msgid="1177138552305184404">"Password"</string>
<string name="action" msgid="183105774472071343">"Accedi"</string>
+ <string name="bookmarks_add_page" msgid="3093456701072617702">"Salva segnalibro"</string>
<string name="bookmarks_search" msgid="5229596268214362873">"Browser"</string>
<string name="cancel" msgid="3017274947407233702">"Annulla"</string>
<string name="ok" msgid="1509280796718850364">"OK"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 2e2de26..09bfb98 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -31,6 +31,7 @@
<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>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index cfcadee..4f6ba32 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -31,6 +31,7 @@
<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">"OK"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index bbea374..d5b4146 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -31,6 +31,7 @@
<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>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 54a7461..657b01e 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -31,6 +31,7 @@
<string name="username" msgid="5057566336518215922">"Pavadinimas"</string>
<string name="password" msgid="1177138552305184404">"Slaptažodis"</string>
<string name="action" msgid="183105774472071343">"Prisijungti"</string>
+ <string name="bookmarks_add_page" msgid="3093456701072617702">"Išsaugoti žymę"</string>
<string name="bookmarks_search" msgid="5229596268214362873">"Naršyklė"</string>
<string name="cancel" msgid="3017274947407233702">"Atšaukti"</string>
<string name="ok" msgid="1509280796718850364">"Gerai"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 207a997..d6fe54a 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -31,6 +31,7 @@
<string name="username" msgid="5057566336518215922">"Pieteikumvārds"</string>
<string name="password" msgid="1177138552305184404">"Parole"</string>
<string name="action" msgid="183105774472071343">"Pierakstīties"</string>
+ <string name="bookmarks_add_page" msgid="3093456701072617702">"Saglabāt kā grāmatzīmi"</string>
<string name="bookmarks_search" msgid="5229596268214362873">"Pārlūkprogramma"</string>
<string name="cancel" msgid="3017274947407233702">"Atcelt"</string>
<string name="ok" msgid="1509280796718850364">"Labi"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 7f69d29..68a2f61 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -31,6 +31,7 @@
<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>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 7f6cd13..24c85e8 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -31,6 +31,7 @@
<string name="username" msgid="5057566336518215922">"Brukernavn"</string>
<string name="password" msgid="1177138552305184404">"Passord"</string>
<string name="action" msgid="183105774472071343">"Logg på"</string>
+ <string name="bookmarks_add_page" msgid="3093456701072617702">"Lagre bokmerke"</string>
<string name="bookmarks_search" msgid="5229596268214362873">"Nettleser"</string>
<string name="cancel" msgid="3017274947407233702">"Avbryt"</string>
<string name="ok" msgid="1509280796718850364">"OK"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index c9a88c7..1f3a85e 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -27,10 +27,11 @@
<string name="tab_snapshots" msgid="1449241204980265186">"Opgeslagen pagina\'s"</string>
<string name="added_to_bookmarks" msgid="4028710765672851635">"Toegevoegd aan bladwijzers."</string>
<string name="removed_from_bookmarks" msgid="546648923924996722">"Verwijderd uit bladwijzers."</string>
- <string name="sign_in_to" msgid="5939425800148759165">"Aanmelden bij <xliff:g id="HOSTNAME">%s1</xliff:g> \'<xliff:g id="REALM">%s2</xliff:g>\'"</string>
+ <string name="sign_in_to" msgid="5939425800148759165">"Inloggen bij <xliff:g id="HOSTNAME">%s1</xliff:g> \'<xliff:g id="REALM">%s2</xliff:g>\'"</string>
<string name="username" msgid="5057566336518215922">"Naam"</string>
<string name="password" msgid="1177138552305184404">"Wachtwoord"</string>
- <string name="action" msgid="183105774472071343">"Aanmelden"</string>
+ <string name="action" msgid="183105774472071343">"Inloggen"</string>
+ <string name="bookmarks_add_page" msgid="3093456701072617702">"Bladwijzer opslaan"</string>
<string name="bookmarks_search" msgid="5229596268214362873">"Browser"</string>
<string name="cancel" msgid="3017274947407233702">"Annuleren"</string>
<string name="ok" msgid="1509280796718850364">"OK"</string>
@@ -162,10 +163,10 @@
<string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Tekst instellen die automatisch in webformulieren kan worden ingevuld"</string>
<string name="pref_autologin_title" msgid="4421187193809267096">"Automatische Google-aanmelding"</string>
<string name="pref_autologin_progress" msgid="8333244467048833461">"Aanmelden bij Google-sites met <xliff:g id="ID_1">%s</xliff:g>"</string>
- <string name="autologin_bar_text" msgid="3684581827167173371">"Aanmelden als"</string>
- <string name="autologin_bar_login_text" msgid="3336615320510851879">"Aanmelden"</string>
+ <string name="autologin_bar_text" msgid="3684581827167173371">"Inloggen als"</string>
+ <string name="autologin_bar_login_text" msgid="3336615320510851879">"Inloggen"</string>
<string name="autologin_bar_hide_text" msgid="3629355974385859580">"Verbergen"</string>
- <string name="autologin_bar_error" msgid="7470001207395920811">"Kan niet aanmelden."</string>
+ <string name="autologin_bar_error" msgid="7470001207395920811">"Kan niet inloggen."</string>
<string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Typ de tekst die u automatisch in webformulieren wilt laten invullen."</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"Volledige naam:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"E-mail:"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 962f7a2..e594bbb 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -31,6 +31,7 @@
<string name="username" msgid="5057566336518215922">"Nazwa"</string>
<string name="password" msgid="1177138552305184404">"Hasło"</string>
<string name="action" msgid="183105774472071343">"Zaloguj się"</string>
+ <string name="bookmarks_add_page" msgid="3093456701072617702">"Zapisz zakładkę"</string>
<string name="bookmarks_search" msgid="5229596268214362873">"Przeglądarka"</string>
<string name="cancel" msgid="3017274947407233702">"Anuluj"</string>
<string name="ok" msgid="1509280796718850364">"OK"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 56dbcc2..77b0cae 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -31,6 +31,7 @@
<string name="username" msgid="5057566336518215922">"Nome"</string>
<string name="password" msgid="1177138552305184404">"Palavra-passe"</string>
<string name="action" msgid="183105774472071343">"Iniciar sessão"</string>
+ <string name="bookmarks_add_page" msgid="3093456701072617702">"Guardar marcador"</string>
<string name="bookmarks_search" msgid="5229596268214362873">"Navegad."</string>
<string name="cancel" msgid="3017274947407233702">"Cancelar"</string>
<string name="ok" msgid="1509280796718850364">"OK"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 89a7a4e..0b78675 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -31,6 +31,7 @@
<string name="username" msgid="5057566336518215922">"Nome"</string>
<string name="password" msgid="1177138552305184404">"Senha"</string>
<string name="action" msgid="183105774472071343">"Fazer login"</string>
+ <string name="bookmarks_add_page" msgid="3093456701072617702">"Salvar favorito"</string>
<string name="bookmarks_search" msgid="5229596268214362873">"Navegador"</string>
<string name="cancel" msgid="3017274947407233702">"Cancelar"</string>
<string name="ok" msgid="1509280796718850364">"OK"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index f55a8c4..64ed24b 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -37,6 +37,8 @@
<string name="username" msgid="5057566336518215922">"Num"</string>
<string name="password" msgid="1177138552305184404">"Pled-clav"</string>
<string name="action" msgid="183105774472071343">"S\'annunziar"</string>
+ <!-- no translation found for bookmarks_add_page (3093456701072617702) -->
+ <skip />
<string name="bookmarks_search" msgid="5229596268214362873">"Navigatur"</string>
<string name="cancel" msgid="3017274947407233702">"Interrumper"</string>
<string name="ok" msgid="1509280796718850364">"OK"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index cd95a24..5e4d782 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -31,6 +31,7 @@
<string name="username" msgid="5057566336518215922">"Nume"</string>
<string name="password" msgid="1177138552305184404">"Parolă"</string>
<string name="action" msgid="183105774472071343">"Conectaţi-vă"</string>
+ <string name="bookmarks_add_page" msgid="3093456701072617702">"Salvați marcajul"</string>
<string name="bookmarks_search" msgid="5229596268214362873">"Browser"</string>
<string name="cancel" msgid="3017274947407233702">"Anulaţi"</string>
<string name="ok" msgid="1509280796718850364">"OK"</string>
@@ -62,7 +63,7 @@
<string name="containing_folder" msgid="6771180232953030479">"Adăugaţi la"</string>
<string name="new_folder" msgid="7743540149088867917">"Dosar nou"</string>
<string name="edit_folder" msgid="621817453133656156">"Editaţi dosarul"</string>
- <string name="delete_folder" msgid="2046483129024501116">"Ştergeţi dosarul"</string>
+ <string name="delete_folder" msgid="2046483129024501116">"Ștergeţi dosarul"</string>
<string name="no_subfolders" msgid="3303645239686962674">"Nu există subdosare."</string>
<string name="add_to_bookmarks_menu_option" msgid="4449323955122214389">"Marcaje"</string>
<string name="add_to_homescreen_menu_option" msgid="1461447829242963790">"Ecran de pornire"</string>
@@ -75,7 +76,7 @@
<string name="edit_bookmark" msgid="5024089053490231905">"Modificaţi marcajul"</string>
<string name="create_shortcut_bookmark" msgid="1995095662095484289">"Adăugaţi o comandă rapidă pe ecranul de pornire"</string>
<string name="open_bookmark" msgid="8473581305759935790">"Deschideţi"</string>
- <string name="remove_bookmark" msgid="8407495852801410891">"Ştergeţi marcajul"</string>
+ <string name="remove_bookmark" msgid="8407495852801410891">"Ștergeţi marcajul"</string>
<string name="remove_from_bookmarks" msgid="4374080666576982775">"Eliminaţi din marcaje"</string>
<string name="remove_history_item" msgid="5021424935726728618">"Eliminaţi din istoric"</string>
<string name="set_as_homepage" msgid="4752937379414905560">"Setaţi ca pagină de pornire"</string>
@@ -90,7 +91,7 @@
<string name="bookmark_thumbnail_view" msgid="3164068314718522138">"Miniaturi"</string>
<string name="bookmark_list_view" msgid="7848510619500937839">"Listă"</string>
<string name="current_page" msgid="7510129573681663135">"din "</string>
- <string name="delete_bookmark_warning" msgid="7825328496411904321">"Ştergeţi marcajul „<xliff:g id="BOOKMARK">%s</xliff:g>”?"</string>
+ <string name="delete_bookmark_warning" msgid="7825328496411904321">"Ștergeţi marcajul „<xliff:g id="BOOKMARK">%s</xliff:g>”?"</string>
<string name="open_all_in_new_window" msgid="455786763426575293">"Deschideţi-le pe toate în file noi"</string>
<string name="goto_dot" msgid="3895839050522602723">"Accesaţi"</string>
<string name="select_dot" msgid="6299170761900561967">"Selectaţi text"</string>
@@ -122,7 +123,7 @@
<string name="contextmenu_send_mail" msgid="1014513374828775660">"Trimiteţi un e-mail"</string>
<string name="contextmenu_map" msgid="7471390435434034912">"Hartă"</string>
<string name="choosertitle_sharevia" msgid="4600490613341909086">"Distribuiţi prin"</string>
- <string name="clear" msgid="7070043081700011461">"Ştergeţi"</string>
+ <string name="clear" msgid="7070043081700011461">"Ștergeţi"</string>
<string name="replace" msgid="4843033491070384047">"Înlocuiţi"</string>
<string name="browser_bookmarks_page_bookmarks_text" msgid="6787605028726162673">"Marcaje"</string>
<string name="menu_preferences" msgid="6709237687234102240">"Setări"</string>
@@ -183,34 +184,34 @@
<string name="autofill_profile_editor_save_profile" msgid="3230301454458581157">"Salvaţi"</string>
<string name="autofill_profile_successful_save" msgid="5691459703493331983">"Textul pentru completare automată a fost salvat."</string>
<string name="autofill_profile_successful_delete" msgid="1790262652460723127">"Textul pentru completarea automată a fost şters."</string>
- <string name="autofill_profile_editor_delete_profile" msgid="3098369314558164153">"Ştergeţi"</string>
+ <string name="autofill_profile_editor_delete_profile" msgid="3098369314558164153">"Ștergeţi"</string>
<string name="autofill_setup_dialog_message" msgid="7123905786076456503">"Browserul poate completa automat formulare web ca acesta. Doriţi să configuraţi textul pentru completarea automată?"</string>
<string name="autofill_setup_dialog_negative_toast" msgid="3288881675232206984">"Puteţi configura oricând textul dvs. pentru completarea automată din ecranul Browser &gt; Setări &gt; General."</string>
<string name="disable_autofill" msgid="8305901059849400354">"Dezactivaţi completarea automată"</string>
<string name="pref_privacy_security_title" msgid="3480313968942160914">"Confidenţialitate şi securitate"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Goliţi memoria cache"</string>
- <string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Ştergeţi conţinutul memoriei cache şi bazele de date"</string>
- <string name="pref_privacy_clear_cache_dlg" msgid="4344512581716422465">"Ştergeţi conţinutul stocat în memoria cache la nivel local şi bazele de date?"</string>
+ <string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Ștergeţi conţinutul memoriei cache şi bazele de date"</string>
+ <string name="pref_privacy_clear_cache_dlg" msgid="4344512581716422465">"Ștergeţi conţinutul stocat în memoria cache la nivel local şi bazele de date?"</string>
<string name="pref_privacy_cookies_title" msgid="6763274282214830526">"Cookie-uri"</string>
- <string name="pref_privacy_clear_cookies" msgid="3095583579133780331">"Ştergeţi toate datele despre cookie-uri"</string>
- <string name="pref_privacy_clear_cookies_summary" msgid="6962742063990677520">"Ştergeţi toate cookie-urile din browser"</string>
- <string name="pref_privacy_clear_cookies_dlg" msgid="1493252163164621278">"Ştergeţi toate cookie-urile?"</string>
- <string name="pref_privacy_clear_history" msgid="8723795508825198477">"Ştergeţi istoricul"</string>
- <string name="pref_privacy_clear_history_summary" msgid="6868501330708940734">"Ştergeţi istoricul de navigare din browser"</string>
- <string name="pref_privacy_clear_history_dlg" msgid="6934317391642846227">"Ştergeţi istoricul de navigare din browser?"</string>
+ <string name="pref_privacy_clear_cookies" msgid="3095583579133780331">"Ștergeţi toate datele despre cookie-uri"</string>
+ <string name="pref_privacy_clear_cookies_summary" msgid="6962742063990677520">"Ștergeţi toate cookie-urile din browser"</string>
+ <string name="pref_privacy_clear_cookies_dlg" msgid="1493252163164621278">"Ștergeţi toate cookie-urile?"</string>
+ <string name="pref_privacy_clear_history" msgid="8723795508825198477">"Ștergeţi istoricul"</string>
+ <string name="pref_privacy_clear_history_summary" msgid="6868501330708940734">"Ștergeţi istoricul de navigare din browser"</string>
+ <string name="pref_privacy_clear_history_dlg" msgid="6934317391642846227">"Ștergeţi istoricul de navigare din browser?"</string>
<string name="pref_privacy_formdata_title" msgid="6549813837982050424">"Date din formular"</string>
- <string name="pref_privacy_clear_form_data" msgid="4232668196344383987">"Ştergeţi datele din formular"</string>
- <string name="pref_privacy_clear_form_data_summary" msgid="7702091143640546200">"Ştergeţi toate datele salvate în formular"</string>
- <string name="pref_privacy_clear_form_data_dlg" msgid="8205626042241338983">"Ştergeţi toate datele salvate în formular?"</string>
- <string name="pref_privacy_clear_passwords" msgid="4750234112289277480">"Ştergeţi parolele"</string>
- <string name="pref_privacy_clear_passwords_summary" msgid="8856782718942903335">"Ştergeţi toate parolele salvate"</string>
- <string name="pref_privacy_clear_passwords_dlg" msgid="5836576259947160045">"Ştergeţi toate parolele salvate?"</string>
+ <string name="pref_privacy_clear_form_data" msgid="4232668196344383987">"Ștergeţi datele din formular"</string>
+ <string name="pref_privacy_clear_form_data_summary" msgid="7702091143640546200">"Ștergeţi toate datele salvate în formular"</string>
+ <string name="pref_privacy_clear_form_data_dlg" msgid="8205626042241338983">"Ștergeţi toate datele salvate în formular?"</string>
+ <string name="pref_privacy_clear_passwords" msgid="4750234112289277480">"Ștergeţi parolele"</string>
+ <string name="pref_privacy_clear_passwords_summary" msgid="8856782718942903335">"Ștergeţi toate parolele salvate"</string>
+ <string name="pref_privacy_clear_passwords_dlg" msgid="5836576259947160045">"Ștergeţi toate parolele salvate?"</string>
<string name="pref_privacy_location_title" msgid="7458378016606081067">"Locaţie"</string>
<string name="pref_privacy_enable_geolocation" msgid="1395040170290765686">"Activaţi locaţia"</string>
<string name="pref_privacy_enable_geolocation_summary" msgid="8437020934664306205">"Permiteţi site-urilor să solicite accesul la locaţia dvs."</string>
<string name="pref_privacy_clear_geolocation_access" msgid="6649680770030042980">"Opriţi accesul la locaţie"</string>
<string name="pref_privacy_clear_geolocation_access_summary" msgid="7750143359497314679">"Opriţi accesul tuturor site-urilor web la locaţia dvs."</string>
- <string name="pref_privacy_clear_geolocation_access_dlg" msgid="3190928760598034346">"Ştergeţi accesul la locaţie al site-ului web?"</string>
+ <string name="pref_privacy_clear_geolocation_access_dlg" msgid="3190928760598034346">"Ștergeţi accesul la locaţie al site-ului web?"</string>
<string name="pref_security_passwords_title" msgid="5734190542383756711">"Parole"</string>
<string name="pref_security_remember_passwords" msgid="6492957683454529549">"Activaţi reţinerea parolelor"</string>
<string name="pref_security_remember_passwords_summary" msgid="256388703356349137">"Salvaţi numele de utilizatori şi parolele pentru site-urile web"</string>
@@ -298,7 +299,7 @@
<string name="browserFrameFormResubmitMessage" msgid="5244059279866705254">"Pagina pe care încercaţi să o afişaţi conţine date deja trimise („POSTDATA”). În caz că retransmiteţi datele, orice acţiune efectuată prin formularul de pe pagină (cum ar fi o căutare sau o achiziţie online), se va repeta."</string>
<string name="loadSuspendedTitle" msgid="6453376579109644551">"Nicio conexiune"</string>
<string name="loadSuspended" msgid="3843343290039218668">"Pagina nu poate fi încărcată de browser, deoarece nu există nicio conexiune la internet."</string>
- <string name="clear_history" msgid="5998307092715979619">"Ştergeţi istoricul"</string>
+ <string name="clear_history" msgid="5998307092715979619">"Ștergeţi istoricul"</string>
<string name="browser_history" msgid="2979476257919939232">"Pagini accesate recent"</string>
<string name="empty_history" msgid="7013369425484218985">"Nu există un istoric al browserului."</string>
<string name="go_home" msgid="109129207276086793">"Pagina de pornire"</string>
@@ -327,8 +328,8 @@
<string name="search_the_web" msgid="6046130189241962337">"Căutaţi pe web"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Spaţiul de stocare pentru browser este insuficient"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Atingeţi pentru a elibera spaţiu."</string>
- <string name="webstorage_clear_data_title" msgid="689484577124333977">"Ştergeţi datele stocate"</string>
- <string name="webstorage_clear_data_dialog_message" msgid="6200681632891775881">"Ştergeţi toate datele stocate de acest site?"</string>
+ <string name="webstorage_clear_data_title" msgid="689484577124333977">"Ștergeţi datele stocate"</string>
+ <string name="webstorage_clear_data_dialog_message" msgid="6200681632891775881">"Ștergeţi toate datele stocate de acest site?"</string>
<string name="webstorage_clear_data_dialog_ok_button" msgid="6682570951259237542">"OK"</string>
<string name="webstorage_clear_data_dialog_cancel_button" msgid="2028867751958942762">"Anulaţi"</string>
<string name="webstorage_origin_summary_mb_stored" msgid="1985885826292236210">"MO stocaţi în telefonul dvs."</string>
@@ -342,11 +343,11 @@
<string name="geolocation_settings_page_title" msgid="1745477985097536528">"Opriţi accesul la locaţie"</string>
<string name="geolocation_settings_page_summary_allowed" msgid="9180251524290811398">"În prezent, site-ul poate accesa locaţia dvs."</string>
<string name="geolocation_settings_page_summary_not_allowed" msgid="7941769772784366199">"În prezent, site-ul nu vă poate accesa locaţia"</string>
- <string name="geolocation_settings_page_dialog_message" msgid="8772923416296868537">"Ştergeţi accesul la locaţie al acestui site web?"</string>
+ <string name="geolocation_settings_page_dialog_message" msgid="8772923416296868537">"Ștergeţi accesul la locaţie al acestui site web?"</string>
<string name="geolocation_settings_page_dialog_ok_button" msgid="2113465477131017852">"OK"</string>
<string name="geolocation_settings_page_dialog_cancel_button" msgid="7941036504673409747">"Anulaţi"</string>
- <string name="website_settings_clear_all" msgid="8739804325997655980">"Ştergeţi toate datele"</string>
- <string name="website_settings_clear_all_dialog_message" msgid="1551164275687475061">"Ştergeţi toate datele site-ului web şi permisiunile de locaţie?"</string>
+ <string name="website_settings_clear_all" msgid="8739804325997655980">"Ștergeţi toate datele"</string>
+ <string name="website_settings_clear_all_dialog_message" msgid="1551164275687475061">"Ștergeţi toate datele site-ului web şi permisiunile de locaţie?"</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">"Anulaţi"</string>
<string name="progress_dialog_setting_wallpaper" msgid="2031391201442335889">"Se setează imaginea de fundal..."</string>
@@ -356,12 +357,12 @@
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
<string name="account_chooser_dialog_title" msgid="3314204833188808194">"Alegeţi un cont"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Sincronizaţi cu un Cont Google"</string>
- <string name="import_bookmarks_dialog_description" msgid="2362897194870789609">"Marcajele de pe acest dispozitiv nu sunt asociate încă unui Cont Google. Salvaţi marcajele prin adăugarea lor într-un cont. Ştergeţi marcajele dacă nu doriţi sincronizarea acestora."</string>
+ <string name="import_bookmarks_dialog_description" msgid="2362897194870789609">"Marcajele de pe acest dispozitiv nu sunt asociate încă unui Cont Google. Salvaţi marcajele prin adăugarea lor într-un cont. Ștergeţi marcajele dacă nu doriţi sincronizarea acestora."</string>
<string name="import_bookmarks_dialog_select_add_account" msgid="7643058662272484895">"Adăugaţi marcajele curente de pe acest dispozitiv şi începeţi sincronizarea cu Contul Google"</string>
- <string name="import_bookmarks_dialog_delete_select_account" msgid="4333848003180415516">"Ştergeţi marcajele curente de pe acest dispozitiv şi începeţi sincronizarea cu Contul Google"</string>
- <string name="import_bookmarks_dialog_confirm_delete" msgid="2204771572755630570">"Ştergeţi marcajele curente de pe acest dispozitiv şi începeţi sincronizarea marcajelor cu <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>?"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="4333848003180415516">"Ștergeţi marcajele curente de pe acest dispozitiv şi începeţi sincronizarea cu Contul Google"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="2204771572755630570">"Ștergeţi marcajele curente de pe acest dispozitiv şi începeţi sincronizarea marcajelor cu <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>?"</string>
<string name="import_bookmarks_dialog_confirm_add" msgid="8942794112340838111">"Adăugaţi marcajele curente de pe acest dispozitiv şi începeţi sincronizarea acestora cu <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>?"</string>
- <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Ştergeţi marcajele"</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Ștergeţi marcajele"</string>
<string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Înainte"</string>
<string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Înapoi"</string>
<string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Anulaţi"</string>
@@ -376,7 +377,7 @@
<string name="ua_switcher_desktop" msgid="220097077327558435">"Solicitaţi versiunea de desktop a site-ului"</string>
<string name="permission_preload_label" msgid="4856971662337877316">"Se preîncarcă rezultatele"</string>
<string name="empty_snapshots_folder" msgid="7675378008107026013">"Nu există pagini salvate."</string>
- <string name="remove_snapshot" msgid="1624447424544976849">"Ştergeţi pagina salvată"</string>
+ <string name="remove_snapshot" msgid="1624447424544976849">"Ștergeţi pagina salvată"</string>
<string name="snapshot_go_live" msgid="1209542802541168497">"Afişaţi pagina live"</string>
<string name="accessibility_button_back" msgid="6194680634245279407">"Înapoi"</string>
<string name="accessibility_button_forward" msgid="1236827218480658168">"Înainte"</string>
@@ -389,7 +390,7 @@
<string name="accessibility_button_closetab" msgid="6954807842756927737">"Închideţi fila"</string>
<string name="accessibility_button_newtab" msgid="4116986240706315748">"Deschideţi filă nouă"</string>
<string name="accessibility_button_newincognitotab" msgid="5254901889040012964">"Deschideţi filă incognito nouă"</string>
- <string name="accessibility_button_clear" msgid="6943152307986161598">"Ştergeţi textul introdus"</string>
+ <string name="accessibility_button_clear" msgid="6943152307986161598">"Ștergeţi textul introdus"</string>
<string name="accessibility_button_uaswitch" msgid="6286804719724282339">"Comutaţi valoarea user agent"</string>
<string name="accessibility_button_go" msgid="1182818872083055958">"Salt la"</string>
<string name="accessibility_button_navscreen" msgid="9142904748728713075">"Manager pagini"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 20ffd1e..2301cad 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -31,6 +31,7 @@
<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>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index d9c60cd..f697877 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -31,6 +31,7 @@
<string name="username" msgid="5057566336518215922">"Meno"</string>
<string name="password" msgid="1177138552305184404">"Heslo"</string>
<string name="action" msgid="183105774472071343">"Prihlásiť sa"</string>
+ <string name="bookmarks_add_page" msgid="3093456701072617702">"Uložiť záložku"</string>
<string name="bookmarks_search" msgid="5229596268214362873">"Prehliadač"</string>
<string name="cancel" msgid="3017274947407233702">"Zrušiť"</string>
<string name="ok" msgid="1509280796718850364">"OK"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 9625145..d0601de 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -31,6 +31,7 @@
<string name="username" msgid="5057566336518215922">"Ime"</string>
<string name="password" msgid="1177138552305184404">"Geslo"</string>
<string name="action" msgid="183105774472071343">"Prijava"</string>
+ <string name="bookmarks_add_page" msgid="3093456701072617702">"Shrani zaznamek"</string>
<string name="bookmarks_search" msgid="5229596268214362873">"Brskalnik"</string>
<string name="cancel" msgid="3017274947407233702">"Prekliči"</string>
<string name="ok" msgid="1509280796718850364">"V redu"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 30416ab..7832ad4 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -31,6 +31,7 @@
<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>
@@ -157,16 +158,16 @@
<string name="pref_general_sync_title" msgid="3138637035975860324">"Синхронизација"</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_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_autofill_profile_editor_summary" msgid="4864447251676856190">"Подешавање текста за аутоматско попуњавање веб-образаца"</string>
<string name="pref_autologin_title" msgid="4421187193809267096">"Аутоматско Google пријављивање"</string>
<string name="pref_autologin_progress" msgid="8333244467048833461">"Пријављивање на Google сајтове помоћу <xliff:g id="ID_1">%s</xliff:g>"</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_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>
@@ -184,7 +185,7 @@
<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_message" msgid="7123905786076456503">"Прегледач може аутоматски да попуњава веб-обрасце попут овог. Желите ли да подесите текст за аутоматско попуњавање?"</string>
<string name="autofill_setup_dialog_negative_toast" msgid="3288881675232206984">"Увек можете да подесите текст за аутоматско попуњавање на екрану Прегледач &gt; Подешавања &gt; Опште."</string>
<string name="disable_autofill" msgid="8305901059849400354">"Онемогући аутоматско попуњавање"</string>
<string name="pref_privacy_security_title" msgid="3480313968942160914">"Приватност и безбедност"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index eb5d574..553dc07 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -31,6 +31,7 @@
<string name="username" msgid="5057566336518215922">"Namn"</string>
<string name="password" msgid="1177138552305184404">"Lösenord"</string>
<string name="action" msgid="183105774472071343">"Logga in"</string>
+ <string name="bookmarks_add_page" msgid="3093456701072617702">"Spara bokmärke"</string>
<string name="bookmarks_search" msgid="5229596268214362873">"Webbläsare"</string>
<string name="cancel" msgid="3017274947407233702">"Avbryt"</string>
<string name="ok" msgid="1509280796718850364">"OK"</string>
@@ -65,7 +66,7 @@
<string name="delete_folder" msgid="2046483129024501116">"Ta bort mapp"</string>
<string name="no_subfolders" msgid="3303645239686962674">"Inga undermappar."</string>
<string name="add_to_bookmarks_menu_option" msgid="4449323955122214389">"Bokmärken"</string>
- <string name="add_to_homescreen_menu_option" msgid="1461447829242963790">"Startsida"</string>
+ <string name="add_to_homescreen_menu_option" msgid="1461447829242963790">"Startskärm"</string>
<string name="add_to_other_folder_menu_option" msgid="5947586525822134105">"Annan mapp"</string>
<string name="name" msgid="5462672162695365387">"Etikett"</string>
<string name="http" msgid="2163722670597250102">"http://"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index c866477..9ea7532 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -19,7 +19,7 @@
<string name="application_name" msgid="1935869255545976415">" Kivinjari"</string>
<string name="choose_upload" msgid="3649366287575002063">"Chagua faili ya kupakia"</string>
<string name="uploads_disabled" msgid="463761197575372994">"Upakiaji wa faili umelemazwa."</string>
- <string name="new_tab" msgid="7971857320679510529">"Tabo mpya"</string>
+ <string name="new_tab" msgid="7971857320679510529">"Kichupo kipya"</string>
<string name="new_incognito_tab" msgid="3606197964239039478">"Kichupo fiche kipya"</string>
<string name="tab_bookmarks" msgid="2305793036003473653">"Alamisho"</string>
<string name="tab_most_visited" msgid="1077402532455000703">"Zilizotembelewa sana"</string>
@@ -31,6 +31,7 @@
<string name="username" msgid="5057566336518215922">"Jina"</string>
<string name="password" msgid="1177138552305184404">"Nenosiri"</string>
<string name="action" msgid="183105774472071343">"Ingia"</string>
+ <string name="bookmarks_add_page" msgid="3093456701072617702">"Hifadhi alamisho"</string>
<string name="bookmarks_search" msgid="5229596268214362873">" Kivinjari"</string>
<string name="cancel" msgid="3017274947407233702">"Ghairi"</string>
<string name="ok" msgid="1509280796718850364">"Sawa"</string>
@@ -78,10 +79,10 @@
<string name="remove_bookmark" msgid="8407495852801410891">"Futa alamisho"</string>
<string name="remove_from_bookmarks" msgid="4374080666576982775">"Ondoa kutoka kwa alamisho"</string>
<string name="remove_history_item" msgid="5021424935726728618">"Ondoa kwenye historia"</string>
- <string name="set_as_homepage" msgid="4752937379414905560">"Weka uwe ukurasa wa mwanzo"</string>
+ <string name="set_as_homepage" msgid="4752937379414905560">"Weka uwe ukurasa wa kwanza"</string>
<string name="bookmark_saved" msgid="2766434679871317557">"Imehifadhiwa kwa alamisho"</string>
<string name="bookmark_not_saved" msgid="1077732557310662080">"Haikuweza kuhifadhi alamamisho."</string>
- <string name="homepage_set" msgid="8768087280310966395">"Ukurasa wa mwanzo umewekwa."</string>
+ <string name="homepage_set" msgid="8768087280310966395">"Ukurasa wa kwanza umewekwa."</string>
<string name="bookmark_needs_title" msgid="6245900436119218187">"Alamisho lazima iwe na jina."</string>
<string name="bookmark_needs_url" msgid="7809876865972755158">"Alamisho lazima iwe na mahali."</string>
<string name="bookmark_url_not_valid" msgid="4917440933384496211">"URL hii si halali."</string>
@@ -99,7 +100,7 @@
<string name="shortcut_bookmark" msgid="3974876480401135895">"Alamisho"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Chagua alamisho"</string>
<string name="history" msgid="2451240511251410032">"Historia"</string>
- <string name="menu_view_download" msgid="2124570321712995120">"Vipakuzi"</string>
+ <string name="menu_view_download" msgid="2124570321712995120">"Vipakuliwa"</string>
<string name="copy_page_url" msgid="1188679152608889555">"Nakili URL ya ukurasa"</string>
<string name="share_page" msgid="593756995297268343">"Shiriki ukurasa"</string>
<string name="menu_save_snapshot" msgid="6935080344031126139">"Hifadhi kwa usomaji wa nje ya mtandao"</string>
@@ -139,8 +140,8 @@
<item msgid="2484126708670016519">"Inapohitajika"</item>
<item msgid="8547442717307793863">"Zima"</item>
</string-array>
- <string name="pref_content_open_in_background_summary" msgid="955411158407739504">"Fungua tabo vipya nyuma ya tabo ya sasa"</string>
- <string name="pref_content_homepage" msgid="3324574611613105696">"Weka ukurasa wa mwanzo"</string>
+ <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_set_homepage_to" msgid="7838684355145561242">"Weka kwa"</string>
@@ -301,17 +302,17 @@
<string name="clear_history" msgid="5998307092715979619">"Futa historia"</string>
<string name="browser_history" msgid="2979476257919939232">"Kurasa zilizotembelewa hivi karibuni"</string>
<string name="empty_history" msgid="7013369425484218985">"Hakuna historia ya kivinjari."</string>
- <string name="go_home" msgid="109129207276086793">"Ukurasa wa mwanzo"</string>
+ <string name="go_home" msgid="109129207276086793">"Ukurasa wa kwanza"</string>
<string name="add_new_bookmark" msgid="3158497555612337238">"Ongeza alamisho"</string>
<string name="add_bookmark_short" msgid="3783984330998103735">"Ongeza"</string>
<string name="search_hint" msgid="4647356319916631820">"Tafuta au chapisha URL"</string>
<string name="search_button_text" msgid="5235226933877634410">"Nenda"</string>
- <string name="search_settings_description" msgid="1422401062529014107">"Historia ya vialamisho na wavuti"</string>
+ <string name="search_settings_description" msgid="1422401062529014107">"Historia ya alamisho na wavuti"</string>
<string name="popup_window_attempt" msgid="31565781154067629">"Ruhusu tovuti hii kufungua dirisha la kidukizo?"</string>
<string name="allow" msgid="1157313689171991335">"Ruhusu"</string>
<string name="block" msgid="9172175889884707800">"Zuia"</string>
<string name="too_many_windows_dialog_title" msgid="5709782301477380438">"Kikomo cha kichupo kimefikiwa"</string>
- <string name="too_many_windows_dialog_message" msgid="3644234634638290304">"Imeshindwa kufungua tabo mpya hadi ufunge moja."</string>
+ <string name="too_many_windows_dialog_message" msgid="3644234634638290304">"Imeshindwa kufungua kichupo kipya hadi ufunge mojawapo ya vile ulivyofungua."</string>
<string name="too_many_subwindows_dialog_title" msgid="3805453941587725944">"Dirisha ibukizi tayari limefunguliwa"</string>
<string name="too_many_subwindows_dialog_message" msgid="2164725447981195556">"Kidukizo moja tu inaweza kufunguliwa kwa wakati."</string>
<string name="download_no_sdcard_dlg_title" product="nosdcard" msgid="56777245081568508">"Hifadhi ya USB haipatikani"</string>
@@ -320,8 +321,8 @@
<string name="download_no_sdcard_dlg_msg" product="default" msgid="2616399456116301518">"Kadi ya SD inahitajika ili kupakua <xliff:g id="FILENAME">%s</xliff:g>"</string>
<string name="download_sdcard_busy_dlg_title" product="nosdcard" msgid="8081445664689818973">"Hifadhi ya USB haipatikani"</string>
<string name="download_sdcard_busy_dlg_title" product="default" msgid="6877712666046917741">"Kadi ya SD haipatikani"</string>
- <string name="download_sdcard_busy_dlg_msg" product="nosdcard" msgid="8412543086906716875">"Hifadhi ya USB ina shughuli. Ili kuruhusu vipakuzi, gusa \"Zima hifadhi ya USB\" katika arifa."</string>
- <string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"Kadi ya SD inashughuli. Kuruhusu vipakuzi, gusa \"Zima Hifadhi ya USB\" katika arifa."</string>
+ <string name="download_sdcard_busy_dlg_msg" product="nosdcard" msgid="8412543086906716875">"Hifadhi ya USB inatumika. Ili kuruhusu vipakuliwa, gusa \"Zima hifadhi ya USB\" katika arifa."</string>
+ <string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"Kadi ya SD inatumika. Kuruhusu vipakuliwa, gusa \"Zima Hifadhi ya USB\" katika arifa."</string>
<string name="cannot_download" msgid="8150552478556798780">"Inaweza kupakua tu URLs za \"http\" au \"https\"."</string>
<string name="download_pending" msgid="2599683668575349559">"Inaanza kupakua..."</string>
<string name="search_the_web" msgid="6046130189241962337">"Tafuta wavuti"</string>
@@ -342,7 +343,7 @@
<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>
- <string name="geolocation_settings_page_dialog_message" msgid="8772923416296868537">"Futa ufikivu wa eneo ya wavuti hii?"</string>
+ <string name="geolocation_settings_page_dialog_message" msgid="8772923416296868537">"Idhini ya kufikia eneo kwa wavuti hii ifutwe?"</string>
<string name="geolocation_settings_page_dialog_ok_button" msgid="2113465477131017852">"Sawa"</string>
<string name="geolocation_settings_page_dialog_cancel_button" msgid="7941036504673409747">"Ghairi"</string>
<string name="website_settings_clear_all" msgid="8739804325997655980">"Futa zote"</string>
@@ -357,10 +358,10 @@
<string name="account_chooser_dialog_title" msgid="3314204833188808194">"Chagua akaunti"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Sawazisha kwa akaunti ya Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2362897194870789609">"Alamisho kwenye kifaa hiki bado haihusishwi na akaunti ya Google. Hifadhi alamisho hizi kwa kuziongeza kwa akaunti. Futa alamisho hizi ikiwa hautaki kuzilandanisha."</string>
- <string name="import_bookmarks_dialog_select_add_account" msgid="7643058662272484895">"Ongeza alamisho iliyo kwenye kifaa hiki sasa na uanze kulandanisha na akaunti ya Google"</string>
- <string name="import_bookmarks_dialog_delete_select_account" msgid="4333848003180415516">"Futa alamisho ilioko sasa kwa kifaa na anza kulandanisha na akaunti za Google"</string>
- <string name="import_bookmarks_dialog_confirm_delete" msgid="2204771572755630570">"Futa alamisho zilizo katika kifaa hiki na anza kulandanisha na <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
- <string name="import_bookmarks_dialog_confirm_add" msgid="8942794112340838111">"Ongeza alamisho zilizo kwenye kifaa hiki na anza kulandanisha na <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>?."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="7643058662272484895">"Ongeza alamisho zilizo kwenye kifaa hiki na uanze kusawazisha na akaunti ya Google"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="4333848003180415516">"Futa alamisho zilizo kwenye kifaa hiki na uanze kusawazisha na akaunti za Google"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="2204771572755630570">"Je, alamisho zilizo katika kifaa hiki zifutwe na alamisho zianze kusawazishwa na <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>?"</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="8942794112340838111">"Alamisho zilizo kwenye kifaa hiki ziongezwe na zianze kusawazishwa na <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>?"</string>
<string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Futa alamisho"</string>
<string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Ifuatayo"</string>
<string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Iliyotangulia"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 136abdf..c997ae8 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -31,6 +31,7 @@
<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>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 54c550b..32503c8 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -31,6 +31,7 @@
<string name="username" msgid="5057566336518215922">"Pangalan"</string>
<string name="password" msgid="1177138552305184404">"Password"</string>
<string name="action" msgid="183105774472071343">"Mag-sign in"</string>
+ <string name="bookmarks_add_page" msgid="3093456701072617702">"I-save ang bookmark"</string>
<string name="bookmarks_search" msgid="5229596268214362873">"Browser"</string>
<string name="cancel" msgid="3017274947407233702">"Kanselahin"</string>
<string name="ok" msgid="1509280796718850364">"OK"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 0550a34..6941e0f 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -31,6 +31,7 @@
<string name="username" msgid="5057566336518215922">"Ad"</string>
<string name="password" msgid="1177138552305184404">"Şifre"</string>
<string name="action" msgid="183105774472071343">"Oturum açın"</string>
+ <string name="bookmarks_add_page" msgid="3093456701072617702">"Yer işaretini kaydetme"</string>
<string name="bookmarks_search" msgid="5229596268214362873">"Tarayıcı"</string>
<string name="cancel" msgid="3017274947407233702">"İptal"</string>
<string name="ok" msgid="1509280796718850364">"Tamam"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 7003e28..0b9b98e 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -31,6 +31,7 @@
<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">"OK"</string>
@@ -306,7 +307,7 @@
<string name="add_bookmark_short" msgid="3783984330998103735">"Додати"</string>
<string name="search_hint" msgid="4647356319916631820">"Знайд. або введіть URL"</string>
<string name="search_button_text" msgid="5235226933877634410">"Викон."</string>
- <string name="search_settings_description" msgid="1422401062529014107">"Закладки й іст. веб-пошуку"</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>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index d68bcc8..c48cfa1 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -31,6 +31,7 @@
<string name="username" msgid="5057566336518215922">"Tên"</string>
<string name="password" msgid="1177138552305184404">"Mật khẩu"</string>
<string name="action" msgid="183105774472071343">"Đăng nhập"</string>
+ <string name="bookmarks_add_page" msgid="3093456701072617702">"Lưu dấu trang"</string>
<string name="bookmarks_search" msgid="5229596268214362873">"Trình duyệt"</string>
<string name="cancel" msgid="3017274947407233702">"Hủy"</string>
<string name="ok" msgid="1509280796718850364">"OK"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 903d85b..578c237 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -31,10 +31,11 @@
<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="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>
@@ -128,7 +129,7 @@
<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" 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>
@@ -176,7 +177,7 @@
<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_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>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index a2c3e24..0dda47e 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -17,7 +17,7 @@
<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="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>
@@ -31,6 +31,7 @@
<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>
@@ -306,7 +307,7 @@
<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="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>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 42f080b..1320460 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -31,6 +31,7 @@
<string name="username" msgid="5057566336518215922">"Igama"</string>
<string name="password" msgid="1177138552305184404">"Iphasiwedi"</string>
<string name="action" msgid="183105774472071343">"Ngena"</string>
+ <string name="bookmarks_add_page" msgid="3093456701072617702">"Londoloza ibhukhimakhi"</string>
<string name="bookmarks_search" msgid="5229596268214362873">"Isiphequluli"</string>
<string name="cancel" msgid="3017274947407233702">"Khansela"</string>
<string name="ok" msgid="1509280796718850364">"KULUNGILE"</string>
diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index b766fb9..3ba3182 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -423,9 +423,9 @@ public abstract class BaseUi implements UI {
.findViewById(R.id.subwindow_close);
final WebView cancelSubView = subView;
cancel.setOnClickListener(new OnClickListener() {
+ @Override
public void onClick(View v) {
- WebViewClassic.fromWebView(cancelSubView).getWebChromeClient().onCloseWindow(
- cancelSubView);
+ ((BrowserWebView) cancelSubView).getWebChromeClient().onCloseWindow(cancelSubView);
}
});
tab.setSubWebView(subView);
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 4555c18..95afa71 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -155,13 +155,14 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener,
}
public void startManagingSettings(WebSettings settings) {
- WebSettingsClassic settingsClassic = (WebSettingsClassic) settings;
+
if (mNeedsSharedSync) {
syncSharedSettings();
}
+
synchronized (mManagedSettings) {
- syncStaticSettings(settingsClassic);
- syncSetting(settingsClassic);
+ syncStaticSettings(settings);
+ syncSetting(settings);
mManagedSettings.add(new WeakReference<WebSettings>(settings));
}
}
@@ -251,22 +252,17 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener,
/**
* Syncs all the settings that have a Preference UI
*/
- private void syncSetting(WebSettingsClassic settings) {
+ private void syncSetting(WebSettings settings) {
settings.setGeolocationEnabled(enableGeolocation());
settings.setJavaScriptEnabled(enableJavascript());
settings.setLightTouchEnabled(enableLightTouch());
settings.setNavDump(enableNavDump());
- settings.setHardwareAccelSkiaEnabled(isSkiaHardwareAccelerated());
- settings.setShowVisualIndicator(enableVisualIndicator());
settings.setDefaultTextEncodingName(getDefaultTextEncoding());
settings.setDefaultZoom(getDefaultZoom());
settings.setMinimumFontSize(getMinimumFontSize());
settings.setMinimumLogicalFontSize(getMinimumFontSize());
- settings.setForceUserScalable(forceEnableUserScalable());
settings.setPluginState(getPluginState());
settings.setTextZoom(getTextZoom());
- settings.setDoubleTapZoom(getDoubleTapZoom());
- settings.setAutoFillEnabled(isAutofillEnabled());
settings.setLayoutAlgorithm(getLayoutAlgorithm());
settings.setJavaScriptCanOpenWindowsAutomatically(!blockPopupWindows());
settings.setLoadsImagesAutomatically(loadImages());
@@ -274,7 +270,6 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener,
settings.setSavePassword(rememberPasswords());
settings.setSaveFormData(saveFormdata());
settings.setUseWideViewPort(isWideViewport());
- settings.setAutoFillProfile(getAutoFillProfile());
String ua = mCustomUserAgents.get(settings);
if (ua != null) {
@@ -283,30 +278,39 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener,
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();
- settings.setProperty(WebViewProperties.gfxInvertedScreen,
+ settingsClassic.setProperty(WebViewProperties.gfxInvertedScreen,
useInverted ? "true" : "false");
if (useInverted) {
- settings.setProperty(WebViewProperties.gfxInvertedScreenContrast,
+ settingsClassic.setProperty(WebViewProperties.gfxInvertedScreenContrast,
Float.toString(getInvertedContrast()));
}
if (isDebugEnabled()) {
- settings.setProperty(WebViewProperties.gfxEnableCpuUploadPath,
+ settingsClassic.setProperty(WebViewProperties.gfxEnableCpuUploadPath,
enableCpuUploadPath() ? "true" : "false");
}
- settings.setLinkPrefetchEnabled(mLinkPrefetchAllowed);
+ settingsClassic.setLinkPrefetchEnabled(mLinkPrefetchAllowed);
}
/**
* Syncs all the settings that have no UI
* These cannot change, so we only need to set them once per WebSettings
*/
- private void syncStaticSettings(WebSettingsClassic settings) {
+ private void syncStaticSettings(WebSettings settings) {
settings.setDefaultFontSize(16);
settings.setDefaultFixedFontSize(13);
- settings.setPageCacheCapacity(getPageCacheCapacity());
// WebView inside Browser doesn't want initial focus to be set.
settings.setNeedInitialFocus(false);
@@ -315,13 +319,6 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener,
// enable smooth transition for better performance during panning or
// zooming
settings.setEnableSmoothTransition(true);
- // 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.
- settings.setProperty(WebViewProperties.gfxUseMinimalMemory, "false");
// disable content url access
settings.setAllowContentAccess(false);
@@ -329,7 +326,6 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener,
settings.setAppCacheEnabled(true);
settings.setDatabaseEnabled(true);
settings.setDomStorageEnabled(true);
- settings.setWorkersEnabled(true); // This only affects V8.
// HTML5 configuration parametersettings.
settings.setAppCacheMaxSize(getWebStorageSizeManager().getAppCacheMaxSize());
@@ -339,6 +335,19 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener,
// 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() {
@@ -355,7 +364,7 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener,
Iterator<WeakReference<WebSettings>> iter = mManagedSettings.iterator();
while (iter.hasNext()) {
WeakReference<WebSettings> ref = iter.next();
- WebSettingsClassic settings = (WebSettingsClassic)ref.get();
+ WebSettings settings = ref.get();
if (settings == null) {
iter.remove();
continue;
diff --git a/src/com/android/browser/BrowserWebView.java b/src/com/android/browser/BrowserWebView.java
index 12d511f..99e0587 100644
--- a/src/com/android/browser/BrowserWebView.java
+++ b/src/com/android/browser/BrowserWebView.java
@@ -20,8 +20,12 @@ import android.content.Context;
import android.graphics.Canvas;
import android.util.AttributeSet;
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;
@@ -37,6 +41,8 @@ public class BrowserWebView extends WebView implements WebViewClassic.TitleBarDe
private boolean mBackgroundRemoved = false;
private TitleBar mTitleBar;
private OnScrollChangedListener mOnScrollChangedListener;
+ private WebChromeClient mWebChromeClient;
+ private WebViewClient mWebViewClient;
/**
* @param context
@@ -74,6 +80,31 @@ public class BrowserWebView extends WebView implements WebViewClassic.TitleBarDe
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;
+ super.setWebChromeClient(client);
+ }
+
+ public WebChromeClient getWebChromeClient() {
+ return mWebChromeClient;
+ }
+
+ @Override
+ public void setWebViewClient(WebViewClient client) {
+ mWebViewClient = client;
+ super.setWebViewClient(client);
+ }
+
+ public WebViewClient getWebViewClient() {
+ return mWebViewClient;
+ }
+
public void setTitleBar(TitleBar title) {
mTitleBar = title;
}
@@ -87,6 +118,7 @@ public class BrowserWebView extends WebView implements WebViewClassic.TitleBarDe
// From TitleBarDelegate
@Override
public void onSetEmbeddedTitleBar(final View title) {
+ // TODO: Remove this method; it is never invoked.
}
public boolean hasTitleBar() {
diff --git a/src/com/android/browser/ComboViewActivity.java b/src/com/android/browser/ComboViewActivity.java
index 2d382cb..91d574e 100644
--- a/src/com/android/browser/ComboViewActivity.java
+++ b/src/com/android/browser/ComboViewActivity.java
@@ -71,10 +71,14 @@ public class ComboViewActivity extends Activity implements CombinedBookmarksCall
mTabsAdapter = new TabsAdapter(this, mViewPager);
mTabsAdapter.addTab(bar.newTab().setText(R.string.tab_bookmarks),
BrowserBookmarksPage.class, args);
- 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 (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 caea83e..7b7fcd4 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -260,7 +260,7 @@ public class Controller
@Override
public void start(final Intent intent) {
- WebViewClassic.setShouldMonitorWebCoreThread();
+ if (BrowserWebView.isClassic()) WebViewClassic.setShouldMonitorWebCoreThread();
// mCrashRecoverHandler has any previously saved state.
mCrashRecoveryHandler.startRecovery(intent);
}
@@ -356,7 +356,7 @@ public class Controller
}
// Read JavaScript flags if it exists.
String jsFlags = getSettings().getJsEngineFlags();
- if (jsFlags.trim().length() != 0) {
+ if (jsFlags.trim().length() != 0 && BrowserWebView.isClassic()) {
WebViewClassic.fromWebView(getCurrentWebView()).setJsFlags(jsFlags);
}
if (intent != null
@@ -1196,7 +1196,12 @@ public class Controller
long id = intent.getLongExtra(
ComboViewActivity.EXTRA_OPEN_SNAPSHOT, -1);
if (id >= 0) {
- createNewSnapshotTab(id, true);
+ if (BrowserWebView.isClassic()) {
+ createNewSnapshotTab(id, true);
+ } else {
+ Toast.makeText(mActivity, "Snapshot Tab requires WebViewClassic",
+ Toast.LENGTH_LONG).show();
+ }
}
}
break;
@@ -2257,7 +2262,9 @@ public class Controller
}
public SelectText(WebView webView) {
- mWebView = WebViewClassic.fromWebView(webView);
+ if (BrowserWebView.isClassic()) {
+ mWebView = WebViewClassic.fromWebView(webView);
+ }
}
}
@@ -2545,7 +2552,7 @@ public class Controller
// In case the user enters nothing.
if (url != null && url.length() != 0 && tab != null && view != null) {
url = UrlUtils.smartUrlFilter(url);
- if (!WebViewClassic.fromWebView(view).getWebViewClient().
+ if (!((BrowserWebView) view).getWebViewClient().
shouldOverrideUrlLoading(view, url)) {
loadUrl(tab, url);
}
@@ -2738,14 +2745,14 @@ public class Controller
}
break;
case KeyEvent.KEYCODE_A:
- if (ctrl) {
+ if (ctrl && BrowserWebView.isClassic()) {
WebViewClassic.fromWebView(webView).selectAll();
return true;
}
break;
// case KeyEvent.KEYCODE_B: // menu
case KeyEvent.KEYCODE_C:
- if (ctrl) {
+ if (ctrl && BrowserWebView.isClassic()) {
WebViewClassic.fromWebView(webView).copySelection();
return true;
}
diff --git a/src/com/android/browser/IntentHandler.java b/src/com/android/browser/IntentHandler.java
index 9f05499..5b79fb1 100644
--- a/src/com/android/browser/IntentHandler.java
+++ b/src/com/android/browser/IntentHandler.java
@@ -179,7 +179,7 @@ public class IntentHandler {
}
}
} else {
- if (!urlData.isEmpty()
+ if (BrowserWebView.isClassic() && !urlData.isEmpty()
&& urlData.mUrl.startsWith("about:debug")) {
if ("about:debug.dom".equals(urlData.mUrl)) {
current.getWebViewClassic().dumpDomTree(false);
diff --git a/src/com/android/browser/NetworkStateHandler.java b/src/com/android/browser/NetworkStateHandler.java
index 4480664..9201f0f 100644
--- a/src/com/android/browser/NetworkStateHandler.java
+++ b/src/com/android/browser/NetworkStateHandler.java
@@ -114,7 +114,7 @@ public class NetworkStateHandler {
private void sendNetworkType(String type, String subtype) {
WebView w = mController.getCurrentWebView();
- if (w != null) {
+ if (w != null && BrowserWebView.isClassic()) {
WebViewClassic.fromWebView(w).setNetworkType(type, subtype);
}
}
diff --git a/src/com/android/browser/PageDialogsHandler.java b/src/com/android/browser/PageDialogsHandler.java
index 3ed1004..dba5289 100644
--- a/src/com/android/browser/PageDialogsHandler.java
+++ b/src/com/android/browser/PageDialogsHandler.java
@@ -27,7 +27,6 @@ import android.view.View;
import android.webkit.HttpAuthHandler;
import android.webkit.SslErrorHandler;
import android.webkit.WebView;
-import android.webkit.WebViewClassic;
import android.widget.LinearLayout;
import android.widget.TextView;
@@ -298,7 +297,7 @@ public class PageDialogsHandler {
mSSLCertificateOnErrorHandler = null;
mSSLCertificateOnErrorError = null;
- WebViewClassic.fromWebView(view).getWebViewClient().
+ ((BrowserWebView) view).getWebViewClient().
onReceivedSslError(view, handler, error);
}
})
@@ -326,7 +325,7 @@ public class PageDialogsHandler {
mSSLCertificateOnErrorHandler = null;
mSSLCertificateOnErrorError = null;
- WebViewClassic.fromWebView(view).getWebViewClient().
+ ((BrowserWebView) view).getWebViewClient().
onReceivedSslError(view, handler, error);
}
})
diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index 4eb5c06..79e635e 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -1314,7 +1314,9 @@ class Tab implements PictureListener {
// 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);
- getWebViewClassic().setWebBackForwardListClient(mWebBackForwardListClient);
+ if (BrowserWebView.isClassic()) {
+ getWebViewClassic().setWebBackForwardListClient(mWebBackForwardListClient);
+ }
TabControl tc = mWebViewController.getTabControl();
if (tc != null && tc.getOnThumbnailUpdatedListener() != null) {
mMainView.setPictureListener(this);
@@ -1556,6 +1558,9 @@ class Tab implements PictureListener {
* @return The main WebView of this tab.
*/
WebViewClassic getWebViewClassic() {
+ if (!BrowserWebView.isClassic()) {
+ return null;
+ }
return WebViewClassic.fromWebView(mMainView);
}
diff --git a/src/com/android/browser/TitleBar.java b/src/com/android/browser/TitleBar.java
index 874296a..a0cc857 100644
--- a/src/com/android/browser/TitleBar.java
+++ b/src/com/android/browser/TitleBar.java
@@ -122,6 +122,7 @@ public class TitleBar extends RelativeLayout {
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;
diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index 3b8245a..df7a586 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -117,7 +117,7 @@ public class XLargeUi extends BaseUi {
void stopWebViewScrolling() {
BrowserWebView web = (BrowserWebView) mUiController.getCurrentWebView();
- if (web != null) {
+ if (web != null && BrowserWebView.isClassic()) {
WebViewClassic.fromWebView(web).stopScroll();
}
}
diff --git a/src/com/android/browser/preferences/InvertedContrastPreview.java b/src/com/android/browser/preferences/InvertedContrastPreview.java
index ed6eadf..2b8ad47 100644
--- a/src/com/android/browser/preferences/InvertedContrastPreview.java
+++ b/src/com/android/browser/preferences/InvertedContrastPreview.java
@@ -23,6 +23,7 @@ import android.webkit.WebSettingsClassic;
import android.webkit.WebViewClassic;
import com.android.browser.BrowserSettings;
+import com.android.browser.BrowserWebView;
import com.android.browser.WebViewProperties;
public class InvertedContrastPreview extends WebViewPreview {
@@ -75,7 +76,7 @@ public class InvertedContrastPreview extends WebViewPreview {
@Override
protected void updatePreview(boolean forceReload) {
- if (mWebView == null) return;
+ if (mWebView == null || !BrowserWebView.isClassic()) return;
WebSettingsClassic ws = WebViewClassic.fromWebView(mWebView).getSettings();
BrowserSettings bs = BrowserSettings.getInstance();