am dc743aad: Reconcile with jb-release
* commit 'dc743aad320f443f4caffbabea8dc6d3af538766':
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index eb428b8..02a398d 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Open almal in nuwe oortjies"</string>
<string name="goto_dot" msgid="3895839050522602723">"Gaan"</string>
<string name="select_dot" msgid="6299170761900561967">"Kies teks"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Maak ander oortjies toe"</string>
<string name="bookmarks" msgid="1961279134885867815">"Boekmerke"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Boekmerk"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Kies \'n boekmerk"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index b4d703b..648fbc5 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"ሁሉንም አዲስ ትር ውስጥ ክፈት"</string>
<string name="goto_dot" msgid="3895839050522602723">"ሂድ"</string>
<string name="select_dot" msgid="6299170761900561967">"ፅሁፍ ምረጥ"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"ሌሎች ትሮችን ዝጋ"</string>
<string name="bookmarks" msgid="1961279134885867815">"ዕልባቶች"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"ዕልባት"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"ዕልባት ምረጥ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 6b35260..3967824 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"فتح الكل في علامات تبويب جديدة"</string>
<string name="goto_dot" msgid="3895839050522602723">"تنفيذ"</string>
<string name="select_dot" msgid="6299170761900561967">"تحديد نص"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"إغلاق علامات التبويب الأخرى"</string>
<string name="bookmarks" msgid="1961279134885867815">"الإشارات"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"إشارة"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"اختيار إشارة مرجعية"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 65a1e88..ca7d261 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Адкрыць усё ў новых укладках"</string>
<string name="goto_dot" msgid="3895839050522602723">"Пачаць"</string>
<string name="select_dot" msgid="6299170761900561967">"Выбраць тэкст"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Закрыць іншыя ўкладкі"</string>
<string name="bookmarks" msgid="1961279134885867815">"Закладкі"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Закладка"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Выберыце закладку"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 44d7d31..2701356 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Отваряне на всички в нови раздели"</string>
<string name="goto_dot" msgid="3895839050522602723">"Старт"</string>
<string name="select_dot" msgid="6299170761900561967">"Избиране на текст"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Затваряне на другите раздели"</string>
<string name="bookmarks" msgid="1961279134885867815">"Отметки"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Отметка"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Изберете отметка"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 36cc6f5..0fa64ca 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Obre-ho tot en pestanyes noves"</string>
<string name="goto_dot" msgid="3895839050522602723">"Vés"</string>
<string name="select_dot" msgid="6299170761900561967">"Selecciona text"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Tanca les altres pestanyes"</string>
<string name="bookmarks" msgid="1961279134885867815">"Adreces d\'interès"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Adreça d\'interès"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Selecció d\'un marcador"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index c3451a0..2de95e4 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Otevřít vše na nových kartách"</string>
<string name="goto_dot" msgid="3895839050522602723">"Přejít"</string>
<string name="select_dot" msgid="6299170761900561967">"Vybrat text"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Zavřít ostatní karty"</string>
<string name="bookmarks" msgid="1961279134885867815">"Záložky"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Záložka"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Zvolte záložku"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 3dafb80..3db6dfc 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Åbn alle på nye faner"</string>
<string name="goto_dot" msgid="3895839050522602723">"Gå"</string>
<string name="select_dot" msgid="6299170761900561967">"Vælg tekst"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Luk andre faner"</string>
<string name="bookmarks" msgid="1961279134885867815">"Bogmærker"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Opret et bogmærke"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Vælg et bogmærke"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index b63199e..92d2f39 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Alle in jeweils neuem Tab öffnen"</string>
<string name="goto_dot" msgid="3895839050522602723">"Los"</string>
<string name="select_dot" msgid="6299170761900561967">"Text auswählen"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Andere Tabs schließen"</string>
<string name="bookmarks" msgid="1961279134885867815">"Lesezeichen"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Lesezeichen"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Lesezeichen auswählen"</string>
@@ -160,7 +161,7 @@
<string name="pref_autofill_profile_editor" msgid="8934844472922113166">"AutoFill-Text"</string>
<string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"AutoFill-Text für Webformulare festlegen"</string>
<string name="pref_autologin_title" msgid="4421187193809267096">"Automatische Google-Anmeldung"</string>
- <string name="pref_autologin_progress" msgid="8333244467048833461">"Anmeldung in Google Sites mit <xliff:g id="ID_1">%s</xliff:g>..."</string>
+ <string name="pref_autologin_progress" msgid="8333244467048833461">"Anmeldung bei Google-Websites mit <xliff:g id="ID_1">%s</xliff:g>..."</string>
<string name="autologin_bar_text" msgid="3684581827167173371">"Anmelden als"</string>
<string name="autologin_bar_login_text" msgid="3336615320510851879">"Anmelden"</string>
<string name="autologin_bar_hide_text" msgid="3629355974385859580">"Ausblenden"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 4e671c4..133b2bd 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Άνοιγμα όλων σε νέες καρτ."</string>
<string name="goto_dot" msgid="3895839050522602723">"Μετάβαση"</string>
<string name="select_dot" msgid="6299170761900561967">"Επιλογή κειμένου"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Κλείσιμο των άλλων καρτελών"</string>
<string name="bookmarks" msgid="1961279134885867815">"Σελιδοδείκτες"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Σελιδοδείκτης"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Επιλέξτε σελιδοδείκτη"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index b535a60..c30e38e 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Open all in new tabs"</string>
<string name="goto_dot" msgid="3895839050522602723">"Go"</string>
<string name="select_dot" msgid="6299170761900561967">"Select text"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Close other tabs"</string>
<string name="bookmarks" msgid="1961279134885867815">"Bookmarks"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Bookmark"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Choose a bookmark"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index eb6170f..379b97a 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Abrir todos en nuevas pestañas"</string>
<string name="goto_dot" msgid="3895839050522602723">"Ir"</string>
<string name="select_dot" msgid="6299170761900561967">"Seleccionar texto"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Cerrar las demás pestañas"</string>
<string name="bookmarks" msgid="1961279134885867815">"Marcadores"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Marcador"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Elige un marcador"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 9633cd2..b7293e4 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Abrir todo en pestañas nuevas"</string>
<string name="goto_dot" msgid="3895839050522602723">"Ir"</string>
<string name="select_dot" msgid="6299170761900561967">"Seleccionar texto"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Cerrar resto de pestañas"</string>
<string name="bookmarks" msgid="1961279134885867815">"Marcadores"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Marcador"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Selecciona un marcador"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 20a83e4..e6a8735 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Ava kõik uutel vahelehtedel"</string>
<string name="goto_dot" msgid="3895839050522602723">"Mine"</string>
<string name="select_dot" msgid="6299170761900561967">"Valige tekst"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Sule teised vahekaardid"</string>
<string name="bookmarks" msgid="1961279134885867815">"Järjehoidjad"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Järjehoidja"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Järjehoidja valimine"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 23ae650..129326b 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"باز کردن همه در برگههای جدید"</string>
<string name="goto_dot" msgid="3895839050522602723">"برو"</string>
<string name="select_dot" msgid="6299170761900561967">"انتخاب متن"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"بستن سایر برگهها"</string>
<string name="bookmarks" msgid="1961279134885867815">"نشانک ها"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"نشانک"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"یک نشانک انتخاب کنید"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 8e25edf..3990dc0 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Avaa kaikki uusiin välilehtiin"</string>
<string name="goto_dot" msgid="3895839050522602723">"Siirry"</string>
<string name="select_dot" msgid="6299170761900561967">"Tekstin valinta"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Sulje muut välilehdet"</string>
<string name="bookmarks" msgid="1961279134885867815">"Kirjanmerkit"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Kirjanmerkki"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Valitse kirjanmerkki"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index ca6e6e5..d4478dc 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Toujours ouvrir dans un nouvel onglet"</string>
<string name="goto_dot" msgid="3895839050522602723">"OK"</string>
<string name="select_dot" msgid="6299170761900561967">"Sélectionner le texte"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Fermer les autres onglets"</string>
<string name="bookmarks" msgid="1961279134885867815">"Favoris"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Favori"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Sélectionner un favori"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index bc1fe8e..36e45a1 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -94,6 +94,8 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"सभी को नए टैब में खोलें"</string>
<string name="goto_dot" msgid="3895839050522602723">"जाएं"</string>
<string name="select_dot" msgid="6299170761900561967">"पाठ का चयन करें"</string>
+ <!-- no translation found for close_other_tabs (7693157495148282778) -->
+ <skip />
<string name="bookmarks" msgid="1961279134885867815">"बुकमार्क"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"बुकमार्क"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"कोई बुकमार्क चुनें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 12e1b27..318801d 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Otvori sve u novim karticama"</string>
<string name="goto_dot" msgid="3895839050522602723">"Idi"</string>
<string name="select_dot" msgid="6299170761900561967">"Odabir teksta"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Zatvori ostale kartice"</string>
<string name="bookmarks" msgid="1961279134885867815">"Oznake"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Oznaka"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Odaberite oznaku"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index e239e68..074dfc0 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Összes megnyitása új lapon"</string>
<string name="goto_dot" msgid="3895839050522602723">"Ugrás"</string>
<string name="select_dot" msgid="6299170761900561967">"Szöveg kijelölése"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Többi lap bezárása"</string>
<string name="bookmarks" msgid="1961279134885867815">"Könyvjelzők"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Könyvjelző"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Válasszon egy könyvjelzőt"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index cd696ae..30919ee 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Buka semua di tab baru"</string>
<string name="goto_dot" msgid="3895839050522602723">"Buka"</string>
<string name="select_dot" msgid="6299170761900561967">"Pilih teks"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Tutup tab lain"</string>
<string name="bookmarks" msgid="1961279134885867815">"Bookmark"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Bookmark"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Pilih bookmark"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 74980d2..e6027d8 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Apri tutto in nuove schede"</string>
<string name="goto_dot" msgid="3895839050522602723">"Vai"</string>
<string name="select_dot" msgid="6299170761900561967">"Seleziona testo"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Chiudi le altre schede"</string>
<string name="bookmarks" msgid="1961279134885867815">"Segnalibri"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Segnalibro"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Scegli un segnalibro"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index ebb048a..6b2c5b8 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"פתח הכל בכרטיסיות חדשות"</string>
<string name="goto_dot" msgid="3895839050522602723">"בצע"</string>
<string name="select_dot" msgid="6299170761900561967">"בחר טקסט"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"סגור את שאר הכרטיסיות"</string>
<string name="bookmarks" msgid="1961279134885867815">"סימניות"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"הוסף לסימניות"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"בחר סימנייה"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index cd96f3d..a9e079d 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"すべて新しいタブで開く"</string>
<string name="goto_dot" msgid="3895839050522602723">"移動"</string>
<string name="select_dot" msgid="6299170761900561967">"テキストを選択してコピー"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"他のタブをすべて閉じる"</string>
<string name="bookmarks" msgid="1961279134885867815">"ブックマーク"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"ブックマーク"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"ブックマークを選択します"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 02b67e4..6a72c99 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"새 탭에서 모두 열기"</string>
<string name="goto_dot" msgid="3895839050522602723">"이동"</string>
<string name="select_dot" msgid="6299170761900561967">"텍스트 선택"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"다른 탭 닫기"</string>
<string name="bookmarks" msgid="1961279134885867815">"북마크"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"북마크"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"북마크 선택"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 992794e..92029f6 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Atidaryti visas naujuose skirtukų lapuose"</string>
<string name="goto_dot" msgid="3895839050522602723">"Pradėti"</string>
<string name="select_dot" msgid="6299170761900561967">"Pasirinkti tekstą"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Uždaryti kitus skirtukus"</string>
<string name="bookmarks" msgid="1961279134885867815">"Žymės"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Žymė"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Pasirinkite žymę"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 2caabf2..bc6d970 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Atvērt visas grāmatzīmes jaunās cilnēs"</string>
<string name="goto_dot" msgid="3895839050522602723">"Sākt"</string>
<string name="select_dot" msgid="6299170761900561967">"Atlasīt tekstu"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Aizvērt citas cilnes"</string>
<string name="bookmarks" msgid="1961279134885867815">"Grāmatzīmes"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Atzīmēt ar grāmatzīmi"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Izvēlieties grāmatzīmi"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 4ee0a0f..168b876 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Buka semua dalam tab baru"</string>
<string name="goto_dot" msgid="3895839050522602723">"Pergi"</string>
<string name="select_dot" msgid="6299170761900561967">"Pilih teks"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Tutup tab lain"</string>
<string name="bookmarks" msgid="1961279134885867815">"Penanda halaman"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Penanda halaman"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Pilih penanda halaman"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 13ad331..d353344 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Åpne alle i nye faner"</string>
<string name="goto_dot" msgid="3895839050522602723">"Gå til"</string>
<string name="select_dot" msgid="6299170761900561967">"Velg tekst"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Lukk de andre fanene"</string>
<string name="bookmarks" msgid="1961279134885867815">"Bokmerker"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Bokmerke"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Velg et bokmerke"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 6c74a4b..9b0acb1 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Alle bladwijzers openen op nieuwe tabbladen"</string>
<string name="goto_dot" msgid="3895839050522602723">"Ga"</string>
<string name="select_dot" msgid="6299170761900561967">"Tekst selecteren"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Andere tabbladen sluiten"</string>
<string name="bookmarks" msgid="1961279134885867815">"Bladwijzers"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Bladwijzer"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Een bladwijzer kiezen"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 532e361..2e881cc 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Otwórz wszystkie w nowych kartach"</string>
<string name="goto_dot" msgid="3895839050522602723">"OK"</string>
<string name="select_dot" msgid="6299170761900561967">"Zaznacz tekst"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Zamknij inne karty"</string>
<string name="bookmarks" msgid="1961279134885867815">"Zakładki"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Zakładka"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Wybierz zakładkę"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index f48ac21..3dd019a 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Abrir tudo em separadores novos"</string>
<string name="goto_dot" msgid="3895839050522602723">"Ir"</string>
<string name="select_dot" msgid="6299170761900561967">"Seleccionar texto"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Fechar os outros separadores"</string>
<string name="bookmarks" msgid="1961279134885867815">"Marcadores"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Marcador"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Escolher um marcador"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index dc79e85..4de7513 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Abrir tudo em novas guias"</string>
<string name="goto_dot" msgid="3895839050522602723">"Ir"</string>
<string name="select_dot" msgid="6299170761900561967">"Selecionar texto"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Fechar outras guias"</string>
<string name="bookmarks" msgid="1961279134885867815">"Favoritos"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Favorito"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Selecione um favorito"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 2625581..acb4569 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -128,6 +128,8 @@
<skip />
<string name="goto_dot" msgid="3895839050522602723">"Dai"</string>
<string name="select_dot" msgid="6299170761900561967">"Selecziunar text"</string>
+ <!-- no translation found for close_other_tabs (7693157495148282778) -->
+ <skip />
<string name="bookmarks" msgid="1961279134885867815">"Segnapaginas"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Segnapagina"</string>
<!-- no translation found for shortcut_bookmark_title (7570786275916681296) -->
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index c84920b..ac350ad 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -94,6 +94,7 @@
<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>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Închideţi celelalte file"</string>
<string name="bookmarks" msgid="1961279134885867815">"Marcaje"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Marcaj"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Alegeţi un marcaj"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 0b3ef6e..3173467 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Открыть все в новых вкладках"</string>
<string name="goto_dot" msgid="3895839050522602723">"Поиск"</string>
<string name="select_dot" msgid="6299170761900561967">"Выбрать текст"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Закрыть другие вкладки"</string>
<string name="bookmarks" msgid="1961279134885867815">"Закладки"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Закладка"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Выберите закладку"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index b63ef48..edb3cc5 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Otvoriť všetky na nových kartách"</string>
<string name="goto_dot" msgid="3895839050522602723">"Hľadať"</string>
<string name="select_dot" msgid="6299170761900561967">"Vybrať text"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Zavrieť ostatné karty"</string>
<string name="bookmarks" msgid="1961279134885867815">"Záložky"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Pridať medzi záložky"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Zvoľte záložku"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index bcb535f..741533d 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Odpri vse v novih zavihkih"</string>
<string name="goto_dot" msgid="3895839050522602723">"Pojdi"</string>
<string name="select_dot" msgid="6299170761900561967">"Izberi besedilo"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Zapri druge zavihke"</string>
<string name="bookmarks" msgid="1961279134885867815">"Zaznamki"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Zaznamek"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Izberite zaznamek"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 2933c21..9b46caa 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Отвори све у новим картицама"</string>
<string name="goto_dot" msgid="3895839050522602723">"Иди"</string>
<string name="select_dot" msgid="6299170761900561967">"Изабери текст"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Затвори друге картице"</string>
<string name="bookmarks" msgid="1961279134885867815">"Обележивачи"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Обележивач"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Избор обележивача"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index fc4b51b..eff36e5 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Öppna alla i nya flikar"</string>
<string name="goto_dot" msgid="3895839050522602723">"Kör"</string>
<string name="select_dot" msgid="6299170761900561967">"Markera text"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Stäng övriga flikar"</string>
<string name="bookmarks" msgid="1961279134885867815">"Bokmärken"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Bokmärke"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Välj ett bokmärke"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 7892959..0ac97e4 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Fungua zote kwenye vichupo vipya"</string>
<string name="goto_dot" msgid="3895839050522602723">"Nenda"</string>
<string name="select_dot" msgid="6299170761900561967">"Chagua maandishi"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Funga vichupo vingine"</string>
<string name="bookmarks" msgid="1961279134885867815">"Alamisho"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Alamisho"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Chagua alamisho"</string>
@@ -126,7 +127,7 @@
<string name="browser_bookmarks_page_bookmarks_text" msgid="6787605028726162673">"Alamisho"</string>
<string name="menu_preferences" msgid="6709237687234102240">"Mipangilio"</string>
<string name="pref_content_title" msgid="3834107397725342174">"Maudhui ya ukurasa"</string>
- <string name="pref_allow_apptabs" msgid="1325989799080202871">"Ruhusu vihupo vingi kwa programu moja"</string>
+ <string name="pref_allow_apptabs" msgid="1325989799080202871">"Ruhusu vichupo vingi kwa programu moja"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"Pakia picha"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"Onyesha picha kwenye kurasa za wavuti"</string>
<string name="pref_content_block_popups" msgid="4158524847764470895">"Zuia madirisha ibukizi"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index c0fabd5..82281fd 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"เปิดทั้งหมดในแท็บใหม่"</string>
<string name="goto_dot" msgid="3895839050522602723">"ไป"</string>
<string name="select_dot" msgid="6299170761900561967">"เลือกข้อความ"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"ปิดแท็บอื่นๆ ทั้งหมด"</string>
<string name="bookmarks" msgid="1961279134885867815">"บุ๊กมาร์ก"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"บุ๊กมาร์ก"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"เลือกบุ๊กมาร์ก"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 02e97c1..110501e 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Buksan lahat sa mga bagong tab"</string>
<string name="goto_dot" msgid="3895839050522602723">"Pumunta"</string>
<string name="select_dot" msgid="6299170761900561967">"Pumili ng teksto"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Isara ang ibang mga tab"</string>
<string name="bookmarks" msgid="1961279134885867815">"Mga Bookmark"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Bookmark"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Pumili ng bookmark"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 9c7451b..31f48b3 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Tümünü yeni sekmelerde aç"</string>
<string name="goto_dot" msgid="3895839050522602723">"Git"</string>
<string name="select_dot" msgid="6299170761900561967">"Metin seç"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Diğer sekmeleri kapat"</string>
<string name="bookmarks" msgid="1961279134885867815">"Favoriler"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Favori"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Bir yer işareti seçin"</string>
@@ -313,14 +314,14 @@
<string name="too_many_windows_dialog_message" msgid="3644234634638290304">"Mevcut sekmelerden birini kapatmadan yeni bir sekme açılamaz."</string>
<string name="too_many_subwindows_dialog_title" msgid="3805453941587725944">"Pop-up pencere zaten açık"</string>
<string name="too_many_subwindows_dialog_message" msgid="2164725447981195556">"Aynı anda yalnızca bir tane pop-up açık olabilir."</string>
- <string name="download_no_sdcard_dlg_title" product="nosdcard" msgid="56777245081568508">"USB dep br kullanılamıyor"</string>
+ <string name="download_no_sdcard_dlg_title" product="nosdcard" msgid="56777245081568508">"USB bellek kullanılamıyor"</string>
<string name="download_no_sdcard_dlg_title" product="default" msgid="605904452159416792">"SD kart yok"</string>
- <string name="download_no_sdcard_dlg_msg" product="nosdcard" msgid="3144652102051031721">"<xliff:g id="FILENAME">%s</xliff:g> adlı dosyanın indirilebilmesi için USB depolama birimi gerekiyor."</string>
+ <string name="download_no_sdcard_dlg_msg" product="nosdcard" msgid="3144652102051031721">"<xliff:g id="FILENAME">%s</xliff:g> adlı dosyanın indirilebilmesi için USB bellek gerekiyor."</string>
<string name="download_no_sdcard_dlg_msg" product="default" msgid="2616399456116301518">"<xliff:g id="FILENAME">%s</xliff:g> dosyasını indirmek için bir SD kart gerekli."</string>
- <string name="download_sdcard_busy_dlg_title" product="nosdcard" msgid="8081445664689818973">"USB dep br kullanılamıyor"</string>
+ <string name="download_sdcard_busy_dlg_title" product="nosdcard" msgid="8081445664689818973">"USB bellek kullanılamıyor"</string>
<string name="download_sdcard_busy_dlg_title" product="default" msgid="6877712666046917741">"SD kart kullanılamıyor"</string>
- <string name="download_sdcard_busy_dlg_msg" product="nosdcard" msgid="8412543086906716875">"USB depolama birimi meşgul. İndirme işlemlerine izin vermek için bildirim alanında USB Depolama Birimini Kapat seçeneğini dokunun."</string>
- <string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"SD kart meşgul. İndirme işlemlerine izin vermek için bildirim alanında USB Depolama Birimini Kapat seçeneğine dokunun."</string>
+ <string name="download_sdcard_busy_dlg_msg" product="nosdcard" msgid="8412543086906716875">"USB bellek meşgul. İndirme işlemlerine izin vermek için bildirim alanında USB Belleği Kapat seçeneğine dokunun."</string>
+ <string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"SD kart meşgul. İndirme işlemlerine izin vermek için bildirim alanında USB Belleği Kapat seçeneğine dokunun."</string>
<string name="cannot_download" msgid="8150552478556798780">"Yalnızca \"http\" veya \"https\" URL\'leri indirilebilir."</string>
<string name="download_pending" msgid="2599683668575349559">"İndirme işlemi başlatılıyor…"</string>
<string name="search_the_web" msgid="6046130189241962337">"Web\'de ara"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 3e41c8e..543b2a4 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Відкрити все в нових вкладках"</string>
<string name="goto_dot" msgid="3895839050522602723">"Викон."</string>
<string name="select_dot" msgid="6299170761900561967">"Вибрати текст"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Закрити інші вкладки"</string>
<string name="bookmarks" msgid="1961279134885867815">"Закладки"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Закладка"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Виберіть закладку"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 32e232d..f9ecc41 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Mở tất cả dấu trang trong tab mới"</string>
<string name="goto_dot" msgid="3895839050522602723">"Đến"</string>
<string name="select_dot" msgid="6299170761900561967">"Chọn văn bản"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Đóng các tab khác"</string>
<string name="bookmarks" msgid="1961279134885867815">"Dấu trang"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Dấu trang"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Chọn dấu trang"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index b774521..6d66205 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"在新标签页中打开全部书签"</string>
<string name="goto_dot" msgid="3895839050522602723">"转至"</string>
<string name="select_dot" msgid="6299170761900561967">"选择文本"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"关闭其他标签页"</string>
<string name="bookmarks" msgid="1961279134885867815">"书签"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"书签"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"选择书签"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 39c49b2..f6aa0eb 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"在新分頁中開啟所有書籤"</string>
<string name="goto_dot" msgid="3895839050522602723">"前往"</string>
<string name="select_dot" msgid="6299170761900561967">"選取文字"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"關閉其他分頁"</string>
<string name="bookmarks" msgid="1961279134885867815">"書籤"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"書籤"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"選擇書籤"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 1006e94..3d59639 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -94,6 +94,7 @@
<string name="open_all_in_new_window" msgid="455786763426575293">"Vula konke kwizithikithana ezintsha"</string>
<string name="goto_dot" msgid="3895839050522602723">"Hamba"</string>
<string name="select_dot" msgid="6299170761900561967">"Khetha umbhalo"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"Vala ezinye izithikithana"</string>
<string name="bookmarks" msgid="1961279134885867815">"Amabhukimakhi"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"Ibhukimakhi"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"Khetha ibhukumaka"</string>
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 8511778..4166b11 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -43,6 +43,7 @@
public static final String ACTION_SHOW_BROWSER = "show_browser";
public static final String ACTION_RESTART = "--restart--";
private static final String EXTRA_STATE = "state";
+ public static final String EXTRA_DISABLE_URL_OVERRIDE = "disable_url_override";
private final static String LOGTAG = "browser";
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index ebfd56f..eefeffe 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -2574,6 +2574,9 @@
if (data.isPreloaded()) {
// this isn't called for preloaded tabs
} else {
+ if (t != null && data.mDisableUrlOverride) {
+ t.disableUrlOverridingForLoad();
+ }
loadUrl(t, data.mUrl, data.mHeaders);
}
}
diff --git a/src/com/android/browser/DownloadHandler.java b/src/com/android/browser/DownloadHandler.java
index 1da6795..2292716 100644
--- a/src/com/android/browser/DownloadHandler.java
+++ b/src/com/android/browser/DownloadHandler.java
@@ -67,7 +67,6 @@
// that matches.
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setDataAndType(Uri.parse(url), mimetype);
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
ResolveInfo info = activity.getPackageManager().resolveActivity(intent,
PackageManager.MATCH_DEFAULT_ONLY);
if (info != null) {
diff --git a/src/com/android/browser/IntentHandler.java b/src/com/android/browser/IntentHandler.java
index e22c5dc..f0998a4 100644
--- a/src/com/android/browser/IntentHandler.java
+++ b/src/com/android/browser/IntentHandler.java
@@ -335,12 +335,14 @@
final Map<String, String> mHeaders;
final PreloadedTabControl mPreloadedTab;
final String mSearchBoxQueryToSubmit;
+ final boolean mDisableUrlOverride;
UrlData(String url) {
this.mUrl = url;
this.mHeaders = null;
this.mPreloadedTab = null;
this.mSearchBoxQueryToSubmit = null;
+ this.mDisableUrlOverride = false;
}
UrlData(String url, Map<String, String> headers, Intent intent) {
@@ -353,6 +355,12 @@
this.mHeaders = headers;
this.mPreloadedTab = preloaded;
this.mSearchBoxQueryToSubmit = searchBoxQueryToSubmit;
+ if (intent != null) {
+ mDisableUrlOverride = intent.getBooleanExtra(
+ BrowserActivity.EXTRA_DISABLE_URL_OVERRIDE, false);
+ } else {
+ mDisableUrlOverride = false;
+ }
}
boolean isEmpty() {
diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index 28734bd..7cb00d9 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -64,6 +64,7 @@
import android.webkit.WebView.PictureListener;
import android.webkit.WebViewClassic;
import android.webkit.WebViewClient;
+import android.webkit.WebViewClientClassicExt;
import android.widget.CheckBox;
import android.widget.Toast;
@@ -155,6 +156,7 @@
// If true, the tab is in page loading state (after onPageStarted,
// before onPageFinsihed)
private boolean mInPageLoad;
+ private boolean mDisableOverrideUrlLoading;
// The last reported progress of the current page
private int mPageLoadProgress;
// The time the load started, used to find load page time
@@ -322,7 +324,7 @@
// WebViewClient implementation for the main WebView
// -------------------------------------------------------------------------
- private final WebViewClient mWebViewClient = new WebViewClient() {
+ private final WebViewClientClassicExt mWebViewClient = new WebViewClientClassicExt() {
private Message mDontResend;
private Message mResend;
@@ -372,6 +374,7 @@
@Override
public void onPageFinished(WebView view, String url) {
+ mDisableOverrideUrlLoading = false;
if (!isPrivateBrowsingEnabled()) {
LogTag.logPageFinishedLoading(
url, SystemClock.uptimeMillis() - mLoadStartTime);
@@ -383,7 +386,7 @@
// return true if want to hijack the url to let another app to handle it
@Override
public boolean shouldOverrideUrlLoading(WebView view, String url) {
- if (mInForeground) {
+ if (!mDisableOverrideUrlLoading && mInForeground) {
return mWebViewController.shouldOverrideUrlLoading(Tab.this,
view, url);
} else {
@@ -1045,12 +1048,12 @@
// Subclass of WebViewClient used in subwindows to notify the main
// WebViewClient of certain WebView activities.
- private static class SubWindowClient extends WebViewClient {
+ private static class SubWindowClient extends WebViewClientClassicExt {
// The main WebViewClient.
- private final WebViewClient mClient;
+ private final WebViewClientClassicExt mClient;
private final WebViewController mController;
- SubWindowClient(WebViewClient client, WebViewController controller) {
+ SubWindowClient(WebViewClientClassicExt client, WebViewController controller) {
mClient = client;
mController = controller;
}
@@ -1894,6 +1897,10 @@
}
}
+ public void disableUrlOverridingForLoad() {
+ mDisableOverrideUrlLoading = true;
+ }
+
protected void capture() {
if (mMainView == null || mCapture == null) return;
if (mMainView.getContentWidth() <= 0 || mMainView.getContentHeight() <= 0) {
diff --git a/src/com/android/browser/UrlHandler.java b/src/com/android/browser/UrlHandler.java
index ac4b880..167d410 100644
--- a/src/com/android/browser/UrlHandler.java
+++ b/src/com/android/browser/UrlHandler.java
@@ -175,6 +175,7 @@
return false;
}
try {
+ intent.putExtra(BrowserActivity.EXTRA_DISABLE_URL_OVERRIDE, true);
if (mActivity.startActivityIfNeeded(intent, -1)) {
// before leaving BrowserActivity, close the empty child tab.
// If a new tab is created through JavaScript open to load this
diff --git a/tests/src/com/android/browser/TestWebViewClient.java b/tests/src/com/android/browser/TestWebViewClient.java
index 208a822..6ab40dd 100644
--- a/tests/src/com/android/browser/TestWebViewClient.java
+++ b/tests/src/com/android/browser/TestWebViewClient.java
@@ -25,6 +25,7 @@
import android.webkit.SslErrorHandler;
import android.webkit.WebView;
import android.webkit.WebViewClient;
+import android.webkit.WebViewClientClassicExt;
/**
*
@@ -33,7 +34,7 @@
* Wraps around existing client so that specific methods can be overridden if needed.
*
*/
-abstract class TestWebViewClient extends WebViewClient {
+abstract class TestWebViewClient extends WebViewClientClassicExt {
private WebViewClient mWrappedClient;
@@ -105,7 +106,11 @@
@Override
public void onReceivedClientCertRequest(WebView view, ClientCertRequestHandler handler,
String host_and_port) {
- mWrappedClient.onReceivedClientCertRequest(view, handler, host_and_port);
+ if (mWrappedClient instanceof WebViewClientClassicExt) {
+ ((WebViewClientClassicExt) mWrappedClient).onReceivedClientCertRequest(view, handler, host_and_port);
+ } else {
+ super.onReceivedClientCertRequest(view, handler, host_and_port);
+ }
}
/** {@inheritDoc} */