Mass merge from gingerbread - do not merge
Change-Id: Ie3a334d6d190164a4207dfbbdf035c906bf43742
diff --git a/res/drawable-hdpi/fav_incognito.png b/res/drawable-hdpi/fav_incognito.png
deleted file mode 100644
index b8acde2..0000000
--- a/res/drawable-hdpi/fav_incognito.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_chevron.png b/res/drawable-hdpi/ic_chevron.png
index 96e1afb..6dc842f 100644
--- a/res/drawable-hdpi/ic_chevron.png
+++ b/res/drawable-hdpi/ic_chevron.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_incognito_holo_dark.png b/res/drawable-hdpi/ic_incognito_holo_dark.png
index 8f7a9d4..f4997ae 100644
--- a/res/drawable-hdpi/ic_incognito_holo_dark.png
+++ b/res/drawable-hdpi/ic_incognito_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/fav_incognito.png b/res/drawable-mdpi/fav_incognito.png
deleted file mode 100644
index 6a120b9..0000000
--- a/res/drawable-mdpi/fav_incognito.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_chevron.png b/res/drawable-mdpi/ic_chevron.png
index 6804d75..786899a 100644
--- a/res/drawable-mdpi/ic_chevron.png
+++ b/res/drawable-mdpi/ic_chevron.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_incognito_holo_dark.png b/res/drawable-mdpi/ic_incognito_holo_dark.png
index e2e8b17..dfb380a 100644
--- a/res/drawable-mdpi/ic_incognito_holo_dark.png
+++ b/res/drawable-mdpi/ic_incognito_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/textfield_active_holo_dark.9.png b/res/drawable-mdpi/textfield_active_holo_dark.9.png
index d37c8b2..7ca771f 100644
--- a/res/drawable-mdpi/textfield_active_holo_dark.9.png
+++ b/res/drawable-mdpi/textfield_active_holo_dark.9.png
Binary files differ
diff --git a/res/drawable-mdpi/textfield_default_holo_dark.9.png b/res/drawable-mdpi/textfield_default_holo_dark.9.png
index ab6abdc..621d024 100644
--- a/res/drawable-mdpi/textfield_default_holo_dark.9.png
+++ b/res/drawable-mdpi/textfield_default_holo_dark.9.png
Binary files differ
diff --git a/res/drawable/url_background.xml b/res/drawable/url_background.xml
new file mode 100644
index 0000000..f719c29
--- /dev/null
+++ b/res/drawable/url_background.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<selector
+ xmlns:android="http://schemas.android.com/apk/res/android">
+ <item
+ android:state_focused="true"
+ android:drawable="@drawable/textfield_active_holo_dark" />
+ <item
+ android:state_focused="false"
+ android:drawable="@drawable/textfield_default_holo_dark" />
+</selector>
\ No newline at end of file
diff --git a/res/layout/tab_title.xml b/res/layout/tab_title.xml
index 164e9b6..e2c6d0a 100644
--- a/res/layout/tab_title.xml
+++ b/res/layout/tab_title.xml
@@ -18,43 +18,40 @@
android:orientation="horizontal">
<ImageView
android:id="@+id/chevron"
- android:layout_width="16dip"
- android:layout_height="16dip"
- android:layout_marginRight="4dip"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
android:gravity="center_vertical"
android:src="@drawable/ic_chevron"
android:visibility="gone" />
<ImageView
android:id="@+id/incognito"
- android:layout_width="16dip"
- android:layout_height="16dip"
- android:layout_marginRight="16dip"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
android:gravity="center_vertical"
- android:src="@drawable/fav_incognito"
+ android:src="@drawable/ic_incognito_holo_dark"
android:visibility="gone" />
<ImageView
android:id="@+id/favicon"
android:layout_width="20dip"
android:layout_height="20dip"
- android:layout_marginRight="16dip" />
+ android:layout_marginLeft="8dip"
+ android:layout_marginRight="8dip" />
<ImageView
android:id="@+id/lock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginRight="16dip"
android:visibility="gone" />
<TextView
android:id="@+id/title"
android:layout_height="match_parent"
android:layout_width="0dip"
android:layout_weight="1.0"
- android:layout_marginRight="16dip"
+ android:paddingLeft="8dip"
+ android:paddingRight="8dip"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/white"
android:gravity="center_vertical"
android:scrollHorizontally="true"
- android:fadingEdge="horizontal"
- android:fadingEdgeLength="24dip"
android:lines="1"
android:singleLine="true" />
<ImageButton
@@ -62,6 +59,5 @@
android:background="?android:attr/selectableItemBackground"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginRight="16dip"
android:src="@drawable/ic_tab_close" />
</merge>
diff --git a/res/layout/url_bar.xml b/res/layout/url_bar.xml
index 3a4e4bb..526e44c 100644
--- a/res/layout/url_bar.xml
+++ b/res/layout/url_bar.xml
@@ -35,7 +35,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
style="@style/HoloButton" />
- <ImageView
+ <ImageButton
android:id="@+id/stop"
android:layout_width="wrap_content"
android:layout_height="match_parent"
@@ -50,7 +50,13 @@
android:layout_marginLeft="8dip"
android:layout_marginRight="8dip"
android:orientation="horizontal"
- android:background="@drawable/textfield_default_holo_dark">
+ android:background="@drawable/url_background">
+ <ImageView
+ android:id="@+id/web_icon"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:src="@drawable/ic_web_holo_dark"
+ style="@style/HoloIcon" />
<ImageView
android:id="@+id/voice_icon"
android:layout_width="wrap_content"
@@ -66,10 +72,10 @@
android:visibility="gone" />
<com.android.browser.UrlInputView
android:id="@+id/url_focused"
+ android:focusable="true"
android:layout_width="0dip"
android:layout_weight="1.0"
android:layout_height="match_parent"
- android:layout_marginTop="12dip"
android:layout_marginLeft="16dip"
android:paddingLeft="0dip"
android:paddingRight="0dip"
@@ -83,13 +89,13 @@
android:inputType="textUri"
android:imeOptions="actionGo"
style="@style/Suggestions" />
- <ImageView
+ <ImageButton
android:id="@+id/star"
android:src="@drawable/btn_imageview_star"
android:layout_width="wrap_content"
android:layout_height="match_parent"
style="@style/HoloButton" />
- <ImageView
+ <ImageButton
android:id="@+id/clear"
android:src="@drawable/ic_stop_holo_dark"
android:layout_width="wrap_content"
@@ -104,7 +110,7 @@
android:visibility="gone"
android:gravity="center_vertical"
style="@style/HoloButton" />
- <ImageView
+ <ImageButton
android:id="@+id/voicesearch"
android:src="@drawable/ic_voice_search_holo_dark"
android:layout_width="wrap_content"
diff --git a/res/menu-xlarge/browser.xml b/res/menu-xlarge/browser.xml
index bd255ae..1b52c9a 100644
--- a/res/menu-xlarge/browser.xml
+++ b/res/menu-xlarge/browser.xml
@@ -39,7 +39,7 @@
<item android:id="@+id/view_downloads_menu_id"
android:title="@string/menu_view_download"
android:icon="@drawable/ic_downloads_holo_dark"
- android:alphabeticShortcut="d" />
+ android:alphabeticShortcut="j" />
<item android:id="@+id/preferences_menu_id"
android:title="@string/menu_preferences"
android:icon="@drawable/ic_settings_holo_dark"
@@ -77,14 +77,12 @@
android:alphabeticShortcut="7" />
<item android:id="@+id/window_eight_menu_id"
android:alphabeticShortcut="8" />
- <item android:id="@+id/back_menu_id"
- android:alphabeticShortcut="j" />
- <item android:id="@+id/forward_menu_id"
- android:alphabeticShortcut="k" />
+ <item android:id="@+id/back_menu_id" />
+ <item android:id="@+id/forward_menu_id" />
<item android:id="@+id/bookmarks_menu_id"
android:alphabeticShortcut="b" />
<item android:id="@+id/add_bookmark_menu_id"
- android:alphabeticShortcut="a" />
+ android:alphabeticShortcut="d" />
<item android:id="@+id/stop_reload_menu_id"
android:alphabeticShortcut="r" />
<item android:id="@+id/goto_menu_id"
diff --git a/res/menu/browser.xml b/res/menu/browser.xml
index 594681a..beaa8f3 100644
--- a/res/menu/browser.xml
+++ b/res/menu/browser.xml
@@ -23,8 +23,7 @@
<item android:id="@+id/bookmarks_menu_id"
android:title="@string/bookmarks"
android:alphabeticShortcut="b"
- android:icon="@drawable/ic_bookmarks_holo_dark"
- />
+ android:icon="@drawable/ic_bookmarks_holo_dark" />
<item android:id="@+id/active_tabs_menu_id"
android:title="@string/active_tabs"
android:icon="@drawable/ic_windows_holo_dark"
@@ -33,12 +32,11 @@
android:alphabeticShortcut="r" />
<item android:id="@+id/forward_menu_id"
android:title="@string/forward"
- android:alphabeticShortcut="k"
android:icon="@*android:drawable/ic_menu_forward" />
<item android:id="@+id/add_bookmark_menu_id"
android:title="@string/save_to_bookmarks"
android:icon="@drawable/ic_bookmark_on_holo_dark"
- android:alphabeticShortcut="a" />
+ android:alphabeticShortcut="d" />
<item android:id="@+id/find_menu_id"
android:title="@*android:string/find_on_page"
android:icon="@*android:drawable/ic_menu_find"
@@ -54,7 +52,7 @@
<item android:id="@+id/view_downloads_menu_id"
android:title="@string/menu_view_download"
android:icon="@drawable/ic_downloads_holo_dark"
- android:alphabeticShortcut="d" />
+ android:alphabeticShortcut="j" />
<item android:id="@+id/preferences_menu_id"
android:title="@string/menu_preferences"
android:icon="@drawable/ic_settings_holo_dark"
@@ -92,8 +90,7 @@
android:alphabeticShortcut="7" />
<item android:id="@+id/window_eight_menu_id"
android:alphabeticShortcut="8" />
- <item android:id="@+id/back_menu_id"
- android:alphabeticShortcut="j" />
+ <item android:id="@+id/back_menu_id" />
<item android:id="@+id/goto_menu_id"
android:alphabeticShortcut="l" />
<item android:id="@+id/close_menu_id"
diff --git a/res/mipmap-hdpi/ic_launcher_browser.png b/res/mipmap-hdpi/ic_launcher_browser.png
index ed7d3ce..cb7d20d 100644
--- a/res/mipmap-hdpi/ic_launcher_browser.png
+++ b/res/mipmap-hdpi/ic_launcher_browser.png
Binary files differ
diff --git a/res/mipmap-mdpi/ic_launcher_browser.png b/res/mipmap-mdpi/ic_launcher_browser.png
index 46ad0a0..f32ea3b 100644
--- a/res/mipmap-mdpi/ic_launcher_browser.png
+++ b/res/mipmap-mdpi/ic_launcher_browser.png
Binary files differ
diff --git a/res/raw/favicon_myspace.ico b/res/raw/favicon_myspace.ico
deleted file mode 100644
index 22c46be..0000000
--- a/res/raw/favicon_myspace.ico
+++ /dev/null
Binary files differ
diff --git a/res/raw/favicon_twitter.ico b/res/raw/favicon_twitter.ico
new file mode 100644
index 0000000..00450d4
--- /dev/null
+++ b/res/raw/favicon_twitter.ico
Binary files differ
diff --git a/res/raw/thumb_myspace.png b/res/raw/thumb_myspace.png
deleted file mode 100644
index d6f6e76..0000000
--- a/res/raw/thumb_myspace.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/thumb_twitter.png b/res/raw/thumb_twitter.png
new file mode 100644
index 0000000..95e247f
--- /dev/null
+++ b/res/raw/thumb_twitter.png
Binary files differ
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 7a10ed1..28eb7cf 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -202,7 +202,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"حذف الملف الشخصي"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"يستطيع المتصفح إكمال نماذج ويب مثل هذا النموذج. هل تريد إعداد ملفك الشخصي؟"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"يمكن تهيئة ميزة الملء التلقائي من خلال إعدادات المتصفح -&gt; الإعدادات الشخصية."</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"يمكن تهيئة ميزة الملء التلقائي من خلال إعدادات المتصفح -&gt; الإعدادات الشخصية."</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"الخصوصية والأمان"</string>
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"الإشارات"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"ليس هناك أي إشارات"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"اختيار الحساب"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"المزامنة مع حساب Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"لم يتم إقران إشارات Android مع حساب Google"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"إزالة إشارات Android"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 2bae0a0..adf2241 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -203,7 +203,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Изтриване на профила"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"Браузърът може автоматично да попълва уеб формуляри като този. Искате ли да настроите потребителския си профил?"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Автоматичното попълване винаги може да се конфигурира от „Настройки на браузъра“ -&gt; „Лични настройки“."</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Автоматичното попълване винаги може да се конфигурира от „Настройки на браузъра“ -&gt; „Лични настройки“."</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"Поверителност и сигурност"</string>
@@ -372,6 +372,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Отметки"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Няма отметки"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Изберете профил"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Синхронизиране с профил в Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Отметките ви в Android не са свързани с профил в Google"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Премахване на отметките ви в Android"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index c60a4ca..0fd3816 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -203,7 +203,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Suprimeix el perfil"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"El navegador pot emplenar formularis web com aquest automàticament. Vols configurar el teu perfil?"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"L\'emplenament automàtic es pot configurar en qualsevol moment mitjançant la configuració del navegador -&gt; configuració personal."</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"L\'emplenament automàtic es pot configurar en qualsevol moment mitjançant la configuració del navegador -&gt; configuració personal."</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"Privadesa i seguretat"</string>
@@ -372,6 +372,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Marcadors"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"No hi ha marcadors"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Elecció d\'un compte"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Sincronitza amb el Compte de Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Els teus marcadors d\'Android no estan associades amb un Compte de Google"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Elimina els teus marcadors d\'Android"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index ca82065..f3259be 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -202,7 +202,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Smazat profil"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"Podobné webové formuláře může prohlížeč vyplňovat automaticky. Chcete nastavit profil?"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Automatické vyplňování je možné nastavit v nabídce Nastavení prohlížeče -&gt; Osobní nastavení."</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Automatické vyplňování je možné nastavit v nabídce Nastavení prohlížeče -&gt; Osobní nastavení."</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"Ochrana osobních údajů a zabezpečení"</string>
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Záložky"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Žádné záložky k zobrazení"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Zvolit účet"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Synchronizovat s účtem Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Vaše záložky v systému Android nejsou přidruženy k účtu Google."</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Odebrat záložky systému Android"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index e6ee140..388194e 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -202,7 +202,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Slet profil"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"Browseren kan automatisk udfylde webformularer som denne. Vil du konfigurere din profil?"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"AutoFyld kan altid konfigureres i Browserindstillinger -&gt; Personlige indstillinger."</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"AutoFyld kan altid konfigureres i Browserindstillinger -&gt; Personlige indstillinger."</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"Sikkerhed og beskyttelse af personlige oplysninger"</string>
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Bogmærker"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Der er ingen bogmærker"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Vælg konto"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Synkroniser med Google-konto"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Dine Android-bogmærker er ikke tilknyttet en Google-konto"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Fjern dine Android-bogmærker"</string>
diff --git a/res/values-de-xlarge/strings.xml b/res/values-de-xlarge/strings.xml
index 84cf669..dd546b7 100644
--- a/res/values-de-xlarge/strings.xml
+++ b/res/values-de-xlarge/strings.xml
@@ -22,8 +22,7 @@
<string name="contextmenu_openlink_newwindow" msgid="1061831678814826192">"In neuem Tab öffnen"</string>
<!-- no translation found for contextmenu_openlink_newwindow_background (5625314148071601758) -->
<skip />
- <!-- no translation found for open_all_in_new_window (8498279523071618315) -->
- <skip />
+ <string name="open_all_in_new_window" msgid="8498279523071618315">"Alle in jeweils neuem Tab öffnen"</string>
<!-- no translation found for pref_content_open_in_background_summary (7653600574808720292) -->
<skip />
</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index c187589..cfcb512 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -98,8 +98,7 @@
<string name="current_page" msgid="7510129573681663135">"von "</string>
<string name="delete_bookmark_warning" msgid="758043186202032205">"Lesezeichen \"<xliff:g id="BOOKMARK">%s</xliff:g>\" wird gelöscht."</string>
<string name="open_in_new_window" msgid="6596775546468054510">"In neuem Fenster öffnen"</string>
- <!-- no translation found for open_all_in_new_window (6514602245828366045) -->
- <skip />
+ <string name="open_all_in_new_window" msgid="6514602245828366045">"Alle in jeweils neuem Fenster öffnen"</string>
<string name="goto_dot" msgid="3895839050522602723">"Los"</string>
<string name="incognito_tab" msgid="5419458065370134289">"Neuen Inkognito-Tab öffnen"</string>
<string name="select_dot" msgid="6299170761900561967">"Text auswählen"</string>
@@ -203,7 +202,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Profil löschen"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"Browser können solche Webformulare automatisch vervollständigen. Möchten Sie Ihr Profil anlegen?"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"AutoFill kann stets über \"Browsereinstellungen\" &gt; \"Persönliche Einstellungen\" konfiguriert werden."</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"AutoFill kann jederzeit über \"Browsereinstellungen\" &gt; \"Persönliche Einstellungen\" konfiguriert werden."</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"Datenschutz und Sicherheit"</string>
@@ -257,7 +256,7 @@
<string name="pref_default_zoom_dialogtitle" msgid="6095974367125109021">"Standard-Zoom"</string>
<string name="pref_content_load_page" msgid="2219810141690955452">"Seitenübersicht"</string>
<string name="pref_content_load_page_summary" msgid="8792093504054149369">"Neue Seiten in der Übersicht anzeigen"</string>
- <!-- outdated translation 3091250467679722382 --> <string name="pref_extras_title" msgid="7075456173747370647">"Erweiterte Einstellungen"</string>
+ <string name="pref_extras_title" msgid="7075456173747370647">"Erweitert"</string>
<string name="pref_extras_website_settings" msgid="67866640052455549">"Website-Einstellungen"</string>
<string name="pref_extras_website_settings_summary" msgid="1656771443223494406">"Erweiterte Einstellungen für einzelne Websites"</string>
<string name="pref_extras_reset_default_title" msgid="3579760449455761762">"Auf Standardwerte zurücksetzen"</string>
@@ -278,13 +277,11 @@
<item msgid="2193955365569270096">"Koreanisch (EUC-KR)"</item>
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Textcodierung"</string>
- <!-- outdated translation 2965318885051241044 --> <string name="pref_lab_title" msgid="5571091610359629423">"Lab"</string>
+ <string name="pref_lab_title" msgid="5571091610359629423">"Labs"</string>
<string name="pref_lab_quick_controls" msgid="2105979166017257647">"Schnellsteuerung"</string>
<string name="pref_lab_quick_controls_summary" msgid="8025196176636589803">"Daumen zum Zugriff auf Schnellsteuerung von linker oder rechte Ecke ziehen"</string>
- <!-- no translation found for pref_lab_most_visited_homepage (547134501893835512) -->
- <skip />
- <!-- no translation found for pref_lab_most_visited_homepage_summary (6857702350834122532) -->
- <skip />
+ <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"Startseite - am häufigsten besucht"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Legt fest, dass auf der Starts. die am häufigsten besuchten Seiten angez. werden"</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Datenverbindungsproblem"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Problem mit Datei"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Bestätigen"</string>
@@ -374,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Lesezeichen"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Es sind keine Lesezeichen vorhanden."</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Konto wählen"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Mit Google-Konto synchronisieren"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Ihre Android-Lesezeichen sind mit keinem Google-Konto verknüpft."</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Android-Lesezeichen entfernen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 5eb13b9..ed46098 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -202,7 +202,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Διαγραφή προφίλ"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"Το πρόγραμμα περιήγησης μπορεί να ολοκληρώσει αυτόματα φόρμες ιστού σαν αυτήν. Θα θέλατε να δημιουργήσετε το δικό σας προφίλ;"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Είναι πάντοτε δυνατή η διαμόρφωση της Αυτόματης συμπλήρωσης μέσω των επιλογών Ρυθμίσεις προγράμματος περιήγησης -&gt; Προσωπικές ρυθμίσεις"</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Είναι πάντοτε δυνατή η διαμόρφωση της Αυτόματης συμπλήρωσης μέσω των επιλογών Ρυθμίσεις προγράμματος περιήγησης -&gt; Προσωπικές ρυθμίσεις"</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"Απόρρητο και Ασφάλεια"</string>
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Σελιδοδείκτες"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Δεν υπάρχουν σελιδοδείκτες"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Επιλέξτε λογαριασμό"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Συγχρον. με Λογαριασμό Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Οι σελιδοδείκτες σας Android δεν σχετίζονται με κάποιον Λογαριασμό Google"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Καταργήστε τους σελιδοδείκτες σας Android"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 1154ebf..e6abbb5 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -202,7 +202,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Delete profile"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"Browser can complete web forms like this one automatically. Would you like to set up your profile?"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Auto-Fill can always be configured through Browser Settings -&gt; Personal Settings."</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Auto-Fill can always be configured through Browser Settings -&gt; Personal Settings."</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"Privacy & Security"</string>
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Bookmarks"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"There are no bookmarks"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Choose Account"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Sync with Google account"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Your Android bookmarks are not associated with a Google account"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Remove your Android bookmarks"</string>
diff --git a/res/values-es-rUS-xlarge/strings.xml b/res/values-es-rUS-xlarge/strings.xml
index e2a260a..93a693b 100644
--- a/res/values-es-rUS-xlarge/strings.xml
+++ b/res/values-es-rUS-xlarge/strings.xml
@@ -20,8 +20,7 @@
<string name="new_incognito_tab" msgid="5149742197322201152">"Nueva pestaña de incógnito"</string>
<string name="active_tabs" msgid="5324492165541331128">"Pestañas"</string>
<string name="contextmenu_openlink_newwindow" msgid="1061831678814826192">"Abrir en una ventana nueva"</string>
- <!-- no translation found for contextmenu_openlink_newwindow_background (5625314148071601758) -->
- <skip />
+ <!-- outdated translation 8630182574181104587 --> <string name="contextmenu_openlink_newwindow_background" msgid="5625314148071601758">"Abrir en una nueva pestaña en segundo plano"</string>
<string name="open_all_in_new_window" msgid="8498279523071618315">"Abrir todos en pestañas nuevas"</string>
<!-- no translation found for pref_content_open_in_background_summary (7653600574808720292) -->
<skip />
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index c4ebf13..b8eda3d 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -117,8 +117,7 @@
<string name="contextheader_folder_empty" msgid="974171637803391651">"Vaciar carpeta"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"Abrir"</string>
<string name="contextmenu_openlink_newwindow" msgid="992765050093960353">"Abrir en una ventana nueva"</string>
- <!-- no translation found for contextmenu_openlink_newwindow_background (5556131402560251639) -->
- <skip />
+ <!-- outdated translation 7697600654413234206 --> <string name="contextmenu_openlink_newwindow_background" msgid="5556131402560251639">"Abrir en una nueva ventana en segundo plano"</string>
<string name="contextmenu_savelink" msgid="5508554930832538184">"Guardar enlace"</string>
<string name="contextmenu_sharelink" msgid="5392275392280130331">"Compartir vínculo"</string>
<string name="contextmenu_copy" msgid="398860586635404030">"Copiar"</string>
@@ -171,10 +170,8 @@
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"Completa formularios web con un clic"</string>
<string name="pref_autofill_profile_editor" msgid="1350709161524642663">"Configuración de autollenado"</string>
<string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"Configurar y administrar datos para los formularios de autollenado"</string>
- <!-- no translation found for pref_autologin_title (2362827272595366379) -->
- <skip />
- <!-- no translation found for pref_autologin_no_account (4409223615542478868) -->
- <skip />
+ <!-- outdated translation 7521451742003302656 --> <string name="pref_autologin_title" msgid="2362827272595366379">"Acceso automático a Google"</string>
+ <!-- outdated translation 1153514574092102114 --> <string name="pref_autologin_no_account" msgid="4409223615542478868">"No se encontraron las cuentas"</string>
<!-- no translation found for pref_autologin_summary (8168866316823968574) -->
<skip />
<!-- no translation found for pref_autologin_progress (8643826219376543293) -->
@@ -194,17 +191,14 @@
<string name="autofill_profile_editor_zip_code" msgid="283668573295656671">"Código postal:"</string>
<string name="autofill_profile_editor_country" msgid="7234470301239156656">"País:"</string>
<string name="autofill_profile_editor_phone_number" msgid="4938852821413729276">"Teléfono:"</string>
- <!-- no translation found for autofill_profile_editor_phone_number_invalid (7166394872369167580) -->
- <skip />
+ <!-- outdated translation 3319040244965497585 --> <string name="autofill_profile_editor_phone_number_invalid" msgid="7166394872369167580">"Número de teléfono no válido"</string>
<string name="autofill_profile_editor_save_profile" msgid="8349915287435262888">"Guardar perfil"</string>
<string name="autofill_profile_successful_save" msgid="6834102203944938409">"Perfil guardado"</string>
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"Perfil eliminado"</string>
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Eliminar perfil"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"El navegador puede completar formularios web como este de forma automática. ¿Deseas configurar tu perfil?"</string>
- <!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Autocomp se conf en cualq mom. c Conf del naveg -&gt; Conf pnal"</string>
- <!-- no translation found for disable_autofill (3706426217720202898) -->
- <skip />
+ <!-- outdated translation 8290973940003625025 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Autocomp. se configura en cualquier momento con Configuración del navegador."</string>
+ <!-- outdated translation 7984096318749960909 --> <string name="disable_autofill" msgid="3706426217720202898">"Inhabilitar Autocompl."</string>
<string name="pref_privacy_security_title" msgid="1705642466867300373">"Privacidad y seguridad"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Borrar memoria caché"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Borrar el contenido y las bases de datos de la memoria caché local"</string>
@@ -371,6 +365,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Marcadores"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"No hay ningún marcador"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Seleccionar la cuenta"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Sincronización con cta de Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Tus favoritos de Android no están asociados con una cuenta de Google."</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Eliminar tus favoritos de Android"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index deb3e82..543e02e 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -202,7 +202,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Eliminar perfil"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"El navegador puede completar de forma automática formularios web como este. ¿Te gustaría configurar tu perfil?"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"La función Autocompletar se puede configurar en cualquier momento a través de Ajustes del navegador -&gt; Configuración personal."</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"La función Autocompletar se puede configurar en cualquier momento a través de Ajustes del navegador -&gt; Configuración personal."</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"Privacidad y seguridad"</string>
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Marcadores"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"No hay ningún marcador."</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Elegir cuenta"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Sincronizar con cuenta de Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Tus marcadores de Android no se han asociado a una cuenta de Google."</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Eliminar los marcadores de Android"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index ef185ef..3f56b4b 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -203,7 +203,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"حذف نمایه"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"مرورگر می تواند بصورت خودکار فرم های وب مانند این یکی را پر کند. دوست دارید نمایه خود را تنظیم کنید؟"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"تکمیل خودکار را همیشه می توان از طریق تنظیمات مرورگر -&gt; تنظیمات شخصی پیکربندی کرد."</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"تکمیل خودکار را همیشه می توان از طریق تنظیمات مرورگر -&gt; تنظیمات شخصی پیکربندی کرد."</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"حریم خصوصی و ایمنی"</string>
@@ -372,6 +372,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"نشانک ها"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"نشانکی وجود ندارد"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"انتخاب حساب"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"همگام سازی با حساب Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"نشانک های Android شما با حساب Google مرتبط نیستند"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"حذف نشانک های Android خود"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 1e1fc55..9767321 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -202,7 +202,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Poista profiili"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"Selain voi täydentää automaattisesti tämän kaltaisia verkkolomakkeita. Haluatko luoda profiilin?"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Automaattisen täytön asetuksia voi aina muokata kohdassa Selaimen asetukset &gt; Omat asetukset."</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Automaattisen täytön asetuksia voi aina muokata kohdassa Selaimen asetukset &gt; Omat asetukset."</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"Tietosuoja ja turvallisuus"</string>
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Kirjanmerkit"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Ei kirjanmerkkejä"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Valitse tili"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Synkronoi Google-tilin kanssa"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Android-kirjanmerkkejä ei ole yhdistetty Google-tiliin"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Poista Android-kirjanmerkkisi"</string>
diff --git a/res/values-fr-xlarge/strings.xml b/res/values-fr-xlarge/strings.xml
index 5084af6..50c6228 100644
--- a/res/values-fr-xlarge/strings.xml
+++ b/res/values-fr-xlarge/strings.xml
@@ -22,8 +22,7 @@
<string name="contextmenu_openlink_newwindow" msgid="1061831678814826192">"Ouvrir dans un nouvel onglet"</string>
<!-- no translation found for contextmenu_openlink_newwindow_background (5625314148071601758) -->
<skip />
- <!-- no translation found for open_all_in_new_window (8498279523071618315) -->
- <skip />
+ <string name="open_all_in_new_window" msgid="8498279523071618315">"Toujours ouvrir dans un nouvel onglet"</string>
<!-- no translation found for pref_content_open_in_background_summary (7653600574808720292) -->
<skip />
</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 4f5e361..da9de24 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -98,8 +98,7 @@
<string name="current_page" msgid="7510129573681663135">"de "</string>
<string name="delete_bookmark_warning" msgid="758043186202032205">"Le favori \"<xliff:g id="BOOKMARK">%s</xliff:g>\" sera supprimé."</string>
<string name="open_in_new_window" msgid="6596775546468054510">"Nouvelle fenêtre"</string>
- <!-- no translation found for open_all_in_new_window (6514602245828366045) -->
- <skip />
+ <string name="open_all_in_new_window" msgid="6514602245828366045">"Toujours ouvrir dans une nouvelle fenêtre"</string>
<string name="goto_dot" msgid="3895839050522602723">"OK"</string>
<string name="incognito_tab" msgid="5419458065370134289">"Ouvrir un onglet de navigation privée"</string>
<string name="select_dot" msgid="6299170761900561967">"Sélectionner le texte"</string>
@@ -203,7 +202,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Supprimer le profil"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"Le navigateur peut remplir automatiquement des formulaires Web tels que celui-ci. Voulez-vous configurer votre profil ?"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Vous pouvez configurer la saisie automatique à tout moment dans Paramètres du navigateur -&gt; Paramètres personnels."</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Vous pouvez configurer la saisie automatique à tout moment dans Paramètres du navigateur -&gt; Paramètres personnels."</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"Confidentialité et sécurité"</string>
@@ -257,7 +256,7 @@
<string name="pref_default_zoom_dialogtitle" msgid="6095974367125109021">"Zoom par défaut"</string>
<string name="pref_content_load_page" msgid="2219810141690955452">"Aperçu des pages"</string>
<string name="pref_content_load_page_summary" msgid="8792093504054149369">"Afficher un aperçu des pages ouvertes récemment"</string>
- <!-- outdated translation 3091250467679722382 --> <string name="pref_extras_title" msgid="7075456173747370647">"Paramètres avancés"</string>
+ <string name="pref_extras_title" msgid="7075456173747370647">"Options avancées"</string>
<string name="pref_extras_website_settings" msgid="67866640052455549">"Paramètres du site Web"</string>
<string name="pref_extras_website_settings_summary" msgid="1656771443223494406">"Paramètres avancés de sites Web individuels"</string>
<string name="pref_extras_reset_default_title" msgid="3579760449455761762">"Réinitialiser les valeurs par défaut"</string>
@@ -278,13 +277,11 @@
<item msgid="2193955365569270096">"Coréen (EUC-KR)"</item>
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Codage du texte"</string>
- <!-- outdated translation 2965318885051241044 --> <string name="pref_lab_title" msgid="5571091610359629423">"Lab"</string>
+ <string name="pref_lab_title" msgid="5571091610359629423">"Labs"</string>
<string name="pref_lab_quick_controls" msgid="2105979166017257647">"Commandes rapides"</string>
<string name="pref_lab_quick_controls_summary" msgid="8025196176636589803">"Glisser votre pouce vers la droite ou la gauche pour accéder aux commandes rapides"</string>
- <!-- no translation found for pref_lab_most_visited_homepage (547134501893835512) -->
- <skip />
- <!-- no translation found for pref_lab_most_visited_homepage_summary (6857702350834122532) -->
- <skip />
+ <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"Page d\'accueil Les plus visitées"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Votre page d\'accueil affiche les pages les plus visitées."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Problème de connectivité des données"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Problème de fichier"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Confirmer"</string>
@@ -374,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Favoris"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Aucun favori"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Choisir un compte"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Synchronisation avec un compte Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Vos favoris Android ne sont associés à aucun compte Google."</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Supprimer vos favoris Android"</string>
diff --git a/res/values-hr-xlarge/strings.xml b/res/values-hr-xlarge/strings.xml
index 1e8c83b..1a1f91e 100644
--- a/res/values-hr-xlarge/strings.xml
+++ b/res/values-hr-xlarge/strings.xml
@@ -22,8 +22,7 @@
<string name="contextmenu_openlink_newwindow" msgid="1061831678814826192">"Otvori u novoj kartici"</string>
<!-- no translation found for contextmenu_openlink_newwindow_background (5625314148071601758) -->
<skip />
- <!-- no translation found for open_all_in_new_window (8498279523071618315) -->
- <skip />
+ <string name="open_all_in_new_window" msgid="8498279523071618315">"Otvori sve na novim karticama"</string>
<!-- no translation found for pref_content_open_in_background_summary (7653600574808720292) -->
<skip />
</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 3dc0471..10b5924 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -99,8 +99,7 @@
<string name="current_page" msgid="7510129573681663135">"s lokacije "</string>
<string name="delete_bookmark_warning" msgid="758043186202032205">"Oznaka \"<xliff:g id="BOOKMARK">%s</xliff:g>\" izbrisat će se."</string>
<string name="open_in_new_window" msgid="6596775546468054510">"Otvori u novom prozoru"</string>
- <!-- no translation found for open_all_in_new_window (6514602245828366045) -->
- <skip />
+ <string name="open_all_in_new_window" msgid="6514602245828366045">"Otvori sve u novim prozorima"</string>
<string name="goto_dot" msgid="3895839050522602723">"Idi"</string>
<string name="incognito_tab" msgid="5419458065370134289">"Otvori novu karticu anonimno"</string>
<string name="select_dot" msgid="6299170761900561967">"Odabir teksta"</string>
@@ -204,7 +203,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Izbriši profil"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"Preglednik može automatski popunjavati web-obrasce poput ovog. Želite li postaviti svoj profil?"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Automatsko popunjavanje uvijek se može konfigurirati putem Postavki preglednika -&gt; Osobnih postavki."</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Automatsko popunjavanje uvijek se može konfigurirati putem Postavki preglednika -&gt; Osobnih postavki."</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"Privatnost i sigurnost"</string>
@@ -258,7 +257,7 @@
<string name="pref_default_zoom_dialogtitle" msgid="6095974367125109021">"Zadano povećanje/smanjenje"</string>
<string name="pref_content_load_page" msgid="2219810141690955452">"Otvori stranice u pregledu"</string>
<string name="pref_content_load_page_summary" msgid="8792093504054149369">"Pokaži pregled novootvorenih stranica"</string>
- <!-- outdated translation 3091250467679722382 --> <string name="pref_extras_title" msgid="7075456173747370647">"Napredne postavke"</string>
+ <string name="pref_extras_title" msgid="7075456173747370647">"Napredno"</string>
<string name="pref_extras_website_settings" msgid="67866640052455549">"Postavke web-lokacije"</string>
<string name="pref_extras_website_settings_summary" msgid="1656771443223494406">"Napredne postavke za pojedinačne web-lokacije"</string>
<string name="pref_extras_reset_default_title" msgid="3579760449455761762">"Vrati na zadano"</string>
@@ -279,13 +278,11 @@
<item msgid="2193955365569270096">"korejski (EUC-KR)"</item>
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Kodiranje teksta"</string>
- <!-- outdated translation 2965318885051241044 --> <string name="pref_lab_title" msgid="5571091610359629423">"Laboratorij"</string>
+ <string name="pref_lab_title" msgid="5571091610359629423">"Labs"</string>
<string name="pref_lab_quick_controls" msgid="2105979166017257647">"Brze kontrole"</string>
<string name="pref_lab_quick_controls_summary" msgid="8025196176636589803">"Pomaknite se slijeva ili zdesna kako biste pristupili brzim kontrolama"</string>
- <!-- no translation found for pref_lab_most_visited_homepage (547134501893835512) -->
- <skip />
- <!-- no translation found for pref_lab_most_visited_homepage_summary (6857702350834122532) -->
- <skip />
+ <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"Najposjećenija početna stranica"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Na vašoj početnoj stranici postavlja najposjećenije stranice."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Problem s podatkovnom povezivošću"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Problem s datotekom"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Potvrdi"</string>
@@ -375,6 +372,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Oznake"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Nema oznaka"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Odaberite Račun"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Sinkronizacija s Google Računom"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Vaše Android oznake nisu povezane s Google Računom"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Izbrišite oznake programa Android"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index cf869b3..aca9dc4 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -202,7 +202,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Profil törlése"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"A böngésző automatikusan ki tudja tölteni az ilyen internetes űrlapokat. Beállítja a profilját?"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Az Automatikus kitöltést bármikor beállíthatja a Böngésző beállításai -&gt; Személyes beállítások menüpontban."</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Az Automatikus kitöltést bármikor beállíthatja a Böngésző beállításai -&gt; Személyes beállítások menüpontban."</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"Adatvédelem és biztonság"</string>
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Könyvjelzők"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Nincsenek könyvjelzők"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Fiók kiválasztása"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Szinkronizálás Google Fiókkal"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Androidos könyvjelzői nincsenek Google Fiókhoz társítva"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Az Androidos könyvjelzők törlése"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index dcfdf15..3913128 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -203,7 +203,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Hapus profil"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"Peramban dapat melengkapi formulir web seperti ini. Apakah Anda ingin menyiapkan profil?"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"IsiOtomatis dapat dikonfigurasi melalui Setelan Peramban -&gt; Setelan Pribadi."</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"IsiOtomatis dapat dikonfigurasi melalui Setelan Peramban -&gt; Setelan Pribadi."</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"Privasi & Keamanan"</string>
@@ -372,6 +372,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Bookmark"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Tidak ada bookmark"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Pilih Akun"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Sinkronkan dengan akun Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Bookmark Android Anda tidak terkait dengan akun Google"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Hapus bookmark Android Anda"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 5429a75..6373249 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -202,7 +202,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Elimina profilo"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"Il browser può compilare automaticamente i moduli web come questo. Vuoi impostare il tuo profilo?"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"La funzione Compilazione automatica può essere sempre configurata da Impostazioni browser -&gt; Impostazioni personali."</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"La funzione Compilazione automatica può essere sempre configurata da Impostazioni browser -&gt; Impostazioni personali."</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"Privacy e sicurezza"</string>
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Segnalibri"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Nessun segnalibro disponibile"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Scegli account"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Sincronizza con l\'account Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"I tuoi Segnalibri Android non sono associati a un account Google"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Rimuovi i tuoi Segnalibri Android"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 8a4dcd5..eb2a7c5 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -202,7 +202,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"מחק את הפרופיל"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"הדפדפן יכול למלא טופסי אינטרנט כמו זה באופן אוטומטי. האם תרצה להגדיר את הפרופיל שלך?"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"ניתן להגדיר \'מילוי אוטומטי\' באמצעות \'הגדרות דפדפן\' -&gt; \'הגדרות אישיות\'."</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"ניתן תמיד להגדיר \'מילוי אוטומטי\' באמצעות \'הגדרות דפדפן\' -&gt; \'הגדרות אישיות\'."</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"פרטיות ואבטחה"</string>
@@ -277,7 +277,7 @@
<item msgid="2193955365569270096">"קוריאנית (EUC-KR)"</item>
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"קידוד טקסט"</string>
- <string name="pref_lab_title" msgid="5571091610359629423">"מעבדות"</string>
+ <string name="pref_lab_title" msgid="5571091610359629423">"Labs"</string>
<string name="pref_lab_quick_controls" msgid="2105979166017257647">"פקדים מהירים"</string>
<string name="pref_lab_quick_controls_summary" msgid="8025196176636589803">"החלק את האגודל מהקצה הימני או השמאלי כדי לגשת לפקדים המהירים"</string>
<string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"דף הבית הפופולרי ביותר"</string>
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"סימניות"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"אין סימניות"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"בחר חשבון"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"סנכרן עם חשבון Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"סימניות Android שלך אינן משויכות לחשבון Google"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"הסר את הסימניות של Android"</string>
diff --git a/res/values-ja-xlarge/strings.xml b/res/values-ja-xlarge/strings.xml
index bc25dc9..a3dd654 100644
--- a/res/values-ja-xlarge/strings.xml
+++ b/res/values-ja-xlarge/strings.xml
@@ -22,8 +22,7 @@
<string name="contextmenu_openlink_newwindow" msgid="1061831678814826192">"新しいタブで開く"</string>
<!-- no translation found for contextmenu_openlink_newwindow_background (5625314148071601758) -->
<skip />
- <!-- no translation found for open_all_in_new_window (8498279523071618315) -->
- <skip />
+ <string name="open_all_in_new_window" msgid="8498279523071618315">"常に新しいタブで開く"</string>
<!-- no translation found for pref_content_open_in_background_summary (7653600574808720292) -->
<skip />
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index dc72c09..db2d9e5 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -98,8 +98,7 @@
<string name="current_page" msgid="7510129573681663135">"URL "</string>
<string name="delete_bookmark_warning" msgid="758043186202032205">"ブックマーク「<xliff:g id="BOOKMARK">%s</xliff:g>」を削除します。"</string>
<string name="open_in_new_window" msgid="6596775546468054510">"新しいウィンドウで開く"</string>
- <!-- no translation found for open_all_in_new_window (6514602245828366045) -->
- <skip />
+ <string name="open_all_in_new_window" msgid="6514602245828366045">"常に新しいウィンドウで開く"</string>
<string name="goto_dot" msgid="3895839050522602723">"移動"</string>
<string name="incognito_tab" msgid="5419458065370134289">"新しいシークレットタブを開く"</string>
<string name="select_dot" msgid="6299170761900561967">"テキストを選択してコピー"</string>
@@ -203,7 +202,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"プロフィールを削除"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"このようなウェブフォームにブラウザで自動入力できます。プロフィールを設定しますか？"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"自動入力はいつでも[ブラウザ設定] -&gt; [個人設定]から設定できます。"</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"自動入力はいつでも[ブラウザ設定]-&gt;[個人設定]から設定できます。"</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"プライバシーとセキュリティ"</string>
@@ -257,7 +256,7 @@
<string name="pref_default_zoom_dialogtitle" msgid="6095974367125109021">"デフォルトの倍率"</string>
<string name="pref_content_load_page" msgid="2219810141690955452">"ページを全体表示で開く"</string>
<string name="pref_content_load_page_summary" msgid="8792093504054149369">"新しく開いたページを全体表示する"</string>
- <!-- outdated translation 3091250467679722382 --> <string name="pref_extras_title" msgid="7075456173747370647">"詳細設定"</string>
+ <string name="pref_extras_title" msgid="7075456173747370647">"高度な設定"</string>
<string name="pref_extras_website_settings" msgid="67866640052455549">"ウェブサイト設定"</string>
<string name="pref_extras_website_settings_summary" msgid="1656771443223494406">"個々のウェブサイトの詳細設定"</string>
<string name="pref_extras_reset_default_title" msgid="3579760449455761762">"初期設定にリセット"</string>
@@ -278,13 +277,11 @@
<item msgid="2193955365569270096">"韓国語（EUC-KR）"</item>
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"テキストエンコード"</string>
- <!-- outdated translation 2965318885051241044 --> <string name="pref_lab_title" msgid="5571091610359629423">"Labs"</string>
+ <string name="pref_lab_title" msgid="5571091610359629423">"Labs"</string>
<string name="pref_lab_quick_controls" msgid="2105979166017257647">"クイックコントロール"</string>
<string name="pref_lab_quick_controls_summary" msgid="8025196176636589803">"クイックコントロールにアクセスするには左端または右端から親指をスワイプします"</string>
- <!-- no translation found for pref_lab_most_visited_homepage (547134501893835512) -->
- <skip />
- <!-- no translation found for pref_lab_most_visited_homepage_summary (6857702350834122532) -->
- <skip />
+ <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"アクセス数が最も多いホームページ"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"アクセス数が最も多いページが表示されるようにホームページを設定します。"</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"データアクセスエラー"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"ファイルに問題があります"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"確認"</string>
@@ -374,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"ブックマーク"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"ブックマークはありません"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"アカウントの選択"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Googleアカウントと同期"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"AndroidのブックマークはGoogleアカウントに関連付けられていません"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Androidのブックマークを削除"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index bbfc21c..3d66b0b 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -202,7 +202,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"프로필 삭제"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"브라우저에서 이 양식과 같은 웹 양식을 자동으로 완성할 수 있습니다. 프로필을 설정하시겠습니까?"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"브라우저 설정 -&gt; 개인 설정에서 언제든지 자동완성을 구성할 수 있습니다."</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"브라우저 설정 -&gt; 개인 설정에서 언제든지 자동완성을 구성할 수 있습니다."</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"개인정보 보호 및 보안"</string>
@@ -259,11 +259,11 @@
<string name="pref_extras_title" msgid="7075456173747370647">"고급"</string>
<string name="pref_extras_website_settings" msgid="67866640052455549">"웹사이트 설정"</string>
<string name="pref_extras_website_settings_summary" msgid="1656771443223494406">"개별 웹사이트의 고급 설정"</string>
- <string name="pref_extras_reset_default_title" msgid="3579760449455761762">"기본값 재설정"</string>
- <string name="pref_extras_reset_default" msgid="8904000515846202110">"기본값으로 재설정"</string>
+ <string name="pref_extras_reset_default_title" msgid="3579760449455761762">"초기화"</string>
+ <string name="pref_extras_reset_default" msgid="8904000515846202110">"초기화"</string>
<string name="pref_extras_reset_default_summary" msgid="4247870778270414501">"기본 설정값 복원"</string>
<string name="pref_extras_reset_default_dlg" msgid="6640261575874704022">"설정이 기본값으로 되돌아갑니다."</string>
- <string name="pref_extras_reset_default_dlg_title" msgid="2250334970728938936">"기본값으로 재설정"</string>
+ <string name="pref_extras_reset_default_dlg_title" msgid="2250334970728938936">"초기화"</string>
<string name="pref_development_title" msgid="3263854204533056480">"디버그"</string>
<string name="pref_default_text_encoding" msgid="5742965543955558478">"텍스트 인코딩"</string>
<string-array name="pref_default_text_encoding_choices">
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"북마크"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"북마크가 없습니다."</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"계정 선택"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Google 계정과 동기화"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"사용자의 Android 북마크는 Google 계정과 연결되지 않았습니다."</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Android 북마크 삭제"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 1a0a598..e776b55 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -203,7 +203,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Ištrinti profilį"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"Naršyklė gali automatiškai užpildyti į šią panašias žiniatinklio formas. Ar norite nustatyti profilį?"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Automatinį pildymą visada galima konfigūruoti apsilankius skiltyje „Naršyklės nustatymai“ -&gt; „Asmeniniai nustatymai“."</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Automatinį pildymą visada galima konfigūruoti apsilankius skiltyje „Naršyklės nustatymai“ -&gt; „Asmeniniai nustatymai“."</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"Privatumas ir sauga"</string>
@@ -372,6 +372,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Žymės"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Nėra žymių"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Pasirinkite paskyrą"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Sinchron. su „Google“ paskyra"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"„Android“ žymės nėra susietos su „Google“ paskyra"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Pašalinti „Android“ žymes"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 9599c56..459bcb3 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -203,7 +203,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Dzēst profilu"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"Pārlūkprogramma var automātiski aizpildīt šāda veida tīmekļa veidlapas. Vai vēlaties iestatīt savu profilu?"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Automātisko aizpildi vienmēr var konfigurēt sadaļā Pārlūkprogrammas iestatījumi -&gt; Personiskie iestatījumi."</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Automātisko aizpildi vienmēr var konfigurēt sadaļā Pārlūkprogrammas iestatījumi -&gt; Personiskie iestatījumi."</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"Konfidencialitāte un drošība"</string>
@@ -372,6 +372,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Grāmatzīmes"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Nav nevienas grāmatzīmes."</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Izvēlieties kontu."</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Sinhronizācija ar Google kontu"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Jūsu Android grāmatzīmes nav saistītas ar jūsu Google kontu."</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Noņemt Android grāmatzīmes"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 634b623..23480a3 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -202,7 +202,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Slett profil"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"Nettleseren kan automatisk fylle ut slike nettskjemaer. Vil du konfigurere profilen din?"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Autofyll kan alltid konfigureres gjennom Nettleserinnstillinger -&gt; Personlige innstillinger."</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Autofyll kan alltid konfigureres gjennom Nettleserinnstillinger -&gt; Personlige innstillinger."</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"Personvern og sikkerhet"</string>
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Bokmerker"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Det er ingen bokmerker"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Velg konto"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Synkroniser med Google-konto"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Dine Android-bokmerker er ikke tilknyttet en Google-konto"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Fjern Android-bokmerkene"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index c88e621..ea00997 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -202,7 +202,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Profiel verwijderen"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"De browser kan webformulieren zoals dit formulier automatisch invullen. Wilt u uw profiel instellen?"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Automatisch aanvullen kan altijd worden geconfigureerd via \'Browserinstellingen\' -&gt; \'Persoonlijke instellingen\'."</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Automatisch aanvullen kan altijd worden geconfigureerd via \'Browserinstellingen\' -&gt; \'Persoonlijke instellingen\'."</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"Privacy en beveiliging"</string>
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Bladwijzers"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Er zijn geen bladwijzers"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"J1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Account kiezen"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Synchroniseren met Google-account"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Uw Android-bladwijzers zijn niet gekoppeld aan een Google-account"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Uw Android-bladwijzers verwijderen"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 6ef0905..83d5827 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -202,7 +202,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Usuń profil"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"Takie formularze internetowe mogą być automatycznie wypełniane w przeglądarce. Czy chcesz skonfigurować swój profil?"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Autouzupełnianie można zawsze skonfigurować, wybierając kolejno opcje Ustawienia przeglądarki -&gt; Ustawienia osobiste."</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Autouzupełnianie można zawsze skonfigurować, wybierając kolejno opcje Ustawienia przeglądarki -&gt; Ustawienia osobiste."</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"Prywatność i bezpieczeństwo"</string>
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Zakładki"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Brak zakładek"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Wybierz konto"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Synchronizuj z kontem Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Zakładki w systemie Android nie są powiązane z kontem Google"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Usuń zakładki w systemie Android"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 5f991e1..07c40c0 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -202,7 +202,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Eliminar perfil"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"O navegador pode preencher automaticamente os formulários Web deste tipo. Pretende configurar o seu perfil?"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"O preenchimento automático pode ser configurado através de Definições do navegador -&gt; Definições pessoais."</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"O preenchimento automático pode ser configurado através de Definições do navegador -&gt; Definições pessoais."</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"Privacidade e segurança"</string>
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Marcadores"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Não existem marcadores"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Escolher conta"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Sincronizar com conta Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Os seus marcadores do Android não estão associados a uma conta Google"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Remover marcadores do Android"</string>
diff --git a/res/values-pt-xlarge/strings.xml b/res/values-pt-xlarge/strings.xml
index 5ba2aee..c4747e0 100644
--- a/res/values-pt-xlarge/strings.xml
+++ b/res/values-pt-xlarge/strings.xml
@@ -22,8 +22,7 @@
<string name="contextmenu_openlink_newwindow" msgid="1061831678814826192">"Abrir em uma nova guia"</string>
<!-- no translation found for contextmenu_openlink_newwindow_background (5625314148071601758) -->
<skip />
- <!-- no translation found for open_all_in_new_window (8498279523071618315) -->
- <skip />
+ <string name="open_all_in_new_window" msgid="8498279523071618315">"Abrir todos em novas abas"</string>
<!-- no translation found for pref_content_open_in_background_summary (7653600574808720292) -->
<skip />
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 4030bb2..036bd51 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -98,8 +98,7 @@
<string name="current_page" msgid="7510129573681663135">"de "</string>
<string name="delete_bookmark_warning" msgid="758043186202032205">"O favorito \"<xliff:g id="BOOKMARK">%s</xliff:g>\" será excluído."</string>
<string name="open_in_new_window" msgid="6596775546468054510">"Abrir em uma nova janela"</string>
- <!-- no translation found for open_all_in_new_window (6514602245828366045) -->
- <skip />
+ <string name="open_all_in_new_window" msgid="6514602245828366045">"Abrir todos em novas janelas"</string>
<string name="goto_dot" msgid="3895839050522602723">"Ir"</string>
<string name="incognito_tab" msgid="5419458065370134289">"Abrir nova guia anônima"</string>
<string name="select_dot" msgid="6299170761900561967">"Selecionar texto"</string>
@@ -203,7 +202,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Excluir perfil"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"O navegador pode preencher automaticamente formulários da web como este. Gostaria de configurar seu perfil?"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"O preenchimento automático pode ser configurado a qualquer momento por meio das \"Configurações do navegador -&gt; Configurações pessoais\"."</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"O preenchimento automático pode ser configurado a qualquer momento por meio das \"Configurações do navegador -&gt; Configurações pessoais\"."</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"Privacidade e segurança"</string>
@@ -257,7 +256,7 @@
<string name="pref_default_zoom_dialogtitle" msgid="6095974367125109021">"Zoom padrão"</string>
<string name="pref_content_load_page" msgid="2219810141690955452">"Abrir em visão geral"</string>
<string name="pref_content_load_page_summary" msgid="8792093504054149369">"Exibir visão geral de páginas que acabaram de ser abertas"</string>
- <!-- outdated translation 3091250467679722382 --> <string name="pref_extras_title" msgid="7075456173747370647">"Configurações avançadas"</string>
+ <string name="pref_extras_title" msgid="7075456173747370647">"Avançado"</string>
<string name="pref_extras_website_settings" msgid="67866640052455549">"Configurações do site"</string>
<string name="pref_extras_website_settings_summary" msgid="1656771443223494406">"Configurações avançadas para sites individuais."</string>
<string name="pref_extras_reset_default_title" msgid="3579760449455761762">"Redefinir padrões"</string>
@@ -278,13 +277,11 @@
<item msgid="2193955365569270096">"Coreano (EUC-KR)"</item>
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Codificação de texto"</string>
- <!-- outdated translation 2965318885051241044 --> <string name="pref_lab_title" msgid="5571091610359629423">"Lab"</string>
+ <string name="pref_lab_title" msgid="5571091610359629423">"Google Labs"</string>
<string name="pref_lab_quick_controls" msgid="2105979166017257647">"Controles rápidos"</string>
<string name="pref_lab_quick_controls_summary" msgid="8025196176636589803">"Passe o polegar da margem esquerda ou direita para acessar os controles rápidos"</string>
- <!-- no translation found for pref_lab_most_visited_homepage (547134501893835512) -->
- <skip />
- <!-- no translation found for pref_lab_most_visited_homepage_summary (6857702350834122532) -->
- <skip />
+ <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"Páginas iniciais mais visitadas"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Definir sua página inicial para mostrar as páginas mais visitadas."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Problema de conectividade de dados"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Problema com o arquivo"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Confirmar"</string>
@@ -374,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Favoritos"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Não há nenhum favorito"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Escolha conta"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Sincronizar com Conta do Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Seus favoritos do Android não estão associados a uma Conta do Google"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Remover os favoritos do Android"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index b9a32e9..777e778 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -436,6 +436,9 @@
<!-- no translation found for empty_bookmarks_folder (7843361614634930942) -->
<skip />
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <!-- no translation found for account_chooser_dialog_title (3314204833188808194) -->
+ <!-- no translation found for account_chooser_dialog_title (4833571985009544332) -->
+ <skip />
<!-- no translation found for import_bookmarks_dialog_title (3325557652271172128) -->
<skip />
<!-- no translation found for import_bookmarks_dialog_description (2187665745413495303) -->
diff --git a/res/values-ro-xlarge/strings.xml b/res/values-ro-xlarge/strings.xml
index d8e407d..2e13633 100644
--- a/res/values-ro-xlarge/strings.xml
+++ b/res/values-ro-xlarge/strings.xml
@@ -22,7 +22,7 @@
<string name="contextmenu_openlink_newwindow" msgid="1061831678814826192">"Deschideţi în filă nouă"</string>
<!-- no translation found for contextmenu_openlink_newwindow_background (5625314148071601758) -->
<skip />
- <string name="open_all_in_new_window" msgid="8498279523071618315">"Deschideţi toate în file noi"</string>
+ <string name="open_all_in_new_window" msgid="8498279523071618315">"Deschideţi-le pe toate în file noi"</string>
<!-- no translation found for pref_content_open_in_background_summary (7653600574808720292) -->
<skip />
</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 1aca43c..741d11e 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -99,7 +99,7 @@
<string name="current_page" msgid="7510129573681663135">"din "</string>
<string name="delete_bookmark_warning" msgid="758043186202032205">"Marcajul „<xliff:g id="BOOKMARK">%s</xliff:g>” va fi şters."</string>
<string name="open_in_new_window" msgid="6596775546468054510">"Deschideţi într-o fereastră nouă"</string>
- <string name="open_all_in_new_window" msgid="6514602245828366045">"Deschideţi toate în ferestre noi"</string>
+ <string name="open_all_in_new_window" msgid="6514602245828366045">"Deschideţi-le pe toate în ferestre noi"</string>
<string name="goto_dot" msgid="3895839050522602723">"Accesaţi"</string>
<string name="incognito_tab" msgid="5419458065370134289">"Deschideţi filă incognito nouă"</string>
<string name="select_dot" msgid="6299170761900561967">"Selectaţi text"</string>
@@ -203,7 +203,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Ştergeţi profilul"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"Browserul poate completa în mod automat formulare web ca acesta. Doriţi să vă configuraţi profilul?"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Completarea automată poate fi întotdeauna configurată din Setări browser -&gt; Setări personale."</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Completarea automată poate fi întotdeauna configurată din Setări browser -&gt; Setări personale."</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"Confidenţialitate şi securitate"</string>
@@ -281,8 +281,8 @@
<string name="pref_lab_title" msgid="5571091610359629423">"Laborator"</string>
<string name="pref_lab_quick_controls" msgid="2105979166017257647">"Comenzi rapide"</string>
<string name="pref_lab_quick_controls_summary" msgid="8025196176636589803">"Glisaţi degetul dinspre marg. din st. sau din dr. pt. a accesa comenzile rapide"</string>
- <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"Cea mai accesată Pagină de pornire"</string>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Setează pagina dvs. de pornire pentru a afişa cele mai accesate pagini."</string>
+ <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"Pagina de pornire Cele mai vizitate"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Vă setează pagina de pornire pentru a afişa cele mai vizitate pagini."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Există o problemă de conexiune la date"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Problemă cu fişierul"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Confirmaţi"</string>
@@ -372,6 +372,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Marcaje"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Nu există marcaje"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Alegeţi contul"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Sincronizaţi cu un Cont Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Marcajele dvs. Android nu sunt asociate unui Cont Google"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Eliminaţi marcajele Android"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 6d75e7a..5eca519 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -202,7 +202,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Удалить профиль"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"Браузер может заполнять такие формы автоматически. Настроить профиль автозаполнения?"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Автозаполнение можно настроить в меню \"Настройки браузера\" -&gt; \"Личные настройки\"."</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Автозаполнение можно настроить в меню \"Настройки браузера\" -&gt; \"Личные настройки\"."</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"Конфиденциальность и безопасность"</string>
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Закладки"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Нет закладок"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Выберите аккаунт"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Синхронизация с аккаунтом Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Закладки Android не связаны с аккаунтом Google"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Удалить закладки Android"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 5862a62..f7d3a11 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -203,7 +203,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Odstrániť profil"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"Prehliadač dokáže automaticky vyplniť webové formuláre, ako je tento. Chcete nastaviť svoj profil?"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Funkciu Automatické dopĺňanie môžete nakonfigurovať prechodom na položku Nastavenia prehliadača –&gt; Osobné nastavenia."</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Funkciu Automatické dopĺňanie môžete nakonfigurovať prechodom na položku Nastavenia prehliadača –&gt; Osobné nastavenia."</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"Ochrana osobných údajov a zabezpečenie"</string>
@@ -372,6 +372,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Záložky"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Žiadne záložky na zobrazenie"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Vyberte účet"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Synchronizovať s účtom Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Vaše záložky v systéme Android nie sú priradené k účtu Google."</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Odstrániť záložky systému Android"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 3933344..cbbb9b8 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -203,7 +203,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Izbriši profil"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"Brskalnik lahko samodejno izpolni spletne obrazce, kot je ta. Ali želite prilagoditi svoj profil?"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Samodejno izpolnjevanje lahko vedno urejate v razdelku »Nastavitve brskalnika« -&gt; »Osebne nastavitve«."</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Samodejno izpolnjevanje lahko vedno urejate v razdelku »Nastavitve brskalnika« -&gt; »Osebne nastavitve«."</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"Zasebnost in varnost"</string>
@@ -372,6 +372,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Zaznamki"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Ni zaznamkov"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Izberite račun"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Sinhroniziraj z Google Računom"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Vaši Androidovi zaznamki niso povezani z Googlovim računom"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Odstranite Androidove zaznamke"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index f449c6b..1f0f528 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -203,7 +203,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Избриши профил"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"Прегледач може аутоматски да попуњава веб обрасце попут овог. Желите ли да подесите профил?"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Аутоматско попуњавање увек можете да конфигуришете преко Подешавања прегледача – &gt; Лична подешавања."</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Аутоматско попуњавање увек можете да конфигуришете преко Подешавања прегледача – &gt; Лична подешавања."</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"Приватност и безбедност"</string>
@@ -372,6 +372,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Обележивачи"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Нема обележивача"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Избор налога"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Синхронизуј са Google налогом"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Android обележивачи нису повезани са Google налогом"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Уклоните Android обележиваче"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 60153fe..e57dd8c 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -202,7 +202,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Ta bort profil"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"Webbläsaren kan fylla i den här typen av formulär automatiskt. Vill du skapa en profil?"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Du kan när som helst ändra inställningarna för Autofyll under webbläsarens inställningar -&gt; Personliga inställningar."</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Du kan när som helst ändra inställningarna för Autofyll under webbläsarens inställningar -&gt; Personliga inställningar."</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"Sekretess och säkerhet"</string>
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Bokmärken"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Det finns inga bokmärken"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Välj konto"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Synkronisera med Google-konto"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Dina Android-bokmärken har inte kopplats till något Google-konto"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Ta bort dina Android-bokmärken"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 1d11533..8145292 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -202,7 +202,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"ลบโปรไฟล์"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"เบราว์เซอร์จะกรอกเว็บฟอร์มให้โดยอัตโนมัติเช่นฟอร์มนี้ คุณต้องการตั้งค่าโปรไฟล์ของคุณหรือไม่"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"ฟังก์ชันป้อนอัตโนมัติสามารถกำหนดค่าได้ผ่านการตั้งค่าเบราว์เซอร์ -&gt; การตั้งค่าส่วนบุคคล"</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"ฟังก์ชันป้อนอัตโนมัติสามารถกำหนดค่าได้ผ่านการตั้งค่าเบราว์เซอร์ -&gt; การตั้งค่าส่วนบุคคล"</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"ข้อมูลส่วนบุคคลและความปลอดภัย"</string>
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"บุ๊กมาร์ก"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"ไม่มีบุ๊กมาร์ก"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"เลือกบัญชี"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"ซิงค์กับบัญชี Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"บุ๊กมาร์ก Android ของคุณไม่เชื่อมโยงกับบัญชี Google"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"ลบบุ๊กมาร์ก Android ของคุณ"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index ac3762f..3c65ac0 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -203,7 +203,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Tanggalin ang profile"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"Maaaring awtomatikong kumpletuhin ng browser ang mga form ng web katulad nito. Gusto mo bang i-set up ang iyong profile?"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Maaaring palaging i-configure ang AutoFill sa pamamagitan ng Mga Setting ng Browser -&gt; Mga Personal na Setting."</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Maaaring palaging i-configure ang AutoFill sa pamamagitan ng Mga Setting ng Browser -&gt; Mga Personal na Setting."</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"Privacy at Seguridad"</string>
@@ -372,6 +372,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Mga Bookmark"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Walang mga bookmark"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Pumili ng Account"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Mag-sync sa Google account"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Walang kaugnayan ang iyong mga Android bookmark sa isang Google account"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Alisin ang iyong mga Android bookmark"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 0349f9a..c8a95ee 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -202,7 +202,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Profili sil"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"Tarayıcı bunun gibi web formlarını otomatik olarak tamamlayabilir. Profilinizi ayarlamak ister misiniz?"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Otomatik Doldurma\'yı istediğiniz zaman Tarayıcı Ayarları -&gt; Kişisel Ayarlar menüsünden yapılandırabilirsiniz."</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Otomatik Doldurma\'yı istediğiniz zaman Tarayıcı Ayarları -&gt; Kişisel Ayarlar menüsünden yapılandırabilirsiniz."</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"Gizlilik ve Güvenlik"</string>
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Yer işaretleri"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Hiçbir yer işareti yok"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Hesap Seçin"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Google hesabı ile senkronize et"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Android yer işaretleriniz bir Google hesabı ile ilişkilendirilmemiş"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Android yer işaretlerinizi kaldırın"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index d91e1c5..08e87d1 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -203,7 +203,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Видалити профіль"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"Веб-переглядач може автоматично заповнювати подібні веб-форми. Налаштувати ваш профіль?"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Автозаповнення можна завжди налаштувати за допомогою меню \"Налаштування веб-переглядача\" –&gt; \"Персональні налаштування\"."</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Автозаповнення можна завжди налаштувати за допомогою меню \"Налаштування веб-переглядача\" –&gt; \"Персональні налаштування\"."</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"Конфіденційність і безпека"</string>
@@ -282,7 +282,7 @@
<string name="pref_lab_quick_controls" msgid="2105979166017257647">"Елементи швидкого керування"</string>
<string name="pref_lab_quick_controls_summary" msgid="8025196176636589803">"Проведіть пальцем від лівого/правого краю для доступу до елем. швидк. керування"</string>
<string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"Дом. стор. функції \"Часто відвідувані\""</string>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Налаштовує домашню сторінку на відображення найчастіше відвідуваних сторінок."</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Налаштовує на домашній сторінці показ найчастіше відвідуваних сторінок."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Проблема з доступом до даних"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Проблема з файлом"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Підтверд."</string>
@@ -372,6 +372,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Закладки"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Немає закладок"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Вибрати обліковий запис"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Синхроніз. з обл. записом Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Ваші закладки Android не пов\'язано з обліковим записом Google"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Видалити закладки Android"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 00d5cde..b9bc1d6 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -203,7 +203,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Xóa tiểu sử"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"Trình duyệt có thể tự động hoàn thành biểu mẫu web như biểu mẫu này. Bạn có muốn thiết lập cấu hình của mình không?"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Luôn có thể định cấu hình tính năng Tự động điền thông qua Cài đặt trình duyệt -&gt; Cài đặt cá nhân."</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Luôn có thể định cấu hình tính năng Tự động điền thông qua Cài đặt trình duyệt -&gt; Cài đặt cá nhân."</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"Quyền riêng tư & Bảo mật"</string>
@@ -372,6 +372,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"Dấu trang"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"Không có dấu trang"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"Chọn tài khoản"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Đồng bộ hóa với tài khoản Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Dấu trang Android của bạn không được kết hợp với tài khoản Google"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Xóa dấu trang Android của bạn"</string>
diff --git a/res/values-xlarge/dimensions.xml b/res/values-xlarge/dimensions.xml
index 05a4087..27c1ce2 100644
--- a/res/values-xlarge/dimensions.xml
+++ b/res/values-xlarge/dimensions.xml
@@ -16,7 +16,7 @@
<dimen name="widgetThumbnailHeight">104dip</dimen>
<dimen name="widgetHorizontalSpacing">14dip</dimen>
<dimen name="widgetVerticalSpacing">12dip</dimen>
- <dimen name="favicon_padded_size">24dip</dimen>
+ <dimen name="favicon_padded_size">28dip</dimen>
<!-- For the most visited page -->
<dimen name="mv_max_width">1010dp</dimen>
<dimen name="mv_item_width">231dp</dimen>
diff --git a/res/values-zh-rCN-xlarge/strings.xml b/res/values-zh-rCN-xlarge/strings.xml
index ba56c58..97fb9a0 100644
--- a/res/values-zh-rCN-xlarge/strings.xml
+++ b/res/values-zh-rCN-xlarge/strings.xml
@@ -22,8 +22,7 @@
<string name="contextmenu_openlink_newwindow" msgid="1061831678814826192">"在新标签页中打开"</string>
<!-- no translation found for contextmenu_openlink_newwindow_background (5625314148071601758) -->
<skip />
- <!-- no translation found for open_all_in_new_window (8498279523071618315) -->
- <skip />
+ <string name="open_all_in_new_window" msgid="8498279523071618315">"在新标签页中打开全部书签"</string>
<!-- no translation found for pref_content_open_in_background_summary (7653600574808720292) -->
<skip />
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index c987af7..9e4b87a 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -98,8 +98,7 @@
<string name="current_page" msgid="7510129573681663135">"来源 "</string>
<string name="delete_bookmark_warning" msgid="758043186202032205">"将会删除书签“<xliff:g id="BOOKMARK">%s</xliff:g>”。"</string>
<string name="open_in_new_window" msgid="6596775546468054510">"在新窗口中打开"</string>
- <!-- no translation found for open_all_in_new_window (6514602245828366045) -->
- <skip />
+ <string name="open_all_in_new_window" msgid="6514602245828366045">"在新窗口中打开全部书签"</string>
<string name="goto_dot" msgid="3895839050522602723">"转至"</string>
<string name="incognito_tab" msgid="5419458065370134289">"打开新的隐身标签页"</string>
<string name="select_dot" msgid="6299170761900561967">"选择文本"</string>
@@ -203,7 +202,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"删除个人资料"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"浏览器可自动填充网络表单（例如该表单）。您希望设置个人资料吗？"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"您可以随时通过“浏览器设置”-&gt;“个人设置”对自动填充功能进行配置。"</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"您可以随时通过“浏览器设置”-&gt;“个人设置”对自动填充功能进行配置。"</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"隐私与安全"</string>
@@ -257,7 +256,7 @@
<string name="pref_default_zoom_dialogtitle" msgid="6095974367125109021">"默认缩放设置"</string>
<string name="pref_content_load_page" msgid="2219810141690955452">"以概览模式打开网页"</string>
<string name="pref_content_load_page_summary" msgid="8792093504054149369">"显示新打开网页的概览"</string>
- <!-- outdated translation 3091250467679722382 --> <string name="pref_extras_title" msgid="7075456173747370647">"高级设置"</string>
+ <string name="pref_extras_title" msgid="7075456173747370647">"高级"</string>
<string name="pref_extras_website_settings" msgid="67866640052455549">"网站设置"</string>
<string name="pref_extras_website_settings_summary" msgid="1656771443223494406">"各网站的高级设置"</string>
<string name="pref_extras_reset_default_title" msgid="3579760449455761762">"重置默认设置"</string>
@@ -278,13 +277,11 @@
<item msgid="2193955365569270096">"韩语 (EUC-KR)"</item>
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"文字编码"</string>
- <!-- outdated translation 2965318885051241044 --> <string name="pref_lab_title" msgid="5571091610359629423">"实验室"</string>
+ <string name="pref_lab_title" msgid="5571091610359629423">"实验室"</string>
<string name="pref_lab_quick_controls" msgid="2105979166017257647">"快速控制"</string>
<string name="pref_lab_quick_controls_summary" msgid="8025196176636589803">"从左侧或右侧边缘滑动拇指以使用快速控制"</string>
- <!-- no translation found for pref_lab_most_visited_homepage (547134501893835512) -->
- <skip />
- <!-- no translation found for pref_lab_most_visited_homepage_summary (6857702350834122532) -->
- <skip />
+ <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"“访问最多”首页"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"设置您的主页，以显示“访问最多”首页。"</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"数据连接性问题"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"文件有问题"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"确认"</string>
@@ -374,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"书签"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"无书签"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"选择帐户"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"与 Google 帐户同步"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Android 书签尚未与 Google 帐户关联"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"删除 Android 书签"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index fdb89db..6d0a1d5 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -202,7 +202,7 @@
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"刪除設定檔"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"瀏覽器可以自動填寫這類網路表單，您要建立個人資料嗎？"</string>
<!-- unknown quoting pattern: original -1, translation 1 -->
- <!-- outdated translation 4653039631354546610 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"自動填入功能可隨時透過 [瀏覽器設定] -&gt; [個人設定] 加以調整。"</string>
+ <!-- outdated translation 8606640740851832808 --> <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"自動填入功能可隨時透過 [瀏覽器設定] -&gt; [個人設定] 加以調整。"</string>
<!-- no translation found for disable_autofill (3706426217720202898) -->
<skip />
<string name="pref_privacy_security_title" msgid="1705642466867300373">"隱私權與安全性"</string>
@@ -371,6 +371,7 @@
<string name="defaultBookmarksUpButton" msgid="2303951020715704735">"書籤"</string>
<string name="empty_bookmarks_folder" msgid="7843361614634930942">"沒有任何書籤"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
+ <string name="account_chooser_dialog_title" msgid="3314204833188808194">"選擇帳戶"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"與 Google 帳戶保持同步"</string>
<string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"您的 Android 書籤未與任何 Google 帳戶建立關聯"</string>
<string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"移除您的 Android 書籤"</string>
diff --git a/res/values/bookmarks_icons.xml b/res/values/bookmarks_icons.xml
index 3f1b5d6..5d8e85a 100644
--- a/res/values/bookmarks_icons.xml
+++ b/res/values/bookmarks_icons.xml
@@ -9,8 +9,8 @@
<item>@raw/thumb_yahoo</item>
<item>@raw/favicon_msn</item>
<item>@raw/thumb_msn</item>
- <item>@raw/favicon_myspace</item>
- <item>@raw/thumb_myspace</item>
+ <item>@raw/favicon_twitter</item>
+ <item>@raw/thumb_twitter</item>
<item>@raw/favicon_facebook</item>
<item>@raw/thumb_facebook</item>
<item>@raw/favicon_wikipedia</item>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 84e5348..68b58f7 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -34,4 +34,5 @@
<color name="bookmarkWidgetFaviconBackground">#23ffffff</color>
<color name="bookmarkListFaviconBackground">#23ffffff</color>
<color name="urlTextColor">#0E774A</color>
+ <color name="tabFaviconBackground">#FF555555</color>
</resources>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index d738288..300714b 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -43,4 +43,6 @@
<dimen name="tab_first_padding_left">12dp</dimen>
<dimen name="list_favicon_padding">5dip</dimen>
<dimen name="list_favicon_corner_radius">3dip</dimen>
+ <dimen name="tab_favicon_corner_radius">2dip</dimen>
+ <dimen name="dropdown_offset">8dip</dimen>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7333f3f..75762a0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -811,15 +811,15 @@
<item>Google</item>
<item>http://www.google.com/</item>
<item>Picasa</item>
- <item>http://picasaweb.google.com/m/viewer?source=androidclient</item>
+ <item>http://picasaweb.google.com/</item>
<item>Yahoo!</item>
<item>http://www.yahoo.com/</item>
<item>MSN</item>
<item>http://www.msn.com/</item>
- <item>MySpace</item>
- <item>http://www.myspace.com/</item>
+ <item>Twitter</item>
+ <item>http://twitter.com/</item>
<item>Facebook</item>
- <item>http://www.facebook.com/</item>
+ <item>http://www.facebook.com/?m2w</item>
<item>Wikipedia</item>
<item>http://www.wikipedia.org/</item>
<item>eBay</item>
@@ -831,7 +831,7 @@
<item>ESPN</item>
<item>http://espn.com/</item>
<item>Amazon</item>
- <item>http://www.amazon.com/</item>
+ <item>http://www.amazon.com/?force-full-site=1</item>
<item>Weather Channel</item>
<item>http://www.weather.com/</item>
<item>BBC</item>
@@ -906,6 +906,9 @@
<!-- Access point for RLZ tracking. -->
<string name="rlz_access_point">Y1</string>
+ <!-- Title for a dialog asking the user which account to sync their bookmarks to [CHAR LIMIT=32] -->
+ <string name="account_chooser_dialog_title" msgid="4833571985009544332">Choose account</string>
+
<!-- Title for a dialog asking the user what they want to do with their bookmarks when adding a sync account [CHAR-LIMIT=32] -->
<string name="import_bookmarks_dialog_title">Sync with Google account</string>
diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index 5deb335..40bc16e 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -32,6 +32,7 @@
import android.view.Menu;
import android.view.View;
import android.view.View.OnClickListener;
+import android.view.View.OnKeyListener;
import android.view.ViewGroup;
import android.view.ViewGroup.LayoutParams;
import android.view.WindowManager;
@@ -113,7 +114,6 @@
mCustomViewContainer = (FrameLayout) mBrowserFrameLayout
.findViewById(R.id.fullscreen_custom_content);
frameLayout.addView(mBrowserFrameLayout, COVER_SCREEN_PARAMS);
-
}
/**
@@ -253,7 +253,7 @@
}
private void attachTabToContentView(Tab tab) {
- if (tab.getWebView() == null) {
+ if ((tab == null) || (tab.getWebView() == null)) {
return;
}
View container = tab.getViewContainer();
@@ -286,6 +286,8 @@
Log.w(LOGTAG, "mContainer is already attached to content in"
+ " attachTabToContentView!");
}
+ mainView.setNextFocusUpId(R.id.url_focused);
+ mainView.setNextFocusDownId(R.id.url_focused);
mUiController.attachSubWindow(tab);
}
@@ -643,9 +645,9 @@
}
private void setStatusBarVisibility(boolean visible) {
- int flag = visible ? 0 : WindowManager.LayoutParams.FLAG_FULLSCREEN;
- mActivity.getWindow().setFlags(flag,
- WindowManager.LayoutParams.FLAG_FULLSCREEN);
+ WindowManager.LayoutParams params = mActivity.getWindow().getAttributes();
+ params.systemUiVisibility = visible ? View.STATUS_BAR_VISIBLE : View.STATUS_BAR_HIDDEN;
+ mActivity.getWindow().setAttributes(params);
}
// -------------------------------------------------------------------------
diff --git a/src/com/android/browser/BookmarkUtils.java b/src/com/android/browser/BookmarkUtils.java
index 379b22d..cfb8e46 100644
--- a/src/com/android/browser/BookmarkUtils.java
+++ b/src/com/android/browser/BookmarkUtils.java
@@ -16,6 +16,7 @@
package com.android.browser;
+import android.app.ActivityManager;
import android.app.AlertDialog;
import android.content.ContentUris;
import android.content.Context;
@@ -33,6 +34,7 @@
import android.graphics.PorterDuffXfermode;
import android.graphics.Rect;
import android.graphics.RectF;
+import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.PaintDrawable;
import android.net.Uri;
@@ -40,6 +42,7 @@
import android.preference.PreferenceManager;
import android.provider.Browser;
import android.provider.BrowserContract;
+import android.util.DisplayMetrics;
public class BookmarkUtils {
private final static String LOGTAG = "BookmarkUtils";
@@ -60,10 +63,11 @@
*/
static Bitmap createIcon(Context context, Bitmap touchIcon, Bitmap favicon,
BookmarkIconType type) {
- int iconDimension = context.getResources().getDimensionPixelSize(
- android.R.dimen.app_icon_size);
-
- return createIcon(context, touchIcon, favicon, type, iconDimension);
+ final ActivityManager am = (ActivityManager) context
+ .getSystemService(Context.ACTIVITY_SERVICE);
+ final int iconDimension = am.getLauncherLargeIconSize();
+ final int iconDensity = am.getLauncherLargeIconDensity();
+ return createIcon(context, touchIcon, favicon, type, iconDimension, iconDensity);
}
static Drawable createListFaviconBackground(Context context) {
@@ -79,7 +83,7 @@
}
private static Bitmap createIcon(Context context, Bitmap touchIcon,
- Bitmap favicon, BookmarkIconType type, int iconDimension) {
+ Bitmap favicon, BookmarkIconType type, int iconDimension, int iconDensity) {
Bitmap bm = Bitmap.createBitmap(iconDimension, iconDimension, Bitmap.Config.ARGB_8888);
Canvas canvas = new Canvas(bm);
Rect iconBounds = new Rect(0, 0, bm.getWidth(), bm.getHeight());
@@ -90,7 +94,7 @@
} else {
// No touch icon so create our own.
// Set the background based on the type of shortcut (either webapp or home shortcut).
- Bitmap icon = getIconBackground(context, type);
+ Bitmap icon = getIconBackground(context, type, iconDensity);
if (icon != null) {
// Now draw the correct icon background into our new bitmap.
@@ -127,17 +131,25 @@
return i;
}
- private static Bitmap getIconBackground(Context context, BookmarkIconType type) {
+ private static Bitmap getIconBackground(Context context, BookmarkIconType type, int density) {
if (type == BookmarkIconType.ICON_HOME_SHORTCUT) {
// Want to create a shortcut icon on the homescreen, so the icon
// background is the red bookmark.
- return BitmapFactory.decodeResource(context.getResources(),
- R.mipmap.ic_launcher_shortcut_browser_bookmark);
+ Drawable drawable = context.getResources().getDrawableForDensity(
+ R.mipmap.ic_launcher_shortcut_browser_bookmark, density);
+ if (drawable instanceof BitmapDrawable) {
+ BitmapDrawable bd = (BitmapDrawable) drawable;
+ return bd.getBitmap();
+ }
} else if (type == BookmarkIconType.ICON_INSTALLABLE_WEB_APP) {
// Use the web browser icon as the background for the icon for an installable
// web app.
- return BitmapFactory.decodeResource(context.getResources(),
- R.mipmap.ic_launcher_browser);
+ Drawable drawable = context.getResources().getDrawableForDensity(
+ R.mipmap.ic_launcher_browser, density);
+ if (drawable instanceof BitmapDrawable) {
+ BitmapDrawable bd = (BitmapDrawable) drawable;
+ return bd.getBitmap();
+ }
}
return null;
}
diff --git a/src/com/android/browser/BookmarksLoader.java b/src/com/android/browser/BookmarksLoader.java
index e2f8941..7722392 100644
--- a/src/com/android/browser/BookmarksLoader.java
+++ b/src/com/android/browser/BookmarksLoader.java
@@ -21,7 +21,6 @@
import android.net.Uri;
import android.provider.BrowserContract.Bookmarks;
import android.provider.BrowserContract.ChromeSyncColumns;
-import android.text.TextUtils;
public class BookmarksLoader extends CursorLoader {
public static final String ARG_ACCOUNT_TYPE = "acct_type";
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index a67b4e6..527f025 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -94,8 +94,6 @@
if (((AccessibilityManager) getSystemService(ACCESSIBILITY_SERVICE))
.isEnabled()) {
setDefaultKeyMode(DEFAULT_KEYS_DISABLE);
- } else {
- setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL);
}
mController = new Controller(this);
diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java
index fa7a5e2..7475237 100644
--- a/src/com/android/browser/BrowserBookmarksPage.java
+++ b/src/com/android/browser/BrowserBookmarksPage.java
@@ -25,11 +25,11 @@
import android.content.ClipboardManager;
import android.content.ContentUris;
import android.content.Context;
-import android.content.CursorLoader;
import android.content.Intent;
import android.content.Loader;
import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor;
+import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.database.Cursor;
@@ -40,9 +40,7 @@
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.provider.BrowserContract;
-import android.provider.BrowserContract.Accounts;
import android.provider.BrowserContract.ChromeSyncColumns;
-import android.text.TextUtils;
import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo;
import android.view.LayoutInflater;
@@ -52,10 +50,8 @@
import android.view.View;
import android.view.ViewGroup;
import android.webkit.WebIconDatabase.IconListener;
-import android.widget.Adapter;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener;
-import android.widget.AdapterView.OnItemSelectedListener;
import android.widget.GridView;
import android.widget.ListView;
import android.widget.PopupMenu.OnMenuItemClickListener;
@@ -74,12 +70,11 @@
*/
public class BrowserBookmarksPage extends Fragment implements View.OnCreateContextMenuListener,
LoaderManager.LoaderCallbacks<Cursor>, OnItemClickListener, IconListener,
- OnItemSelectedListener, BreadCrumbView.Controller, OnMenuItemClickListener {
+ BreadCrumbView.Controller, OnMenuItemClickListener, OnSharedPreferenceChangeListener {
static final String LOGTAG = "browser";
static final int LOADER_BOOKMARKS = 1;
- static final int LOADER_ACCOUNTS_THEN_BOOKMARKS = 2;
static final String EXTRA_DISABLE_WINDOW = "disable_new_window";
@@ -88,7 +83,6 @@
public static final String PREF_ACCOUNT_TYPE = "acct_type";
public static final String PREF_ACCOUNT_NAME = "acct_name";
- static final String DEFAULT_ACCOUNT = "local";
static final int VIEW_THUMBNAILS = 1;
static final int VIEW_LIST = 2;
static final String PREF_SELECTED_VIEW = "bookmarks_view";
@@ -124,13 +118,12 @@
public Loader<Cursor> onCreateLoader(int id, Bundle args) {
switch (id) {
case LOADER_BOOKMARKS: {
- String accountType = null;
- String accountName = null;
- if (args != null) {
- accountType = args.getString(BookmarksLoader.ARG_ACCOUNT_TYPE);
- accountName = args.getString(BookmarksLoader.ARG_ACCOUNT_NAME);
- }
- BookmarksLoader bl = new BookmarksLoader(getActivity(), accountType, accountName);
+ SharedPreferences prefs = PreferenceManager
+ .getDefaultSharedPreferences(getActivity());
+ String accountType = prefs.getString(PREF_ACCOUNT_TYPE, null);
+ String accountName = prefs.getString(PREF_ACCOUNT_NAME, null);
+ BookmarksLoader bl = new BookmarksLoader(getActivity(),
+ accountType, accountName);
if (mCrumbs != null) {
Uri uri = (Uri) mCrumbs.getTopData();
if (uri != null) {
@@ -139,11 +132,6 @@
}
return bl;
}
- case LOADER_ACCOUNTS_THEN_BOOKMARKS: {
- return new CursorLoader(getActivity(), Accounts.CONTENT_URI,
- new String[] { Accounts.ACCOUNT_TYPE, Accounts.ACCOUNT_NAME }, null, null,
- null);
- }
}
throw new UnsupportedOperationException("Unknown loader id " + id);
}
@@ -166,77 +154,12 @@
mAdapter.changeCursor(cursor);
break;
}
-
- case LOADER_ACCOUNTS_THEN_BOOKMARKS: {
- SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(
- getActivity());
- String storedAccountType = prefs.getString(PREF_ACCOUNT_TYPE, null);
- String storedAccountName = prefs.getString(PREF_ACCOUNT_NAME, null);
- String accountType =
- TextUtils.isEmpty(storedAccountType) ? DEFAULT_ACCOUNT : storedAccountType;
- String accountName =
- TextUtils.isEmpty(storedAccountName) ? DEFAULT_ACCOUNT : storedAccountName;
-
- Bundle args = null;
- if (cursor == null || !cursor.moveToFirst()) {
- // No accounts, set the prefs to the default
- accountType = DEFAULT_ACCOUNT;
- accountName = DEFAULT_ACCOUNT;
- } else {
- int accountPosition = -1;
-
- if (!DEFAULT_ACCOUNT.equals(accountType) &&
- !DEFAULT_ACCOUNT.equals(accountName)) {
- // Check to see if the account in prefs still exists
- cursor.moveToFirst();
- do {
- if (accountType.equals(cursor.getString(0))
- && accountName.equals(cursor.getString(1))) {
- accountPosition = cursor.getPosition();
- break;
- }
- } while (cursor.moveToNext());
- }
-
- if (accountPosition == -1) {
- if (!(DEFAULT_ACCOUNT.equals(accountType)
- && DEFAULT_ACCOUNT.equals(accountName))) {
- // No account is set in prefs and there is at least one,
- // so pick the first one as the default
- cursor.moveToFirst();
- accountType = cursor.getString(0);
- accountName = cursor.getString(1);
- }
- }
-
- args = new Bundle();
- args.putString(BookmarksLoader.ARG_ACCOUNT_TYPE, accountType);
- args.putString(BookmarksLoader.ARG_ACCOUNT_NAME, accountName);
- }
-
- // The stored account name wasn't found, update the stored account with a valid one
- if (!accountType.equals(storedAccountType)
- || !accountName.equals(storedAccountName)) {
- prefs.edit()
- .putString(PREF_ACCOUNT_TYPE, accountType)
- .putString(PREF_ACCOUNT_NAME, accountName)
- .apply();
- }
- getLoaderManager().initLoader(LOADER_BOOKMARKS, args, this);
-
- break;
- }
}
}
+ @Override
public void onLoaderReset(Loader<Cursor> loader) {
onLoadFinished(loader, null);
- switch (loader.getId()) {
- case LOADER_BOOKMARKS: {
- onLoadFinished(loader, null);
- break;
- }
- }
}
long getFolderId() {
@@ -443,28 +366,15 @@
if (mCallbacks != null) {
mCallbacks.onFolderChanged(1, BrowserContract.Bookmarks.CONTENT_URI_DEFAULT_FOLDER);
}
-
// Start the loaders
LoaderManager lm = getLoaderManager();
- SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+ SharedPreferences prefs = PreferenceManager
+ .getDefaultSharedPreferences(getActivity());
+ prefs.registerOnSharedPreferenceChangeListener(this);
mCurrentView =
prefs.getInt(PREF_SELECTED_VIEW, BrowserBookmarksPage.VIEW_THUMBNAILS);
mAdapter = new BrowserBookmarksAdapter(getActivity(), mCurrentView);
- String accountType = prefs.getString(PREF_ACCOUNT_TYPE, DEFAULT_ACCOUNT);
- String accountName = prefs.getString(PREF_ACCOUNT_NAME, DEFAULT_ACCOUNT);
- if (!TextUtils.isEmpty(accountType) && !TextUtils.isEmpty(accountName)) {
- // There is an account set, load up that one
- Bundle args = null;
- if (!DEFAULT_ACCOUNT.equals(accountType) && !DEFAULT_ACCOUNT.equals(accountName)) {
- args = new Bundle();
- args.putString(BookmarksLoader.ARG_ACCOUNT_TYPE, accountType);
- args.putString(BookmarksLoader.ARG_ACCOUNT_NAME, accountName);
- }
- lm.restartLoader(LOADER_BOOKMARKS, args, this);
- } else {
- // No account set, load the account list first
- lm.restartLoader(LOADER_ACCOUNTS_THEN_BOOKMARKS, null, this);
- }
+ lm.restartLoader(LOADER_BOOKMARKS, null, this);
// Add our own listener in case there are favicons that have yet to be loaded.
CombinedBookmarkHistoryView.getIconListenerSet().addListener(this);
@@ -475,12 +385,17 @@
@Override
public void onDestroyView() {
super.onDestroyView();
+ SharedPreferences prefs = PreferenceManager
+ .getDefaultSharedPreferences(getActivity());
+ prefs.unregisterOnSharedPreferenceChangeListener(this);
if (mHeaderContainer != null) {
mHeaderContainer.removeView(mHeader);
}
mCrumbs.setController(null);
mCrumbs = null;
getLoaderManager().destroyLoader(LOADER_BOOKMARKS);
+ mAdapter = null;
+ CombinedBookmarkHistoryView.getIconListenerSet().removeListener(this);
}
@Override
@@ -518,36 +433,6 @@
}
}
- @Override
- public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
- Adapter adapter = parent.getAdapter();
- String accountType = "com.google";
- String accountName = adapter.getItem(position).toString();
-
- Bundle args = null;
- if (ACCOUNT_NAME_UNSYNCED.equals(accountName)) {
- accountType = DEFAULT_ACCOUNT;
- accountName = DEFAULT_ACCOUNT;
- } else {
- args = new Bundle();
- args.putString(BookmarksLoader.ARG_ACCOUNT_TYPE, accountType);
- args.putString(BookmarksLoader.ARG_ACCOUNT_NAME, accountName);
- }
-
- // Remember the selection for later
- PreferenceManager.getDefaultSharedPreferences(getActivity()).edit()
- .putString(PREF_ACCOUNT_TYPE, accountType)
- .putString(PREF_ACCOUNT_NAME, accountName)
- .apply();
-
- getLoaderManager().restartLoader(LOADER_BOOKMARKS, args, this);
- }
-
- @Override
- public void onNothingSelected(AdapterView<?> parent) {
- // Do nothing
- }
-
/* package */ static Intent createShortcutIntent(Context context, Cursor cursor) {
String url = cursor.getString(BookmarksLoader.COLUMN_INDEX_URL);
String title = cursor.getString(BookmarksLoader.COLUMN_INDEX_TITLE);
@@ -842,4 +727,21 @@
mCrumbs.setMaxVisible(mCrumbMaxVisible);
}
}
+
+ @Override
+ public void onSharedPreferenceChanged(
+ SharedPreferences sharedPreferences, String key) {
+ if (PREF_ACCOUNT_NAME.equals(key) || PREF_ACCOUNT_TYPE.equals(key)) {
+ mCrumbs.setController(null);
+ mCrumbs.clear();
+ LoaderManager lm = getLoaderManager();
+ lm.restartLoader(LOADER_BOOKMARKS, null, this);
+ mCrumbs.setController(this);
+ String name = getString(R.string.bookmarks);
+ mCrumbs.pushView(name, false, BrowserContract.Bookmarks.CONTENT_URI_DEFAULT_FOLDER);
+ if (mCallbacks != null) {
+ mCallbacks.onFolderChanged(1, BrowserContract.Bookmarks.CONTENT_URI_DEFAULT_FOLDER);
+ }
+ }
+ }
}
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 48f1d6f..faf0042 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -498,8 +498,8 @@
quickControls = p.getBoolean(PREF_QUICK_CONTROLS, quickControls);
useMostVisitedHomepage = p.getBoolean(PREF_MOST_VISITED_HOMEPAGE, useMostVisitedHomepage);
- // Only set these on startup if it is a dev build
- if (DEV_BUILD) {
+ // Only set these if this is a dev build or debug is enabled
+ if (DEV_BUILD || showDebugSettings()) {
userAgent = Integer.parseInt(p.getString(PREF_USER_AGENT, "0"));
hardwareAccelerated = p.getBoolean(PREF_HARDWARE_ACCEL, hardwareAccelerated);
}
@@ -601,9 +601,11 @@
return showDebugSettings;
}
- public void toggleDebugSettings() {
+ public void toggleDebugSettings(Context context) {
showDebugSettings = !showDebugSettings;
navDump = showDebugSettings;
+ syncSharedPreferences(context,
+ PreferenceManager.getDefaultSharedPreferences(context));
update();
}
diff --git a/src/com/android/browser/CombinedBookmarkHistoryView.java b/src/com/android/browser/CombinedBookmarkHistoryView.java
index 734addd..173abba 100644
--- a/src/com/android/browser/CombinedBookmarkHistoryView.java
+++ b/src/com/android/browser/CombinedBookmarkHistoryView.java
@@ -244,14 +244,21 @@
protected void onDetachedFromWindow() {
super.onDetachedFromWindow();
if (mCurrentFragment != INVALID_ID) {
- FragmentManager fm = mActivity.getFragmentManager();
- FragmentTransaction transaction = fm.beginTransaction();
- if (mCurrentFragment == FRAGMENT_ID_BOOKMARKS) {
- transaction.remove(mBookmarks);
- } else if (mCurrentFragment == FRAGMENT_ID_HISTORY) {
- transaction.remove(mHistory);
+ try {
+ FragmentManager fm = mActivity.getFragmentManager();
+ FragmentTransaction transaction = fm.beginTransaction();
+ if (mCurrentFragment == FRAGMENT_ID_BOOKMARKS) {
+ transaction.remove(mBookmarks);
+ } else if (mCurrentFragment == FRAGMENT_ID_HISTORY) {
+ transaction.remove(mHistory);
+ }
+ transaction.commit();
+ } catch (IllegalStateException ex) {
+ // This exception is thrown if the fragment isn't added
+ // This will happen if the activity is finishing, and the
+ // fragment was already removed before this view was detached
+ // Aka, success!
}
- transaction.commit();
mCurrentFragment = INVALID_ID;
}
mUiController.unregisterOptionsMenuHandler(this);
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 6c6fe0b..472201b 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -63,7 +63,6 @@
import android.view.ContextMenu.ContextMenuInfo;
import android.view.Gravity;
import android.view.KeyEvent;
-import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
@@ -78,7 +77,6 @@
import android.webkit.WebIconDatabase;
import android.webkit.WebSettings;
import android.webkit.WebView;
-import android.widget.TextView;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -2020,7 +2018,6 @@
}
protected void reuseTab(Tab appTab, String appId, UrlData urlData) {
- Log.i(LOGTAG, "Reusing tab for " + appId);
// Dismiss the subwindow if applicable.
dismissSubWindow(appTab);
// Since we might kill the WebView, remove it from the
@@ -2127,9 +2124,11 @@
public Tab openIncognitoTab() {
if (mTabControl.canCreateNewTab()) {
Tab currentTab = mTabControl.getCurrentTab();
- Tab tab = mTabControl.createNewTab(false, null, null, true);
+ Tab tab = mTabControl.createNewTab(false, null,
+ null, true);
addTab(tab);
setActiveTab(tab);
+ loadUrlDataIn(tab, new UrlData("browser:incognito"));
return tab;
} else {
mUi.showMaxTabsWarning();
@@ -2195,12 +2194,9 @@
removeComboView();
int currentIndex = mTabControl.getCurrentIndex();
int removeIndex = mTabControl.getTabIndex(tab);
- removeTab(tab);
- if (currentIndex >= removeIndex && currentIndex != 0) {
- currentIndex--;
- }
Tab newtab = mTabControl.getTab(currentIndex);
setActiveTab(newtab);
+ removeTab(tab);
}
/**************** TODO: Url loading clean up *******************************/
@@ -2413,67 +2409,28 @@
return true;
}
break;
- case KeyEvent.KEYCODE_B:
- if (ctrl) {
- bookmarksOrHistoryPicker(false);
- return true;
- }
- break;
+// case KeyEvent.KEYCODE_B: // menu
case KeyEvent.KEYCODE_C:
if (ctrl) {
webView.copySelection();
return true;
}
break;
- case KeyEvent.KEYCODE_D:
- if (ctrl) {
- bookmarkCurrentPage(AddBookmarkPage.DEFAULT_FOLDER_ID);
- return true;
- }
- break;
+// case KeyEvent.KEYCODE_D: // menu
// case KeyEvent.KEYCODE_E: // in Chrome: puts '?' in URL bar
- case KeyEvent.KEYCODE_F:
- if (ctrl) {
- webView.showFindDialog(null, true);
- return true;
- }
- break;
+// case KeyEvent.KEYCODE_F: // menu
// case KeyEvent.KEYCODE_G: // in Chrome: finds next match
- case KeyEvent.KEYCODE_H:
- if (ctrl) {
- bookmarksOrHistoryPicker(true);
- return true;
- }
- break;
+// case KeyEvent.KEYCODE_H: // menu
// case KeyEvent.KEYCODE_I: // unused
- case KeyEvent.KEYCODE_J:
- if (ctrl) {
- viewDownloads();
- return true;
- }
- break;
+// case KeyEvent.KEYCODE_J: // menu
// case KeyEvent.KEYCODE_K: // in Chrome: puts '?' in URL bar
- case KeyEvent.KEYCODE_L:
- if (ctrl) {
- editUrl();
- return true;
- }
- break;
+// case KeyEvent.KEYCODE_L: // menu
// case KeyEvent.KEYCODE_M: // unused
// case KeyEvent.KEYCODE_N: // in Chrome: new window
// case KeyEvent.KEYCODE_O: // in Chrome: open file
// case KeyEvent.KEYCODE_P: // in Chrome: print page
// case KeyEvent.KEYCODE_Q: // unused
- case KeyEvent.KEYCODE_R:
- if (ctrl) {
- if (mInLoad) {
- stopLoading();
- } else {
- webView.reload();
- }
- return true;
- }
- break;
+// case KeyEvent.KEYCODE_R:
// case KeyEvent.KEYCODE_S: // in Chrome: saves page
case KeyEvent.KEYCODE_T:
if (ctrl) {
@@ -2487,17 +2444,13 @@
break;
// case KeyEvent.KEYCODE_U: // in Chrome: opens source of page
// case KeyEvent.KEYCODE_V: // text view intercepts to paste
- case KeyEvent.KEYCODE_W:
- if (ctrl) {
- closeCurrentTab();
- return true;
- }
- break;
+// case KeyEvent.KEYCODE_W: // menu
// case KeyEvent.KEYCODE_X: // text view intercepts to cut
// case KeyEvent.KEYCODE_Y: // unused
// case KeyEvent.KEYCODE_Z: // unused
}
- return false;
+ // if we get here, it is a regular key and webview is not null
+ return mUi.dispatchKey(keyCode, event);
}
boolean onKeyUp(int keyCode, KeyEvent event) {
diff --git a/src/com/android/browser/IntentHandler.java b/src/com/android/browser/IntentHandler.java
index 9c50975..e17fdc5 100644
--- a/src/com/android/browser/IntentHandler.java
+++ b/src/com/android/browser/IntentHandler.java
@@ -179,7 +179,7 @@
} else if ("about:debug.nav".equals(urlData.mUrl)) {
current.getWebView().debugDump();
} else {
- mSettings.toggleDebugSettings();
+ mSettings.toggleDebugSettings(mActivity);
}
return;
}
diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index 99fc4a0..4119c29 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -22,6 +22,7 @@
import android.util.Log;
import android.view.ActionMode;
import android.view.Gravity;
+import android.view.KeyEvent;
import android.view.Menu;
import android.view.View;
import android.view.ViewGroup;
@@ -269,4 +270,9 @@
hideFakeTitleBar();
}
+ @Override
+ public boolean dispatchKey(int code, KeyEvent event) {
+ return false;
+ }
+
}
diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index 83db214..c4897f2 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -148,14 +148,12 @@
if (incognito) {
mUrl = "browser:incognito";
mTitle = c.getString(R.string.new_incognito_tab);
- mFavicon = BitmapFactory.decodeResource(
- c.getResources(), R.drawable.fav_incognito);
} else {
mUrl = "";
mTitle = c.getString(R.string.new_tab);
- mFavicon = BitmapFactory.decodeResource(
- c.getResources(), R.drawable.app_web_browser_sm);
}
+ mFavicon = BitmapFactory.decodeResource(
+ c.getResources(), R.drawable.app_web_browser_sm);
mLockIcon = LockIcon.LOCK_ICON_UNSECURE;
}
@@ -170,13 +168,8 @@
if (favicon != null) {
mFavicon = favicon;
} else {
- if (incognito) {
- mFavicon = BitmapFactory.decodeResource(
- c.getResources(), R.drawable.fav_incognito);
- } else {
- mFavicon = BitmapFactory.decodeResource(
- c.getResources(), R.drawable.app_web_browser_sm);
- }
+ mFavicon = BitmapFactory.decodeResource(
+ c.getResources(), R.drawable.app_web_browser_sm);
}
}
}
diff --git a/src/com/android/browser/TabBar.java b/src/com/android/browser/TabBar.java
index 1ab02ed..df2e68a 100644
--- a/src/com/android/browser/TabBar.java
+++ b/src/com/android/browser/TabBar.java
@@ -18,13 +18,16 @@
import com.android.browser.ScrollWebView.ScrollListener;
+import android.animation.Animator;
+import android.animation.Animator.AnimatorListener;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
import android.app.Activity;
import android.content.Context;
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.BitmapShader;
import android.graphics.Canvas;
-import android.graphics.Color;
import android.graphics.Matrix;
import android.graphics.Paint;
import android.graphics.Path;
@@ -151,6 +154,7 @@
mTabMap.clear();
for (Tab tab : tabs) {
TabView tv = buildTabView(tab);
+ mTabs.addTab(tv);
}
mTabs.setSelectedTab(mTabControl.getCurrentIndex());
}
@@ -286,7 +290,6 @@
TabView tabview = new TabView(mActivity, tab);
mTabMap.put(tab, tabview);
tabview.setOnClickListener(this);
- mTabs.addTab(tabview);
return tabview;
}
@@ -327,7 +330,7 @@
mTab = tab;
setGravity(Gravity.CENTER_VERTICAL);
setOrientation(LinearLayout.HORIZONTAL);
- setPadding(mTabPadding, 0, 0, 0);
+ setPadding(mTabOverlap, 0, mTabSliceWidth, 0);
LayoutInflater inflater = LayoutInflater.from(getContext());
mTabContent = inflater.inflate(R.layout.tab_title, this, true);
mTitle = (TextView) mTabContent.findViewById(R.id.title);
@@ -346,6 +349,14 @@
void showIndicator(boolean show) {
if (mSelected) {
mIndicator.setVisibility(show ? View.VISIBLE : View.GONE);
+ LayoutParams lp = (LinearLayout.LayoutParams) getLayoutParams();
+ if (show) {
+ lp.width = mTabWidthSelected + mIndicator.getWidth();
+ } else {
+ lp.width = mTabWidthSelected;
+ }
+ lp.height = LayoutParams.MATCH_PARENT;
+ setLayoutParams(lp);
} else {
mIndicator.setVisibility(View.GONE);
}
@@ -485,21 +496,88 @@
}
+ static Drawable createFaviconBackground(Context context) {
+ PaintDrawable faviconBackground = new PaintDrawable();
+ Resources res = context.getResources();
+ faviconBackground.getPaint().setColor(context.getResources()
+ .getColor(R.color.tabFaviconBackground));
+ faviconBackground.setCornerRadius(
+ res.getDimension(R.dimen.tab_favicon_corner_radius));
+ return faviconBackground;
+ }
+
private Drawable renderFavicon(Bitmap icon) {
- Drawable[] array = new Drawable[3];
- array[0] = new PaintDrawable(Color.BLACK);
- array[1] = new PaintDrawable(Color.WHITE);
+ Drawable[] array = new Drawable[2];
+ array[0] = createFaviconBackground(getContext());
if (icon == null) {
- array[2] = mGenericFavicon;
+ array[1] = mGenericFavicon;
} else {
- array[2] = new BitmapDrawable(icon);
+ array[1] = new BitmapDrawable(icon);
}
LayerDrawable d = new LayerDrawable(array);
- d.setLayerInset(1, 1, 1, 1, 1);
- d.setLayerInset(2, 2, 2, 2, 2);
+ d.setLayerInset(1, 2, 2, 2, 2);
return d;
}
+ private void animateTabOut(final Tab tab, final TabView tv) {
+ ObjectAnimator scalex = ObjectAnimator.ofFloat(tv, "scaleX", 1.0f, 0.0f);
+ ObjectAnimator scaley = ObjectAnimator.ofFloat(tv, "scaleY", 1.0f, 0.0f);
+ ObjectAnimator alpha = ObjectAnimator.ofFloat(tv, "alpha", 1.0f, 0.0f);
+ AnimatorSet animator = new AnimatorSet();
+ animator.playTogether(scalex, scaley, alpha);
+ animator.setDuration(150);
+ animator.addListener(new AnimatorListener() {
+
+ @Override
+ public void onAnimationCancel(Animator animation) {
+ }
+
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ mTabs.removeTab(tv);
+ mTabMap.remove(tab);
+ mUi.onRemoveTabCompleted(tab);
+ }
+
+ @Override
+ public void onAnimationRepeat(Animator animation) {
+ }
+
+ @Override
+ public void onAnimationStart(Animator animation) {
+ }
+
+ });
+ animator.start();
+ }
+
+ private void animateTabIn(final Tab tab, final TabView tv) {
+ ObjectAnimator scalex = ObjectAnimator.ofFloat(tv, "scaleX", 0.0f, 1.0f);
+ scalex.setDuration(150);
+ scalex.addListener(new AnimatorListener() {
+
+ @Override
+ public void onAnimationCancel(Animator animation) {
+ }
+
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ mUi.onAddTabCompleted(tab);
+ }
+
+ @Override
+ public void onAnimationRepeat(Animator animation) {
+ }
+
+ @Override
+ public void onAnimationStart(Animator animation) {
+ mTabs.addTab(tv);
+ }
+
+ });
+ scalex.start();
+ }
+
// TabChangeListener implementation
public void onSetActiveTab(Tab tab) {
@@ -526,6 +604,7 @@
public void onNewTab(Tab tab) {
TabView tv = buildTabView(tab);
+ animateTabIn(tab, tv);
}
public void onProgress(Tab tab, int progress) {
@@ -538,9 +617,10 @@
public void onRemoveTab(Tab tab) {
TabView tv = mTabMap.get(tab);
if (tv != null) {
- mTabs.removeTab(tv);
+ animateTabOut(tab, tv);
+ } else {
+ mTabMap.remove(tab);
}
- mTabMap.remove(tab);
}
public void onUrlAndTitle(Tab tab, String url, String title) {
diff --git a/src/com/android/browser/TabScrollView.java b/src/com/android/browser/TabScrollView.java
index 09dddee..d0648b7 100644
--- a/src/com/android/browser/TabScrollView.java
+++ b/src/com/android/browser/TabScrollView.java
@@ -28,7 +28,6 @@
*/
public class TabScrollView extends HorizontalScrollView {
- private Context mContext;
private LinearLayout mContentView;
private int mSelected;
private int mAnimationDuration;
@@ -62,13 +61,12 @@
}
private void init(Context ctx) {
- mContext = ctx;
mAnimationDuration = ctx.getResources().getInteger(
R.integer.tab_animation_duration);
mTabOverlap = (int) ctx.getResources().getDimension(R.dimen.tab_overlap);
setHorizontalScrollBarEnabled(false);
setOverScrollMode(OVER_SCROLL_NEVER);
- mContentView = new TabLayout(mContext);
+ mContentView = new TabLayout(ctx);
mContentView.setOrientation(LinearLayout.HORIZONTAL);
mContentView.setLayoutParams(
new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT));
@@ -189,6 +187,21 @@
return getScrollX();
}
+ @Override
+ protected void onScrollChanged(int l, int t, int oldl, int oldt) {
+ super.onScrollChanged(l, t, oldl, oldt);
+
+ // TabViews base their drawing based on their absolute position within the
+ // window. When hardware accelerated, we need to recreate their display list
+ // when they scroll
+ if (isHardwareAccelerated()) {
+ int count = mContentView.getChildCount();
+ for (int i = 0; i < count; i++) {
+ mContentView.getChildAt(i).invalidate();
+ }
+ }
+ }
+
class TabLayout extends LinearLayout {
public TabLayout(Context context) {
diff --git a/src/com/android/browser/TitleBarXLarge.java b/src/com/android/browser/TitleBarXLarge.java
index 4822cc0..0dcece6 100644
--- a/src/com/android/browser/TitleBarXLarge.java
+++ b/src/com/android/browser/TitleBarXLarge.java
@@ -60,6 +60,7 @@
private ImageButton mBackButton;
private ImageButton mForwardButton;
private ImageView mStar;
+ private ImageView mWebIcon;
private View mSearchButton;
private View mUrlContainer;
private View mGoButton;
@@ -105,6 +106,7 @@
// back/forward. Probably should be done inside onPageStarted.
mBackButton = (ImageButton) findViewById(R.id.back);
mForwardButton = (ImageButton) findViewById(R.id.forward);
+ mWebIcon = (ImageView) findViewById(R.id.web_icon);
mStar = (ImageView) findViewById(R.id.star);
mStopButton = (ImageView) findViewById(R.id.stop);
mSearchButton = findViewById(R.id.search);
@@ -131,7 +133,7 @@
mUrlInput.setOnFocusChangeListener(this);
mUrlInput.setSelectAllOnFocus(true);
mUrlInput.addTextChangedListener(this);
- setUrlMode(false);
+ setEditMode(false);
}
void updateNavigationState(Tab tab) {
@@ -158,7 +160,7 @@
void setUseQuickControls(boolean useQuickControls) {
mUseQuickControls = useQuickControls;
- mUrlInput.setReverseResults(mUseQuickControls);
+ mUrlInput.setUseQuickControls(mUseQuickControls);
if (mUseQuickControls) {
mBackButton.setVisibility(View.GONE);
mForwardButton.setVisibility(View.GONE);
@@ -185,7 +187,11 @@
if (!mEditable && hasFocus) {
mUi.editUrl(false);
} else {
- setUrlMode(hasFocus);
+ if (hasFocus) {
+ setEditMode(hasFocus);
+ } else {
+ mUrlInput.stopEditing();
+ }
}
mUrlContainer.setBackgroundDrawable(hasFocus
? mFocusDrawable : mUnfocusDrawable);
@@ -264,7 +270,7 @@
private void clearOrClose() {
if (TextUtils.isEmpty(mUrlInput.getText())) {
// close
- setUrlMode(false);
+ mUrlInput.stopEditing();
} else {
// clear
mUrlInput.setText("");
@@ -300,22 +306,21 @@
i.putExtra(SearchManager.APP_DATA, appData);
}
mUiController.handleNewIntent(i);
- setUrlMode(false);
setDisplayTitle(text);
}
@Override
public void onDismiss() {
- WebView top = mUiController.getCurrentTopWebView();
- if (top != null) {
- mUiController.getCurrentTopWebView().requestFocus();
- }
+ final Tab currentTab = mUi.getActiveTab();
mUi.hideFakeTitleBar();
- setUrlMode(false);
- // if top != null current must be set
- if ((top != null) && !mInVoiceMode) {
- setDisplayTitle(mUiController.getCurrentWebView().getUrl());
- }
+ post(new Runnable() {
+ public void run() {
+ TitleBarXLarge.this.clearFocus();
+ if ((currentTab != null) && !mInVoiceMode) {
+ setDisplayTitle(currentTab.getUrl());
+ }
+ }
+ });
}
/**
@@ -330,8 +335,8 @@
}
}
- void setUrlMode(boolean focused) {
- if (focused) {
+ void setEditMode(boolean edit) {
+ if (edit) {
mUrlInput.setDropDownWidth(mUrlContainer.getWidth());
mUrlInput.setDropDownHorizontalOffset(-mUrlInput.getLeft());
mSearchButton.setVisibility(View.GONE);
@@ -340,9 +345,9 @@
if (mInVoiceMode) {
mVoiceSearchIndicator.setVisibility(View.VISIBLE);
}
+ mWebIcon.setImageResource(R.drawable.ic_search_holo_dark);
updateSearchMode();
} else {
- mUrlInput.clearFocus();
mGoButton.setVisibility(View.GONE);
mVoiceSearch.setVisibility(View.GONE);
mStar.setVisibility(View.VISIBLE);
@@ -353,6 +358,7 @@
} else {
mSearchButton.setVisibility(View.VISIBLE);
}
+ mWebIcon.setImageResource(R.drawable.ic_web_holo_dark);
}
}
@@ -450,4 +456,5 @@
void setIncognitoMode(boolean incognito) {
mUrlInput.setIncognitoMode(incognito);
}
+
}
diff --git a/src/com/android/browser/UI.java b/src/com/android/browser/UI.java
index 4738522..8de2b19 100644
--- a/src/com/android/browser/UI.java
+++ b/src/com/android/browser/UI.java
@@ -20,6 +20,7 @@
import android.graphics.Bitmap;
import android.os.Bundle;
import android.view.ActionMode;
+import android.view.KeyEvent;
import android.view.Menu;
import android.view.View;
import android.webkit.WebChromeClient.CustomViewCallback;
@@ -117,4 +118,6 @@
void showMaxTabsWarning();
+ boolean dispatchKey(int code, KeyEvent event);
+
}
diff --git a/src/com/android/browser/UrlInputView.java b/src/com/android/browser/UrlInputView.java
index 0214843..23e412d 100644
--- a/src/com/android/browser/UrlInputView.java
+++ b/src/com/android/browser/UrlInputView.java
@@ -18,11 +18,15 @@
import com.android.browser.SuggestionsAdapter.CompletionListener;
import com.android.browser.SuggestionsAdapter.SuggestItem;
+import com.android.browser.search.SearchEngine;
+import com.android.browser.search.SearchEngineInfo;
+import com.android.browser.search.SearchEngines;
import android.content.Context;
import android.content.res.Configuration;
import android.text.TextUtils;
import android.util.AttributeSet;
+import android.util.Patterns;
import android.view.KeyEvent;
import android.view.View;
import android.view.View.OnFocusChangeListener;
@@ -55,6 +59,8 @@
private View mContainer;
private boolean mLandscape;
private boolean mInVoiceMode;
+ private boolean mIncognitoMode;
+ private int mVOffset;
public UrlInputView(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
@@ -81,6 +87,7 @@
onConfigurationChanged(ctx.getResources().getConfiguration());
setThreshold(1);
setOnItemClickListener(this);
+ mVOffset = 0;
}
void setController(UiController controller) {
@@ -89,6 +96,13 @@
setCustomSelectionActionModeCallback(urlSelectionMode);
}
+ void setUseQuickControls(boolean useQuickControls) {
+ mVOffset = (useQuickControls
+ ? (int) getResources().getDimension(R.dimen.dropdown_offset)
+ : 0);
+ mAdapter.setReverseResults(useQuickControls);
+ }
+
void setContainer(View container) {
mContainer = container;
}
@@ -130,7 +144,7 @@
if (getLeft() != -getDropDownHorizontalOffset()) {
setDropDownHorizontalOffset(-getLeft());
}
- setDropDownVerticalOffset(8);
+ setDropDownVerticalOffset(mVOffset);
}
@Override
@@ -152,14 +166,16 @@
performFiltering(getText().toString(), 0);
showDropDown();
}
- } else {
- finishInput(null, null, null);
}
if (mWrappedFocusListener != null) {
mWrappedFocusListener.onFocusChange(v, hasFocus);
}
}
+ void stopEditing() {
+ finishInput(null, null, null);
+ }
+
public void setUrlInputListener(UrlInputListener listener) {
mListener = listener;
}
@@ -174,10 +190,33 @@
if (TextUtils.isEmpty(url)) {
mListener.onDismiss();
} else {
+ if (mIncognitoMode && isSearch(url)) {
+ // To prevent logging, intercept this request
+ // TODO: This is a quick hack, refactor this
+ SearchEngine searchEngine = BrowserSettings.getInstance()
+ .getSearchEngine();
+ if (searchEngine == null) return;
+ SearchEngineInfo engineInfo = SearchEngines
+ .getSearchEngineInfo(mContext, searchEngine.getName());
+ if (engineInfo == null) return;
+ url = engineInfo.getSearchUriForQuery(url);
+ // mLister.onAction can take it from here without logging
+ }
mListener.onAction(url, extra, source);
}
}
+ boolean isSearch(String inUrl) {
+ String url = UrlUtils.fixUrl(inUrl).trim();
+ if (TextUtils.isEmpty(url)) return false;
+
+ if (Patterns.WEB_URL.matcher(url).matches()
+ || UrlUtils.ACCEPTED_URI_SCHEMA.matcher(url).matches()) {
+ return false;
+ }
+ return true;
+ }
+
// Completion Listener
@Override
@@ -219,12 +258,9 @@
}
- public void setReverseResults(boolean reverse) {
- mAdapter.setReverseResults(reverse);
- }
-
public void setIncognitoMode(boolean incognito) {
- mAdapter.setIncognitoMode(incognito);
+ mIncognitoMode = incognito;
+ mAdapter.setIncognitoMode(mIncognitoMode);
}
}
diff --git a/src/com/android/browser/UrlUtils.java b/src/com/android/browser/UrlUtils.java
index 0a7e90c..d6278ca 100644
--- a/src/com/android/browser/UrlUtils.java
+++ b/src/com/android/browser/UrlUtils.java
@@ -152,7 +152,8 @@
if (inUrl == null) {
return "";
}
- if (inUrl.startsWith(HomeProvider.MOST_VISITED)) {
+ if (inUrl.startsWith("content:")
+ || inUrl.startsWith("browser:")) {
return "";
}
return inUrl;
diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index a9cc9fe..0fa38cf 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -24,6 +24,7 @@
import android.util.Log;
import android.view.ActionMode;
import android.view.Gravity;
+import android.view.KeyEvent;
import android.view.View;
import android.webkit.WebChromeClient.CustomViewCallback;
import android.webkit.WebView;
@@ -81,6 +82,7 @@
@Override
public void hideComboView() {
+ checkTabCount();
super.hideComboView();
// ComboView changes the action bar, set it back up to what we want
setupActionBar();
@@ -209,6 +211,9 @@
@Override
public void addTab(Tab tab) {
mTabBar.onNewTab(tab);
+ }
+
+ protected void onAddTabCompleted(Tab tab) {
checkTabCount();
}
@@ -251,6 +256,9 @@
public void removeTab(Tab tab) {
super.removeTab(tab);
mTabBar.onRemoveTab(tab);
+ }
+
+ protected void onRemoveTabCompleted(Tab tab) {
checkTabCount();
}
@@ -296,7 +304,7 @@
@Override
protected void hideFakeTitleBar() {
if (isFakeTitleBarShowing()) {
- mFakeTitleBar.setUrlMode(false);
+ mFakeTitleBar.setEditMode(false);
mContentView.removeView(mFakeTitleBar);
mTabBar.onHideTitleBar();
}
@@ -396,4 +404,25 @@
mActivity.getActionBar().show();
}
}
+
+ @Override
+ public boolean dispatchKey(int code, KeyEvent event) {
+ WebView web = getActiveTab().getWebView();
+ switch (code) {
+ case KeyEvent.KEYCODE_TAB:
+ case KeyEvent.KEYCODE_DPAD_UP:
+ case KeyEvent.KEYCODE_DPAD_LEFT:
+ if ((web != null) && web.hasFocus()) {
+ editUrl(true);
+ return true;
+ }
+ }
+ boolean ctrl = event.hasModifiers(KeyEvent.META_CTRL_ON);
+ if (!ctrl && event.isPrintingKey() && !mFakeTitleBar.isEditingUrl()) {
+ editUrl(true);
+ return mContentView.dispatchKeyEvent(event);
+ }
+ return false;
+ }
+
}
diff --git a/src/com/android/browser/preferences/GeneralPreferencesFragment.java b/src/com/android/browser/preferences/GeneralPreferencesFragment.java
index 2735166..b6228dc 100644
--- a/src/com/android/browser/preferences/GeneralPreferencesFragment.java
+++ b/src/com/android/browser/preferences/GeneralPreferencesFragment.java
@@ -224,7 +224,7 @@
mDialog = new AlertDialog.Builder(getActivity())
.setIcon(android.R.drawable.ic_dialog_alert)
- .setTitle("Choose account") // STOPSHIP localize
+ .setTitle(R.string.account_chooser_dialog_title)
.setSingleChoiceItems(accountNames, curAccountOffset, this)
.create();
return mDialog;
diff --git a/src/com/android/browser/preferences/PrivacySecurityPreferencesFragment.java b/src/com/android/browser/preferences/PrivacySecurityPreferencesFragment.java
index c0cf3cf..91705e5 100644
--- a/src/com/android/browser/preferences/PrivacySecurityPreferencesFragment.java
+++ b/src/com/android/browser/preferences/PrivacySecurityPreferencesFragment.java
@@ -44,6 +44,11 @@
Preference e = findPreference(BrowserSettings.PREF_CLEAR_HISTORY);
e.setOnPreferenceChangeListener(this);
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
setupAutoLoginPreference();
}
@@ -66,6 +71,8 @@
values[i] = "";
autologinPref.setEntries(names);
autologinPref.setEntryValues(values);
+ autologinPref.setValue(BrowserSettings.getInstance()
+ .getAutoLoginAccount(getActivity()));
}
private void updateAutoLoginSummary(Preference pref) {
diff --git a/src/com/android/browser/search/SearchEngines.java b/src/com/android/browser/search/SearchEngines.java
index 62690e7..a6ba3de 100644
--- a/src/com/android/browser/search/SearchEngines.java
+++ b/src/com/android/browser/search/SearchEngines.java
@@ -61,7 +61,7 @@
return new OpenSearchSearchEngine(context, searchEngineInfo);
}
- private static SearchEngineInfo getSearchEngineInfo(Context context, String name) {
+ public static SearchEngineInfo getSearchEngineInfo(Context context, String name) {
try {
return new SearchEngineInfo(context, name);
} catch (IllegalArgumentException exception) {
diff --git a/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java b/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java
index 51ba2ca..1c7856f 100644
--- a/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java
+++ b/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java
@@ -75,14 +75,16 @@
private static final int BOOKMARK_INDEX_TOUCH_ICON = 5;
private static final int BOOKMARK_INDEX_THUMBNAIL = 7;
- private Map<Integer, BookmarkFactory> mFactories;
+ // The service will likely be destroyed at any time, so we need to keep references to the
+ // factories across services connections.
+ private static final Map<Integer, BookmarkFactory> mFactories =
+ new HashMap<Integer, BookmarkFactory>();
private Handler mUiHandler;
private BookmarksObserver mBookmarksObserver;
@Override
public void onCreate() {
super.onCreate();
- mFactories = new HashMap<Integer, BookmarkFactory>();
mUiHandler = new Handler();
mBookmarksObserver = new BookmarksObserver(mUiHandler);
getContentResolver().registerContentObserver(
@@ -109,6 +111,12 @@
BookmarkFactory fac = mFactories.get(widgetId);
if (fac != null && folderId >= 0) {
fac.changeFolder(folderId);
+ } else {
+ // This a workaround to the issue when the Browser process crashes, after which
+ // mFactories is not populated (due to onBind() not being called). Calling
+ // notifyDataSetChanged() will trigger a connection to be made.
+ AppWidgetManager.getInstance(getApplicationContext())
+ .notifyAppWidgetViewDataChanged(widgetId, R.id.bookmarks_list);
}
}
return START_STICKY;
