Merge "Adding search_client_id which includes the "ms-" or "tablet-" client-id prefix, set in GooglePartnerSetup. Retaining client-id (which does not include the client-id prefix) for legacy purposes, if Browser is used with an older version of GooglePartnerSetup." into honeycomb-mr1
diff --git a/Android.mk b/Android.mk
index a5a47b3..b85a869 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,6 +17,9 @@
LOCAL_EMMA_COVERAGE_FILTER := *,-com.android.common.*
+# We need the sound recorder for the Media Capture API.
+LOCAL_REQUIRED_MODULES := SoundRecorder
+
include $(BUILD_PACKAGE)
# additionally, build tests in sub-folders in a separate .apk
diff --git a/res/anim/autologin_enter.xml b/res/anim/autologin_enter.xml
new file mode 100644
index 0000000..45e5204
--- /dev/null
+++ b/res/anim/autologin_enter.xml
@@ -0,0 +1,19 @@
+<?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.
+-->
+
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+ android:fromYDelta="-100%" android:toYDelta="0"
+ android:duration="@android:integer/config_longAnimTime"/>
diff --git a/res/anim/autologin_exit.xml b/res/anim/autologin_exit.xml
new file mode 100644
index 0000000..6faa715
--- /dev/null
+++ b/res/anim/autologin_exit.xml
@@ -0,0 +1,19 @@
+<?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.
+-->
+
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+ android:fromYDelta="0" android:toYDelta="-100%"
+ android:duration="@android:integer/config_longAnimTime"/>
diff --git a/res/drawable-mdpi/bg_bookmarks_widget_holo.9.png b/res/drawable-mdpi/bg_bookmarks_widget_holo.9.png
new file mode 100644
index 0000000..4fd263f
--- /dev/null
+++ b/res/drawable-mdpi/bg_bookmarks_widget_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/browsertab_add_focused.png b/res/drawable-mdpi/browsertab_add_focused.png
new file mode 100644
index 0000000..53fda75
--- /dev/null
+++ b/res/drawable-mdpi/browsertab_add_focused.png
Binary files differ
diff --git a/res/drawable-mdpi/qc_background_normal.png b/res/drawable-mdpi/qc_background_normal.png
index 539b45d..b9a16d1 100644
--- a/res/drawable-mdpi/qc_background_normal.png
+++ b/res/drawable-mdpi/qc_background_normal.png
Binary files differ
diff --git a/res/drawable-mdpi/qc_background_selected.png b/res/drawable-mdpi/qc_background_selected.png
deleted file mode 100644
index c0a6efc..0000000
--- a/res/drawable-mdpi/qc_background_selected.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/tab_nr.png b/res/drawable-mdpi/tab_nr.png
new file mode 100644
index 0000000..93e7598
--- /dev/null
+++ b/res/drawable-mdpi/tab_nr.png
Binary files differ
diff --git a/res/drawable/add_tab_selector.xml b/res/drawable/add_tab_selector.xml
new file mode 100644
index 0000000..4898f8f
--- /dev/null
+++ b/res/drawable/add_tab_selector.xml
@@ -0,0 +1,24 @@
+<?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.
+-->
+
+<!-- Custom background for the new tab button -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_focused="false"
+ android:drawable="@drawable/browsertab_add" />
+ <item android:state_focused="true"
+ android:drawable="@drawable/browsertab_add_focused" />
+</selector>
diff --git a/res/drawable/item_background_holo_dark.xm b/res/drawable/item_background_holo_dark.xm
deleted file mode 100644
index d5fa3c0..0000000
--- a/res/drawable/item_background_holo_dark.xm
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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"
- android:exitFadeDuration="@android:integer/config_mediumAnimTime">
- <item
- android:state_window_focused="false"
- android:drawable="@color/transparent" />
- <!--
- Even though these two point to the same resource, have two states so the
- drawable will invalidate itself when coming out of pressed state.
- -->
- <item
- android:state_focused="true"
- android:state_enabled="false"
- android:state_pressed="true"
- android:drawable="@drawable/list_selector_disabled_holo_dark" />
- <item
- android:state_focused="true"
- android:state_enabled="false"
- android:drawable="@drawable/list_selector_disabled_holo_dark" />
- <item
- android:state_focused="true"
- android:state_pressed="true"
- android:drawable="@drawable/list_selector_background_transition_holo_dark" />
- <item
- android:state_focused="false"
- android:state_pressed="true"
- android:drawable="@drawable/list_selector_background_transition_holo_dark" />
- <item
- android:state_focused="true"
- android:drawable="@drawable/list_focused_holo" />
- <item
- android:drawable="@color/transparent" />
-</selector>
\ No newline at end of file
diff --git a/res/drawable/qc_menu_selector.xml b/res/drawable/qc_menu_selector.xml
new file mode 100644
index 0000000..141f165
--- /dev/null
+++ b/res/drawable/qc_menu_selector.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_pressed="true"
+ android:drawable="@*android:drawable/list_selector_pressed_holo_dark" />
+ <item android:state_pressed="false" android:drawable="@drawable/clear" />
+</selector>
diff --git a/res/layout/bookmark_sync_wizard.xml b/res/layout/bookmark_sync_wizard.xml
new file mode 100644
index 0000000..3a3d9da
--- /dev/null
+++ b/res/layout/bookmark_sync_wizard.xml
@@ -0,0 +1,78 @@
+<?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.
+-->
+<view class="com.android.browser.view.EventRedirectingFrameLayout"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/pages"
+ android:paddingTop="6dip">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:background="@android:color/black">
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/import_bookmarks_dialog_description"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textColor="?android:attr/textColorAlertDialogListItem" />
+
+ <ListView
+ android:id="@+id/add_remove_bookmarks"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ android:divider="?android:attr/listDividerAlertDialog"
+ android:scrollbars="vertical"
+ android:overScrollMode="ifContentScrolls"
+ android:choiceMode="singleChoice" />
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:background="@android:color/black">
+
+ <TextView
+ android:id="@+id/select_account_description"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textColor="?android:attr/textColorAlertDialogListItem" />
+
+ <ListView
+ android:id="@+id/select_account"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ android:divider="?android:attr/listDividerAlertDialog"
+ android:scrollbars="vertical"
+ android:overScrollMode="ifContentScrolls"
+ android:choiceMode="singleChoice" />
+
+ </LinearLayout>
+
+ <TextView
+ android:id="@+id/confirm"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@android:color/black"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
+</view>
diff --git a/res/layout/bookmark_sync_wizard_item.xml b/res/layout/bookmark_sync_wizard_item.xml
new file mode 100644
index 0000000..91ec3de
--- /dev/null
+++ b/res/layout/bookmark_sync_wizard_item.xml
@@ -0,0 +1,26 @@
+<?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.
+-->
+
+<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@android:id/text1"
+ android:layout_width="match_parent"
+ android:layout_height="?android:attr/listPreferredItemHeight"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:gravity="center_vertical"
+ android:checkMark="?android:attr/listChoiceIndicatorSingle"
+ android:paddingLeft="6dip"
+ android:paddingRight="6dip"
+/>
diff --git a/res/layout/bookmarkthumbnailwidget.xml b/res/layout/bookmarkthumbnailwidget.xml
index 12191e8..2ac0db1 100644
--- a/res/layout/bookmarkthumbnailwidget.xml
+++ b/res/layout/bookmarkthumbnailwidget.xml
@@ -17,25 +17,26 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:paddingTop="4dip"
- android:paddingBottom="20dip"
- android:paddingLeft="12dip"
- android:paddingRight="12dip">
+ android:paddingTop="0dip"
+ android:paddingBottom="23dip"
+ android:paddingLeft="8dip"
+ android:paddingRight="8dip">
<GridView
android:id="@+id/bookmarks_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:numColumns="2"
- android:paddingBottom="6dip"
- android:paddingRight="3dip"
- android:paddingLeft="3dip"
+ android:paddingTop="6dip"
+ android:paddingRight="7dip"
+ android:paddingLeft="7dip"
android:stretchMode="columnWidth"
android:horizontalSpacing="@dimen/widgetHorizontalSpacing"
android:verticalSpacing="@dimen/widgetVerticalSpacing"
android:drawSelectorOnTop="true"
android:listSelector="@drawable/bookmark_widget_thumb_selector"
android:fadingEdgeLength="24dp"
- android:scrollbarStyle="outsideOverlay" />
+ android:scrollbarStyle="outsideOverlay"
+ android:background="@drawable/bg_bookmarks_widget_holo" />
<ImageButton
android:id="@+id/app_shortcut"
diff --git a/res/layout/bookmarkthumbnailwidget_item.xml b/res/layout/bookmarkthumbnailwidget_item.xml
index 3247806..8bc1efb 100644
--- a/res/layout/bookmarkthumbnailwidget_item.xml
+++ b/res/layout/bookmarkthumbnailwidget_item.xml
@@ -53,9 +53,8 @@
android:layout_gravity="center_vertical"
android:singleLine="true"
android:ellipsize="end"
- android:textSize="14sp"
+ android:textSize="12sp"
android:typeface="sans"
- android:textStyle="bold"
android:textColor="@android:color/white" />
</LinearLayout>
</RelativeLayout>
diff --git a/res/layout/qc_menu_item.xml b/res/layout/qc_menu_item.xml
new file mode 100644
index 0000000..9e4a2e8
--- /dev/null
+++ b/res/layout/qc_menu_item.xml
@@ -0,0 +1,30 @@
+<?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.
+-->
+
+<TextView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:minHeight="44dip"
+ android:background="@drawable/qc_menu_selector"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:gravity="center"
+ android:paddingLeft="8dip"
+ android:paddingRight="8dip"
+ android:paddingTop="4dip"
+ android:paddingBottom="4dip"
+ />
diff --git a/res/layout/qc_tab.xml b/res/layout/qc_tab.xml
new file mode 100644
index 0000000..5379680
--- /dev/null
+++ b/res/layout/qc_tab.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:background="@color/black"
+ android:padding="0dip"
+ >
+ <TextView android:id="@+id/title1"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingLeft="8dip"
+ android:paddingRight="2dip"
+ android:paddingTop="1dip"
+ android:paddingBottom="1dip"
+ android:gravity="center_vertical"
+ android:singleLine="true"
+ android:ellipsize="marquee"
+ android:typeface="sans"
+ android:textSize="12sp"
+ android:textColor="#DDDDDD"
+ />
+ <ImageView
+ android:id="@+id/thumb"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:layout_marginTop= "1dip"
+ android:layout_marginLeft= "1dip"
+ android:layout_marginRight= "1dip"
+ android:layout_marginBottom= "1dip"
+ android:src="@drawable/browser_thumbnail"
+ android:scaleType="centerCrop"
+ />
+ <TextView android:id="@+id/title2"
+ android:layout_width="match_parent"
+ android:layout_height="20dip"
+ android:paddingLeft="8dip"
+ android:paddingRight="2dip"
+ android:gravity="center_vertical"
+ android:singleLine="true"
+ android:ellipsize="marquee"
+ android:typeface="sans"
+ android:textSize="12sp"
+ android:textColor="#DDDDDD"
+ />
+</LinearLayout>
diff --git a/res/layout/qc_tabs_view.xml b/res/layout/qc_tabs_view.xml
new file mode 100644
index 0000000..accae68
--- /dev/null
+++ b/res/layout/qc_tabs_view.xml
@@ -0,0 +1,39 @@
+<?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.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="0dip"
+ >
+ <ImageView
+ android:id="@+id/icon"
+ android:layout_width="48dip"
+ android:layout_height="48dip"
+ />
+ <TextView android:id="@+id/label"
+ android:layout_height="24dip"
+ android:layout_width="24dip"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentBottom="true"
+ android:gravity="center_horizontal|center_vertical"
+ android:typeface="sans"
+ android:textSize="12sp"
+ android:textStyle="bold"
+ android:textColor="#ffffff"
+ android:background="@drawable/tab_nr"
+ />
+</RelativeLayout>
diff --git a/res/layout/tab_bar.xml b/res/layout/tab_bar.xml
index d3683b1..1710218 100644
--- a/res/layout/tab_bar.xml
+++ b/res/layout/tab_bar.xml
@@ -30,5 +30,5 @@
android:layout_width="wrap_content"
android:layout_height="44dip"
style="@style/HoloButton"
- android:background="@drawable/browsertab_add" />
+ android:background="@drawable/add_tab_selector" />
</merge>
\ No newline at end of file
diff --git a/res/layout/url_bar.xml b/res/layout/url_bar.xml
index f2b32c4..8743906 100644
--- a/res/layout/url_bar.xml
+++ b/res/layout/url_bar.xml
@@ -10,11 +10,66 @@
the specific language governing permissions and limitations under the
License.
-->
-<LinearLayout
+<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical">
+ >
+ <LinearLayout
+ android:id="@+id/autologin"
+ android:background="#FBF0A0"
+ android:gravity="center_vertical"
+ android:paddingTop="3dip"
+ android:visibility="gone"
+ android:layout_below="@+id/taburlbar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ <TextView
+ android:text="@string/autologin_bar_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@android:color/primary_text_light"
+ android:paddingLeft="15dip"
+ android:paddingRight="15dip"
+ android:textAppearance="?android:attr/textAppearanceMedium"/>
+ <Spinner
+ android:id="@+id/autologin_account"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ style="@android:style/Widget.Holo.Light.Spinner" />
+ <Button
+ android:id="@+id/autologin_login"
+ android:text="@string/autologin_bar_login_text"
+ style="@android:style/Widget.Holo.Light.Button"
+ android:layout_marginRight="15dip"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content" />
+ <ProgressBar
+ android:id="@+id/autologin_progress"
+ android:indeterminateOnly="true"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:visibility="gone" />
+ <TextView
+ android:id="@+id/autologin_error"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:textColor="#dd6826"
+ android:text="@string/autologin_bar_error"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:visibility="gone" />
+ <View
+ android:layout_width="2dip"
+ android:layout_height="match_parent"
+ android:layout_weight="1"/>
+ <ImageButton
+ android:id="@+id/autologin_close"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingRight="15dip"
+ android:background="@null"
+ android:src="@*android:drawable/btn_close"/>
+ </LinearLayout>
<LinearLayout
android:id="@+id/taburlbar"
android:layout_width="match_parent"
@@ -128,7 +183,8 @@
android:layout_width="match_parent"
android:layout_height="22dip"
android:background="@null"
+ android:layout_below="@+id/taburlbar"
android:src="@drawable/progress"
android:layout_marginTop="-11dip"
android:visibility="gone" />
-</LinearLayout>
+</RelativeLayout>
diff --git a/res/menu/bookmarkscontext.xml b/res/menu/bookmarkscontext.xml
index 3a13b9a..df6f9af 100644
--- a/res/menu/bookmarkscontext.xml
+++ b/res/menu/bookmarkscontext.xml
@@ -20,7 +20,7 @@
<item android:id="@+id/open_context_menu_id"
android:title="@string/open_bookmark"/>
<item android:id="@+id/new_window_context_menu_id"
- android:title="@string/open_in_new_window"/>
+ android:title="@string/contextmenu_openlink_newwindow"/>
<item android:id="@+id/edit_context_menu_id"
android:title="@string/edit_bookmark"/>
<item android:id="@+id/shortcut_context_menu_id"
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 4253bc5..8b5e833 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"المتصفح"</string>
<string name="choose_upload" msgid="3649366287575002063">"اختر ملفًا لتحميله"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"تحميلات الملفات معطلة."</string>
<string name="new_tab" msgid="4505722538297295141">"نافذة جديدة"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"نافذة جديدة للتصفح المتخفي"</string>
<string name="active_tabs" msgid="3050623868203544623">"نظام التشغيل Windows"</string>
@@ -99,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"قائمة"</string>
<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>
<string name="open_all_in_new_window" msgid="6514602245828366045">"فتح الكل في نوافذ جديدة"</string>
<string name="goto_dot" msgid="3895839050522602723">"تنفيذ"</string>
<string name="incognito_tab" msgid="5419458065370134289">"فتح علامة تبويب جديدة للتصفح المتخفي"</string>
@@ -112,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"التنزيلات"</string>
<string name="copy_page_url" msgid="7635062169011319208">"نسخ عنوان URL للصفحة"</string>
<string name="share_page" msgid="593756995297268343">"مشاركة الصفحة"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"حفظ كأرشيف ويب"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"تم حفظ أرشيف الويب."</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"أخفق حفظ أرشيف الويب."</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"حفظ الصفحة"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"تم حفظ الصفحة."</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"أخفق حفظ الصفحة."</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"<xliff:g id="BOOKMARK_COUNT">%d</xliff:g> من الإشارات المرجعية"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"المجلد فارغ"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"فتح"</string>
@@ -139,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"إعدادات محتوى الصفحة"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"تحميل الصور"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"عرض الصور على صفحات الويب"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"حظر النوافذ المنبثقة"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"حظر النوافذ المنبثقة"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"تمكين جافا سكريبت"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"فتح في الخلفية"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"تمكين المكونات الإضافية"</string>
@@ -149,7 +147,7 @@
<item msgid="8547442717307793863">"إيقاف"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"فتح نوافذ جديدة وراء النافذة الحالية"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"تعيين الصفحة الرئيسية"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"تعيين الصفحة الرئيسية"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"تعين محرك بحث"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"تحديد محرك بحث"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"تعيين على..."</string>
@@ -160,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"تنسيق صفحات الويب لاحتوائها في الشاشة"</string>
<string name="pref_general_title" msgid="1946872771219249323">"إعدادات عامة"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"المزامنة"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"الملء التلقائي"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"الملء التلقائي"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"المزامنة مع Google Chrome"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"مشاركة الإشارات والبيانات الأخرى بين متصفح Android وGoogle Chrome"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"حساب Google"</string>
@@ -168,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"مزامنة الإشارات بين متصفح Android وGoogle Chrome"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"بدء المزامنة"</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"تحديد حساب Google لمشاركته مع"</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"الملء التلقائي للنموذج"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"الملء التلقائي للنموذج"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"ملء نماذج الويب بنقرة واحدة"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"إعدادات الملء التلقائي"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"إعداد وإدارة البيانات للنماذج التي يتم ملؤها تلقائيًا"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"بيانات الملء التلقائي"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"إدخال وحفظ البيانات لملء حقول نموذج الويب تلقائيًا"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"تسجيل الدخول تلقائيًا إلى Google"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"لم يتم العثور على أي حسابات."</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"تسجيل الدخول إلى مواقع Google تلقائيًا باستخدام <xliff:g id="ID_1">%s</xliff:g>"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"تسجيل الدخول إلى مواقع Google باستخدام <xliff:g id="ID_1">%s</xliff:g>"\n"تتحكم إعدادات الخصوصية والأمان في تسجيل الدخول التلقائي إلى Google"</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"عدم تسجيل الدخول تلقائيًا"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"سيستخدم الملء التلقائي ملفك الشخصي لمساعدتك على إكمال نماذج الويب بنقرة واحدة."</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"تسجيل الدخول إلى مواقع Google باستخدام <xliff:g id="ID_1">%s</xliff:g>"\n"تتحكم إعدادات الخصوصية والأمان في تسجيل الدخول التلقائي إلى Google"</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"تسجل الدخول التلقائي متاح."</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"تسجيل الدخول"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"أخفق تسجيل الدخول."</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"أدخل البيانات المراد ملؤها تلقائيًا في حقول الويب عندما تلمسها."</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"الاسم بالكامل:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"البريد الإلكتروني:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"اسم الشركة:"</string>
@@ -196,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"تم حذف الملف الشخصي"</string>
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"حذف الملف الشخصي"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"يستطيع المتصفح إكمال نماذج ويب مثل هذا النموذج. هل تريد إعداد ملفك الشخصي؟"</string>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"يمكن تهيئة الملء التلقائي دائمًا عبر إعدادات المتصفح."</string>
- <string name="disable_autofill" msgid="3706426217720202898">"تعطيل الملء التلقائي"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"الخصوصية والأمان"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"يمكن تهيئة الملء التلقائي دائمًا من خلال إعدادات المتصفح."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"تعطيل الملء التلقائي"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"الخصوصية والأمان"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"محو ذاكرة التخزين المؤقت"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"محو قواعد البيانات والمحتوى المخزن مؤقتًا محليًا"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"سيتم حذف قواعد البيانات والمحتوى المخزن مؤقتًا محليًا."</string>
@@ -271,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"تشفير النص"</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>
- <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"الصفحة الرئيسية الأكثر زيارة"</string>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"لتعيين صفحتك الرئيسية لعرض الصفحات الأكثر زيارة."</string>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"عناصر التحكم السريعة"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"مرر الإبهام من الحافة اليسرى أو اليمنى للدخول إلى عناصر التحكم السريعة وإخفاء وأشرطة عناوين URL والتطبيق"</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"الصفحة الرئيسية لـ \"الأكثر زيارة\""</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"تعرض صفحتك الرئيسية مواقع الويب الأكثر زيارة."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"بحث Google الفوري"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"استخدم بحث Google الفوري عندما تستخدم بحث Google, لإظهار النتائج أثناء الكتابة (يمكن أن يزيد ذلك من استخدام البيانات)."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"مشكلة في اتصال البيانات"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"مشكلة في الملف"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"تأكيد"</string>
@@ -371,11 +367,19 @@
<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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"لم يتم إقران الإشارات المرجعية حتى الآن مع حساب Google. احفظ هذه الإشارات من خلال إضافتها إلى حساب. ويمكنك حذفها إذا كنت لا ترغب في مزامنتها."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"إضافة الإشارات المرجعية الموجودة على هذا الجهاز حاليًا وبدء مزامنتها مع حساب Google"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"حذف الإشارات المرجعية الموجودة على هذا الجهاز حاليًا وبدء مزامنتها مع حساب Google"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"حذف الإشارات المرجعية الموجودة على هذا الجهاز حاليًا وبدء مزامنتها مع <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"إضافة الإشارات المرجعية الموجودة على هذا الجهاز حاليًا وبدء مزامنتها مع <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"حذف الإشارات المرجعية"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"التالي"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"السابق"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"إلغاء"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"تم"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"إضافة الإشارات المرجعية إلى حساب Google"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"إضافة إشارات Android إلى إشارات <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
<string name="menu_share_url" msgid="5851814357333739700">"مشاركة"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"لا يتوفر المزيد من علامات التبويب"</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Google مع البحث الفوري (ميزات اختبارية)"</string>
</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 3951765..a5fd83a 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Браузър"</string>
<string name="choose_upload" msgid="3649366287575002063">"Избор на файл за качване"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"Качванията на файлове са деактивирани."</string>
<string name="new_tab" msgid="4505722538297295141">"Нов прозорец"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"Нов прозорец „инкогнито“"</string>
<string name="active_tabs" msgid="3050623868203544623">"Прозорци"</string>
@@ -78,8 +77,7 @@
<string name="http" msgid="2163722670597250102">"http://"</string>
<string name="save_to_bookmarks" msgid="6101482434920313244">"Добавяне към отметките"</string>
<string name="bookmark_this_page" msgid="7530739804320811054">"Запазване на тази страница като отметка"</string>
- <!-- no translation found for remove (7820112494467011374) -->
- <skip />
+ <string name="remove" msgid="7820112494467011374">"Премахване"</string>
<string name="edit_bookmark" msgid="5024089053490231905">"Редактиране на отметката"</string>
<string name="create_shortcut_bookmark" msgid="1995095662095484289">"Добавяне на пряк път до „Начало“"</string>
<string name="open_bookmark" msgid="8473581305759935790">"Отваряне"</string>
@@ -100,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"Списък"</string>
<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>
<string name="open_all_in_new_window" msgid="6514602245828366045">"Отваряне на всички в нови прозорци"</string>
<string name="goto_dot" msgid="3895839050522602723">"Старт"</string>
<string name="incognito_tab" msgid="5419458065370134289">"Нов раздел „инкогнито“"</string>
@@ -113,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"Изтеглени"</string>
<string name="copy_page_url" msgid="7635062169011319208">"Копиране на URL адреса на страницата"</string>
<string name="share_page" msgid="593756995297268343">"Споделяне на страницата"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"Запазване като уеб архив"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"Уеб архивът бе запазен."</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"Запазването на уеб архив не бе успешно."</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"Запазване на страницата"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"Страницата е запазена."</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"Запазването на страницата не бе успешно."</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"<xliff:g id="BOOKMARK_COUNT">%d</xliff:g> отметки"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"Празна папка"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"Отваряне"</string>
@@ -140,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"Настройки за съдържанието на страници"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"Зареждане на изображенията"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"Показване на изображенията в уеб страници"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"Блокиране на изскачащи прозорци"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"Изскачащи прозорци – блокиране"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"Активиране на JavaScript"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"Отваряне на заден план"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"Активиране на приставки"</string>
@@ -150,7 +147,7 @@
<item msgid="8547442717307793863">"Изкл."</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"Отваряне на нови прозорци зад текущия"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"Задаване на начална страница"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"Задаване на начална страница"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"Задаване на търсеща машина"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"Избор на търсеща машина"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"Задаване на..."</string>
@@ -161,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"Уеб страниците се форматират до размера на екрана"</string>
<string name="pref_general_title" msgid="1946872771219249323">"Общи"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"Синхронизиране"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"Автоматично попълване"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"Автоматично попълване"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"Синхронизиране с Google Chrome"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"Споделяйте отметки и други данни между браузъра в Android и Google Chrome"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"Профил в Google"</string>
@@ -169,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"Синхронизирайте отметки между браузъра в Android и Google Chrome"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"Старт на синхрона"</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"Избор на профил в Google, с който да се споделя"</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"Авт. попълване на формуляри"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"Авт. попълване на формуляри"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"Попълвайте формуляри в мрежата с едно кликване"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"Настройки за авт. попълване"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"Настройка и управление на данните за формуляри с автоматично попълване"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Данни за автоматичното попълване"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Въведете и запазете данни за автоматично попълване на полетата в уеб формуляри"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"Автоматичен вход в Google"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"Няма намерени профили"</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"Автоматично влизане в сайтовете на Google посредством <xliff:g id="ID_1">%s</xliff:g>"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"Влизате в сайтове на Google посредством <xliff:g id="ID_1">%s</xliff:g>"\n"Настройките ви за поверителност и сигурност контролират автоматичния вход в Google"</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"Да не се влиза автоматично"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"Автоматичното попълване ще използва потребителския ви профил, за да ви помогне да попълвате уеб формуляри с едно кликване."</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"Влизате в сайтове на Google посредством <xliff:g id="ID_1">%s</xliff:g>"\n"Настройките ви за поверителност и сигурност контролират автоматичния вход в Google"</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"Автоматичният вход е налице."</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"Вход"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"Влизането не бе успешно."</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"Въведете данните, които при докосване искате да се попълнят автоматично в уеб полетата."</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"Пълно име:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"Имейл адрес:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"Име на фирмата:"</string>
@@ -197,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"Потребителският профил бе изтрит"</string>
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Изтриване на профила"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"Браузърът може автоматично да попълва уеб формуляри като този. Искате ли да настроите потребителския си профил?"</string>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Автоматичното попълване винаги може да се конфигурира от „Настройки на браузъра“."</string>
- <string name="disable_autofill" msgid="3706426217720202898">"Деактивиране на автоматичното попълване"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"Поверителност и сигурност"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"Автоматичното попълване винаги може да се конфигурира от „Настройки на браузъра“."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"Деактивиране на автоматичното попълване"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"Поверителност и сигурност"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Изчистване на кеша"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Изчистване на съдържанието и базите от данни от локалния кеш"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"Съдържанието и базите от данни в локалния кеш ще бъдат изтрити."</string>
@@ -272,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Текстово кодиране"</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>
- <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"Най-посещавана начална страница"</string>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Задава началната ви страница да показва най-посещаваните страници."</string>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"Бързи контроли"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"Прокарайте палец от левия/десния край за достъп до бързите контроли и скр. на лентите за прил. и URL адр."</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"Най-посещаваната начална страница"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"Началната ви страница показва най-посещаваните от вас уеб страници."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Google Динамично търсене"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Използвайте Google Динамично търсене, за да се показват резултати, докато пишете (може да увеличи употребата на данни)."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Проблем с обмен на данни"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Проблем с файла"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Потвърждаване"</string>
@@ -372,11 +367,19 @@
<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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"Отметките на това устройство още не са свързани с профил в Google. Запазете ги, като ги добавите към профил. Изтрийте тези отметки, ако не искате да ги синхронизирате."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"Добавяне на текущите отметки от това устройство и начало на синхронизирането с профил в Google"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"Изтриване на текущите отметки от това устройство и начало на синхронизирането с профил в Google"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"Изтриване на текущите отметки от това устройство и начало на синхронизирането на отметките с/ъс <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"Добавяне на текущите отметки от това устройство и начало на синхронизирането на отметките с/ъс <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Изтриване на отметките"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Напред"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Назад"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Отказ"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Готово"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"Добавяне на отметките към профил в Google"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Добавяне на отметките ви в Android към тези на <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
<string name="menu_share_url" msgid="5851814357333739700">"Споделяне"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"Не се предлагат повече раздели"</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Google с Динамично търсене (Лаборатория)"</string>
</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 536b3e7..5f4ae04 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Navegador"</string>
<string name="choose_upload" msgid="3649366287575002063">"Trieu un fitxer per penjar-lo"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"Les càrregues de fitxers estan desactivades."</string>
<string name="new_tab" msgid="4505722538297295141">"Finestra nova"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"Nova finestra d\'incògnit"</string>
<string name="active_tabs" msgid="3050623868203544623">"Windows"</string>
@@ -78,8 +77,7 @@
<string name="http" msgid="2163722670597250102">"http://"</string>
<string name="save_to_bookmarks" msgid="6101482434920313244">"Afegeix als marcadors"</string>
<string name="bookmark_this_page" msgid="7530739804320811054">"Af. pàg. a marc."</string>
- <!-- no translation found for remove (7820112494467011374) -->
- <skip />
+ <string name="remove" msgid="7820112494467011374">"Elimina"</string>
<string name="edit_bookmark" msgid="5024089053490231905">"Edita l\'adreça d\'interès"</string>
<string name="create_shortcut_bookmark" msgid="1995095662095484289">"Afegeix una drecera a la pàgina d\'inici"</string>
<string name="open_bookmark" msgid="8473581305759935790">"Obre"</string>
@@ -100,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"Llista"</string>
<string name="current_page" msgid="7510129573681663135">"de "</string>
<string name="delete_bookmark_warning" msgid="758043186202032205">"Se suprimirà l\'adreça d\'interès \"<xliff:g id="BOOKMARK">%s</xliff:g>\"."</string>
- <string name="open_in_new_window" msgid="6596775546468054510">"Obre en una finestra nova"</string>
<string name="open_all_in_new_window" msgid="6514602245828366045">"Obre-ho tot en finestres noves"</string>
<string name="goto_dot" msgid="3895839050522602723">"Vés"</string>
<string name="incognito_tab" msgid="5419458065370134289">"Obre una nova pest. d\'incògnit"</string>
@@ -113,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"Baixades"</string>
<string name="copy_page_url" msgid="7635062169011319208">"Copia l\'URL de la pàgina"</string>
<string name="share_page" msgid="593756995297268343">"Comparteix la pàgina"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"Desa com a arxiu web"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"Arxiu web desat."</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"Error en desar l\'arxiu web."</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"Desa la pàgina"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"S\'ha desat la pàgina."</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"No s\'ha pogut desar la pàgina."</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"<xliff:g id="BOOKMARK_COUNT">%d</xliff:g> marcadors"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"Carpeta buida"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"Obre"</string>
@@ -140,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"Configuració del contingut de la pàgina"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"Carrega les imatges"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"Mostra les imatges a les pàgines web"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"Bloqueja les finestres emergents"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"Bloqueja finestres emergents"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"Activa JavaScript"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"Obre en segon terme"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"Activa els complements"</string>
@@ -150,7 +147,7 @@
<item msgid="8547442717307793863">"Desactivat"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"Obre finestres noves darrera la finestra actual"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"Defineix la pàgina d\'inici"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"Estableix la pàgina d\'inici"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"Defineix el motor de cerca"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"Selecciona un motor de cerca"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"Defineix com a..."</string>
@@ -161,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"Formata les pàgines web perquè s\'ajustin a la pantalla"</string>
<string name="pref_general_title" msgid="1946872771219249323">"General"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"Sincronització"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"Emplenament automàtic"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"Emplenament automàtic"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"Sincronitza amb Google Chrome"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"Comparteix els marcadors i altres dades entre el navegador d\'Android i Google Chrome"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"Compte de Google"</string>
@@ -169,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"Sincronitza els marcadors entre el navegador d\'Android i Google Chrome"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"Inicia la sincron."</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"Selecciona el Compte de Google amb el qual vols compartir"</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"Emplenament automàtic del formulari"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"Emplenament autom. del formulari"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"Emplena formularis web amb un simple clic"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"Configuració d\'emplenament automàtic"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"Configura i gestiona les dades per a formularis emplenats automàticament"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Dades d\'emplenament automàtic"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Introdueix i desa les dades per emplenar automàticament els camps del formulari web"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"Inici sessió automàtic a Google"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"No s\'ha trobat cap compte"</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"Inicia la sessió a Llocs web de Google automàticament mitjançant <xliff:g id="ID_1">%s</xliff:g>"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"S\'està iniciant la sessió a Llocs web de Google amb <xliff:g id="ID_1">%s</xliff:g>"\n"La configuració de privadesa i de seguretat controla l\'inici de sessió automàtic de Google"</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"No iniciïs la sessió automàticament"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"Emplenament automàtic utilitzarà el teu perfil per ajudar-te a emplenar formularis web amb un sol clic."</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"S\'està iniciant la sessió a Llocs web de Google amb <xliff:g id="ID_1">%s</xliff:g>"\n"La configuració de privadesa i de seguretat controla l\'inici de sessió automàtic de Google"</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"Inici de sessió automàtic disponible."</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"Inici sessió"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"Error en iniciar sessió."</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"Introdueix les dades que vulguis que s\'emplenin automàticament als camps web quan els toquis."</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"Nom complet:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"Correu electrònic:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"Nom de l\'empresa:"</string>
@@ -197,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"S\'ha suprimit el perfil"</string>
<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>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"L\'emplenament automàtic sempre es pot establir mitjançant la configuració del navegador."</string>
- <string name="disable_autofill" msgid="3706426217720202898">"Desactiva l\'emplenament automàtic"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"Privadesa i seguretat"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"L\'emplenament automàtic sempre es pot establir mitjançant la configuració del navegador."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"Desactiva l\'emplenament automàtic"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"Privadesa i seguretat"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Esborra la memòria cau"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Esborra el contingut i les bases de dades de la memòria cau local"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"Se suprimiran el contingut i les bases de dades de la memòria cau local."</string>
@@ -272,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Codificació del text"</string>
<string name="pref_lab_title" msgid="5571091610359629423">"Labs"</string>
- <string name="pref_lab_quick_controls" msgid="2105979166017257647">"Controls ràpids"</string>
- <string name="pref_lab_quick_controls_summary" msgid="8025196176636589803">"Fes lliscar el polze cap a la dreta o cap a l\'esquerra per accedir als controls ràpids"</string>
- <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"Pàgina principal més visitada"</string>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Estableix la pàgina d\'inici perquè mostri les pàgines més visitades."</string>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"Controls ràpids"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"Fes lliscar el polze des de la vora esquerra o dreta per accedir als controls ràpids i ocultar les barres d\'aplicació i URL"</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"Pàgina d\'inici més visitada"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"La teva pàgina d\'inici mostra les pàgines web que més visites."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Google Instant"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Utilitza Google Instant quan utilitzis la Cerca de Google per mostrar resultats mentre escrius (augmenta l\'ús de dades)."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Problema de connectivitat de dades"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Problema amb el fitxer"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Confirma"</string>
@@ -372,11 +367,19 @@
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
<string name="account_chooser_dialog_title" msgid="3314204833188808194">"Tria 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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"Els marcadors d\'aquest dispositiu encara no estan associats a un compte de Google. Afegeix aquests marcadors a un compte per desar-los. Suprimeix-los si no vols sincronitzar-los."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"Afegeix els marcadors d\'aquest dispositiu i comença a sincronitzar-los amb el compte de Google"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"Afegeix els marcadors d\'aquest dispositiu i comença a sincronitzar-los amb el compte de Google"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"Suprimeix els marcadors d\'aquest dispositiu i comença a sincronitzar els marcadors amb <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"Afegeix els marcadors d\'aquest dispositiu i comença a sincronitzar els marcadors amb <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Suprimeix els marcadors"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Següent"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Anterior"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Cancel·la"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Fet"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"Afegeix marcadors al compte de Google"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Afegeix els marcadors d\'Android als marcadors de <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
<string name="menu_share_url" msgid="5851814357333739700">"Comparteix"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"No hi ha cap més pestanya disponible"</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Google amb Instant (Labs)"</string>
</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index bf895d1..a86f58d 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Prohlížeč"</string>
<string name="choose_upload" msgid="3649366287575002063">"Zvolit soubor, který chcete nahrát."</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"Nahrávání souborů je deaktivováno."</string>
<string name="new_tab" msgid="4505722538297295141">"Nové okno"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"Nové anonymní okno"</string>
<string name="active_tabs" msgid="3050623868203544623">"Okna"</string>
@@ -99,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"Seznam"</string>
<string name="current_page" msgid="7510129573681663135">"od "</string>
<string name="delete_bookmark_warning" msgid="758043186202032205">"Záložka <xliff:g id="BOOKMARK">%s</xliff:g> bude smazána."</string>
- <string name="open_in_new_window" msgid="6596775546468054510">"Otevřít v novém okně"</string>
<string name="open_all_in_new_window" msgid="6514602245828366045">"Otevřít vše v nových oknech"</string>
<string name="goto_dot" msgid="3895839050522602723">"Přejít"</string>
<string name="incognito_tab" msgid="5419458065370134289">"Otevřít novou anonymní kartu"</string>
@@ -112,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"Stažené"</string>
<string name="copy_page_url" msgid="7635062169011319208">"Kopírovat adresu URL stránky"</string>
<string name="share_page" msgid="593756995297268343">"Sdílet stránku"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"Uložit jako webový archiv"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"Webový archiv byl uložen."</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"Uložení webového archivu se nezdařilo."</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"Uložit stránku"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"Stránka byla uložena."</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"Uložení stránky se nezdařilo."</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"Počet záložek: <xliff:g id="BOOKMARK_COUNT">%d</xliff:g>"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"Prázdná složka"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"Otevřít"</string>
@@ -139,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"Nastavení obsahu stránky"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"Načíst obrázky"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"Zobrazovat na webových stránkách obrázky"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"Blokovat vyskakovací okna"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"Blokovat vyskakovací okna"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"Povolit JavaScript"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"Otevřít na pozadí"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"Povolit pluginy"</string>
@@ -149,7 +147,7 @@
<item msgid="8547442717307793863">"Vypnuto"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"Otevírat nová okna za aktuálním oknem"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"Nastavit domovskou stránku"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"Nastavit domovskou stránku"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"Nastavit vyhledávač"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"Výběr vyhledávače"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"Nastavit na..."</string>
@@ -160,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"Přizpůsobit velikost webových stránek obrazovce"</string>
<string name="pref_general_title" msgid="1946872771219249323">"Obecné"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"Synchronizace"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"Automatické vyplňování"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"Automatické vyplňování"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"Synchronizovat s prohlížečem Google Chrome"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"Sdílet záložky a jiná data mezi Prohlížečem systému Android a aplikací Google Chrome"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"Účet Google"</string>
@@ -168,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"Synchronizovat záložky mezi Prohlížečem systému Android a aplikací Google Chrome"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"Synchronizovat"</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"Vyberte účet Google pro sdílení"</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"Automatické vyplňování formulářů"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"Automatické vyplňování formulářů"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"Vyplňování webových formulářů jediným kliknutím"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"Nastavení autom. vyplňování"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"Nastavení a správa automaticky vyplněných formulářů"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Automatické vyplnění údajů"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Zadat a uložit údaje pro automatické vyplnění polí webových formulářů"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"Automatické přihlášení do Googlu"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"Nebyly nalezeny žádné účty"</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"Automaticky se přihlašovat k webům Google pomocí účtu <xliff:g id="ID_1">%s</xliff:g>"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"Přihlášení na stránky Google pomocí uživatelského jména <xliff:g id="ID_1">%s</xliff:g>"\n" Automatické přihlášení Google se řídí vaším nastavením ochrany osobních údajů a zabezpečení"</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"Nepřihlašovat se automaticky"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"Automatické vyplňování umožňuje vyplnit webové formuláře jediným kliknutím pomocí údajů z vašeho profilu."</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"Přihlašování na stránky Google pomocí uživatelského jména <xliff:g id="ID_1">%s</xliff:g>"\n"Automatické přihlášení Google se řídí vaším nastavením ochrany osobních údajů a zabezpečení"</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"Automatické přihlašování je k dispozici."</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"Přihlášení"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"Přihlášení selhalo."</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"Zadejte data, která chcete automaticky vyplňovat do textových polí na webu, když se jich dotknete."</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"Jméno a příjmení:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"E-mail:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"Název společnosti:"</string>
@@ -196,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"Profil byl smazán."</string>
<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>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Automatické vyplňování lze vždy nakonfigurovat prostřednictvím nastavení prohlížeče."</string>
- <string name="disable_autofill" msgid="3706426217720202898">"Deaktivovat Automatické vyplňování"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"Ochrana osobních údajů a zabezpečení"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"Automatické vyplňování lze vždy nakonfigurovat prostřednictvím nastavení prohlížeče."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"Vypnout automatické vyplňování"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"Ochrana osobních údajů a zabezpečení"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Vymazat mezipaměť"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Vymazat všechen obsah a databáze uložené do místní mezipaměti"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"Obsah a databáze uložené v místní mezipaměti budou vymazány."</string>
@@ -271,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Kódování textu"</string>
<string name="pref_lab_title" msgid="5571091610359629423">"Laboratoř Google"</string>
- <string name="pref_lab_quick_controls" msgid="2105979166017257647">"Rychlé ovládací prvky"</string>
- <string name="pref_lab_quick_controls_summary" msgid="8025196176636589803">"Posunutím palce z levého nebo pravého okraje otevřete rychlé ovládací prvky."</string>
- <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"Nejnavštěvovanější domovská stránka"</string>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Nastaví domovskou stránku tak, aby zobrazovala nejčastěji navštěvované stránky."</string>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"Rychlé ovládací prvky"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"Posunutím prstu od levého nebo pravého okraje zobrazíte rychlé ovládací prvky a skryjete panely aplikací a URL."</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"Nejnavštěvovanější domovská stránka"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"Na vaší domovské stránce se zobrazují nejnavštěvovanější webové stránky."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Dynamické vyhledávání Google"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Dynamické vyhledávání ve Vyhledávání Google zobrazuje výsledky již při zadávání dotazu. (Může se zvýšit množství dat.)"</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Problémy s datovým připojením"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Problém se souborem"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Potvrdit"</string>
@@ -371,11 +367,19 @@
<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">"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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"Záložky v tomto zařízení zatím nejsou přidruženy k žádnému účtu Google. Pokud je chcete uložit, přidejte je do účtu. Pokud je s účtem synchronizovat nechcete, smažte je."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"Přidat záložky aktuálně uložené v tomto zařízení a zahájit synchronizaci s účtem Google"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"Smazat záložky aktuálně uložené v tomto zařízení a zahájit synchronizaci s účtem Google"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"Smazat záložky aktuálně uložené v tomto zařízení a zahájit synchronizaci záložek s účtem <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"Přidat záložky aktuálně uložené v tomto zařízení a zahájit synchronizaci záložek s účtem <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Smazat záložky"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Další"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Předchozí"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Zrušit"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Hotovo"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"Přidat záložky do účtu Google"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Přidat všechny záložky systému Android do záložek účtu <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
<string name="menu_share_url" msgid="5851814357333739700">"Sdílet"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"Žádné další karty nejsou k dispozici"</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Google s dynamickým vyhledáváním (experimentální funkce)"</string>
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index bbd5136..766bd97 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Browser"</string>
<string name="choose_upload" msgid="3649366287575002063">"Vælg fil til upload"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"Upload af filer er deaktiveret."</string>
<string name="new_tab" msgid="4505722538297295141">"Nyt vindue"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"Nyt inkognitovindue"</string>
<string name="active_tabs" msgid="3050623868203544623">"Vinduer"</string>
@@ -99,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"Liste"</string>
<string name="current_page" msgid="7510129573681663135">"fra "</string>
<string name="delete_bookmark_warning" msgid="758043186202032205">"Bogmærket \"<xliff:g id="BOOKMARK">%s</xliff:g>\" slettes."</string>
- <string name="open_in_new_window" msgid="6596775546468054510">"Åbn i et nyt vindue"</string>
<string name="open_all_in_new_window" msgid="6514602245828366045">"Åbn alle i nye vinduer"</string>
<string name="goto_dot" msgid="3895839050522602723">"Gå"</string>
<string name="incognito_tab" msgid="5419458065370134289">"Åbn ny inkognitofane"</string>
@@ -112,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"Downloads"</string>
<string name="copy_page_url" msgid="7635062169011319208">"Kopier sidens webadresse"</string>
<string name="share_page" msgid="593756995297268343">"Del side"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"Gem som webarkiv"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"Webarkivet blev gemt."</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"Webarkivet blev ikke gemt."</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"Gem side."</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"Siden er gemt."</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"Siden kunne ikke gemmes."</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"<xliff:g id="BOOKMARK_COUNT">%d</xliff:g> bogmærker"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"Mappen er tom"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"Åbn"</string>
@@ -139,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"Indstillinger for sideindhold"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"Indlæs billeder"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"Vis billeder på websider"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"Bloker pop op-vinduer"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"Bloker pop-op-vinduer"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"Aktiver Javascript"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"Åbn i baggrunden"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"Aktiver plugins"</string>
@@ -149,7 +147,7 @@
<item msgid="8547442717307793863">"Fra"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"Åbn nye vinduer bag det aktive"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"Angiv startside"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"Indstil startside"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"Angiv søgemaskine"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"Vælg en søgemaskine"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"Angiv som..."</string>
@@ -160,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"Tilpas websider, så de passer til skærmen"</string>
<string name="pref_general_title" msgid="1946872771219249323">"Generelt"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"Synkronisering"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"AutoFyld"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"AutoFyld"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"Synkroniser med Google Chrome"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"Del bogmærker og andre data mellem Android-browser og Google Chrome"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"Google-konto"</string>
@@ -168,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"Synkroniser bogmærker mellem Android-browser og Google Chrome"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"Start synkronisering"</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"Vælg Google-konto at dele med"</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"AutoFyld-formular"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"Formular til Autofyld"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"Udfyld webformularer med et enkelt klik"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"Indstillinger for AutoFyld"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"Konfigurer og administrer data for AutoFyld-formularer"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Data i AutoFyld"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Indtast og gem data til autoudfyldning af felter i webformularer"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"Automatisk Google-login"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"Der blev ikke fundet nogen konti"</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"Log automatisk ind på Googles websteder med <xliff:g id="ID_1">%s</xliff:g>"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"Logger ind på Google-websteder ved hjælp af <xliff:g id="ID_1">%s</xliff:g>"\n"Dine indstillinger for sikkerhed og beskyttelse af personlige oplysninger kontrollerer automatisk login til Google"</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"Log ikke ind automatisk"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"AutoFyld bruger din profil til at hjælpe dig med at udfylde webformularer med et enkelt klik."</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"Logger ind på Googles websteder ved hjælp af <xliff:g id="ID_1">%s</xliff:g>"\n"Dine indstillinger for sikkerhed og beskyttelse af personlige oplysninger kontrollerer automatisk Google-login"</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"Automatisk login er tilgængelig."</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"Log ind"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"Login mislykkedes."</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"Angiv de data, der skal udfyldes automatisk i webfelter, når du trykker på dem."</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"Fulde navn:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"E-mail:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"Virksomhedsnavn:"</string>
@@ -196,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"Profilen er slettet"</string>
<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>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"AutoFyld kan altid konfigureres via indstillingerne for Browser."</string>
- <string name="disable_autofill" msgid="3706426217720202898">"Deaktiver AutoFyld"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"Sikkerhed og beskyttelse af personlige oplysninger"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"AutoFyld kan altid konfigureres via indstillingerne for Browser."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"Deaktiver AutoFyld"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"Sikkerhed og beskyttelse af personlige oplysninger"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Ryd cache"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Ryd lokalt cachelagret indhold og databaser"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"Lokalt cachelagret indhold og databaser slettes."</string>
@@ -271,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Tekstkodning"</string>
<string name="pref_lab_title" msgid="5571091610359629423">"Labs"</string>
- <string name="pref_lab_quick_controls" msgid="2105979166017257647">"Hurtig betjening"</string>
- <string name="pref_lab_quick_controls_summary" msgid="8025196176636589803">"Lad tommelfingeren glide hurtigt fra venstre eller højre side for at få adgang til hurtig betjening"</string>
- <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"Mest besøgte hjemmeside"</string>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Indstiller din hjemmeside til at vise de mest besøgte sider."</string>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"Hurtig betjening"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"Glid fra venstre til højre for hurtig betjening og for at skjule applikation og adresselinje"</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"Mest besøgte startside"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"Din startside viser dine mest besøgte websider."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Google Direkte"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Brug Google Direkte, når du søger på Google for at få vist resultater ved indtastning (kan forøge dataforbruget)."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Dataforbindelsesproblem"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Der er et problem med filen"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Bekræft"</string>
@@ -371,11 +367,19 @@
<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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"Bogmærker på denne enhed er endnu ikke knyttet til en Google-konto. Gem disse bogmærker ved at føje dem til en konto. Slet disse bogmærker, hvis du ikke vil synkronisere dem."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"Tilføj bogmærker på denne enhed, og begynd synkronisering med Google-konto"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"Slet bogmærker på denne enhed, og begynd synkronisering med Google-konto"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"Slet bogmærker på denne enhed, og begynd synkronisering af bogmærker med <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"Tilføj bogmærker på denne enhed, og begynd synkronisering af bogmærker med <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Slet bogmærker"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Næste"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Forrige"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Annuller"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Udfør"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"Føj bogmærker til Google-konto"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Føj dine Android-bogmærker til bogmærker for <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
<string name="menu_share_url" msgid="5851814357333739700">"Del"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"Der er ikke flere tilgængelige faner"</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Google med Direkte (Labs)"</string>
</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 8527d98..af0655b 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Browser"</string>
<string name="choose_upload" msgid="3649366287575002063">"Datei zum Hochladen auswählen"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"Dateiuploads sind deaktiviert."</string>
<string name="new_tab" msgid="4505722538297295141">"Neues Fenster"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"Neues Inkognito-Fenster"</string>
<string name="active_tabs" msgid="3050623868203544623">"Fenster"</string>
@@ -99,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"Liste"</string>
<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>
<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>
@@ -111,17 +109,17 @@
<string name="history" msgid="2451240511251410032">"Verlauf"</string>
<string name="menu_view_download" msgid="2124570321712995120">"Downloads"</string>
<string name="copy_page_url" msgid="7635062169011319208">"Seiten-URL kopieren"</string>
- <string name="share_page" msgid="593756995297268343">"Seitenlink weiterleiten"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"Als Webarchiv speichern"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"Webarchiv gespeichert."</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"Das Webarchiv wurde nicht gespeichert."</string>
+ <string name="share_page" msgid="593756995297268343">"Seitenlink weitergeben"</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"Seite speichern"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"Seite wurde gespeichert."</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"Seite konnte nicht gespeichert werden."</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"<xliff:g id="BOOKMARK_COUNT">%d</xliff:g> Lesezeichen"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"Leerer Ordner"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"Öffnen"</string>
<string name="contextmenu_openlink_newwindow" msgid="992765050093960353">"In neuem Fenster öffnen"</string>
<string name="contextmenu_openlink_newwindow_background" msgid="5556131402560251639">"In neuem Hintergrundfenster öffnen"</string>
<string name="contextmenu_savelink" msgid="5508554930832538184">"Link speichern"</string>
- <string name="contextmenu_sharelink" msgid="5392275392280130331">"Link weiterleiten"</string>
+ <string name="contextmenu_sharelink" msgid="5392275392280130331">"Link weitergeben"</string>
<string name="contextmenu_copy" msgid="398860586635404030">"Kopieren"</string>
<string name="contextmenu_copylink" msgid="5153657160294534270">"Link-URL kopieren"</string>
<string name="contextmenu_download_image" msgid="4243829645180686912">"Bild speichern"</string>
@@ -131,7 +129,7 @@
<string name="contextmenu_add_contact" msgid="3183511922223645716">"Kontakt hinzufügen"</string>
<string name="contextmenu_send_mail" msgid="1014513374828775660">"E-Mail senden"</string>
<string name="contextmenu_map" msgid="7471390435434034912">"Karte"</string>
- <string name="choosertitle_sharevia" msgid="4600490613341909086">"Weiterleiten über"</string>
+ <string name="choosertitle_sharevia" msgid="4600490613341909086">"Weitergeben über"</string>
<string name="clear" msgid="7070043081700011461">"Löschen"</string>
<string name="replace" msgid="4843033491070384047">"Ersetzen"</string>
<string name="browser_bookmarks_page_bookmarks_text" msgid="6787605028726162673">"Lesezeichen"</string>
@@ -139,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"Einstellungen für Seiteninhalt"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"Bilder laden"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"Bilder auf Webseiten anzeigen"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"Pop-ups blockieren"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"Pop-ups blockieren"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"JavaScript aktivieren"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"Im Hintergrund öffnen"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"Plug-ins aktivieren"</string>
@@ -149,7 +147,7 @@
<item msgid="8547442717307793863">"Aus"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"Neues Fenster hinter dem aktuellen Fenster öffnen"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"Startseite festlegen"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"Startseite festlegen"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"Suchmaschine festlegen"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"Suchmaschine auswählen"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"Eingestellt auf..."</string>
@@ -160,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"Webseiten an den Bildschirm anpassen"</string>
<string name="pref_general_title" msgid="1946872771219249323">"Allgemein"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"Synchronisierung"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"AutoFill"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"AutoFill"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"Mit Google Chrome synchronisieren"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"Lesezeichen und andere Daten zwischen Android-Browser und Google Chrome austauschen"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"Google-Konto"</string>
@@ -168,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"Lesezeichen zwischen Android-Browser und Google Chrome synchronisieren"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"Synchronis. starten"</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"Google-Konto wählen"</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"Formulare automatisch ausfüllen"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"Formular automatisch ausfüllen"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"Onlineformulare mit einem einzigen Klick ausfüllen"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"AutoFill-Einstellungen"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"Angaben für das automatische Ausfüllen von Formularen festlegen und verwalten"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Daten automatisch ausfüllen"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Eingabe und Speichern von Daten für automatisch auszufüllende Webformularfelder"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"Automatische Google-Anmeldung"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"Keine Konten gefunden"</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"Bei Google-Websites automatisch mit <xliff:g id="ID_1">%s</xliff:g> anmelden"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"Die Anmeldung auf Google-Websites anhand <xliff:g id="ID_1">%s</xliff:g>"\n"Ihrer Einstellungen für Datenschutz und Sicherheit steuert die automatische Google-Anmeldung."</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"Nicht automatisch anmelden"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"AutoFill verwendet Ihr Profil, damit Sie Onlineformulare mit einem einzigen Klick ausfüllen können."</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"Sie werden mit <xliff:g id="ID_1">%s</xliff:g> in Google-Websites angemeldet."\n"Die automatische Google-Anmeldung wird durch Ihre Einstellungen für Datenschutz und Sicherheit gesteuert."</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"Automatische Anmeldung ist verfügbar."</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"Anmelden"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"Anmeldung fehlgeschlagen"</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"Geben Sie die Daten ein, die automatisch in Web-Felder eingetragen werden sollen, wenn Sie sie berühren."</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"Vollständiger Name:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"E-Mail:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"Name des Unternehmens:"</string>
@@ -196,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"Profil gelöscht"</string>
<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>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"AutoFill kann stets über die Browsereinstellungen konfiguriert werden."</string>
- <string name="disable_autofill" msgid="3706426217720202898">"AutoFill deaktivieren"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"Datenschutz und Sicherheit"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"AutoFill kann stets über die Browsereinstellungen konfiguriert werden."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"AutoFill deaktivieren"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"Datenschutz und Sicherheit"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Cache löschen"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Content und Datenbanken aus dem lokalen Cache löschen"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"Content und Datenbanken werden aus dem lokalen Cache gelöscht."</string>
@@ -271,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Textcodierung"</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>
- <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>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"Schnellsteuerung"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"Für Schnellsteuerung/Ausblenden der App- und URL-Leisten Daumen von links nach rechts ziehen"</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"\"Am häufigsten besucht\" auf Startseite"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"Auf Ihrer Startseite werden Ihre am häufigsten besuchten Webseiten angezeigt."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Google Instant"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Nutzen Sie Google Instant bei der Google-Suche. Ergebnisse werden bei Eingabe angezeigt (ggf. mehr Speicher erforderl.)."</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>
@@ -371,11 +367,19 @@
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
<string name="account_chooser_dialog_title" msgid="3314204833188808194">"Konto auswä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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"Die Lesezeichen auf diesem Gerät sind noch nicht mit einem Google-Konto verknüpft. Speichern Sie diese Lesezeichen, indem Sie sie einem Konto hinzufügen. Falls Sie sie nicht synchronisieren möchten, löschen Sie diese Lesezeichen."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"Derzeit auf diesem Gerät befindliche Lesezeichen hinzufügen und Synchronisierung mit Google-Konto starten"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"Derzeit auf diesem Gerät befindliche Lesezeichen löschen und Synchronisierung mit Google-Konto starten"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"Derzeit auf diesem Gerät befindliche Lesezeichen löschen und Synchronisierung der Lesezeichen mit <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g> starten"</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"Derzeit auf diesem Gerät befindliche Lesezeichen hinzufügen und Synchronisierung der Lesezeichen mit <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g> starten"</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Lesezeichen löschen"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Weiter"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Zurück"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Abbrechen"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Fertig"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"Lesezeichen zu Google-Konto hinzufügen"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Ihre Android-Lesezeichen den Lesezeichen für <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g> hinzufügen"</string>
<string name="menu_share_url" msgid="5851814357333739700">"Weitergeben"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"Es sind keine weiteren Tabs verfügbar."</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Google mit dynamischer Suche (Labs)"</string>
</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 8b55d61..bddb6bf 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Internet"</string>
<string name="choose_upload" msgid="3649366287575002063">"Επιλογή αρχείου για μεταφόρτωση"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"Η μεταφόρτωση αρχείων είναι απενεργοποιημένη."</string>
<string name="new_tab" msgid="4505722538297295141">"Νέο παράθυρο"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"Νέο παράθυρο για ανώνυμη περιήγηση"</string>
<string name="active_tabs" msgid="3050623868203544623">"Παράθυρα"</string>
@@ -99,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"Λίστα"</string>
<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>
<string name="open_all_in_new_window" msgid="6514602245828366045">"Άνοιγμα όλων σε νέα παράθυρα"</string>
<string name="goto_dot" msgid="3895839050522602723">"Μετάβαση"</string>
<string name="incognito_tab" msgid="5419458065370134289">"Άνοιγμα νέας καρτέλας ανώνυμης περιήγησης"</string>
@@ -112,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"Λήψεις"</string>
<string name="copy_page_url" msgid="7635062169011319208">"Αντιγραφή διεύθυνσης url της σελίδας"</string>
<string name="share_page" msgid="593756995297268343">"Κοινή χρήση σελίδας"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"Αποθήκευση ως αρχείου ιστού"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"Το αρχείο ιστού αποθηκεύθηκε."</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"Η αποθήκευση του αρχείου ιστού απέτυχε."</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"Αποθήκευση σελίδας"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"Η σελίδα αποθηκεύτηκε."</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"Απέτυχε η αποθήκευση της σελίδας."</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"<xliff:g id="BOOKMARK_COUNT">%d</xliff:g> σελιδοδείκτες"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"Κενός φάκελος"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"Άνοιγμα"</string>
@@ -139,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"Ρυθμίσεις περιεχομένου σελίδας"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"Φόρτωση εικόνων"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"Προβολή εικόνων στις ιστοσελίδες"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"Αποκλεισμός αναδυόμενων παραθύρων"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"Αποκλεισμός αναδυόμενων παραθύρων"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"Ενεργοποίηση JavaScript"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"Άνοιγμα στο παρασκήνιο"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"Ενεργοποίηση πρόσθετων"</string>
@@ -149,7 +147,7 @@
<item msgid="8547442717307793863">"Απενεργοποιημένο"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"Άνοιγμα νέων παραθύρων πίσω από το τρέχον"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"Ορισμός ως αρχική σελίδα"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"Ορισμός αρχικής σελίδας"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"Ορισμός μηχανής αναζήτησης"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"Επιλέξτε μηχανή αναζήτησης"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"Ορισμός σε..."</string>
@@ -160,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"Μορφοποίηση ιστοσελίδων για την προσαρμογή τους στο μέγεθος της οθόνης"</string>
<string name="pref_general_title" msgid="1946872771219249323">"Γενικές"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"Συγχρονισμός"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"Αυτόματη συμπλήρωση"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"Αυτόματη συμπλήρωση"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"Συγχρονισμός με Google Chrome"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"Κάντε κοινή χρήση σελιδοδεικτών και άλλων δεδομένων μεταξύ του Προγράμματος περιήγησης του Android και του Google Chrome"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"Λογαριασμός Google"</string>
@@ -168,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"Συγχρονισμός σελιδοδεικτών μεταξύ του Προγράμματος περιήγησης του Android και του Google Chrome"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"Έναρξη συγχρονισμού"</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"Επιλογή λογαριασμού"</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"Αυτόματη συμπλήρωση φόρμας"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"Αυτόμ. συμπλήρωση φόρμας"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"Συμπληρώστε φόρμες ιστού με ένα κλικ"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"Ρυθμίσεις αυτόματης συμπλήρωσης"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"Ρύθμιση και διαχείριση δεδομένων για φόρμες Αυτόματης συμπλήρωσης"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Αυτόματη συμπλήρωση δεδομένων"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Καταχώριση και αποθήκευση δεδομένων για πεδία φόρμας ιστού αυτόματης συμπλήρωσης"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"Αυτόματη σύνδεση στο Google"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"Δεν βρέθηκαν λογαριασμοί"</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"Συνδεθείτε αυτόματα σε Ιστότοπους Google χρησιμοποιώντας το λογαριασμό <xliff:g id="ID_1">%s</xliff:g>"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"Σύνδεση σε Ιστότοπους Google χρησιμοποιώντας το αναγνωριστικό <xliff:g id="ID_1">%s</xliff:g>"\n"Οι ρυθμίσεις Απόρρητο και Ασφάλεια ελέγχουν την αυτόματη σύνδεση στο Google"</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"Να μην γίνεται αυτόματη σύνδεση"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"Η Αυτόματη Συμπλήρωση θα χρησιμοποιήσει το προφίλ σας για να σας βοηθήσει να συμπληρώσετε φόρμες ιστού με ένα κλικ."</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"Σύνδεση σε Ιστότοπους Google χρησιμοποιώντας το αναγνωριστικό <xliff:g id="ID_1">%s</xliff:g>"\n"Οι ρυθμίσεις απορρήτου και ασφάλειας ελέγχουν την αυτόματη σύνδεση στο Google"</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"Διαθέσιμη αυτόματη σύνδεση."</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"Σύνδεση"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"Η σύνδεση απέτυχε."</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"Καταχωρίστε τα δεδομένα που θέλετε για να κάνετε αυτόματη συμπλήρωση των πεδίων ιστού όταν τα αγγίζετε,"</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"Πλήρες όνομα:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"Ηλεκτρονικό ταχυδρομείο:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"Επωνυμία εταιρείας:"</string>
@@ -196,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"Το προφίλ διαγράφηκε"</string>
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Διαγραφή προφίλ"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"Το πρόγραμμα περιήγησης μπορεί να ολοκληρώσει αυτόματα φόρμες ιστού σαν αυτήν. Θα θέλατε να δημιουργήσετε το δικό σας προφίλ;"</string>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Μπορείτε να διαμορφώσετε τη λειτουργία αυτόματης συμπλήρωσης μέσα από τις ρυθμίσεις του προγράμματος περιήγησης."</string>
- <string name="disable_autofill" msgid="3706426217720202898">"Απενεργοποίηση αυτόματης συμπλήρωσης"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"Απόρρητο και Ασφάλεια"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"Μπορείτε να διαμορφώσετε τη λειτουργία αυτόματης συμπλήρωσης μέσα από τις ρυθμίσεις του προγράμματος περιήγησης."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"Απενεργοποιήστε τη λειτουργία αυτόματης συμπλήρωσης"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"Απόρρητο και ασφάλεια"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Εκκαθάριση προσωρινής μνήμης"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Εκκαθάριση τοπικά αποθηκευμένου στη μνήμη cache περιεχομένου και βάσεων δεδομένων"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"Περιεχόμενο και βάσεις δεδομένων που έχουν αποθηκευτεί στην τοπική προσωρινή μνήμη θα διαγραφούν."</string>
@@ -271,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Κωδικοποίηση κειμένου"</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>
- <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"Αρχική σελίδα με τις περισ. επισκέψεις"</string>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Ορίζει στην αρχική σελίδα την εμφάνιση των σελίδων με τις περισσότ. επισκέψεις"</string>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"Στοιχεία γρήγορου ελέγχου"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"Σύρετε τον αντίχειρα από αριστερά ή δεξιά για πρόσβαση στα στοιχεία γρήγορου ελέγχου και απόκρυψη των γραμμών εφαρμογής και διεύθυνσης URL"</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"Αρχική σελίδα με τις περισσότερες επισκέψεις"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"Η αρχική σελίδα εμφανίζει τις ιστοσελίδες με τις περισσότερες επισκέψεις σας."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Google Instant"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Χρησιμοποιήστε το Google Instant μαζί με την Αναζήτηση Google για να εμφανίζονται τα αποτελέσματα καθώς πληκτρολογείτε (μπορεί να αυξηθεί η χρήση δεδομένων)."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Πρόβλημα σύνδεσης δεδομένων"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Υπάρχει πρόβλημα με το αρχείο"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Επιβεβαίωση"</string>
@@ -371,11 +367,19 @@
<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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"Οι σελιδοδείκτες που υπάρχουν σε αυτή τη συσκευή δεν έχουν συσχετιστεί ακόμα με κάποιον λογαριασμό Google. Αποθηκεύστε αυτούς τους σελιδοδείκτες προσθέτοντάς τους σε κάποιον λογαριασμό. Διαγράψτε αυτούς τους σελιδοδείκτες αν δεν θέλετε να τους συγχρονίσετε."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"Προσθέστε τους σελιδοδείκτες που υπάρχουν αυτή τη στιγμή στη συσκευή σας και αρχίστε να εκτελείτε συγχρονισμό με κάποιον Λογαριασμό Google"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"Διαγράψτε τους σελιδοδείκτες που υπάρχουν αυτή τη στιγμή στη συσκευή σας και αρχίστε να εκτελείτε συγχρονισμό με κάποιον Λογαριασμό Google"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"Διαγράψτε τους σελιδοδείκτες που υπάρχουν αυτή τη στιγμή στη συσκευή σας και αρχίστε να εκτελείτε συγχρονισμό των σελιδοδεικτών με τον λογαριασμό <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"Προσθέστε τους σελιδοδείκτες που υπάρχουν αυτή τη στιγμή στη συσκευή σας και αρχίστε να εκτελείτε συγχρονισμό των σελιδοδεικτών με τον λογαριασμό <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Διαγραφή σελιδοδεικτών"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Επόμενο"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Προηγούμενο"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Ακύρωση"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Τέλος"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"Προσθέστε σελιδοδείκτες στον Λογαριασμό Google"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Προσθ. τους σελιδοδείκτες Android στους σελιδοδείκτες του <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
<string name="menu_share_url" msgid="5851814357333739700">"Κοινή χρήση"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"Δεν υπάρχουν άλλες διαθέσιμες καρτέλες"</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Google με Instant (Labs)"</string>
</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index d63ff00..e3120df 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Browser"</string>
<string name="choose_upload" msgid="3649366287575002063">"Choose file for upload"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"File uploads are disabled."</string>
<string name="new_tab" msgid="4505722538297295141">"New window"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"New incognito window"</string>
<string name="active_tabs" msgid="3050623868203544623">"Windows"</string>
@@ -99,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"List"</string>
<string name="current_page" msgid="7510129573681663135">"from "</string>
<string name="delete_bookmark_warning" msgid="758043186202032205">"Bookmark \"<xliff:g id="BOOKMARK">%s</xliff:g>\" will be deleted."</string>
- <string name="open_in_new_window" msgid="6596775546468054510">"Open in new window"</string>
<string name="open_all_in_new_window" msgid="6514602245828366045">"Open all in new windows"</string>
<string name="goto_dot" msgid="3895839050522602723">"Go"</string>
<string name="incognito_tab" msgid="5419458065370134289">"Open new incognito tab"</string>
@@ -112,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"Downloads"</string>
<string name="copy_page_url" msgid="7635062169011319208">"Copy page URL"</string>
<string name="share_page" msgid="593756995297268343">"Share page"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"Save as Web Archive"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"Web archive saved."</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"Failed to save web archive."</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"Save page"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"Page saved."</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"Failed to save page."</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"<xliff:g id="BOOKMARK_COUNT">%d</xliff:g> bookmarks"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"Empty folder"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"Open"</string>
@@ -139,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"Page content settings"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"Load images"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"Display images on web pages"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"Block pop-up windows"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"Block pop-ups"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"Enable JavaScript"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"Open in background"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"Enable plug-ins"</string>
@@ -149,7 +147,7 @@
<item msgid="8547442717307793863">"Off"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"Open new windows behind the current one"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"Set homepage"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"Set homepage"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"Set search engine"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"Select a search engine"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"Set to…"</string>
@@ -160,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"Format web pages to fit the screen"</string>
<string name="pref_general_title" msgid="1946872771219249323">"General"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"Sync"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"Auto-fill"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"Auto-fill"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"Sync with Google Chrome"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"Share bookmarks & other data between Android Browser and Google Chrome"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"Google account"</string>
@@ -168,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"Sync bookmarks between Android Browser and Google Chrome"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"Start syncing"</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"Select Google account to share with"</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"Form AutoFill"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"Form auto-fill"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"Fill in web forms with a single click"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"AutoFill Settings"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"Set up & manage data for AutoFilled forms"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Auto-fill data"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Enter and save data for auto-filling web form fields"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"Automatic Google sign-in"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"No accounts found"</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"Sign in to Google sites automatically, using <xliff:g id="ID_1">%s</xliff:g>"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"Signing into Google sites, using <xliff:g id="ID_1">%s</xliff:g>"\n"Your Privacy & Security settings control automatic Google sign-in"</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"Don\'t sign in automatically"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"AutoFill will use your profile to help you complete web forms with a single click."</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"Signing into Google sites using <xliff:g id="ID_1">%s</xliff:g>"\n"Your privacy & security settings controls automatic Google sign-in"</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"Automatic sign-in is available."</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"Login"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"Login failed."</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"Enter the data that you want to auto-fill in web fields when you touch them."</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"Full name:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"Email:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"Company name:"</string>
@@ -196,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"Profile deleted"</string>
<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>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Auto-Fill can always be configured through Browser Settings."</string>
- <string name="disable_autofill" msgid="3706426217720202898">"Disable Auto-Fill"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"Privacy & Security"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"Auto-fill can always be configured through Browser Settings."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"Disable auto-fill"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"Privacy & security"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Clear cache"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Clear locally cached content and databases"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"Locally cached content and databases will be deleted."</string>
@@ -271,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Text encoding"</string>
<string name="pref_lab_title" msgid="5571091610359629423">"Labs"</string>
- <string name="pref_lab_quick_controls" msgid="2105979166017257647">"Quick Controls"</string>
- <string name="pref_lab_quick_controls_summary" msgid="8025196176636589803">"Swipe thumb from left or right edge to access quick controls"</string>
- <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"Most Visited Homepage"</string>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Sets your homepage to show the most visited pages."</string>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"Quick controls"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"Swipe thumb from left or right edge to access quick controls and hide Application and URL bars"</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"Most-visited homepage"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"Your homepage displays your most-visited web pages."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Google Instant"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Use Google Instant when you use Google Search, to show results as you type (this can increase data use)."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Data connectivity problem"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Problem with file"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Confirm"</string>
@@ -371,11 +367,19 @@
<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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"Bookmarks on this device are not yet associated with a Google account. Save these bookmarks by adding them to an account. Delete these bookmarks if you do not want to sync them."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"Add bookmarks currently on this device and begin syncing with Google Account"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"Delete bookmarks currently on this device and begin synchronising with Google Account"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"Delete bookmarks currently on this device and begin synchronising bookmarks with <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"Add bookmarks currently on this device and begin synchronising bookmarks with <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Delete bookmarks"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Next"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Previous"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Cancel"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Done"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"Add bookmarks to Google Account"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Add your Android bookmarks to bookmarks for <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
<string name="menu_share_url" msgid="5851814357333739700">"Share"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"No more tabs available"</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Google with Instant (Labs)"</string>
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 0962df9..f4abc2c 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Navegador"</string>
<string name="choose_upload" msgid="3649366287575002063">"Elegir el archivo para cargar"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"Las cargas de archivo se desactivaron."</string>
<string name="new_tab" msgid="4505722538297295141">"Ventana nueva"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"Nueva ventana de incógnito"</string>
<string name="active_tabs" msgid="3050623868203544623">"Ventanas"</string>
@@ -88,18 +87,17 @@
<string name="set_as_homepage" msgid="4752937379414905560">"Definir como página principal"</string>
<string name="bookmark_saved" msgid="2766434679871317557">"Guardado en los marcadores."</string>
<string name="bookmark_not_saved" msgid="700600955089376724">"No se pudo agregar a favoritos."</string>
- <string name="homepage_set" msgid="8768087280310966395">"Configuración de página principal."</string>
+ <string name="homepage_set" msgid="8768087280310966395">"Página principal establecida."</string>
<string name="bookmark_needs_title" msgid="6245900436119218187">"El marcador debe tener un nombre."</string>
<string name="bookmark_needs_url" msgid="7809876865972755158">"El marcador debe tener una ubicación."</string>
<string name="bookmark_url_not_valid" msgid="6719785633980202419">"La URL no es válida."</string>
<string name="bookmark_cannot_save_url" msgid="791722768778386941">"No se puede agregar esta URL a los marcadores."</string>
<string name="delete_bookmark" msgid="2422989994934201992">"Eliminar"</string>
- <string name="bookmark_page" msgid="6845189305130307274">"Última página vista del marcador"</string>
+ <string name="bookmark_page" msgid="6845189305130307274">"Agregar marcador a última página vista"</string>
<string name="bookmark_thumbnail_view" msgid="3164068314718522138">"Miniaturas"</string>
<string name="bookmark_list_view" msgid="7848510619500937839">"Lista"</string>
<string name="current_page" msgid="7510129573681663135">"de "</string>
<string name="delete_bookmark_warning" msgid="758043186202032205">"El marcador \"<xliff:g id="BOOKMARK">%s</xliff:g>\" se eliminará."</string>
- <string name="open_in_new_window" msgid="6596775546468054510">"Abrir en una ventana nueva"</string>
<string name="open_all_in_new_window" msgid="6514602245828366045">"Abrir todos en ventanas nuevas"</string>
<string name="goto_dot" msgid="3895839050522602723">"Ir"</string>
<string name="incognito_tab" msgid="5419458065370134289">"Abrir nueva pestaña de incógnito"</string>
@@ -112,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"Descargas"</string>
<string name="copy_page_url" msgid="7635062169011319208">"Copiar URL de la página"</string>
<string name="share_page" msgid="593756995297268343">"Compartir página"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"Guardar como Archivo web"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"Archivo web guardado."</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"Error al guardar el archivo web."</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"Guardar página"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"Página guardada"</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"Error al guardar la página"</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"<xliff:g id="BOOKMARK_COUNT">%d</xliff:g> Marcadores"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"Vaciar carpeta"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"Abrir"</string>
@@ -139,17 +137,17 @@
<string name="pref_content_title" msgid="722227111894838633">"Configuración del contenido de la página"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"Cargar imágenes"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"Visualizar imágenes en páginas web"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"Bloq. ventanas emerg."</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"Bloquear ventanas emergentes"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"Habilitar JavaScript"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"Abrir en modo subord."</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"Activar complementos"</string>
<string-array name="pref_content_plugins_choices">
- <item msgid="6745108155096660725">"Siempre en"</item>
+ <item msgid="6745108155096660725">"Siempre activado"</item>
<item msgid="2484126708670016519">"A pedido"</item>
<item msgid="8547442717307793863">"Apagado"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"Abrir ventanas nuevas detrás de la actual"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"Definir página de inicio"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"Configurar página principal"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"Establecer el motor de búsqueda"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"Seleccionar un motor de búsqueda"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"Configurado en"</string>
@@ -160,31 +158,31 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"Formatea las páginas web para que se ajusten a la pantalla"</string>
<string name="pref_general_title" msgid="1946872771219249323">"General"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"Sincronización"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"Autocompletar"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"Autocompletar"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"Sincronización con Google Chrome"</string>
- <string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"Compartir favoritos & otros datos entre el navegador Android y Google Chrome"</string>
+ <string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"Compartir favoritos y otros datos entre el navegador de Android y Google Chrome"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"Cuenta de Google"</string>
<string name="pref_personal_sync_bookmarks" msgid="59237515966184432">"Sincronizar favoritos"</string>
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"Sincronizar favoritos entre el navegador Android y Google Chrome"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"Iniciar la sincr."</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"Selec cta Google p/comp"</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"Formulario de autollenado"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"Llenado automático de formulario"</string>
<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>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Datos de llenado automático"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Ingresa y guarda datos para llenar campos de formularios web automáticamente."</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"Acceso automático a Google"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"No se encontraron las cuentas"</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"Acceder automáticamente a sitios de Google utilizando <xliff:g id="ID_1">%s</xliff:g>"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"Accediendo a Google Sites utilizando<xliff:g id="ID_1">%s</xliff:g>"\n"Tu control de configuración de seguridad & privacidad automático para acceso a Google"</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"No accedas de manera automática"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"La función Autocompletar utilizará tu perfil para ayudarte a rellenar formularios web con un solo clic."</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"Acceso a sitios de Google usando <xliff:g id="ID_1">%s</xliff:g>"\n"tu acceso automático en Google de control de configuraciones de privacidad & seguridad"</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"Acceso automático disponible"</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"Acceder"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"Falló el acceso."</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"Ingresa los datos que deseas que se completen automáticamente al tocar los campos web."</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"Nombre completo:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"Correo electrónico:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"Nombre de la empresa:"</string>
<string name="autofill_profile_editor_address_line_1" msgid="836433242509243081">"Dirección línea 1:"</string>
<string name="autofill_profile_editor_address_line_1_hint" msgid="5965659598509327172">"Dirección postal, código postal, A/A"</string>
<string name="autofill_profile_editor_address_line_2" msgid="8194745202893822479">"Dirección línea 2:"</string>
- <string name="autofill_profile_editor_address_line_2_hint" msgid="2048330295853546405">"Apartamento, suite, unidad, edificio, suelo, etc."</string>
+ <string name="autofill_profile_editor_address_line_2_hint" msgid="2048330295853546405">"Departamento, oficina, unidad, edificio, piso, etc."</string>
<string name="autofill_profile_editor_city" msgid="4193225955409148508">"Ciudad/Pueblo:"</string>
<string name="autofill_profile_editor_state" msgid="8549739922338171458">"Estado / Provincia / Región:"</string>
<string name="autofill_profile_editor_zip_code" msgid="283668573295656671">"Código postal:"</string>
@@ -196,26 +194,26 @@
<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>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Autocompletar siempre se puede configurar mediante los Parámetros de configuración del navegador."</string>
- <string name="disable_autofill" msgid="3706426217720202898">"Desactivar Autocompletar"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"Privacidad y seguridad"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"Autocompletar siempre se puede configurar mediante los Parámetros de configuración del navegador."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"Inhabilitar Autocompletar"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"Privacidad & 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>
- <string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"Se suprimirá el contenido y las bases de datos de la memoria caché local."</string>
+ <string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"Se eliminará el contenido y las bases de datos de la memoria caché local."</string>
<string name="pref_privacy_cookies_title" msgid="6763274282214830526">"Cookies"</string>
<string name="pref_privacy_clear_cookies" msgid="3095583579133780331">"Borrar datos de cookies"</string>
<string name="pref_privacy_clear_cookies_summary" msgid="6962742063990677520">"Eliminar todas las cookies del navegador"</string>
- <string name="pref_privacy_clear_cookies_dlg" msgid="552855688091432682">"Se suprimirán todas las cookies."</string>
+ <string name="pref_privacy_clear_cookies_dlg" msgid="552855688091432682">"Se eliminarán todas las cookies."</string>
<string name="pref_privacy_clear_history" msgid="8723795508825198477">"Borrar historial"</string>
<string name="pref_privacy_clear_history_summary" msgid="6868501330708940734">"Borrar el historial de navegación del navegador"</string>
- <string name="pref_privacy_clear_history_dlg" msgid="544903007914753853">"Se suprimirá el historial del navegador."</string>
+ <string name="pref_privacy_clear_history_dlg" msgid="544903007914753853">"Se eliminará el historial del navegador."</string>
<string name="pref_privacy_formdata_title" msgid="6549813837982050424">"Datos de formulario"</string>
<string name="pref_privacy_clear_form_data" msgid="4232668196344383987">"Borrar datos del formulario"</string>
<string name="pref_privacy_clear_form_data_summary" msgid="1790390894719517167">"Borrar todos los datos guardados del formulario"</string>
- <string name="pref_privacy_clear_form_data_dlg" msgid="4443621086781197928">"Se suprimirán todos los datos guardados del formulario."</string>
+ <string name="pref_privacy_clear_form_data_dlg" msgid="4443621086781197928">"Se eliminarán todos los datos guardados del formulario."</string>
<string name="pref_privacy_clear_passwords" msgid="4750234112289277480">"Borrar contraseñas"</string>
<string name="pref_privacy_clear_passwords_summary" msgid="8856782718942903335">"Eliminar todas las contraseñas guardadas"</string>
- <string name="pref_privacy_clear_passwords_dlg" msgid="2083869328824248255">"Se suprimirán todas las contraseñas guardadas."</string>
+ <string name="pref_privacy_clear_passwords_dlg" msgid="2083869328824248255">"Se eliminarán todas las contraseñas guardadas."</string>
<string name="pref_privacy_location_title" msgid="7458378016606081067">"Ubicación"</string>
<string name="pref_privacy_enable_geolocation" msgid="1395040170290765686">"Activar ubicación"</string>
<string name="pref_privacy_enable_geolocation_summary" msgid="8437020934664306205">"Permitir que los sitios soliciten acceso a tu ubicación"</string>
@@ -233,20 +231,20 @@
<string name="pref_security_accept_cookies_summary" msgid="1465118934875026920">"Permitir que los sitios guarden y lean datos de las \"cookies\""</string>
<string name="pref_text_size" msgid="3827031324346612208">"Tamaño del texto"</string>
<string-array name="pref_text_size_choices">
- <item msgid="4952686548944739548">"Más pequeño"</item>
+ <item msgid="4952686548944739548">"Diminuto"</item>
<item msgid="1950030433642671460">"Pequeño"</item>
<item msgid="4338347520133294584">"Normal"</item>
<item msgid="5043128215356351184">"Grande"</item>
<item msgid="7201512237890458902">"Enorme"</item>
</string-array>
<string name="pref_text_size_dialogtitle" msgid="3625388833512647865">"Tamaño del texto"</string>
- <string name="pref_default_zoom" msgid="8076142259097187395">"Predeterminar zoom"</string>
+ <string name="pref_default_zoom" msgid="8076142259097187395">"Zoom predeterminado"</string>
<string-array name="pref_default_zoom_choices">
<item msgid="549583171195154919">"Lejos"</item>
<item msgid="5619034257768161024">"Medio"</item>
<item msgid="3840999588443167001">"Cerca"</item>
</string-array>
- <string name="pref_default_zoom_dialogtitle" msgid="6095974367125109021">"Predeterminar zoom"</string>
+ <string name="pref_default_zoom_dialogtitle" msgid="6095974367125109021">"Zoom predeterminado"</string>
<string name="pref_content_load_page" msgid="2219810141690955452">"Abrir las páginas en descripción general"</string>
<string name="pref_content_load_page_summary" msgid="8792093504054149369">"Mostrar la descripción general de las páginas nuevas abiertas"</string>
<string name="pref_extras_title" msgid="7075456173747370647">"Avanzado"</string>
@@ -260,7 +258,7 @@
<string name="pref_development_title" msgid="3263854204533056480">"Depurar"</string>
<string name="pref_default_text_encoding" msgid="5742965543955558478">"Codificación de texto"</string>
<string-array name="pref_default_text_encoding_choices">
- <item msgid="7275223955790513818">"Latino-1 (ISO-8859-1)"</item>
+ <item msgid="7275223955790513818">"Latin-1 (ISO-8859-1)"</item>
<item msgid="2456597866837587140">"Unicode (UTF-8)"</item>
<item msgid="6122474363777211732">"Chino (GBK)"</item>
<item msgid="373372275931607040">"Chino (Big5)"</item>
@@ -271,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Codificación de texto"</string>
<string name="pref_lab_title" msgid="5571091610359629423">"Labs"</string>
- <string name="pref_lab_quick_controls" msgid="2105979166017257647">"Controles rápidos"</string>
- <string name="pref_lab_quick_controls_summary" msgid="8025196176636589803">"Desliza el pulgar del borde izquierdo o derecho y accede a los controles rápidos."</string>
- <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"Página de inicio más visitada"</string>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Configura tu página principal para que muestre las páginas más visitadas."</string>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"Controles rápidos"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"Desliza pulgar de borde izq. o der. para acceder a contr. ráp. y ocultar barras Aplicación y URL"</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"Página principal más visitada"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"Tu página principal muestra tus páginas web más visitadas."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Google Instant"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Usa Google Instant con Búsq. de Google para que los resultados aparezcan mientras tipeas (esto puede aumentar el uso de datos)."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Problema de conectividad de datos"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Problema con el archivo"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Confirmar"</string>
@@ -321,7 +317,7 @@
<string name="download_sdcard_busy_dlg_title" product="nosdcard" msgid="8081445664689818973">"Almacenamiento USB no disponible"</string>
<string name="download_sdcard_busy_dlg_title" product="default" msgid="6877712666046917741">"Tarjeta SD no disponible"</string>
<string name="download_sdcard_busy_dlg_msg" product="nosdcard" msgid="3979329954835690147">"El almacenamiento USB está ocupado. Para permitir descargas, selecciona \"Desactivar almacenamiento USB\" en la notificación."</string>
- <string name="download_sdcard_busy_dlg_msg" product="default" msgid="3473883538192835204">"La tarjeta SD está llena. Para permitir descargas, selecciona \"Desactivar almacenamiento USB\" en la notificación."</string>
+ <string name="download_sdcard_busy_dlg_msg" product="default" msgid="3473883538192835204">"La tarjeta SD está ocupada. Para permitir descargas, selecciona \"Desactivar almacenamiento USB\" en la notificación."</string>
<string name="cannot_download" msgid="8150552478556798780">"Solo se pueden descargar URL de \"http\" o de \"https\"."</string>
<string name="download_no_application_title" msgid="1286056729168874295">"No se puede abrir el archivo."</string>
<string name="retry" msgid="1835923075542266721">"Intentar nuevamente"</string>
@@ -362,7 +358,7 @@
<string name="geolocation_settings_page_dialog_cancel_button" msgid="7941036504673409747">"Cancelar"</string>
<string name="website_settings_clear_all" msgid="8739804325997655980">"Eliminar todos"</string>
<string name="website_settings_clear_all_dialog_title" msgid="7791826325122461718">"¿Deseas eliminar toda la configuración del sitio web?"</string>
- <string name="website_settings_clear_all_dialog_message" msgid="6150502090601476333">"Se suprimirán todos los datos del sitio web y los permisos de ubicación."</string>
+ <string name="website_settings_clear_all_dialog_message" msgid="6150502090601476333">"Se eliminarán todos los permisos de ubicación y los datos del sitio web."</string>
<string name="website_settings_clear_all_dialog_ok_button" msgid="6401582240627669431">"Eliminar todos los datos"</string>
<string name="website_settings_clear_all_dialog_cancel_button" msgid="1896757051856611674">"Cancelar"</string>
<string name="progress_dialog_setting_wallpaper" msgid="4871900779338536674">"Estableciendo fondo de pantalla..."</string>
@@ -371,11 +367,19 @@
<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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"Los favoritos de este dispositivo aún no están asociados a una cuenta de Google. Guarda estos favoritos agregándolos a una cuenta. Si no deseas sincronizarlos, elimínalos."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"Agrega los favoritos que actualmente tienes en este dispositivo y comienza a sincronizarlos con una cuenta de Google."</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"Elimina los favoritos que actualmente tienes en este dispositivo y comienza a sincronizarlos con una cuenta de Google."</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"Elimina los favoritos que actualmente tienes en este dispositivo y comienza a sincronizar favoritos con <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"Agrega los favoritos que actualmente tienes en este dispositivo y comienza a sincronizar favoritos con <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Eliminar favoritos"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Siguiente"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Anterior"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Cancelar"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Finalizado"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"Agregar favoritos a una Cuenta de Google"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Agrega tus favoritos de Android a tus favoritos para <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
<string name="menu_share_url" msgid="5851814357333739700">"Compartir"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"No hay más pestañas disponibles."</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Google con Instant (Labs)"</string>
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 87b92c6..4e7ad01 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Navegador"</string>
<string name="choose_upload" msgid="3649366287575002063">"Seleccionar archivo para subir"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"Las subidas de archivos están inhabilitadas."</string>
<string name="new_tab" msgid="4505722538297295141">"Nueva ventana"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"Nueva ventana de incógnito"</string>
<string name="active_tabs" msgid="3050623868203544623">"Ventanas"</string>
@@ -99,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"Lista"</string>
<string name="current_page" msgid="7510129573681663135">"de "</string>
<string name="delete_bookmark_warning" msgid="758043186202032205">"Se eliminará el marcador \"<xliff:g id="BOOKMARK">%s</xliff:g>\"."</string>
- <string name="open_in_new_window" msgid="6596775546468054510">"Abrir en ventana nueva"</string>
<string name="open_all_in_new_window" msgid="6514602245828366045">"Abrir todo en ventanas nuevas"</string>
<string name="goto_dot" msgid="3895839050522602723">"Ir"</string>
<string name="incognito_tab" msgid="5419458065370134289">"Abrir nueva pestaña de incógnito"</string>
@@ -112,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"Descargas"</string>
<string name="copy_page_url" msgid="7635062169011319208">"Copiar URL de página"</string>
<string name="share_page" msgid="593756995297268343">"Compartir página"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"Guardar como archivo web"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"Archivo web guardado"</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"Error al guardar archivo web"</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"Guardar página"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"Página guardada"</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"Error al guardar la página"</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"<xliff:g id="BOOKMARK_COUNT">%d</xliff:g> marcadores"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"Carpeta vacía"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"Abrir"</string>
@@ -139,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"Ajustes de contenido de la página"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"Cargar imágenes"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"Mostrar imágenes en páginas web"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"Bloquear pop-ups"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"Bloquear ventanas emergentes"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"Habilitar JavaScript"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"Abrir en segundo plano"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"Habilitar complementos"</string>
@@ -149,7 +147,7 @@
<item msgid="8547442717307793863">"Desactivado"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"Abrir nuevas ventanas detrás de la actual"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"Escritorio"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"Establecer página principal"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"Establecer motor de búsqueda"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"Seleccionar un motor de búsqueda"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"Establecer como…"</string>
@@ -160,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"Configurar las páginas web para ajustarlas a la pantalla"</string>
<string name="pref_general_title" msgid="1946872771219249323">"General"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"Sincronización"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"Autocompletar"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"Autocompletar"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"Sincronizar con Google Chrome"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"Compartir marcadores y otros datos entre el navegador de Android y Google Chrome"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"Cuenta de Google"</string>
@@ -168,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"Sincronizar marcadores entre el navegador de Android y Google Chrome"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"Iniciar sincronización"</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"Elegir cuenta para compartir"</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"Autocompletar formulario"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"Autocompletado de formulario"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"Rellenar formularios web con un solo clic"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"Ajustes de autocompletado"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"Configurar y administrar los datos de los formularios rellenados automáticamente"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Datos de Autocompletar"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Introducir y guardar datos de campos de cumplimentación automática de formularios web"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"Acceso automático a Google"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"No se han encontrado cuentas."</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"Accede a los sitios de Google de forma automática mediante la cuenta <xliff:g id="ID_1">%s</xliff:g>."</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"Accediendo a Google Sites mediante el <xliff:g id="ID_1">%s</xliff:g>"\n"acceso automático de Google de control de los ajustes de seguridad y de privacidad"</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"No acceder automáticamente"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"La función Autocompletar utilizará tu perfil para ayudarte a rellenar formularios web con un solo clic."</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"Accediendo a Google Sites mediante el <xliff:g id="ID_1">%s</xliff:g>"\n"acceso automático de Google de control de los ajustes de seguridad y de privacidad"</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"El acceso automático está disponible."</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"Acceder"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"Error al acceder"</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"Introduce los datos con los que quieres que los campos web se completen automáticamente al tocarlos."</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"Nombre completo:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"Email:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"Nombre de la empresa:"</string>
@@ -196,9 +194,9 @@
<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 de forma automática formularios web como este. ¿Te gustaría configurar tu perfil?"</string>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"La función Autocompletar se puede configurar en cualquier momento a través de los ajustes del navegador."</string>
- <string name="disable_autofill" msgid="3706426217720202898">"Inhabilitar Autocompletar"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"Privacidad y seguridad"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"La función Autocompletar se puede configurar a través de los ajustes del navegador."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"Inhabilitar autocompletar"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"Seguridad y privacidad"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Borrar caché"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Borrar bases de datos y contenido de la memoria caché local"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"Las bases de datos y el contenido se eliminarán de la memoria caché local."</string>
@@ -271,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Codificación de texto"</string>
<string name="pref_lab_title" msgid="5571091610359629423">"Labs"</string>
- <string name="pref_lab_quick_controls" msgid="2105979166017257647">"Controles rápidos"</string>
- <string name="pref_lab_quick_controls_summary" msgid="8025196176636589803">"Desliza el pulgar de izquierda a derecha para acceder a los controles rápidos."</string>
- <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"Página principal más visitada"</string>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Configura tu página principal para que muestre las páginas más visitadas."</string>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"Controles rápidos"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"Desliza el pulgar para acceder a los controles rápidos y ocultar las barras."</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"Página principal más visitada"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"En la página principal se muestran las páginas web más visitadas."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Google Instant"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Con Google Instant, aparecerán resultados de búsqueda de Google a medida que escribas (puede aumentar el uso de datos)."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Problema de conectividad de datos"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Problema con archivo"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"OK"</string>
@@ -371,11 +367,19 @@
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
<string name="account_chooser_dialog_title" msgid="3314204833188808194">"Seleccionar 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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"Los marcadores de este dispositivo aún no están asociados a ninguna cuenta de Google. Añádelos a una cuenta para guardarlos o elimínalos si no quieres sincronizarlos."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"Añadir los marcadores de este dispositivo e iniciar la sincronización con la cuenta de Google"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"Eliminar los marcadores de este dispositivo e iniciar la sincronización con la cuenta de Google"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"Eliminar los marcadores de este dispositivo y empezar a sincronizarlos con <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"Añadir los marcadores de este dispositivo y empezar a sincronizar los marcadores con <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Eliminar marcadores"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Siguiente"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Anterior"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Cancelar"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Listo"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"Añadir marcadores a la cuenta de Google"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Añadir tus marcadores de Android a marcadores de <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
<string name="menu_share_url" msgid="5851814357333739700">"Compartir"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"No hay más pestañas disponibles."</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Google con Instant (experimental)"</string>
</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 70c54dd..9d768de 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"مرورگر"</string>
<string name="choose_upload" msgid="3649366287575002063">"انتخاب فایل برای آپلود"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"آپلودهای فایل غیر فعال هستند."</string>
<string name="new_tab" msgid="4505722538297295141">"پنجره جدید"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"پنجره ناشناخته جدید"</string>
<string name="active_tabs" msgid="3050623868203544623">"پنجره ها"</string>
@@ -78,8 +77,7 @@
<string name="http" msgid="2163722670597250102">"http://"</string>
<string name="save_to_bookmarks" msgid="6101482434920313244">"افزودن به نشانک ها"</string>
<string name="bookmark_this_page" msgid="7530739804320811054">"این صفحه نشانک گذاری شود"</string>
- <!-- no translation found for remove (7820112494467011374) -->
- <skip />
+ <string name="remove" msgid="7820112494467011374">"حذف"</string>
<string name="edit_bookmark" msgid="5024089053490231905">"ویرایش نشانک"</string>
<string name="create_shortcut_bookmark" msgid="1995095662095484289">"افزودن میانبر به صفحه اصلی"</string>
<string name="open_bookmark" msgid="8473581305759935790">"باز کردن"</string>
@@ -100,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"لیست"</string>
<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>
<string name="open_all_in_new_window" msgid="6514602245828366045">"باز کردن همه در پنجره های جدید"</string>
<string name="goto_dot" msgid="3895839050522602723">"برو"</string>
<string name="incognito_tab" msgid="5419458065370134289">"باز کردن زبانه ناشناخته جدید"</string>
@@ -113,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"دانلودها"</string>
<string name="copy_page_url" msgid="7635062169011319208">"کپی url صفحه"</string>
<string name="share_page" msgid="593756995297268343">"اشتراک گذاری صفحه"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"ذخیره به عنوان بایگانی وب"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"بایگانی وب ذخیره شد."</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"ذخیره بایگانی وب ناموفق بود."</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"ذخیره صفحه"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"صفحه ذخیره شد."</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"صفحه ذخیره نشد."</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"<xliff:g id="BOOKMARK_COUNT">%d</xliff:g> نشانک"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"پوشه خالی"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"باز کردن"</string>
@@ -140,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"تنظیمات محتوای صفحه"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"بارگیری تصاویر"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"نمایش تصاویر در صفحات وب"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"مسدود کردن پنجره های بازشو"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"انسداد پنجره های بازشو"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"فعال کردن جاوا اسکریپت"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"باز کردن در پس زمینه"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"فعال کردن افزونه ها"</string>
@@ -150,7 +147,7 @@
<item msgid="8547442717307793863">"خاموش"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"باز کردن پنجره های جدید پشت پنجره فعلی"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"تنظیم صفحه اصلی"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"تنظیم صفحه اصلی"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"تنظیم موتور جستجو"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"انتخاب یک موتور جستجو"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"تنظیم به..."</string>
@@ -161,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"قالب صفحات وب متناسب با صفحه"</string>
<string name="pref_general_title" msgid="1946872771219249323">"عمومی"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"همگامسازی"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"تکمیل خودکار"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"تکمیل خودکار"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"همگام سازی با Google Chrome"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"اشتراک گذاری نشانک ها و سایر داده ها بین مرورگر Android و Google Chrome"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"حساب Google"</string>
@@ -169,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"همگام سازی نشانک ها بین مرورگر Android و Google Chrome"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"شروع همگام سازی"</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"انتخاب حساب Google جهت اشتراک گذاری"</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"تکمیل خودکار فرم"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"تکمیل خودکار فرم"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"تکمیل کردن فرم ها با یک کلیک"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"تنظیمات تکمیل خودکار"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"تنظیم و مدیریت داده برای فرم های تکمیل شده به طور خودکار"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"تکمیل خودکار داده ها"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"جهت تکمیل خودکار قسمت های فرم وب، داده ها را وارد و ذخیره کنید"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"ورود به سیستم خودکار Google"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"حسابی یافت نشد"</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"با استفاده از <xliff:g id="ID_1">%s</xliff:g> به صورت خودکار به سایت های Google وارد شوید"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"ورود به سایت های Google با استفاده از <xliff:g id="ID_1">%s</xliff:g>"\n"تنظیمات حریم خصوصی و امنیت خود، ورود به سیستم خودکار Google را کنترل می کند"</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"به صورت خودکار به سیستم وارد نشوید"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"تکمیل خودکار از نمایه شما استفاده می کند تا به شما کمک کند فرم های وب را با یک کلیک پر کنید."</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"ورود به سیستم سایت های Google با استفاده از <xliff:g id="ID_1">%s</xliff:g>"\n"تنظیمات حریم خصوصی و امنیت، ورود به سیستم خودکار Google را کنترل می کند"</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"ورود به سیستم خودکار امکان پذیر است."</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"ورود به سیستم"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"ورود به سیستم انجام نشد."</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"داده های مورد نظر را وارد كنيد تا هنگام لمس كردن زمينه های وب، به صورت خودكار تكميل شوند."</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"نام کامل:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"ایمیل:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"نام شرکت:"</string>
@@ -197,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"نمایه حذف شد"</string>
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"حذف نمایه"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"مرورگر می تواند بصورت خودکار فرم های وب مانند این یکی را پر کند. دوست دارید نمایه خود را تنظیم کنید؟"</string>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"تکمیل خودکار را همیشه می توانید از طریق تنظیمات مرورگر پیکربندی کنید."</string>
- <string name="disable_autofill" msgid="3706426217720202898">"غیرفعال کردن تکمیل خودکار"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"حریم خصوصی و ایمنی"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"تکمیل خودکار را همیشه می توانید از طریق تنظیمات مرورگر پیکربندی کنید."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"غیرفعال کردن تکمیل خودکار"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"حریم خصوصی و امنیت"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"پاک کردن حافظه پنهان"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"پاک کردن پایگاه های داده و محتوای موجود در حافظه پنهان محلی"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"پایگاه داده ها و محتوای موجود در حافظه پنهان محلی حذف می شوند."</string>
@@ -272,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"رمزگذاری متن"</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>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"صفحه اصلی شما را برای نمایش صفحات بیشتر بازدید شده تنظیم می کند."</string>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"کنترل های سریع"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"انگشت شست را از لبه چپ یا راست حرکت دهید تا به کنترل های سریع دسترسی داشته و نوارهای URL و برنامه را پنهان کنید"</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"صفحه اصلی بیشتر بازدید شده"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"صفحات وب بیشتر بازدید شده شما در صفحه اصلی نشان داده می شود."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Google Instant"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"هنگام استفاده از جستجوی Google، برای نمایش نتایج در حین تایپ از Google Instant استفاده کنید (ممکن است مصرف داده بالا برود)."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"مشکل اتصال داده"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"مشکل در فایل"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"تأیید"</string>
@@ -372,11 +367,19 @@
<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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"نشانک های موجود در این دستگاه هنوز با یک حساب Google مرتبط نشده اند. این نشانک ها را با افزودن به یک حساب ذخیره کنید. اگر نمی خواهید این نشانک ها را همگام سازی کنید، آن ها را حذف نمایید."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"نشانک های موجود در این دستگاه را اضافه کرده و شروع به همگام سازی با حساب Google کنید"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"نشانک های موجود در این دستگاه را حذف کرده و شروع به همگام سازی آن ها با حساب Google کنید."</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"نشانک های موجود در این دستگاه را حذف کرده و شروع به همگام سازی آن ها با <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g> کنید."</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"نشانک های موجود در این دستگاه را اضافه کرده و شروع به همگام سازی آن ها با <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g> کنید."</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"حذف نشانک ها"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"بعدی"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"قبلی"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"لغو"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"انجام شد"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"افزودن نشانک ها به حساب Google"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"افزودن نشانک های Android خود به نشانک های <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
<string name="menu_share_url" msgid="5851814357333739700">"اشتراک گذاری"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"برگه بیشتری در دسترس نیست"</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Google با Instant (ویژگی های آزمایشی)"</string>
</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 70f1433..acc1c78 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Selain"</string>
<string name="choose_upload" msgid="3649366287575002063">"Valitse lähetettävä tiedosto"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"Tiedostojen lähettäminen ei ole käytössä."</string>
<string name="new_tab" msgid="4505722538297295141">"Uusi ikkuna"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"Uusi incognito-ikkuna"</string>
<string name="active_tabs" msgid="3050623868203544623">"Windows"</string>
@@ -99,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"Luettelo"</string>
<string name="current_page" msgid="7510129573681663135">"kohteesta "</string>
<string name="delete_bookmark_warning" msgid="758043186202032205">"Kirjanmerkki \"<xliff:g id="BOOKMARK">%s</xliff:g>\" poistetaan."</string>
- <string name="open_in_new_window" msgid="6596775546468054510">"Avaa uudessa ikkunassa"</string>
<string name="open_all_in_new_window" msgid="6514602245828366045">"Avaa kaikki uusissa ikkunoissa"</string>
<string name="goto_dot" msgid="3895839050522602723">"Siirry"</string>
<string name="incognito_tab" msgid="5419458065370134289">"Avaa uusi incognito-välilehti"</string>
@@ -112,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"Lataukset"</string>
<string name="copy_page_url" msgid="7635062169011319208">"Kopioi sivun URL-osoite"</string>
<string name="share_page" msgid="593756995297268343">"Jaa sivu"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"Tallenna verkkoarkistona"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"Verkkoarkisto tallennettu."</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"Verkkoarkiston tallentaminen epäonnistui."</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"Tallenna sivu"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"Sivu tallennettu."</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"Sivun tallennus epäonnistui."</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"<xliff:g id="BOOKMARK_COUNT">%d</xliff:g> kirjanmerkkiä"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"Tyhjä kansio"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"Avaa"</string>
@@ -139,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"Sivun sisältöasetukset"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"Lataa kuvat"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"Näytä verkkosivujen kuvat"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"Ponnahdusikkunoiden esto"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"Estä ponnahdusikkunat"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"Ota JavaScript käyttöön"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"Avaa taustalla"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"Ota laajennukset käyttöön"</string>
@@ -149,7 +147,7 @@
<item msgid="8547442717307793863">"Pois käytöstä"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"Avaa uudet ikkunat nykyisen taakse"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"Aseta aloitussivu"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"Aseta etusivu"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"Aseta hakukone"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"Valitse hakukone"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"Aseta etusivuksi..."</string>
@@ -160,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"Sovita verkkosivut näytölle"</string>
<string name="pref_general_title" msgid="1946872771219249323">"Yleinen"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"Synkronointi"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"Automaattinen täyttö"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"Automaattinen täyttö"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"Synkronoi Google Chromen kanssa"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"Jaa kirjanmerkkejä ja muita tietoja Android-selaimen ja Google Chromen välillä"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"Google-tili"</string>
@@ -168,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"Synkronoi kirjanmerkit Android-selaimen ja Google Chromen välillä"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"Aloita synkronointi"</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"Valitse, minkä Google-tilin kanssa jaetaan"</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"Lomakkeen automaattinen täyttö"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"Lomakkeen automaattinen täyttö"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"Täytä verkkolomakkeita yhdellä napsautuksella"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"Automaattisen täytön asetukset"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"Aseta automaattisesti täytettyjen lomakkeiden tiedot ja hallinnoi tietoja"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Tietojen automaattinen täyttö"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Tallenna tietoja verkkolomakkeiden automaattista täyttöä varten"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"Automaattinen Google-sisäänkirjaus"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"Ei tilejä"</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"Kirjaudu sisään Googlen sivustoihin automaattisesti käyttäen tiliä <xliff:g id="ID_1">%s</xliff:g>"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"Kirjaudutaan sisään Googlen sivustoihin käyttäen tiliä <xliff:g id="ID_1">%s</xliff:g>"\n"Automaattista Google-sisäänkirjautumista säätelevät tietosuoja- ja turvallisuusasetuksesi"</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"Älä kirjaudu sisään automaattisesti"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"Automaattinen täyttö käyttää profiiliasi, jotta voit täyttää verkkolomakkeita yhdellä napsautuksella."</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"Kirjaudutaan sisään Googlen sivustoihin käyttäen tiliä <xliff:g id="ID_1">%s</xliff:g>"\n"Automaattista Google-sisäänkirjautumista säätelevät tietosuoja- ja turvallisuusasetuksesi"</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"Automaattinen kirjautuminen käytettävissä."</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"Kirjaudu"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"Kirjautuminen epäonnistui."</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"Kirjoita tiedot, jotka haluat täyttää automaattisesti verkon kenttiin koskettaessasi kenttiä."</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"Koko nimi:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"Sähköposti:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"Yrityksen nimi:"</string>
@@ -196,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"Profiili poistettu."</string>
<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>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Automaattisen täytön asetuksia voi aina muuttaa selainasetuksista."</string>
- <string name="disable_autofill" msgid="3706426217720202898">"Poista automaattinen täyttö käytöstä"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"Tietosuoja ja turvallisuus"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"Automaattisen täytön asetuksia voi aina muuttaa selainasetuksista."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"Poista automaattinen täyttö käytöstä"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"Tietosuoja ja turvallisuus"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Tyhjennä välimuisti"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Poista paikallisen välimuistin sisältö ja tietokannat"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"Paikallisen välimuistin sisältö ja tietokannat poistetaan."</string>
@@ -271,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Tekstin koodaus"</string>
<string name="pref_lab_title" msgid="5571091610359629423">"Labs"</string>
- <string name="pref_lab_quick_controls" msgid="2105979166017257647">"Pikasäätimet"</string>
- <string name="pref_lab_quick_controls_summary" msgid="8025196176636589803">"Saat pikasäätimet käyttöösi liu\'uttamalla vasemmalta tai oikealta reunalta"</string>
- <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"Useimmin napsautetut etusivulla"</string>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Asettaa etusivusi näyttämään vierailluimmat sivut."</string>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"Pikasäätimet"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"Saat pikasäätimet käyttöösi ja voit piilottaa Sovellus- ja URL-palkit liu\'uttamalla vasemmalta tai oikealta reunalta"</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"Eniten käytetty etusivu"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"Etusivulla näytetään eniten käyttämäsi verkkosivut."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Google Instant"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Käyttämällä Google Instantia hakiessasi näet tuloksia jo hakua kirjoittaessasi (tämä voi kasvattaa tiedonsiirron määrää)."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Datayhteysongelma"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Tiedosto-ongelma"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Vahvista"</string>
@@ -371,11 +367,19 @@
<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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"Tämän laitteen kirjanmerkkejä ei ole vielä yhdistetty Google-tiliin. Tallenna kirjanmerkit lisäämällä ne tiliin. Poista kirjanmerkit, jos et halua synkronoida niitä."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"Lisää tämän laitteen kirjanmerkit ja aloita synkronoiminen Google-tilin kanssa"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"Poista tämän laitteen kirjanmerkit ja aloita synkronoiminen Google-tilin kanssa"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"Poista tämän laitteen kirjanmerkit ja aloita kirjanmerkkien synkronointi tilin <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g> kanssa."</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"Lisää tämän laitteen kirjanmerkit ja aloita kirjanmerkkien synkronointi tilin <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g> kanssa."</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Poista kirjanmerkit"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Seuraava"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Edellinen"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Peruuta"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Valmis"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"Lisää kirjanmerkit Google-tiliin"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Lisää Android-kirjanmerkit tilin <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g> kirjanmerkkeihin"</string>
<string name="menu_share_url" msgid="5851814357333739700">"Jaa"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"Välilehtiä ei ole enempää saatavilla"</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Google ja Instant (Labs)"</string>
</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 99a2148..c7befa7 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Navigateur"</string>
<string name="choose_upload" msgid="3649366287575002063">"Choisir le fichier à importer"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"Les transferts de fichiers sont désactivés."</string>
<string name="new_tab" msgid="4505722538297295141">"Nouvelle fenêtre"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"Fenêtre de navigation privée"</string>
<string name="active_tabs" msgid="3050623868203544623">"Fenêtres"</string>
@@ -99,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"Liste"</string>
<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>
<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>
@@ -112,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"Téléchargements"</string>
<string name="copy_page_url" msgid="7635062169011319208">"Copier l\'URL de la page"</string>
<string name="share_page" msgid="593756995297268343">"Partager la page"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"Enregistrer comme archive Web"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"Archive Web enregistrée"</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"Échec de l\'enregistrement de l\'archive Web"</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"Enregistrer la page"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"La page a été enregistrée."</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"Échec de l\'enregistrement de la page"</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"<xliff:g id="BOOKMARK_COUNT">%d</xliff:g> favori(s)"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"Dossier vide"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"Ouvrir"</string>
@@ -139,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"Paramètres du contenu de la page"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"Charger les images"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"Afficher les images des pages Web"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"Bloquer les pop-up"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"Bloquer les fenêtres pop-up"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"Activer JavaScript"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"Ouvrir en arrière-plan"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"Activer les plug-ins"</string>
@@ -149,7 +147,7 @@
<item msgid="8547442717307793863">"Désactivé"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"Ouvrir les nouvelles fenêtres derrière la fenêtre actuelle"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"Page d\'accueil"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"Définir la page d\'accueil"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"Définir le moteur de recherche"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"Sélectionner un moteur de recherche"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"Définir comme..."</string>
@@ -160,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"Configurer les pages Web pour qu\'elles s\'ajustent à l\'écran"</string>
<string name="pref_general_title" msgid="1946872771219249323">"Général"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"Synchronisation"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"Saisie automatique"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"Saisie automatique"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"Synchroniser avec Google Chrome"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"Partager les favoris et d\'autres données entre le navigateur Android et Google Chrome"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"Compte Google"</string>
@@ -168,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"Synchroniser les favoris entre le navigateur Android et Google Chrome"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"Démarrer la synchro"</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"Sélection du compte Google"</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"Remplissage auto des formulaires"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"Saisie automatique du formulaire"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"Remplir les formulaires Web en un clic"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"Paramètres de saisie automatique"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"Configurer et gérer les données de remplissage automatique des formulaires"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Données de la saisie automatique"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Saisir et enregistrer des données à des fins de saisie automatique dans les champs de formulaires Web"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"Connexion automatique à Google"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"Aucun compte trouvé"</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"Se connecter automatiquement à Google Sites à l\'aide de <xliff:g id="ID_1">%s</xliff:g>"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"Connexion à Google Sites avec <xliff:g id="ID_1">%s</xliff:g>"\n"Vos paramètres de confidentialité et de sécurité contrôlent la connexion automatique à Google."</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"Ne pas se connecter automatiquement"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"La fonctionnalité de saisie automatique utilise les données de votre profil pour vous aider à remplir les formulaires Web en un seul clic."</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"Connexion aux sites Google avec <xliff:g id="ID_1">%s</xliff:g>"\n"La connexion automatique à Google dépend de vos paramètres de confidentialité et de sécurité."</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"La connexion automatique est disponible."</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"Connexion"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"Échec de la connexion"</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"Renseignez les données à saisir automatiquement dans les champs Web lorsque vous appuyez sur ces derniers."</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"Nom et prénom :"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"Adresse e-mail :"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"Nom de la société :"</string>
@@ -196,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"Profil supprimé"</string>
<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>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"La saisie automatique peut être configurée dans les paramètres du navigateur."</string>
- <string name="disable_autofill" msgid="3706426217720202898">"Désactiver la saisie automatique"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"Confidentialité et sécurité"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"Notez que vous pouvez configurer la saisie automatique dans les paramètres du navigateur."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"Désactiver la saisie automatique"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"Confidentialité et sécurité"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Effacer le cache"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Supprimer les bases de données et le contenu localement en cache"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"Les bases de données et le contenu mis localement en cache vont être supprimés."</string>
@@ -252,7 +250,7 @@
<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>
+ <string name="pref_extras_reset_default_title" msgid="3579760449455761762">"Rétablir les valeurs par défaut"</string>
<string name="pref_extras_reset_default" msgid="8904000515846202110">"Valeurs par défaut"</string>
<string name="pref_extras_reset_default_summary" msgid="4247870778270414501">"Rétablir les paramètres par défaut"</string>
<string name="pref_extras_reset_default_dlg" msgid="6640261575874704022">"Les paramètres par défaut seront rétablis."</string>
@@ -271,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Codage du texte"</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>
- <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>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"Commandes rapides"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"Accès commandes rapides/masquer barres applications et URL : faire glisser vers droite/gauche"</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"Page d\'accueil Les plus visitées"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"Votre page d\'accueil affiche les pages Web les plus visitées."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Recherche instantanée Google"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Affichez plus de résultats lors de la saisie avec la recherche instantanée Google. Peut utiliser plus de donné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>
@@ -371,11 +367,19 @@
<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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"Les favoris de cet appareil ne sont pas encore associés à un compte Google. Enregistrez-les en les ajoutant à un compte. Supprimez-les si vous ne souhaitez pas les synchroniser."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"Ajouter les favoris de cet appareil et démarrer la synchronisation avec le compte Google"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"Supprimer les favoris de cet appareil et démarrer la synchronisation avec le compte Google"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"Supprimer les favoris de cet appareil et démarrer la synchronisation avec les favoris du compte <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"Ajouter les favoris de cet appareil et démarrer la synchronisation avec les favoris du compte <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Supprimer les favoris"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Suivant"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Précédent"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Annuler"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"OK"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"Ajouter les favoris au compte Google"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Ajouter vos favoris Android à ceux de <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
<string name="menu_share_url" msgid="5851814357333739700">"Partager"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"Plus aucun onglet n\'est disponible."</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Google avec Recherche instantanée (Google Labs)"</string>
</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index adf85c1..08b03d6 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Preglednik"</string>
<string name="choose_upload" msgid="3649366287575002063">"Odaberite datoteku za prijenos"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"Prijenosi datoteka onemogućeni su."</string>
<string name="new_tab" msgid="4505722538297295141">"Novi prozor"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"Novi prozor anonimno"</string>
<string name="active_tabs" msgid="3050623868203544623">"Windows"</string>
@@ -78,8 +77,7 @@
<string name="http" msgid="2163722670597250102">"http://"</string>
<string name="save_to_bookmarks" msgid="6101482434920313244">"Dodavanje oznakama"</string>
<string name="bookmark_this_page" msgid="7530739804320811054">"Označi ovu stranicu"</string>
- <!-- no translation found for remove (7820112494467011374) -->
- <skip />
+ <string name="remove" msgid="7820112494467011374">"Ukloni"</string>
<string name="edit_bookmark" msgid="5024089053490231905">"Uredi knjižnu oznaku"</string>
<string name="create_shortcut_bookmark" msgid="1995095662095484289">"Dodaj prečac početnoj stranici"</string>
<string name="open_bookmark" msgid="8473581305759935790">"Otvori"</string>
@@ -100,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"Popis"</string>
<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>
<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>
@@ -113,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"Preuzimanja"</string>
<string name="copy_page_url" msgid="7635062169011319208">"Kopiraj url stranice"</string>
<string name="share_page" msgid="593756995297268343">"Dijeli stranicu"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"Spremi web-arhivu"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"Web-arhiva spremljena."</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"Spremanje web-arhive nije uspjelo."</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"Spremi stranicu"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"Stranica je spremljena."</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"Spremanje stranice nije uspjelo."</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"Br. oznaka: <xliff:g id="BOOKMARK_COUNT">%d</xliff:g>"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"Prazna mapa"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"Otvori"</string>
@@ -140,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"Postavke sadržaja stranice"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"Učitaj slike"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"Prikaži slike na web-stranicama"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"Blokiraj skočne prozore"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"Blokiraj skočne prozore"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"Omogući JavaScript"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"Otvori u pozadini"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"Omogući priključke"</string>
@@ -150,7 +147,7 @@
<item msgid="8547442717307793863">"Isključeno"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"Otvori nove prozore iza trenutnog"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"Postavi početnu stranicu"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"Postavi početnu stranicu"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"Postavljanje tražilice"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"Odabir tražilice"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"Postavi na…"</string>
@@ -161,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"Formatirajte web-stranice kako bi odgovarale zaslonu"</string>
<string name="pref_general_title" msgid="1946872771219249323">"Općenito"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"Sinkronizacija"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"Automatska ispuna"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"Automatsko popunjavanje"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"Sinkronizacija s uslugom Google Chrome"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"Dijeljenje oznaka & ostalih podataka među uslugama Android preglednik i Google Chrome"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"Google Račun"</string>
@@ -169,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"Sinkroniziranje oznaka među uslugama Android preglednik i Google Chrome"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"Počni sinkronizaciju"</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"Odaberite Google Račun s kojim ćete dijeliti"</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"Oblikuj automatsko popunjavanje"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"Automatsko popunjavanje obrasca"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"Ispunite web-obrasce jednim klikom"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"Postavke automat. popunjavanja"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"Postavljanje & upravljanja podacima za oblike automatskog popunjavanja"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Automatsko popunjavanje podataka"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Unošenje i spremanje podataka za automatsko popunjavanje polja web-obrasca"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"Automatska prijava na Google"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"Nema pronađenih računa"</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"Prijavite se na Googleove web-lokacije automatski koristeći <xliff:g id="ID_1">%s</xliff:g>"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"Prijavljivanjem u Google Web-lokacije pomoću postavki <xliff:g id="ID_1">%s</xliff:g>"\n"Vaša privatnost i sigurnost nadzire se automatska prijava na Google"</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"Nemojte se automatski prijavljivati"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"Automatsko ispunjavanje upotrebljavat će vaš profil kako biste lakše ispunili web-obrasce jednim klikom."</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"Prijavljivanjem u Google Web-lokacije pomoću postavki <xliff:g id="ID_1">%s</xliff:g>"\n"Vaša privatnost i sigurnost nadzire se automatska prijava na Google"</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"Dostupna je automatska prijava."</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"Prijava"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"Prijava nije uspjela."</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"Unesite podatke koje želite automatski unijeti u web-polja kad ih dodirnete."</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"Puno ime:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"E-pošta:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"Naziv tvrtke:"</string>
@@ -197,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"Profil izbrisan"</string>
<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>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Automatsko popunjavanje može se konfigurirati u bilo kojem trenutku putem Postavki preglednika."</string>
- <string name="disable_autofill" msgid="3706426217720202898">"Onemogući automatsko popunjavanje"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"Privatnost i sigurnost"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"Automatsko popunjavanje može se bilo kada konfigurirati putem Postavki preglednika."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"Onemogući automatsko popunjavanje"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"Privatnost i sigurnost"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Očisti predmemoriju"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Izbriši sadržaj i baze podataka spremljene u lokalnu predmemoriju"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"Izbrisat će se sadržaj i baze podataka koji su spremljeni u lokalnu predmemoriju."</string>
@@ -272,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Kodiranje teksta"</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>
- <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>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"Brze kontrole"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"Za pristup brzim kontrolama i skrivanje Aplikacija i URL-ova prijeđite palcem"</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"Najposjećenija početna stranica"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"Vaša početna stranica prikazuje vaše najposjećenije web-stranice."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Google Instant"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Kada u Google Pretraživanju upotrebljavate Google Instant, rezultati se prikazuju dok tipkate (promet podataka može porasti)."</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>
@@ -372,11 +367,19 @@
<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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"Oznake na ovom uređaju još nisu povezane s Google Računom. Spremite te oznake dodavanjem na račun. Izbrišite oznake ako ih ne želite sinkronizirati."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"Dodavanje oznaka trenutačno spremljenih na uređaju i početak sinkronizacije s Google Računom"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"Brisanje oznaka trenutačno spremljenih na uređaju i početak sinkronizacije s Google Računom"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"Brisanje oznaka trenutačno spremljenih na uređaju i početak sinkronizacije oznaka s računom <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"Dodavanje oznaka trenutačno spremljenih na uređaju i početak sinkronizacije oznaka s računom <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Izbriši oznake"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Dalje"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Prethodno"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Odustani"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Gotovo"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"Dodaj oznake na Google Račun"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Dodajte svoje Android oznake oznakama za <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
<string name="menu_share_url" msgid="5851814357333739700">"Dijeli"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"Nema više rasp. kartica"</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Google sa značajkom Instant (Labs)"</string>
</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 93750d9..b5bd149 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Böngésző"</string>
<string name="choose_upload" msgid="3649366287575002063">"Válassza ki a feltölteni kívánt fájlt"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"A fájlok feltöltése le van tiltva."</string>
<string name="new_tab" msgid="4505722538297295141">"Új ablak"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"Új inkognitóablak"</string>
<string name="active_tabs" msgid="3050623868203544623">"Ablakok"</string>
@@ -99,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"Lista"</string>
<string name="current_page" msgid="7510129573681663135">"innen: "</string>
<string name="delete_bookmark_warning" msgid="758043186202032205">"A(z) \"<xliff:g id="BOOKMARK">%s</xliff:g>\" könyvjelző törlésre kerül."</string>
- <string name="open_in_new_window" msgid="6596775546468054510">"Megnyitás új ablakban"</string>
<string name="open_all_in_new_window" msgid="6514602245828366045">"Összes megnyitása új ablakban"</string>
<string name="goto_dot" msgid="3895839050522602723">"Ugrás"</string>
<string name="incognito_tab" msgid="5419458065370134289">"Új inkognitólap megnyitása"</string>
@@ -112,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"Letöltések"</string>
<string name="copy_page_url" msgid="7635062169011319208">"Az oldal URL-jének másolása"</string>
<string name="share_page" msgid="593756995297268343">"Oldal megosztása"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"Mentés internetes archívumként"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"Az internetes archívum elmentve."</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"Nem sikerült menteni az internetes archívumot."</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"Oldal mentése"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"Oldal mentve."</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"Nem sikerült menteni az oldalt."</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"<xliff:g id="BOOKMARK_COUNT">%d</xliff:g> könyvjelző"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"Üres mappa"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"Megnyitás"</string>
@@ -139,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"Oldaltartalom-beállítások"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"Képek betöltése"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"Képek megjelenítése a weboldalakon"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"Előugró ablakok letiltása"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"Pop-upok letiltása"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"JavaScript engedélyezése"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"Megnyitás a háttérben"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"Plug-inek engedélyezése"</string>
@@ -149,7 +147,7 @@
<item msgid="8547442717307793863">"Ki"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"Új ablakok megnyitása a jelenlegi mögött"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"Főoldal beállítása"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"Kezdőlap beállítása"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"Keresőmotor beállítása"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"Válasszon ki egy keresőmotort"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"Beállítás a következőre:"</string>
@@ -160,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"A képernyőhöz igazítja a weboldalakat"</string>
<string name="pref_general_title" msgid="1946872771219249323">"Általános"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"Szinkronizálás"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"Automatikus kitöltés"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"Automatikus kitöltés"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"Szinkronizálás a Google Chrome-mal"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"Könyvjelzők és egyéb adatok megosztása az Android böngészője és a Google Chrome között"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"Google Fiók"</string>
@@ -168,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"Az Android böngésző és a Google Chrome könyvjelzőinek szinkronizálása"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"Szinkronizálás most"</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"Fiók kiválasztása"</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"Űrlap automatikus kitöltése"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"Űrlap automatikus kitöltése"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"Internetes űrlapok kitöltése egyetlen kattintással"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"Automatikus kitöltés beállításai"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"Automatikusan kitöltött űrlapadatok megadása és kezelése"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Adatok automatikus kitöltése"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Adatok beírása és mentése az internetes űrlapok mezőinek automatikus kitöltéséhez"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"Automatikus Google-bejelentkezés"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"Nem található fiók"</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"Automatikus bejelentkezés a Google-webhelyekre <xliff:g id="ID_1">%s</xliff:g> fiókkal"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"Bejelentkezés a Google webhelyeire a következő használatával: <xliff:g id="ID_1">%s</xliff:g>"\n"Az automatikus Google-bejelentkezést adatvédelmi és biztonsági beállításai szabályozzák"</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"Ne lépjen be automatikusan"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"Az Automatikus kitöltés az Ön profilja alapján egyetlen kattintással kitölti a webes űrlapokat."</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"Bejelentkezés a Google webhelyeire a következő használatával: <xliff:g id="ID_1">%s</xliff:g>"\n"Az automatikus Google-bejelentkezést adatvédelmi és biztonsági beállításai szabályozzák"</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"Az automatikus bejelentkezés elérhető."</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"Bejelentk."</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"Sikertelen bejelentkezés."</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"Adja meg azokat az adatokat, amelyekkel ki szeretné tölteni az internetes mezőket, amikor megérinti azokat."</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"Teljes név:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"E-mail:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"Vállalat neve:"</string>
@@ -196,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"A profil törölve."</string>
<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>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Az Automatikus kitöltést bármikor konfigurálhatja a Böngésző beállításai között."</string>
- <string name="disable_autofill" msgid="3706426217720202898">"Automatikus kitöltés kikapcsolása"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"Adatvédelem és biztonság"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"Az Automatikus kitöltést bármikor konfigurálhatja a Böngésző beállításai között."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"Automatikus kitöltés letiltása"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"Adatvédelem és biztonság"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"A gyorsítótár törlése"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"A helyileg gyorsítótárazott tartalmak és adatbázisok törlése"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"A helyileg gyorsítótárazott tartalmak és adatbázisok törlésre kerülnek."</string>
@@ -271,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Szöveg kódolása"</string>
<string name="pref_lab_title" msgid="5571091610359629423">"Labs"</string>
- <string name="pref_lab_quick_controls" msgid="2105979166017257647">"Gyorsvezérlők"</string>
- <string name="pref_lab_quick_controls_summary" msgid="8025196176636589803">"A gyorsvezérlők eléréséhez csúsztassa hüvelykujját befelé a bal vagy jobb széltől"</string>
- <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"A leglátogatottabb honlap"</string>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Kezdőlap beállítása, hogy a leglátogatottabb oldalakat mutassa."</string>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"Gyorsbeállítások"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"Húzza hüvelyk. balról jobbra a gyorsvez. elér.-hez, és az Alk. és URL sáv elrejt.-hez."</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"Leggyakrabban felkeresett kezdőlap"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"Kezdőlapján a leggyakrabban felkeresett webhelyek jelennek meg."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Google Instant"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"A Google-keresésnél használja a Google Instantot, és a találatok gépelés közben megjelennek (az adatforgalom nőhet)."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Adatkapcsolat-probléma"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Probléma van a fájllal"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Megerősítés"</string>
@@ -371,11 +367,19 @@
<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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"Az eszközön található könyvjelzők még nincsenek Google Fiókhoz társítva. Mentse a könyvjelzőket úgy, hogy hozzáadja azokat egy fiókhoz. Törölje a könyvjelzőket, ha nem szeretné szinkronizálni azokat."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"Az eszközön jelenleg található könyvjelzők hozzáadása, és a szinkronizálás megkezdése a Google Fiókkal"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"Az eszközön jelenleg található könyvjelzők törlése, és a könyvjelzők szinkronizálásának megkezdése a Google Fiókkal"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"Az eszközön jelenleg található könyvjelzők törlése, és a könyvjelzők szinkronizálásának megkezdése a következővel: <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"Az eszközön jelenleg található könyvjelzők hozzáadása, és a könyvjelzők szinkronizálásának megkezdése a következővel: <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Könyvjelzők törlése"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Tovább"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Előző"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Mégse"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Kész"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"Könyvjelzők hozzáadása a Google Fiókhoz"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Az Androidos könyvjelzők hozzáadása <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g> fiók könyvjelzőihez"</string>
<string name="menu_share_url" msgid="5851814357333739700">"Megosztás"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"Nem nyitható meg több lap"</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Google Instanttal (Labs)"</string>
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index a9d0d90..29954fa 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Peramban"</string>
<string name="choose_upload" msgid="3649366287575002063">"Pilih berkas untuk diunggah"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"Pengunggahan berkas dinonaktifkan."</string>
<string name="new_tab" msgid="4505722538297295141">"Jendela baru"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"Jendela penyamaran baru"</string>
<string name="active_tabs" msgid="3050623868203544623">"Windows"</string>
@@ -78,8 +77,7 @@
<string name="http" msgid="2163722670597250102">"http://"</string>
<string name="save_to_bookmarks" msgid="6101482434920313244">"Tambahkan ke Bookmark"</string>
<string name="bookmark_this_page" msgid="7530739804320811054">"Bookmark laman ini"</string>
- <!-- no translation found for remove (7820112494467011374) -->
- <skip />
+ <string name="remove" msgid="7820112494467011374">"Hapus"</string>
<string name="edit_bookmark" msgid="5024089053490231905">"Edit bookmark"</string>
<string name="create_shortcut_bookmark" msgid="1995095662095484289">"Tambahkan pintasan ke beranda"</string>
<string name="open_bookmark" msgid="8473581305759935790">"Buka"</string>
@@ -100,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"Daftar"</string>
<string name="current_page" msgid="7510129573681663135">"dari "</string>
<string name="delete_bookmark_warning" msgid="758043186202032205">"Bookmark \"<xliff:g id="BOOKMARK">%s</xliff:g>\" akan dihapus."</string>
- <string name="open_in_new_window" msgid="6596775546468054510">"Buka di jendela baru"</string>
<string name="open_all_in_new_window" msgid="6514602245828366045">"Buka semua di jendela baru"</string>
<string name="goto_dot" msgid="3895839050522602723">"Buka"</string>
<string name="incognito_tab" msgid="5419458065370134289">"Buka tab penyamaran baru"</string>
@@ -113,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"Unduhan"</string>
<string name="copy_page_url" msgid="7635062169011319208">"Salin URL laman"</string>
<string name="share_page" msgid="593756995297268343">"Bagikan lama"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"Simpan sebagai Arsip Web"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"Arsip web disimpan."</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"Gagal menyimpan arsip web."</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"Simpan laman"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"Laman tersimpan."</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"Gagal menyimpan laman."</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"<xliff:g id="BOOKMARK_COUNT">%d</xliff:g> bookmark"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"Map kosong"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"Buka"</string>
@@ -140,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"Setelan konten laman"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"Muat gambar"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"Tampilkan gambar pada laman web"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"Cekal jendela munculan"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"Cekal jendela munculan"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"Aktifkan JavaScript"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"Buka di latar belakang"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"Aktifkan pengaya"</string>
@@ -150,7 +147,7 @@
<item msgid="8547442717307793863">"Mati"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"Buka jendela baru di belakang jendela ini"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"Setel beranda"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"Setel beranda"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"Setel mesin telusur"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"Pilih mesin telusur"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"Setel ke..."</string>
@@ -161,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"Format laman web agar sesuai dengan layar"</string>
<string name="pref_general_title" msgid="1946872771219249323">"Umum"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"Sinkronisasi"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"IsiOtomatis"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"Isi-otomatis"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"Sinkronkan dengan Google Chrome"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"Bagikan bookmark & dan data lain antara Peramban Android dan Google Chrome"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"Akun Google"</string>
@@ -169,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"Sinkronkan bookmark antara Peramban Android dan Google Chrome"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"Mulai sinkronisasi"</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"Pilih akun Google untuk berbagi dengan"</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"IsiOtomatis Formulir"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"Isi-otomatis formulir"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"Isi formulir web dengan sekali klik"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"Setelan IsiOtomatis"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"Menyiapkan & mengelola data untuk formulir IsiOtomatis"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Isi-otomatis data"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Masukkan dan simpan data untuk mengisi-otomatis bidang formulir web"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"Masuk ke Google secara otomatis"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"Tidak ada akun yang ditemukan"</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"Masuk ke situs Google secara otomatis menggunakan <xliff:g id="ID_1">%s</xliff:g>"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"Masuk ke situs Google menggunakan <xliff:g id="ID_1">%s</xliff:g>"\n"setelan Privasi & Keamanan mengontrol aktivitas masuk otomatis ke Google"</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"Jangan masuk secara otomatis"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"IsiOtomatis akan menggunakan profil Anda untuk membantu mengisi formulir web dengan sekali klik."</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"Memasuki situs Google dengan <xliff:g id="ID_1">%s</xliff:g>"\n"Setelan privasi & keamanan Anda mengontrol aktivitas masuk otomatis ke Google"</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"Fitur masuk otomatis tersedia."</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"Masuk"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"Upaya masuk gagal."</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"Masukkan data yang ingin Anda isi-otomatiskan ke bidang web saat Anda menyentuhnya."</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"Nama lengkap:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"Email:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"Nama perusahaan:"</string>
@@ -197,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"Profil dihapus"</string>
<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>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"IsiOtomatis selalu dapat dikonfigurasi melalui Setelan Peramban."</string>
- <string name="disable_autofill" msgid="3706426217720202898">"Nonaktifkan IsiOtomatis"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"Privasi & Keamanan"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"Isi-otomatis selalu dapat dikonfigurasi melalui Setelan Peramban."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"Nonaktifkan isi-otomatis"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"Privasi & keamanan"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Hapus tembolok"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Hapus konten dan database yang disimpan dalam tembolok secara lokal"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"Konten dan database yang disimpan dalam tembolok secara lokal akan dihapus."</string>
@@ -272,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Penyandiaksaraan teks"</string>
<string name="pref_lab_title" msgid="5571091610359629423">"Labs"</string>
- <string name="pref_lab_quick_controls" msgid="2105979166017257647">"Kontrol Cepat"</string>
- <string name="pref_lab_quick_controls_summary" msgid="8025196176636589803">"Gesek ibu jari dari tepi kiri atau kanan untuk mengakses kontrol cepat"</string>
- <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"Beranda yang Paling Sering Dikunjungi"</string>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Menyetel beranda Anda untuk menampilkan laman yang paling sering dikunjungi."</string>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"Kontrol cepat"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"Gesek ibu jari dari tepi kiri atau kanan untuk mengakses kontrol cepat dan menyembunyikan bilah aplikasi dan URL"</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"Beranda paling sering disinggahi"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"Beranda Anda menampilkan situs web yang paling sering disinggahi."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Google Sekejap"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Gunakan Google Sekejap di Google Penelusuran agar hasilnya tampil selagi mengetik (ini dapat menambah pemakaian data)."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Masalah konektivitas data"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Masalah dengan berkas"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Konfirmasi"</string>
@@ -372,11 +367,19 @@
<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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"Bookmark pada perangkat ini belum terkait dengan Akun Google. Simpan bookmark ini dengan menambahkannya ke sebuah akun. Hapus bookmark jika Anda tidak ingin menyinkronkannya."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"Tambahkan bookmark saat ini pada perangkat ini dan mulai menyinkronkannya dengan Akun Google"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"Menghapus bookmark yang ada di perangkat ini dan mulai menyinkronkannya dengan Akun Google"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"Menghapus bookmark yang ada di perangkat ini dan mulai menyinkronkan bookmark dengan <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"Tambahkan bookmark saat ini pada perangkat ini dan mulai menyinkronkan bookmark dengan <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Hapus bookmark"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Berikutnya"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Sebelumnya"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Batal"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Selesai"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"Tambahkan bookmark ke Akun Google"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Tambahkan bookmark Android ke bookmark untuk <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
<string name="menu_share_url" msgid="5851814357333739700">"Bagikan"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"Tidak ada lagi tab yang tersedia"</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Google dengan Sekejap (Labs)"</string>
</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 0b7fa64..7a8a6a1 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Browser"</string>
<string name="choose_upload" msgid="3649366287575002063">"Scegli il file per il caricamento"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"I caricamenti di file sono disabilitati."</string>
<string name="new_tab" msgid="4505722538297295141">"Nuova finestra"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"Nuova finestra in incognito"</string>
<string name="active_tabs" msgid="3050623868203544623">"Finestre"</string>
@@ -99,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"Elenco"</string>
<string name="current_page" msgid="7510129573681663135">"da "</string>
<string name="delete_bookmark_warning" msgid="758043186202032205">"Il segnalibro \"<xliff:g id="BOOKMARK">%s</xliff:g>\" verrà eliminato."</string>
- <string name="open_in_new_window" msgid="6596775546468054510">"Apri in nuova finestra"</string>
<string name="open_all_in_new_window" msgid="6514602245828366045">"Apri tutto in nuove finestre"</string>
<string name="goto_dot" msgid="3895839050522602723">"Vai"</string>
<string name="incognito_tab" msgid="5419458065370134289">"Apri nuova scheda in incognito"</string>
@@ -112,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"Download"</string>
<string name="copy_page_url" msgid="7635062169011319208">"Copia URL della pagina"</string>
<string name="share_page" msgid="593756995297268343">"Condividi pagina"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"Salva come archivio web"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"Archivio web salvato."</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"Salvataggio archivio web non riuscito."</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"Salva pagina"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"Pagina salvata."</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"Impossibile salvare la pagina."</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"<xliff:g id="BOOKMARK_COUNT">%d</xliff:g> segnalibri"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"Cartella vuota"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"Apri"</string>
@@ -139,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"Impostazioni contenuti pagina"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"Carica immagini"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"Visualizza immagini in pagine web"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"Blocca finestre pop-up"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"Blocca popup"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"Attiva JavaScript"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"Apri in secondo piano"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"Attiva plug-in"</string>
@@ -149,7 +147,7 @@
<item msgid="8547442717307793863">"Non attivo"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"Apri le nuove finestre dietro la finestra corrente"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"Imposta pagina iniziale"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"Imposta pagina iniziale"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"Imposta motore di ricerca"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"Seleziona un motore di ricerca"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"Imposta su..."</string>
@@ -160,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"Adatta le pagine web allo schermo"</string>
<string name="pref_general_title" msgid="1946872771219249323">"Generali"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"Sincronizzazione"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"Compilazione automatica"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"Compilazione automatica"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"Sincronizza con Google Chrome"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"Condividi Segnalibri e altri dati tra il Browser di Android e Google Chrome"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"Account Google"</string>
@@ -168,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"Sincronizza Segnalibri tra il Browser di Android e Google Chrome"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"Avvia sincronizzazione"</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"Seleziona account Google"</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"Compilazione automatica moduli"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"Compilazione automatica moduli"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"Compila i moduli web con un clic"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"Impost. Compilazione automatica"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"Imposta e gestisci i dati per i moduli compilati automaticamente"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Dati per compilazione automatica"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Inserisci e salva dati per la compilazione automatica dei campi dei moduli web"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"Accesso Google automatico"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"Nessun account trovato"</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"Accedi automaticamente ai siti Google utilizzando <xliff:g id="ID_1">%s</xliff:g>"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"Accesso ai siti di Google con <xliff:g id="ID_1">%s</xliff:g>"\n"L\'accesso automatico a Google è controllato dalle tue impostazioni di privacy e sicurezza"</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"Non accedere automaticamente"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"La Compilazione automatica utilizzerà il tuo profilo per aiutarti a completare i moduli web con un solo clic."</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"Accesso ai siti di Google con <xliff:g id="ID_1">%s</xliff:g>"\n"L\'accesso automatico a Google è controllato dalle tue impostazioni di privacy e sicurezza"</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"Accesso automatico disponibile."</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"Accedi"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"Accesso non riuscito."</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"Inserisci i dati desiderati per la compilazione automatica dei moduli web quando li tocchi."</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"Nome e cognome:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"Email:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"Nome azienda:"</string>
@@ -196,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"Profilo eliminato"</string>
<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>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"È sempre possibile configurare la compilazione automatica tramite le impostazioni del browser."</string>
- <string name="disable_autofill" msgid="3706426217720202898">"Disabilita compilazione automatica"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"Privacy e sicurezza"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"È sempre possibile configurare la compilazione automatica tramite le impostazioni del browser."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"Disattiva compilazione automatica"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"Privacy e sicurezza"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Cancella cache"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Cancella i contenuti e i database memorizzati localmente nella cache"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"I contenuti e i database memorizzati localmente nella cache verranno eliminati."</string>
@@ -271,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Codifica testo"</string>
<string name="pref_lab_title" msgid="5571091610359629423">"Labs"</string>
- <string name="pref_lab_quick_controls" msgid="2105979166017257647">"Controlli rapidi"</string>
- <string name="pref_lab_quick_controls_summary" msgid="8025196176636589803">"Fai scorrere il pollice dal bordo sinistro/destro per accedere ai controlli rapidi"</string>
- <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"Più visitati in pagina iniziale"</string>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Imposta pagina iniziale che mostri le pagine più visitate."</string>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"Controlli rapidi"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"Fai scorrere il pollice dal lato sinistro o destro per accedere ai controlli rapidi e nascondere le barre dell\'applicazione e dell\'URL"</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"Home page più visitata"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"La tua pagina iniziale mostra le tue pagine web più visitate."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Google Instant"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Usa Google Instant con Ricerca Google per visualizzare i risultati durante la digitazione (può aumentare l\'uso dei dati)."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Problema di connettività dati"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Problemi con il file"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Conferma"</string>
@@ -371,11 +367,19 @@
<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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"I segnalibri su questo dispositivo non sono ancora associati a un account Google. Salva questi segnalibri aggiungendoli a un account. Elimina questi segnalibri se non desideri sincronizzarli."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"Aggiungi i segnalibri attualmente presenti su questo dispositivo e inizia a sincronizzarli con l\'account Google"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"Elimina i segnalibri attualmente presenti su questo dispositivo e inizia a sincronizzarli con l\'account Google"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"Elimina i segnalibri attualmente presenti su questo dispositivo e inizia a sincronizzare i segnalibri con <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"Aggiungi i segnalibri attualmente presenti su questo dispositivo e inizia a sincronizzare i segnalibri con <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Elimina segnalibri"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Avanti"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Indietro"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Annulla"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Fine"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"Aggiungi segnalibri all\'account Google"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Aggiungi i tuoi Segnalibri Android a quelli per <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
<string name="menu_share_url" msgid="5851814357333739700">"Condividi"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"Nessun\'altra scheda disponibile"</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Google con Instant (Labs)"</string>
</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 60f080d..85992df 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"דפדפן"</string>
<string name="choose_upload" msgid="3649366287575002063">"בחר קובץ להעלאה"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"העלאות הקובץ הושבתו."</string>
<string name="new_tab" msgid="4505722538297295141">"חלון חדש"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"חלון חדש של גלישה בסתר"</string>
<string name="active_tabs" msgid="3050623868203544623">"חלונות"</string>
@@ -99,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"רשימה"</string>
<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>
<string name="open_all_in_new_window" msgid="6514602245828366045">"פתח הכל בחלונות חדשים"</string>
<string name="goto_dot" msgid="3895839050522602723">"בצע"</string>
<string name="incognito_tab" msgid="5419458065370134289">"פתח כרטיסיה חדשה של גלישה בסתר"</string>
@@ -112,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"הורדות"</string>
<string name="copy_page_url" msgid="7635062169011319208">"העתק כתובת אתר של דף"</string>
<string name="share_page" msgid="593756995297268343">"שתף דף"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"שמור כארכיון אינטרנט"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"ארכיון אינטרנט נשמר."</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"שמירת ארכיון אינטרנט נכשלה."</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"שמור דף"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"הדף נשמר."</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"שמירת הדף נכשלה."</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"<xliff:g id="BOOKMARK_COUNT">%d</xliff:g> סימניות"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"תיקיה ריקה"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"פתח"</string>
@@ -139,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"הגדרות תוכן דף"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"טען תמונות"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"הצג תמונות בדפי אינטרנט"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"חסום חלונות קופצים"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"חסום חלונות קופצים"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"הפוך JavaScript לפעיל"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"פתוח ברקע"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"הפוך רכיבי פלאג אין לפעילים"</string>
@@ -149,7 +147,7 @@
<item msgid="8547442717307793863">"כבוי"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"פתח חלונות חדשים מאחורי החלון הנוכחי"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"הגדר דף בית"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"הגדר את דף הבית"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"הגדר מנוע חיפוש"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"בחר מנוע חיפוש"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"הוגדר ל..."</string>
@@ -160,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"עצב דפי אינטרנט כך שיתאימו למסך"</string>
<string name="pref_general_title" msgid="1946872771219249323">"כללי"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"סנכרון"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"מילוי אוטומטי"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"מילוי אוטומטי"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"סנכרן עם Google Chrome"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"שתף סימניות ונתונים אחרים בין דפדפן Android ו-Google Chrome"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"חשבון Google"</string>
@@ -168,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"סנכרן סימניות בין דפדפן Android ובין Google Chrome"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"התחל סנכרון"</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"בחר חשבון Google לשיתוף"</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"מילוי אוטומטי של טפסים"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"מילוי אוטומטי של טופס"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"מלא טופסי אינטרנט בלחיצה אחת"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"הגדרות מילוי אוטומטי"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"הגדר ונהל נתונים לטפסים במילוי אוטומטי"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"נתונים של \'מילוי אוטומטי\'"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"הזן נתונים ושמור אותם למילוי אוטומטי של שדות בטופס אינטרנט"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"כניסה אוטומטית ל-Google"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"לא נמצאו חשבונות"</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"היכנס ל-Google Sites באופן אוטומטי באמצעות <xliff:g id="ID_1">%s</xliff:g>"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"כניסה ל-Google Sites בעזרת <xliff:g id="ID_1">%s</xliff:g>"\n"הגדרות הפרטיות והאבטחה שלך שולטות בכניסה האוטומטית ל-Google"</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"אל תיכנס באופן אוטומטי"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"\'מילוי אוטומטי\' ישתמש בפרופיל שלך כדי לעזור לך להשלים טופסי אינטרנט בלחיצה אחת."</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"כניסה ל-Google Sites באמצעות <xliff:g id="ID_1">%s</xliff:g>"\n" הגדרות הפרטיות והאבטחה שלך שולטות בכניסה האוטומטית ל-Google"</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"הכניסה האוטומטית זמינה."</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"התחבר"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"ההתחברות נכשלה."</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"הזן את הנתונים שברצונך למלא באופן אוטומטי בשדות באינטרנט כאשר תיגע בשדות אלה."</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"שם מלא:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"דוא\"ל:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"שם חברה:"</string>
@@ -196,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"הפרופיל נמחק"</string>
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"מחק את הפרופיל"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"הדפדפן יכול למלא טופסי אינטרנט כמו זה באופן אוטומטי. האם תרצה להגדיר את הפרופיל שלך?"</string>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"ניתן תמיד להגדיר את \'מילוי אוטומטי\' דרך \'הגדרות דפדפן\'."</string>
- <string name="disable_autofill" msgid="3706426217720202898">"הפוך \'מילוי אוטומטי\' ללא זמין"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"פרטיות ואבטחה"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"תוכל תמיד להגדיר את \'מילוי אוטומטי\' דרך \'הגדרות דפדפן\'."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"השבת את \'מילוי אוטומטי\'"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"פרטיות ואבטחה"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"נקה קובץ שמור"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"נקה תוכן ומסדי נתונים בקובץ השמור המקומי"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"תוכן ומסדי נתונים בקובץ השמור המקומי יימחקו."</string>
@@ -271,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"קידוד טקסט"</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>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"מגדיר את דף הבית שלך להציג את הדפים הפופולריים ביותר."</string>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"פקדים מהירים"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"העבר את האגודל מהקצה השמאלי או הימני כדי לגשת לפקדים המהירים ולהסתיר את סרגלי היישום וכתובת האתר"</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"דף הבית שבו ביקרת בתדירות הגבוהה ביותר"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"דף הבית שלך מציג את דפי האינטרנט שבהם ביקרת בתדירות הגבוהה ביותר."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Google Instant"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"השתמש ב-Google Instant כאשר אתה משתמש בחיפוש Google, כדי להציג תוצאות בעת ההקלדה (פעולה זו יכולה להגדיל שימוש בנתונים)."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"בעיה בקישוריות נתונים"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"בעיה בקובץ"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"אשר"</string>
@@ -371,11 +367,19 @@
<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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"הסימניות בהתקן זה עדיין לא משויכות לחשבון Google. כדי לשמור את הסימניות, הוסף אותן לחשבון. מחק את הסימניות אם אינך מעוניין לסנכרן אותן."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"הוסף את הסימניות הקיימות כרגע בהתקן זה והתחל בסינכרון עם חשבון Google"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"מחק את הסימניות הקיימות כרגע בהתקן זה והתחל בסינכרון עם חשבון Google"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"מחק סימניות הקיימות כרגע בהתקן זה והתחל בסינכרון סימניות עם <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"הוסף את הסימניות הקיימות כרגע בהתקן זה והתחל בסינכרון הסימניות עם <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"מחק סימניות"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"הבא"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"הקודם"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"ביטול"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"סיום"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"הוסף סימניות לחשבון Google"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"הוסף את סימניות Android לסימניות של <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
<string name="menu_share_url" msgid="5851814357333739700">"שתף"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"אין עוד כרטיסיות זמינות"</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Google עם Instant (Google Labs)"</string>
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 474e32f..2620591 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"ブラウザ"</string>
<string name="choose_upload" msgid="3649366287575002063">"アップロードするファイルを選択"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"ファイルのアップロードが無効になっています。"</string>
<string name="new_tab" msgid="4505722538297295141">"新しいウィンドウ"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"新しいシークレットウインドウ"</string>
<string name="active_tabs" msgid="3050623868203544623">"ウィンドウ"</string>
@@ -99,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"リスト"</string>
<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>
<string name="open_all_in_new_window" msgid="6514602245828366045">"常に新しいウィンドウで開く"</string>
<string name="goto_dot" msgid="3895839050522602723">"移動"</string>
<string name="incognito_tab" msgid="5419458065370134289">"新しいシークレットタブを開く"</string>
@@ -112,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"ダウンロード履歴"</string>
<string name="copy_page_url" msgid="7635062169011319208">"ページのURLをコピー"</string>
<string name="share_page" msgid="593756995297268343">"ページを共有"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"ウェブアーカイブとして保存"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"ウェブアーカイブを保存しました。"</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"ウェブアーカイブを保存できませんでした。"</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"ページを保存"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"ページを保存しました。"</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"ページを保存できませんでした。"</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"<xliff:g id="BOOKMARK_COUNT">%d</xliff:g>件のブックマーク"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"空のフォルダ"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"開く"</string>
@@ -139,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"ページコンテンツ設定"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"画像の読み込み"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"ウェブページに画像を表示する"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"ポップアップウィンドウをブロック"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"ポップアップをブロック"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"JavaScriptを有効にする"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"バックグラウンドで開く"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"プラグインを有効にする"</string>
@@ -149,7 +147,7 @@
<item msgid="8547442717307793863">"OFF"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"現在のウィンドウの後ろに新しいウィンドウを開く"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"ホームページ設定"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"ホームページを設定"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"検索エンジンの設定"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"検索エンジンを選択する"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"設定先..."</string>
@@ -160,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"画面に合わせてウェブページをフォーマットする"</string>
<string name="pref_general_title" msgid="1946872771219249323">"全般"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"同期"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"自動入力"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"自動入力"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"Google Chromeと同期する"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"AndroidブラウザとGoogle Chromeの間でブックマークなどのデータを共有する"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"Googleアカウント"</string>
@@ -168,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"AndroidブラウザとGoogle Chromeの間でブックマークを同期"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"同期を開始"</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"Googleアカウントを選択"</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"フォームの自動入力"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"フォームの自動入力"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"1回タップするだけでウェブフォームに入力できます"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"自動入力設定"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"自動入力フォーム用のデータの設定と管理"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"自動入力データ"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"ウェブフォームフィールドに自動入力するデータを入力、保存する"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"Googleへの自動ログイン"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"アカウントが見つかりません"</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"<xliff:g id="ID_1">%s</xliff:g>で自動的にGoogleにログインする"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"<xliff:g id="ID_1">%s</xliff:g>を使用してGoogleサイトにログインしています"\n"Googleへの自動ログインは、プライバシーとセキュリティの設定で管理されます"</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"自動的にログインしない"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"プロフィールは自動入力機能で使用され、1回タップするだけでウェブフォームに入力することができます。"</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"<xliff:g id="ID_1">%s</xliff:g>を使用してGoogleサイトにログインしています"\n"Googleへの自動ログインは、プライバシーとセキュリティの設定で管理されます"</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"自動ログインを利用できます。"</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"ログイン"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"ログインに失敗しました。"</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"ウェブ上でフィールドをタップしたときに自動入力するデータを入力します。"</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"氏名:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"メール:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"会社名:"</string>
@@ -196,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"プロフィールを削除しました"</string>
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"プロフィールを削除"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"このようなウェブフォームにブラウザで自動入力できます。プロフィールを設定しますか？"</string>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"自動入力はいつでもブラウザの[設定]から設定できます。"</string>
- <string name="disable_autofill" msgid="3706426217720202898">"自動入力を無効にする"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"プライバシーとセキュリティ"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"自動入力はいつでもブラウザの[設定]から設定できます。"</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"自動入力を無効にする"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"プライバシーとセキュリティ"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"キャッシュを消去"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"ローカルにキャッシュしたコンテンツとデータベースを消去する"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"ローカルにキャッシュしたコンテンツとデータベースを削除します。"</string>
@@ -271,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"テキストエンコード"</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>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"アクセス数が最も多いページが表示されるようにホームページを設定します。"</string>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"クイックコントロール"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"クイックコントロールへのアクセス（アプリ/URLバー非表示）には左/右端からスワイプ"</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"アクセス回数が最多のホームページ"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"アクセス回数が最多のウェブページをホームページとして表示します。"</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Googleインスタント検索"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Google検索時にGoogleインスタント検索を使用すると、入力中に結果が表示されます（データの使用量が増えることがあります）。"</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"データアクセスエラー"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"ファイルに問題があります"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"確認"</string>
@@ -371,11 +367,19 @@
<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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"この携帯端末のブックマークはまだGoogleアカウントに関連付けられていません。ブックマークはアカウントに追加して保存できます。同期したくない場合はこれらのブックマークを削除してください。"</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"この携帯端末の現在のブックマークを追加し、Googleアカウントとの同期を開始する"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"この携帯端末の現在のブックマークを削除し、Googleアカウントとの同期を開始する"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"この携帯端末の現在のブックマークを削除し、<xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>とのブックマークの同期を開始します。"</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"この携帯端末の現在のブックマークを追加し、<xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>とのブックマークの同期を開始します。"</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"ブックマークを削除"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"次へ"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"戻る"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"キャンセル"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"完了"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"Googleアカウントにブックマークを追加"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Androidのブックマークを<xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>のブックマークに追加"</string>
<string name="menu_share_url" msgid="5851814357333739700">"共有"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"タブ数が上限に達しました"</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Googleインスタント検索（Labs）"</string>
</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index e45c9ca..0427279 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"인터넷"</string>
<string name="choose_upload" msgid="3649366287575002063">"업로드할 파일 선택"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"파일 업로드가 사용 중지되었습니다."</string>
<string name="new_tab" msgid="4505722538297295141">"새 창"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"새 시크릿 창"</string>
<string name="active_tabs" msgid="3050623868203544623">"창"</string>
@@ -99,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"목록"</string>
<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>
<string name="open_all_in_new_window" msgid="6514602245828366045">"새 창에서 모두 열기"</string>
<string name="goto_dot" msgid="3895839050522602723">"이동"</string>
<string name="incognito_tab" msgid="5419458065370134289">"새 시크릿 탭 열기"</string>
@@ -112,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"다운로드"</string>
<string name="copy_page_url" msgid="7635062169011319208">"페이지 URL 복사"</string>
<string name="share_page" msgid="593756995297268343">"페이지 공유"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"웹 아카이브로 저장"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"웹 아카이브를 저장했습니다."</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"웹 아카이브를 저장하지 못했습니다."</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"페이지 저장"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"페이지가 저장되었습니다."</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"페이지를 저장하지 못했습니다."</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"북마크 <xliff:g id="BOOKMARK_COUNT">%d</xliff:g>개"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"빈 폴더"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"열기"</string>
@@ -139,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"페이지 콘텐츠 설정"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"이미지 로드"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"웹페이지에 이미지 표시"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"팝업 창 차단"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"팝업 차단"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"자바스크립트 사용"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"백그라운드에서 열기"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"플러그인 사용"</string>
@@ -149,7 +147,7 @@
<item msgid="8547442717307793863">"사용 안함"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"현재 창 뒤에 새 창 열기"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"홈페이지 설정"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"홈페이지 설정"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"검색 엔진 설정"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"검색 엔진 선택"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"다음으로 설정:"</string>
@@ -160,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"화면에 맞게 웹페이지 형식 지정"</string>
<string name="pref_general_title" msgid="1946872771219249323">"기본설정"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"동기화"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"자동완성"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"자동 입력"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"Google 크롬과 동기화"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"Android 브라우저와 Google 크롬 간에 북마크 및 기타 데이터 공유"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"Google 계정"</string>
@@ -168,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"Android 브라우저와 Google 크롬 간의 북마크 동기화"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"동기화 시작"</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"공유할 Google 계정 선택"</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"양식 자동완성"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"양식 자동 입력"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"클릭 한 번으로 웹 양식 작성"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"자동완성 설정"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"자동완성된 양식의 데이터 설정 및 관리"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"데이터 자동 입력"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"자동 입력 웹 양식 필드에 대한 데이터 입력 및 저장"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"자동 Google 로그인"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"계정이 없습니다."</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"<xliff:g id="ID_1">%s</xliff:g>을(를) 사용하여 Google 사이트에 자동으로 로그인"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"개인정보 및 보안 설정 컨트롤<xliff:g id="ID_1">%s</xliff:g>"\n"자동 Google 로그인을 사용하여 Google 사이트에 로그인"</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"자동 로그인 안함"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"자동완성 기능은 사용자의 프로필을 사용하여 단 한번의 클릭으로 웹 양식을 작성할 수 있도록 도와줍니다."</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"<xliff:g id="ID_1">%s</xliff:g>"\n"개인정보 및 보안 설정 컨트롤 자동 Google 로그인을 사용하여 Google 사이트에 로그인"</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"자동 로그인을 사용할 수 있습니다."</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"로그인"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"로그인하지 못했습니다."</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"터치할 때 웹 입력란에 자동 완성되도록 하려는 데이터를 입력하세요."</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"이름:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"이메일:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"회사 이름:"</string>
@@ -196,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"프로필이 삭제되었습니다."</string>
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"프로필 삭제"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"브라우저에서 이 양식과 같은 웹 양식을 자동으로 완성할 수 있습니다. 프로필을 설정하시겠습니까?"</string>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"브라우저 설정에서 언제든지 자동완성을 구성할 수 있습니다."</string>
- <string name="disable_autofill" msgid="3706426217720202898">"자동완성 사용 안함"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"개인정보 보호 및 보안"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"브라우저 설정에서 언제든지 자동완성을 구성할 수 있습니다."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"자동 입력 사용중지"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"개인정보 보호 및 보안"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"캐시 지우기"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"로컬로 캐시된 콘텐츠 및 데이터베이스 삭제"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"로컬로 캐시된 콘텐츠 및 데이터베이스가 삭제됩니다."</string>
@@ -271,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"텍스트 인코딩"</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>
- <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"자주 방문한 홈페이지"</string>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"자주 방문한 페이지를 표시하도록 홈페이지를 설정합니다."</string>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"빠른 컨트롤"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"좌/우 끝에서 엄지로 스와이프하여 빠른 컨트롤에 액세스하고 앱 및 URL 표시줄 숨김"</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"자주 방문한 홈페이지"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"홈페이지에 자주 방문한 웹페이지가 표시됩니다."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Google 순간 검색"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Google 검색을 사용할 때 Google 순간 검색을 사용하면 입력하는 동안 결과가 표시됩니다(데이터 사용이 증가될 수 있음)."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"데이터 연결에 문제 발생"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"파일 문제 발생"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"확인"</string>
@@ -371,11 +367,19 @@
<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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"이 기기의 북마크가 Google 계정과 아직 연결되지 않았습니다. 이러한 북마크를 계정에 추가하여 저장하세요. 이러한 북마크를 동기화하지 않으려면 삭제하세요."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"현재 이 기기에서 북마크를 추가하고 Google 계정과 동기화를 시작하세요."</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"현재 이 기기에서 북마크를 삭제하고 Google 계정과 동기화를 시작하세요."</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"현재 이 기기에서 북마크를 삭제하고 <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>과 북마크 동기화를 시작하세요."</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"현재 이 기기에서 북마크를 하고 <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>과 북마크 동기화를 시작하세요."</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"북마크 삭제"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"다음"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"이전"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"취소"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"완료"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"Google 계정에 북마크 추가"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"<xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>에 대한 북마크에 Android 북마크 추가"</string>
<string name="menu_share_url" msgid="5851814357333739700">"공유"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"탭이 더 이상 없습니다."</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Google 순간 검색(실험실)"</string>
</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 33b3aa7..af1e434 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Naršyklė"</string>
<string name="choose_upload" msgid="3649366287575002063">"Pasirinkti failą, kurį norite įkelti"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"Neleidžiama įkelti failų."</string>
<string name="new_tab" msgid="4505722538297295141">"Naujas langas"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"Naujas inkognito langas"</string>
<string name="active_tabs" msgid="3050623868203544623">"Windows"</string>
@@ -78,8 +77,7 @@
<string name="http" msgid="2163722670597250102">"http://"</string>
<string name="save_to_bookmarks" msgid="6101482434920313244">"Pridėti prie žymių"</string>
<string name="bookmark_this_page" msgid="7530739804320811054">"Žymėti šį puslapį"</string>
- <!-- no translation found for remove (7820112494467011374) -->
- <skip />
+ <string name="remove" msgid="7820112494467011374">"Pašalinti"</string>
<string name="edit_bookmark" msgid="5024089053490231905">"Redaguoti žymę"</string>
<string name="create_shortcut_bookmark" msgid="1995095662095484289">"Prie pagrindinio psl. pridėti spartųjį klavišą"</string>
<string name="open_bookmark" msgid="8473581305759935790">"Atidaryti"</string>
@@ -100,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"Sąrašas"</string>
<string name="current_page" msgid="7510129573681663135">"nuo "</string>
<string name="delete_bookmark_warning" msgid="758043186202032205">"Žymė „<xliff:g id="BOOKMARK">%s</xliff:g>“ bus ištrinta."</string>
- <string name="open_in_new_window" msgid="6596775546468054510">"Atidaryti naujame lange"</string>
<string name="open_all_in_new_window" msgid="6514602245828366045">"Atidaryti visas naujuose languose"</string>
<string name="goto_dot" msgid="3895839050522602723">"Pradėti"</string>
<string name="incognito_tab" msgid="5419458065370134289">"Atidaryti naują inkogn. skirt."</string>
@@ -113,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"Atsisiuntimai"</string>
<string name="copy_page_url" msgid="7635062169011319208">"Kopijuoti puslapio URL"</string>
<string name="share_page" msgid="593756995297268343">"Bendrinti puslapį"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"Išsaugoti kaip žiniatinklio archyvą"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"Žiniatinklio archyvas išsaugotas."</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"Nepavyko išsaugoti žiniatinklio archyvo."</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"Išsaugoti puslapį"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"Puslapis išsaugotas."</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"Nepavyko išsaugoti puslapio."</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"Žymių: <xliff:g id="BOOKMARK_COUNT">%d</xliff:g>"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"Tuščias aplankas"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"Atidaryti"</string>
@@ -140,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"Puslapio turinio nustatymai"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"Įkelti vaizdus"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"Pateikti vaizdus tinklalapiuose"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"Blokuoti iššokančiuosius langus"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"Blokuoti iššokanč. langus"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"Įgalinti „JavaScript“"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"Atidaryti fone"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"Įgalinti papildinius"</string>
@@ -150,7 +147,7 @@
<item msgid="8547442717307793863">"Išjungta"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"Atidaryti naujus langus už dabartinio lango"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"Nustatyti pagrindinį puslapį"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"Nustatyti pagrindinį puslapį"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"Nustatyti paieškos variklį"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"Pasirinkti paieškos variklį"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"Nustatyti…"</string>
@@ -161,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"Formatuoti tinklalapius, kad tilptų ekrane"</string>
<string name="pref_general_title" msgid="1946872771219249323">"Bendra"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"Sinchronizavimas"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"Automatinis užpildymas"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"Automatinis pildymas"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"Sinchronizuoti su „Google Chrome“"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"Bendrinti žymes ir kitus duomenis tarp „Android“ naršyklės ir „Google Chrome“"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"„Google“ paskyra"</string>
@@ -169,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"Sinchronizuoti žymes tarp „Android“ naršyklės ir „Google Chrome“"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"Pradėti sinchroniz."</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"Pas. bendr. „Google“ pask."</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"Automatinio pildymo forma"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"Automatinis formos pildymas"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"Vienu paspaudimu užpildykite žiniatinklio formas"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"Automatinio pildymo nustatymai"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"Nustatyti ir valdyti automatinio pildymo formų duomenis"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Automatinis duomenų pildymas"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Įveskite duomenis ir išsaugokite juos automatinio pildymo formos žiniatinklyje laukuose"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"Autom. prisijung. prie „Google“"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"Nerasta jokių paskyrų"</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"Automatiškai prisijunkite prie „Google“ svetainių naudodami „<xliff:g id="ID_1">%s</xliff:g>“"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"Prisijungiama prie „Google“ svetainių naudojant <xliff:g id="ID_1">%s</xliff:g>"\n"Automatinis prisijungimas prie „Google“ valdomas pagal „Privatumo ir saugos“ nustatymus"</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"Neprisijungti automatiškai"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"Naudojant automatinį pildymą bus naudojamas profilis, kad galėtumėte vos vienu paspaudimu užpildyti žiniatinklio formas."</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"Prisijungiama prie „Google“ svetainių naudojant <xliff:g id="ID_1">%s</xliff:g>"\n"Automatinis prisijungimas prie „Google“ valdomas pagal „Privatumo ir saugos“ nustatymus"</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"Galimas automatinis prisijungimas."</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"Prisijung."</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"Nepavyko prisijungti."</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"Įveskite duomenis, kuriais norite automatiškai užpildyti žiniatinklio laukus, kai juos paliesite."</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"Vardas ir pavardė:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"El. paštas:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"Įmonės pavadinimas:"</string>
@@ -197,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"Profilis ištrintas"</string>
<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>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Automatinį pildymą visada galima konfigūruoti apsilankius skiltyje „Naršyklės nustatymai“."</string>
- <string name="disable_autofill" msgid="3706426217720202898">"Neleisti automatinio pildymo"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"Privatumas ir sauga"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"Automatinį pildymą visada galima konfigūruoti skiltyje „Naršyklės nustatymai“."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"Neleisti automatinio pildymo"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"Privatumas ir sauga"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Išvalyti talpyklą"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Išvalyti vietinėje talpykloje saugomą turinį ir duomenis"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"Vietinėje talpykloje saugomas turinys ir duomenys bus ištrinti."</string>
@@ -272,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Teksto koduotė"</string>
<string name="pref_lab_title" msgid="5571091610359629423">"Laboratorijos"</string>
- <string name="pref_lab_quick_controls" msgid="2105979166017257647">"Spartieji valdikliai"</string>
- <string name="pref_lab_quick_controls_summary" msgid="8025196176636589803">"Braukite nykščiu iš kairiojo ar dešiniojo krašto, kad pasiektumėte sparč. vald."</string>
- <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"Lankomiausias pagrindinis puslapis"</string>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Nustatoma, kad pagrindiniame puslapyje būtų rodomi lankomiausi puslapiai."</string>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"Spartieji valdikliai"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"Sl. nykščiu iš kair. ar deš. kr., kad pasiekt. sparč. vald. ir pasl. pr. ir URL juost."</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"Dažn. lankomas pagrindinis puslapis"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"Pagrindiniame puslapyje pateikiami dažniausiai lankyti tinklalapiai."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Intuityvioji „Google“ paieška"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Kai naud. „Google“ paiešką, naud. Int. „Google“ paiešką, kad renk. tekst. b. rodomi rezult. (tai g. padid. duom. naud.)."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Duomenų jungiamumo problema"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Failo problema"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Patvirtinti"</string>
@@ -372,11 +367,19 @@
<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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"Šiame įrenginyje esančios žymės dar nesusietos su „Google“ paskyra. Išsaugokite šias žymes pridėdami jas prie paskyros. Jei nenorite žymių sinchronizuoti, ištrinkite jas."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"Pridėti šiuo metu šiame įrenginyje esančias žymes ir pradėti sinchronizavimą su „Google“ paskyra"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"Ištrinti šiuo metu šiame įrenginyje esančias žymes ir pradėti sinchronizavimą su „Google“ paskyra"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"Ištrinti šiuo metu šiame įrenginyje esančias žymes ir pradėti žymių sinchronizavimą su <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"Pridėti šiuo metu šiame įrenginyje esančias žymes ir pradėti žymių sinchronizavimą su <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Ištrinti žymes"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Kitas"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Ankstesnis"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Atšaukti"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Atlikta"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"Pridėti žymių prie „Google“ paskyros"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Pridėkite „Android“ žymes prie <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g> žymių"</string>
<string name="menu_share_url" msgid="5851814357333739700">"Bendrinti"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"Daugiau galimų skirtukų nėra"</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"„Google“ su Intuityviąja paieška (Laboratorijos)"</string>
</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index b7b3382..f880b81 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Pārlūkprogramma"</string>
<string name="choose_upload" msgid="3649366287575002063">"Izvēlieties augšupielādējamo failu"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"Failu augšupielādes ir atspējotas."</string>
<string name="new_tab" msgid="4505722538297295141">"Jauns logs"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"Jauns inkognito logs"</string>
<string name="active_tabs" msgid="3050623868203544623">"Logi"</string>
@@ -78,8 +77,7 @@
<string name="http" msgid="2163722670597250102">"http://"</string>
<string name="save_to_bookmarks" msgid="6101482434920313244">"Pievienot grāmatzīmēm"</string>
<string name="bookmark_this_page" msgid="7530739804320811054">"Saglabāt šo lapu kā grāmatzīmi"</string>
- <!-- no translation found for remove (7820112494467011374) -->
- <skip />
+ <string name="remove" msgid="7820112494467011374">"Noņemt"</string>
<string name="edit_bookmark" msgid="5024089053490231905">"Rediģēt grāmatzīmi"</string>
<string name="create_shortcut_bookmark" msgid="1995095662095484289">"Pievienot saīsni uz sākumu"</string>
<string name="open_bookmark" msgid="8473581305759935790">"Atvērt"</string>
@@ -100,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"Saraksts"</string>
<string name="current_page" msgid="7510129573681663135">"no "</string>
<string name="delete_bookmark_warning" msgid="758043186202032205">"Grāmatzīme “<xliff:g id="BOOKMARK">%s</xliff:g>” tiks dzēsta."</string>
- <string name="open_in_new_window" msgid="6596775546468054510">"Atvērt jaunā logā"</string>
<string name="open_all_in_new_window" msgid="6514602245828366045">"Atvērt visas jaunos logos"</string>
<string name="goto_dot" msgid="3895839050522602723">"Sākt"</string>
<string name="incognito_tab" msgid="5419458065370134289">"Atvērt jaunu inkognito cilni"</string>
@@ -113,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"Lejupielādes"</string>
<string name="copy_page_url" msgid="7635062169011319208">"Kopēt lapas URL"</string>
<string name="share_page" msgid="593756995297268343">"Kopīgot lapu"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"Saglabāt kā tīmekļa arhīvu"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"Tīmekļa arhīvs ir saglabāts."</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"Neizdevās saglabāt tīmekļa arhīvu."</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"Saglabāt lapu"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"Lapa ir saglabāta."</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"Neizdevās saglabāt lapu."</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"<xliff:g id="BOOKMARK_COUNT">%d</xliff:g> grāmatzīmes"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"Tukša mape"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"Atvērt"</string>
@@ -140,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"Lapas satura iestatījumi"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"Ielādēt attēlus"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"Rādīt attēlus tīmekļa lapās"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"Bloķēt uznirstošos logus"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"Bloķēt uznirstošos vienumus"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"Iespējot JavaScript"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"Atvērt fonā"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"Iespējot spraudņus"</string>
@@ -150,7 +147,7 @@
<item msgid="8547442717307793863">"Izslēgt"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"Atvērt jaunus logus aiz pašreizējā loga"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"Iestatīt mājaslapu"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"Iestatīt sākumlapu"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"Iestatīt meklētājprogrammu"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"Atlasīt meklētājprogrammu"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"Iestatīt uz…"</string>
@@ -161,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"Formatēt tīmekļa lapas, lai tās ietilptu ekrānā"</string>
<string name="pref_general_title" msgid="1946872771219249323">"Vispārīgi"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"Sinhronizācija"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"Automātiskā aizpilde"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"Automātiskā aizpilde"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"Sinhronizēt ar Google Chrome"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"Kopīgot grāmatzīmes un citus datus Android pārlūkprogrammā un pārlūkprogrammā Google Chrome"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"Google konts"</string>
@@ -169,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"Sinhronizēt Android pārlūkprogrammas un Google Chrome grāmatzīmes"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"Sākt sinhronizāciju"</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"Kopīg. Google konts"</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"Veidot automātisko aizpildi"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"Automātiski aizpildīt veidlapas"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"Tīmekļa veidlapas aizpildīšana ar vienu klikšķi"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"Autom. aizpildes iestatījumi"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"Iestatīt un pārvaldīt automātiski aizpildīto veidlapu datus"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Datu automātiskā ievadīšana"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Ievadiet un saglabājiet datus tīmekļa veidlapu lauku automātiskai aizpildīšanai."</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"Autom. pierakst. vietnē Google"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"Netika atrasts neviens konts."</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"Automātiski pierakstieties Google vietnēs, izmantojot <xliff:g id="ID_1">%s</xliff:g>."</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"Pierakstīšanās Google vietnēs, izmantojot <xliff:g id="ID_1">%s</xliff:g>"\n" Jūsu konfidencialitātes un drošības iestatījumi nosaka automātisko pierakstīšanos Google"</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"Nepierakstīties automātiski"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"Automātiskās aizpildes funkcija izmantos profilā sniegto informāciju, lai ātri aizpildītu tīmekļa veidlapas."</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"Notiek pierakstīšanās Google vietnēs, izmantojot <xliff:g id="ID_1">%s</xliff:g>"\n"jūsu konfidencialitātes un drošības iestatījumu vadīklu Automātiska Google pierakstīšanās."</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"Ir pieejama automātiskā pierakstīšanās."</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"Pieteikties"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"Neizdevās pieteikties."</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"Ievadiet datus, kas automātiski jāaizpilda tīmekļa laukos, kad tiem pieskaraties."</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"Vārds, uzvārds:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"E-pasta adrese:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"Uzņēmuma nosaukums:"</string>
@@ -197,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"Profils ir dzēsts"</string>
<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>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Automātisko aizpildi var konfigurēt jebkurā laikā, izmantojot pārlūkprogrammas iestatījumus."</string>
- <string name="disable_autofill" msgid="3706426217720202898">"Atspējot automātisko aizpildi"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"Konfidencialitāte un drošība"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"Automātisko aizpildi jebkurā brīdī var konfigurēt, izmantojot pārlūkprogrammas iestatījumus."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"Atspējot automātisko aizpildi"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"Konfidencialitāte un drošība"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Notīrīt kešatmiņu"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Notīrīt lokālajā kešatmiņā saglabāto saturu un datu bāzes"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"Lokālajā kešatmiņā ievietots saturs un datu bāzes tiks dzēstas."</string>
@@ -272,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Teksta kodējums"</string>
<string name="pref_lab_title" msgid="5571091610359629423">"Laboratorijas"</string>
- <string name="pref_lab_quick_controls" msgid="2105979166017257647">"Ātrās vadīklas"</string>
- <string name="pref_lab_quick_controls_summary" msgid="8025196176636589803">"Lai piekļūtu ātrajām vadīklām, velciet īkšķi no kreisās malas uz labo."</string>
- <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"Visvairāk apmeklētā mājaslapa"</string>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Iestata mājaslapu, lai tiktu parādītas visvairāk apmeklētās lapas."</string>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"Ātrās piekļuves vadīklas"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"Lai piekļ. ātr. piekļ. vadīklām un slēptu lietojumpr. un URL joslas, ekr. lab. vai kr. malā pavelciet ar īkšķi."</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"Biežāk apmeklēto lapu sākumlapa"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"Sākumlapā tiek rādītas biežāk apmeklētās tīmekļa lapas."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Google dinamiskā meklēšana"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Izmantojiet Google dinamisko meklēšanu, kad lietojat Google meklēšanu, lai redzētu rezultātus rakstīšanas laikā (var tikt izmantots vairāk datu)."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Datu savienojamības problēma"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Faila problēma"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Apstiprināt"</string>
@@ -372,11 +367,19 @@
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
<string name="account_chooser_dialog_title" msgid="3314204833188808194">"Konta izvēle"</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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"Šajā ierīcē esošās grāmatzīmes vēl nav saistītas ar Google kontu. Saglabājiet šīs grāmatzīmes, pievienojot tās kontam. Dzēsiet šīs grāmatzīmes, ja nevēlaties tās sinhronizēt."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"Pievienot šajā ierīcē pašlaik esošās grāmatzīmes un sākt sinhronizāciju ar Google kontu"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"Dzēst šajā ierīcē pašlaik esošās grāmatzīmes un sākt sinhronizāciju ar Google kontu"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"Dzēsiet šajā ierīcē pašlaik esošās grāmatzīmes un sāciet grāmatzīmju sinhronizāciju ar kontu <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"Pievienojiet šajā ierīcē pašlaik esošās grāmatzīmes un sāciet grāmatzīmju sinhronizāciju ar kontu <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Dzēst grāmatzīmes"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Nākamais"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Iepriekšējais"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Atcelt"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Gatavs"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"Pievienot grāmatzīmes Google kontam"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Pievienot Android grāmatzīmes konta <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g> grāmatzīmēm"</string>
<string name="menu_share_url" msgid="5851814357333739700">"Kopīgot"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"Vairs nav pieejamu ciļņu"</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Pakalpojums Google ar dinamisko meklēšanu (Laboratorijas)"</string>
</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 2d9781c..503648a 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Nettleser"</string>
<string name="choose_upload" msgid="3649366287575002063">"Velg fil for opplasting"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"Filopplasting er deaktivert"</string>
<string name="new_tab" msgid="4505722538297295141">"Ny fane"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"Nytt inkognitovindu"</string>
<string name="active_tabs" msgid="3050623868203544623">"Vinduer"</string>
@@ -99,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"Liste"</string>
<string name="current_page" msgid="7510129573681663135">"fra "</string>
<string name="delete_bookmark_warning" msgid="758043186202032205">"Bokmerket \"<xliff:g id="BOOKMARK">%s</xliff:g>\" vil bli slettet."</string>
- <string name="open_in_new_window" msgid="6596775546468054510">"Åpne i nytt vindu"</string>
<string name="open_all_in_new_window" msgid="6514602245828366045">"Åpne alle i nye vinduer"</string>
<string name="goto_dot" msgid="3895839050522602723">"Gå til"</string>
<string name="incognito_tab" msgid="5419458065370134289">"Åpne ny inkognitofane"</string>
@@ -112,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"Nedlastinger"</string>
<string name="copy_page_url" msgid="7635062169011319208">"Kopier nettstedsadresse"</string>
<string name="share_page" msgid="593756995297268343">"Del side"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"Lagre som nettarkiv"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"Nettarkiv lagret."</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"Kan ikke lagre nettarkivet."</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"Lagre siden"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"Siden ble lagret."</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"Fikk ikke lagret siden."</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"<xliff:g id="BOOKMARK_COUNT">%d</xliff:g> bokmerker"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"Tøm mappe"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"Åpne"</string>
@@ -139,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"Sideinnhold"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"Last bilder"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"Vis bilder på nettsteder"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"Blokker popup-vinduer"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"Blokker forgrunnsvinduer"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"Aktiver JavaScript"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"Åpne i bakgrunnen"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"Aktiver utvidelser"</string>
@@ -149,7 +147,7 @@
<item msgid="8547442717307793863">"Av"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"Nye vinduer åpnes bak det gjeldende"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"Angi startside"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"Angi startside"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"Angi søkemotor"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"Velg en søkemotor"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"Satt til"</string>
@@ -160,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"Tilpass nettsteder til skjermen"</string>
<string name="pref_general_title" msgid="1946872771219249323">"Generelt"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"Synkronisering"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"Autofyll"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"Autofyll"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"Synkroniser med Google Chrome"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"Lagre bokmerker og andre data mellom Android-nettleseren og Google Chrome"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"Google-konto"</string>
@@ -168,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"Synkroniser bokmerker mellom Android-nettleseren og Google Chrome"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"Start synkronisering"</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"Velg kto. å dele med"</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"Autoutfylling av skjemaer"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"Automatisk utfylling av skjema"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"Fyll ut nettskjemaer med ett enkelt klikk"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"Innstillinger for autofyll"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"Konfigurer og vedlikehold data for automatisk utfylte skjemaer"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Fyll inn data automatisk"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Skriv inn og lagre data for automatisk utfylling av nettskjemafelter"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"Automatisk Google-pålogging"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"Finner ingen kontoer"</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"Logg deg på Google-nettsteder automatisk ved å bruke <xliff:g id="ID_1">%s</xliff:g>"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"Pålogging for Google-nettsteder med <xliff:g id="ID_1">%s</xliff:g>"\n"dine innstillinger for personvern og sikkerhet styrer automatisk Google-pålogging"</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"Ikke logg deg på automatisk"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"Autofyll bruker din profil til å hjelpe deg med å fullføre nettskjemaer ved hjelp av ett enkelt klikk."</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"Pålogging for Google-nettsteder med <xliff:g id="ID_1">%s</xliff:g>"\n"Innstillingene for personvern og sikkerhet styrer automatisk Google-pålogging"</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"Automatisk pålogging er tilgjengelig."</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"Logg på"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"Pålogging mislyktes."</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"Skriv inn dataene du vil fylle inn automatisk når du trykker på felter på nettet."</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"Fullt navn:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"E-post:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"Firmanavn:"</string>
@@ -196,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"Profilen ble slettet"</string>
<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>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Autofyll kan alltid konfigureres via Nettleserinnstillinger."</string>
- <string name="disable_autofill" msgid="3706426217720202898">"Deaktiver Autofyll"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"Personvern og sikkerhet"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"Autofyll kan alltid konfigureres via nettleserinnstillingene."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"Deaktiver autofyll"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"Personvern og sikkerhet"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Fjern hurtiglager"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Fjern lokalt bufret innhold og databaser"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"Lokalt bufret innhold og databaser vil bli fjernet."</string>
@@ -271,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Tekstkoding"</string>
<string name="pref_lab_title" msgid="5571091610359629423">"Prøvefunksjoner"</string>
- <string name="pref_lab_quick_controls" msgid="2105979166017257647">"Hurtigkontroller"</string>
- <string name="pref_lab_quick_controls_summary" msgid="8025196176636589803">"Sveip tommelen fra venstre el. høyre kant for å få tilgang til hurtigkontroller"</string>
- <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"Mest besøkte startside"</string>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Angir at hjemmesiden din skal vise de mest besøkte sidene."</string>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"Hurtigkontroller"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"Sveip fra venstre mot høyre kant for å bruke hurtigkontr. og skjule app- og nettadresserader"</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"Mest besøkte startside"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"Startsiden viser dine mest besøkte nettsider."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Google Instant"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Bruk Google Instant når du bruker Google Søk for å vise resultater mens du skriver (dette kan gi økt databruk)."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Datatilkoblingsproblem"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Problem med fil"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Bekreft"</string>
@@ -371,11 +367,19 @@
<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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"Bokmerkene som er på enheten nå er foreløpig ikke knyttet til en Google-konto. Du kan lagre bokmerkene ved å legge dem til en konto. Slett bokmerkene hvis du ikke ønsker å synkronisere dem."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"Legg til bokmerkene som er på enheten nå, og start synkronisering med en Google-konto"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"Slett bokmerkene som er på enheten nå, og start synkronisering med en Google-konto"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"Slett bokmerkene som er på enheten nå, og start synkronisering av bokmerker med <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"Legg til bokmerkene som er på enheten nå, og start synkronisering av bokmerker med <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Slett bokmerker"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Neste"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Forrige"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Avbryt"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Fullført"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"Legg til bokmerker til en Google-konto"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Legg til Android-bokmerker i bokmerker for <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
<string name="menu_share_url" msgid="5851814357333739700">"Del"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"Ingen flere faner tilgjengelig"</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Google med Instant (Labs)"</string>
</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 6abc691..f1486ab 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Browser"</string>
<string name="choose_upload" msgid="3649366287575002063">"Bestand selecteren voor uploaden"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"Bestandsuploads zijn uitgeschakeld."</string>
<string name="new_tab" msgid="4505722538297295141">"Nieuw venster"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"Nieuw incognitovenster"</string>
<string name="active_tabs" msgid="3050623868203544623">"Vensters"</string>
@@ -99,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"Lijst"</string>
<string name="current_page" msgid="7510129573681663135">"van "</string>
<string name="delete_bookmark_warning" msgid="758043186202032205">"Bladwijzer \'<xliff:g id="BOOKMARK">%s</xliff:g>\' wordt verwijderd."</string>
- <string name="open_in_new_window" msgid="6596775546468054510">"Openen in een nieuw venster"</string>
<string name="open_all_in_new_window" msgid="6514602245828366045">"Alle bladwijzers openen in nieuwe vensters"</string>
<string name="goto_dot" msgid="3895839050522602723">"Ga"</string>
<string name="incognito_tab" msgid="5419458065370134289">"Nieuw incognitotabblad openen"</string>
@@ -112,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"Downloads"</string>
<string name="copy_page_url" msgid="7635062169011319208">"Pagina-URL kopiëren"</string>
<string name="share_page" msgid="593756995297268343">"Pagina delen"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"Opslaan als webarchief"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"Webarchief opgeslagen."</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"Opslaan van webarchief is mislukt."</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"Pagina opslaan"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"Pagina opgeslagen."</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"Opslaan van pagina mislukt."</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"<xliff:g id="BOOKMARK_COUNT">%d</xliff:g> bladwijzers"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"Lege map"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"Openen"</string>
@@ -139,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"Instellingen voor pagina-inhoud"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"Afbeeldingen laden"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"Afbeeldingen op webpagina\'s weergeven"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"Pop-ups blokkeren"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"Pop-ups blokkeren"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"JavaScript inschakelen"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"Openen op achtergrond"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"Plug-ins inschakelen"</string>
@@ -149,7 +147,7 @@
<item msgid="8547442717307793863">"Uit"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"Nieuwe vensters openen achter het huidige venster"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"Startpagina instellen"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"Startpagina instellen"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"Zoekmachine instellen"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"Selecteer een zoekmachine"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"Ingesteld op..."</string>
@@ -160,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"Webpagina\'s zo indelen dat deze op het scherm passen"</string>
<string name="pref_general_title" msgid="1946872771219249323">"Algemeen"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"Synchronisatie"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"Automatisch aanvullen"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"Automatisch aanvullen"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"Synchroniseren met Google Chrome"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"Bladwijzers en andere gegevens delen tussen Android Browser en Google Chrome"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"Google-account"</string>
@@ -168,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"Bladwijzers synchroniseren tussen Android Browser en Google Chrome"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"Synchr. starten"</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"Selecteer Google-account voor delen"</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"Formulieren autom. aanvullen"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"Formulier automatisch invullen"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"Webformulier invullen met één klik"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"Instellingen voor auto-aanvullen"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"Gegevens instellen en beheren voor automatisch ingevulde formulieren"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Gegevens automatisch aanvullen"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Gegevens invoeren en opslaan voor automatisch invullen van velden in webformulieren"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"Automatische Google-aanmelding"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"Geen accounts gevonden"</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"Automatisch aanmelden bij Google-sites met <xliff:g id="ID_1">%s</xliff:g>"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"Aanmelden bij Google-sites met <xliff:g id="ID_1">%s</xliff:g>"\n"Uw instellingen voor Privacy en beveiliging zijn van toepassing op uw automatische Google-aanmelding"</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"Niet automatisch aanmelden"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"Automatisch aanvullen gebruikt uw profiel om u te helpen met één klik formulieren in te vullen."</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"Aanmelden bij Google-sites met <xliff:g id="ID_1">%s</xliff:g>"\n"Uw instellingen voor privacy en beveiliging zijn van toepassing op uw automatische Google-aanmelding"</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"Automatisch aanmelden is beschikbaar."</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"Aanmelden"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"Aanmelden mislukt."</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"Geef de gegevens op die u automatisch in webvelden wilt laten invullen wanneer u ze aanraakt."</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"Volledige naam:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"E-mail:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"Bedrijfsnaam:"</string>
@@ -196,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"Profiel verwijderd"</string>
<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>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"U kunt Automatisch aanvullen altijd configureren via de browserinstellingen."</string>
- <string name="disable_autofill" msgid="3706426217720202898">"Automatisch aanvullen uitschakelen"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"Privacy en beveiliging"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"U kunt Automatisch aanvullen altijd configureren via de browserinstellingen."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"Automatisch aanvullen uitschakelen"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"Privacy en beveiliging"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Cache wissen"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Lokaal opgeslagen inhoud en databases wissen"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"Lokaal opgeslagen inhoud en databases worden gewist."</string>
@@ -271,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Tekstcodering"</string>
<string name="pref_lab_title" msgid="5571091610359629423">"Labs"</string>
- <string name="pref_lab_quick_controls" msgid="2105979166017257647">"Quick Controls"</string>
- <string name="pref_lab_quick_controls_summary" msgid="8025196176636589803">"Veeg met uw duim van de linker- of rechterkant voor toegang tot Quick Controls"</string>
- <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"Most Visited Homepage"</string>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Stelt uw startpagina in op het weergeven van de meest bezochte pagina\'s."</string>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"Snelle bedieningselementen"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"Schuif vanaf links of rechts voor Quick Controls en om app- en URL-balken te verbergen"</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"Meest bezochte startpagina"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"Op uw startpagina staan uw meest bezochte webpagina\'s."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Google Instant"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Gebruik Google Instant bij Google Zoeken voor resultaten tijdens het typen (kan resulteren in meer gegevensverbruik)."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Probleem met gegevensverbinding"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Probleem met bestand"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Bevestigen"</string>
@@ -371,11 +367,19 @@
<string name="rlz_access_point" msgid="7165847807377650632">"J1"</string>
<string name="account_chooser_dialog_title" msgid="3314204833188808194">"Account selecteren"</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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"Bladwijzers op dit apparaat zijn nog niet gekoppeld aan een Google-account. Sla deze bladwijzers op door ze toe te voegen aan een account. Verwijder deze bladwijzers als u ze niet wilt synchroniseren."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"Huidige bladwijzers op dit apparaat toevoegen en synchronisatie met Google-account starten"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"Huidige bladwijzers op dit apparaat verwijderen en synchronisatie met Google-account starten"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"Verwijder huidige bladwijzers op dit apparaat en start de synchronisatie van bladwijzers met <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"Voeg huidige bladwijzers op dit apparaat toe en start de synchronisatie van bladwijzers met <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Bladwijzers verwijderen"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Volgende"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Vorige"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Annuleren"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Gereed"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"Bladwijzers toevoegen aan Google-account"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Uw Android-bladwijzers toevoegen aan bladwijzers voor <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
<string name="menu_share_url" msgid="5851814357333739700">"Delen"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"Er zijn niet meer tabbladen beschikbaar"</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Google met Instant (Labs)"</string>
</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index ba3fe0c..2df666f 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Internet"</string>
<string name="choose_upload" msgid="3649366287575002063">"Wybierz plik do przesłania"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"Przesyłanie plików jest wyłączone."</string>
<string name="new_tab" msgid="4505722538297295141">"Nowe okno"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"Nowe okno incognito"</string>
<string name="active_tabs" msgid="3050623868203544623">"Okna"</string>
@@ -99,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"Lista"</string>
<string name="current_page" msgid="7510129573681663135">"z "</string>
<string name="delete_bookmark_warning" msgid="758043186202032205">"Zakładka „<xliff:g id="BOOKMARK">%s</xliff:g>” zostanie usunięta."</string>
- <string name="open_in_new_window" msgid="6596775546468054510">"Otwórz w nowym oknie"</string>
<string name="open_all_in_new_window" msgid="6514602245828366045">"Otwórz wszystkie w nowych oknach"</string>
<string name="goto_dot" msgid="3895839050522602723">"OK"</string>
<string name="incognito_tab" msgid="5419458065370134289">"Otwórz nową kartę incognito"</string>
@@ -112,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"Pobrane"</string>
<string name="copy_page_url" msgid="7635062169011319208">"Kopiuj adres URL strony"</string>
<string name="share_page" msgid="593756995297268343">"Udostępnij stronę"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"Zapisz jako archiwum internetowe"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"Archiwum internetowe zostało zapisane."</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"Nie można zapisać archiwum internetowego."</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"Zapisz stronę"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"Strona została zapisana."</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"Nie można zapisać strony."</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"Zakładki: <xliff:g id="BOOKMARK_COUNT">%d</xliff:g>"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"Pusty folder"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"Otwórz"</string>
@@ -139,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"Ustawienia zawartości stron"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"Wczytuj obrazy"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"Wyświetlaj obrazy na stronach internetowych"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"Blokuj wyskakujące okna"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"Blokuj wyskakujące okienka"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"Włącz skrypty JavaScript"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"Otwieraj w tle"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"Obsługa wtyczek"</string>
@@ -149,7 +147,7 @@
<item msgid="8547442717307793863">"Wyłączona"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"Otwieraj nowe okna za bieżącym"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"Ustaw stronę główną"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"Ustaw stronę główną"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"Ustaw wyszukiwarkę"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"Wybierz wyszukiwarkę"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"Ustaw"</string>
@@ -160,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"Formatuj strony internetowe w celu dopasowania do ekranu"</string>
<string name="pref_general_title" msgid="1946872771219249323">"Ogólne"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"Synchronizacja"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"Autouzupełnianie"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"Autouzupełnianie"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"Synchronizuj z przeglądarką Google Chrome"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"Udostępniaj zakładki i inne dane między przeglądarką w systemie Android i przeglądarką Google Chrome"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"Konto Google"</string>
@@ -168,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"Synchronizuj zakładki między przeglądarką w systemie Android i przeglądarką Google Chrome"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"Synchronizuj"</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"Wybierz konto Google dla udostępniania"</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"Autouzupełnianie formularzy"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"Autouzupełnianie formularzy"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"Wypełniaj formularze internetowe za pomocą jednego kliknięcia"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"Ustawienia autouzupełniania"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"Skonfiguruj dane dla automatycznie uzupełnianych formularzy i zarządzaj nimi"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Dane autouzupełniania"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Wprowadzaj i zapisuj dane na potrzeby autouzupełniania pól formularzy internetowych"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"Automatyczne logowanie do Google"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"Nie znaleziono kont"</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"Automatycznie loguj się do witryn Google, używając konta <xliff:g id="ID_1">%s</xliff:g>"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"Logowanie do witryn Google przy użyciu identyfikatora <xliff:g id="ID_1">%s</xliff:g>"\n"Ustawienia automatycznego logowania do Google znajdują się w sekcji Prywatność i bezpieczeństwo."</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"Nie loguj automatycznie"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"Twój profil będzie używany w funkcji autouzupełniania do wypełniania formularzy internetowych za pomocą jednego kliknięcia."</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"Logowanie do witryn Google przy użyciu identyfikatora <xliff:g id="ID_1">%s</xliff:g>"\n"Ustawienia automatycznego logowania do Google znajdują się w sekcji Prywatność i bezpieczeństwo."</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"Automatyczne logowanie jest dostępne."</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"Zaloguj"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"Niepowodzenie logowania."</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"Wprowadź dane, które chcesz automatycznie umieszczać w dotykanych polach formularzy internetowych."</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"Imię i nazwisko:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"E-mail:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"Nazwa firmy:"</string>
@@ -196,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"Profil usunięto"</string>
<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>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Autouzupełnianie można zawsze skonfigurować w opcjach przeglądarki."</string>
- <string name="disable_autofill" msgid="3706426217720202898">"Wyłącz autouzupełnianie"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"Prywatność i bezpieczeństwo"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"Autouzupełnianie można zawsze skonfigurować w ustawieniach przeglądarki."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"Wyłącz autouzupełnianie"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"Prywatność i bezpieczeństwo"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Wyczyść pamięć podręczną"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Wyczyść zawartość lokalnej pamięci podręcznej i baz danych"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"Zawartość lokalnej pamięci podręcznej i baz danych zostanie usunięta."</string>
@@ -271,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Kodowanie tekstu"</string>
<string name="pref_lab_title" msgid="5571091610359629423">"Laboratorium"</string>
- <string name="pref_lab_quick_controls" msgid="2105979166017257647">"Szybkie sterowanie"</string>
- <string name="pref_lab_quick_controls_summary" msgid="8025196176636589803">"Przesuń kciukiem od lewej lub prawej krawędzi, aby przejść do szybkiego sterowania"</string>
- <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"Strona główna Popularne"</string>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Ustawia wyświetlanie popularnych stron na stronie głównej."</string>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"Szybkie sterowanie"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"Przesuń kciukiem od lewej lub prawej, aby użyć szybkiego sterowania oraz ukryć paski aplikacji i URL"</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"Najczęściej odwiedzane na stronie głównej"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"Na stronie głównej wyświetlane są najczęściej odwiedzane strony internetowe."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Wyszukiwanie dynamiczne Google"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Użyj wyszukiwania dynamicznego Google, aby uzyskiwać wyniki podczas pisania (może być pobierana większa ilość danych)."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Problem z łącznością danych"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Problem z plikiem"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Potwierdzenie"</string>
@@ -371,11 +367,19 @@
<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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"Zakładki na tym urządzeniu nie są jeszcze powiązane z kontem Google. Możesz je zapisać, dodając do konta. Jeśli nie chcesz ich synchronizować, usuń je."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"Dodaj bieżące zakładki z tego urządzenia i rozpocznij synchronizację zakładek z kontem Google"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"Usuń bieżące zakładki z tego urządzenia i rozpocznij synchronizację zakładek z kontem Google"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"Usuń bieżące zakładki z tego urządzenia i rozpocznij synchronizację zakładek z kontem <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"Dodaj bieżące zakładki z tego urządzenia i rozpocznij synchronizację zakładek z kontem <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Usuń zakładki"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Dalej"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Wstecz"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Anuluj"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Gotowe"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"Dodaj zakładki do konta Google"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Dodaj zakładki z systemu Android do zakładek na koncie <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
<string name="menu_share_url" msgid="5851814357333739700">"Udostępnij"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"Brak dostępnych kart"</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Google z wyszukiwaniem dynamicznym (Laboratorium)"</string>
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 7b88b23..5c911a0 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Navegad."</string>
<string name="choose_upload" msgid="3649366287575002063">"Escolher ficheiro a carregar"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"Os carregamentos de ficheiros estão desativados."</string>
<string name="new_tab" msgid="4505722538297295141">"Nova janela"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"Nova janela de naveg. anónima"</string>
<string name="active_tabs" msgid="3050623868203544623">"Janelas"</string>
@@ -99,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"Lista"</string>
<string name="current_page" msgid="7510129573681663135">"de "</string>
<string name="delete_bookmark_warning" msgid="758043186202032205">"O marcador \"<xliff:g id="BOOKMARK">%s</xliff:g>\" será eliminado."</string>
- <string name="open_in_new_window" msgid="6596775546468054510">"Abrir numa janela nova"</string>
<string name="open_all_in_new_window" msgid="6514602245828366045">"Abrir tudo em janelas novas"</string>
<string name="goto_dot" msgid="3895839050522602723">"Ir"</string>
<string name="incognito_tab" msgid="5419458065370134289">"Abrir novo separador de navegação anónima"</string>
@@ -112,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"Transferências"</string>
<string name="copy_page_url" msgid="7635062169011319208">"Copiar URL da página"</string>
<string name="share_page" msgid="593756995297268343">"Partilhar página"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"Guardar como arquivo Web"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"Arquivo Web guardado."</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"Não foi possível guardar o arquivo Web."</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"Guardar página"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"Página guardada."</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"Ocorreu uma falha ao guardar a página."</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"<xliff:g id="BOOKMARK_COUNT">%d</xliff:g> marcadores"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"Pasta vazia"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"Abrir"</string>
@@ -139,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"Definições de conteúdo da página"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"Carregar imagens"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"Apresentar imagens em páginas Web"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"Bloquear janelas pop-up"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"Bloquear pop-ups"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"Activar JavaScript"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"Abrir em segundo plano"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"Activar plug-ins"</string>
@@ -149,7 +147,7 @@
<item msgid="8547442717307793863">"Desligado"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"Abrir novas janelas atrás da actual"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"Definir página inicial"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"Definir página inicial"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"Definir motor de pesquisa"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"Seleccionar um motor de pesquisa"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"Definido para..."</string>
@@ -160,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"Formatar páginas Web para se ajustarem ao ecrã"</string>
<string name="pref_general_title" msgid="1946872771219249323">"Gerais"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"Sincronizar"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"Preenchimento automático"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"Preenchimento automático"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"Sincronizar com o Google Chrome"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"Partilhar marcadores e outros dados entre o navegador do Android e o Google Chrome"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"Conta Google"</string>
@@ -168,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"Sincronizar marcadores entre o navegador do Android e o Google Chrome"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"Inic. sincronização"</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"Selec. conta Google p/ partilhar c/"</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"Preench. autom. do formulário"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"Preench. automático formulários"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"Preencher formulários Web com um único clique"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"Def. do preenchimento automático"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"Configurar e gerir dados para formulários preenchidos automaticamente"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Preencher dados automaticamente"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Introduzir e guardar dados de campos de formulários Web de preenchimento automático"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"Início sessão automático Google"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"Nenhuma conta encontrada"</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"Iniciar sessão automaticamente nos Web sites da Google utilizando <xliff:g id="ID_1">%s</xliff:g>"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"Iniciar sessão em sites Google utilizando <xliff:g id="ID_1">%s</xliff:g>"\n"o início de sessão automático do Google do controlo de definições de Privacidade e Segurança"</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"Não iniciar sessão automaticamente"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"O preenchimento automático vai utilizar o seu perfil para o ajudar a preencher formulários Web com um único clique."</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"Iniciar sessão em sites Google utilizando <xliff:g id="ID_1">%s</xliff:g>"\n"o início de sessão automático do Google do controlo de definições de Privacidade e Segurança"</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"Início sessão automático disponível."</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"In. sessão"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"Falha ao iniciar sessão."</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"Introduza os dados que pretende preencher automaticamente nos campos Web quando tocar nos mesmos."</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"Nome completo:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"E-mail:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"Nome da empresa:"</string>
@@ -196,9 +194,9 @@
<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">"O navegador pode preencher automaticamente os formulários Web deste tipo. Pretende configurar o seu perfil?"</string>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"O Preenchimento automático pode sempre ser configurado através das Definições do navegador."</string>
- <string name="disable_autofill" msgid="3706426217720202898">"Desactivar preenchimento automático"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"Privacidade e segurança"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"O Preenchimento automático pode sempre ser configurado através das Definições do navegador."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"Desativar preenchimento automático"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"Privacidade e segurança"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Limpar cache"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Limpar bases de dados e conteúdos colocados em cache localmente"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"As bases de dados e os conteúdos colocados em cache localmente serão eliminados."</string>
@@ -271,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Codificação do texto"</string>
<string name="pref_lab_title" msgid="5571091610359629423">"Labs"</string>
- <string name="pref_lab_quick_controls" msgid="2105979166017257647">"Controlos rápidos"</string>
- <string name="pref_lab_quick_controls_summary" msgid="8025196176636589803">"Passe o polegar na margem esquerda ou direita para aceder aos controlos rápidos"</string>
- <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"Página inicial mais visitada"</string>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Define a sua página inicial para mostrar as páginas mais visitadas."</string>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"Controlos rápidos"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"Deslize polegar margem esq. ou dir. p/ aceder contr. rápidos e ocultar barras Aplicação e URL"</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"Página inicial mais visitada"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"A sua página inicial apresenta as páginas Web mais visitadas."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Google Instantâneo"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Utilize Google Instantâneo na Pesquisa do Google para mostrar resultados quando escreve (pode aumentar utiliz. dados)."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Problema de conectividade de dados"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Problemas com o ficheiro"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Confirmar"</string>
@@ -371,11 +367,19 @@
<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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"Os marcadores neste aparelho ainda não estão associados a uma Conta Google. Guarde estes marcadores, adicionando-os a uma conta ou elimine-os se não pretender sincronizá-los."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"Adicione marcadores atualmente neste aparelho e comece a sincronizar com a Conta Google"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"Elimine marcadores atualmente neste aparelho e comece a sincronizar com a Conta Google"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"Elimine marcadores atualmente neste aparelho e comece a sincronizar marcadores com <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"Adicione marcadores atualmente neste aparelho e comece a sincronizar marcadores com <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Eliminar marcadores"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Seguinte"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Anterior"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Cancelar"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Concluído"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"Adicionar marcadores à Conta Google"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Adicionar os seus marcadores do Android aos marcadores da <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
<string name="menu_share_url" msgid="5851814357333739700">"Partilhar"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"Atingiu o limite de separadores"</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Google com Instantâneo (Labs)"</string>
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 2e08363..694cce9 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Navegador"</string>
<string name="choose_upload" msgid="3649366287575002063">"Escolha o arquivo para envio"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"O upload de arquivos está desativado."</string>
<string name="new_tab" msgid="4505722538297295141">"Nova janela"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"Nova janela anônima"</string>
<string name="active_tabs" msgid="3050623868203544623">"Janelas"</string>
@@ -99,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"Lista"</string>
<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>
<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>
@@ -112,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"Downloads"</string>
<string name="copy_page_url" msgid="7635062169011319208">"Copiar URL da página"</string>
<string name="share_page" msgid="593756995297268343">"Compartilhar página"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"Salvar como arquivo da web"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"Arquivo da web salvo."</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"Falha ao salvar arquivo da web."</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"Salvar a página"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"Página salva."</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"Falha ao salvar página."</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"<xliff:g id="BOOKMARK_COUNT">%d</xliff:g> favoritos"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"Pasta vazia"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"Abrir"</string>
@@ -139,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"Configurações do conteúdo da página"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"Carregar imagens"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"Exibir imagens nas páginas da web"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"Bloquear janelas pop-up"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"Bloquear pop-ups"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"Ativar JavaScript"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"Abrir em segundo plano"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"Ativar plug-ins"</string>
@@ -149,7 +147,7 @@
<item msgid="8547442717307793863">"Desativado"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"Abrir novas janelas atrás da janela atual"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"Definir a página inicial"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"Definir página inicial"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"Definir mecanismo de pesquisa"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"Selecionar um mecanismo de pesquisa"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"Definir para..."</string>
@@ -160,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"Formatar páginas da web para se ajustarem à tela"</string>
<string name="pref_general_title" msgid="1946872771219249323">"Geral"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"Sincronização"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"Preencher automaticamente"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"Preenchimento automático"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"Sincronizar com o Google Chrome"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"Compartilhar favoritos e outros dados entre o navegador do Android e o Google Chrome"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"Conta do Google"</string>
@@ -168,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"Sincronizar favoritos entre o navegador do Android e o Google Chrome"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"Iniciar sincroniz."</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"Sel. conta p/ comp."</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"Preench. autom. de formulários"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"Preenchim. autom. do formulário"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"Preencher formulários da web com apenas um clique"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"Config. de Preench. automático"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"Configurar e gerenciar os dados de formulários preenchidos automaticamente"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Dados de preenchim. autom."</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Inserir e salvar dados para preencher automaticamente os campos dos formulários da web"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"Login automático do Google"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"Nenhuma conta encontrada"</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"Faça login automaticamente em sites do Google usando <xliff:g id="ID_1">%s</xliff:g>"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"Fazendo login no Google Sites usando o login automático do Google de controle de configurações de <xliff:g id="ID_1">%s</xliff:g>"\n"Privacidade e Segurança &"</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"Não fazer login automaticamente"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"O preenchimento automático usará seu perfil para ajudá-lo a preencher formulários na web com um único clique."</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"Fazendo login nos sites do Google com <xliff:g id="ID_1">%s</xliff:g>"\n"Suas configurações de Privacidade e segurança controlam o login automático no Google"</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"O login automático está disponível."</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"Fazer login"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"Falha de login."</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"Insira os dados que deseja preencher automaticamente em campos da web ao tocá-los."</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"Nome completo:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"E-mail:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"Nome da empresa:"</string>
@@ -196,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"Perfil excluído"</string>
<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>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"O Preenchimento automático sempre pode ser configurado através das Configurações do Navegador."</string>
- <string name="disable_autofill" msgid="3706426217720202898">"Desativar o Preenchimento automático"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"Privacidade e segurança"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"O preenchimento automático sempre pode ser configurado através das configurações do navegador."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"Desativar o preenchimento automático"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"Privacidade e segurança"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Limpar cache"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Limpar conteúdo e bancos de dados armazenados localmente em cache"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"O conteúdo e os bancos de dados armazenados localmente em cache serão excluídos."</string>
@@ -271,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Codificação de texto"</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>
- <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"Página inicial mais visitada"</string>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Definir sua página inicial para mostrar as páginas mais visitadas."</string>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"Controles rápidos"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"Deslize o polegar da esqu. ou dir. para acessar controles rápidos e ocultar barras de apps e URL"</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"Páginas mais visitadas"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"Sua página inicial exibe as páginas da web mais visitadas."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Google Instant"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Use o Google Instant ao usar a Pesquisa Google para exibir resultados enquanto digita (o uso de dados pode aumentar)."</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>
@@ -371,11 +367,19 @@
<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 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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"Os favoritos localizados neste dispositivo ainda não estão associados a uma Conta do Google. Salve esses favoritos adicionando-os a uma conta. Exclua-os se não desejar sincronizá-los."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"Adicione os favoritos localizados atualmente neste dispositivo e comece a sincronizá-los com a Conta do Google."</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"Exclua os favoritos localizados atualmente neste dispositivo e comece a sincronizar com a Conta do Google"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"Exclua os favoritos localizados atualmente neste dispositivo e comece a sincronizá-los com <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"Adicione os favoritos localizados atualmente neste dispositivo e comece a sincronizá-los com <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Excluir favoritos"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Avançar"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Anterior"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Cancelar"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Concluído"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"Adicione os favoritos à Conta do Google"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Adicionar favoritos do Android aos favoritos de <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
<string name="menu_share_url" msgid="5851814357333739700">"Compartilhar"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"Não há mais guias disponíveis"</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Google com Instant (Labs)"</string>
</resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 1ef3670..bc23cc8 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -111,7 +111,6 @@
<skip />
<string name="current_page" msgid="7510129573681663135">"da "</string>
<string name="delete_bookmark_warning" msgid="758043186202032205">"\"Il segnapagina \"\"<xliff:g id="BOOKMARK">%s</xliff:g>\"\" vegn stizzà.\""</string>
- <string name="open_in_new_window" msgid="6596775546468054510">"Avrir en ina nova fanestra"</string>
<!-- no translation found for open_all_in_new_window (6514602245828366045) -->
<skip />
<string name="goto_dot" msgid="3895839050522602723">"Dai"</string>
@@ -155,7 +154,7 @@
<string name="pref_content_title" msgid="722227111894838633">"Parameters dal cuntegn da la pagina"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"Chargiar ils maletgs"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"Mussar ils maletgs da las paginas web"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"Bloccar las fanestras pop-up"</string>
+ <!-- outdated translation 7808433807197256726 --> <string name="pref_content_block_popups" msgid="4158524847764470895">"Bloccar las fanestras pop-up"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"Activar JavaScript"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"Avrir davos las culissas"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"Activar ils plug-ins"</string>
@@ -165,7 +164,7 @@
<item msgid="8547442717307793863">"Deactivà"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"Avrir las novas fanestras davos la fanestra actuala"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"Definir la pagina da partenza"</string>
+ <!-- outdated translation 6082437160778559806 --> <string name="pref_content_homepage" msgid="3324574611613105696">"Definir la pagina da partenza"</string>
<!-- no translation found for pref_content_search_engine (1620101310821644144) -->
<skip />
<!-- no translation found for pref_content_search_engine_summary (5162667665858487316) -->
@@ -183,7 +182,7 @@
<skip />
<!-- no translation found for pref_general_sync_title (3138637035975860324) -->
<skip />
- <!-- no translation found for pref_general_autofill_title (64638897890112873) -->
+ <!-- no translation found for pref_general_autofill_title (547881256865816858) -->
<skip />
<!-- no translation found for pref_personal_sync_with_chrome (1695182180332194033) -->
<skip />
@@ -199,25 +198,25 @@
<skip />
<!-- no translation found for pref_personal_account_dialog_title (1390867119887955530) -->
<skip />
- <!-- no translation found for pref_autofill_enabled (1174197447388234595) -->
+ <!-- no translation found for pref_autofill_enabled (1015751713312396713) -->
<skip />
<!-- no translation found for pref_autofill_enabled_summary (422640696197018914) -->
<skip />
- <!-- no translation found for pref_autofill_profile_editor (1350709161524642663) -->
+ <!-- no translation found for pref_autofill_profile_editor (3864116896052437796) -->
<skip />
- <!-- no translation found for pref_autofill_profile_editor_summary (6748434431641768870) -->
+ <!-- no translation found for pref_autofill_profile_editor_summary (3653552312512743181) -->
<skip />
<!-- no translation found for pref_autologin_title (2362827272595366379) -->
<skip />
- <!-- no translation found for pref_autologin_no_account (4409223615542478868) -->
+ <!-- no translation found for pref_autologin_progress (4975430912641403743) -->
<skip />
- <!-- no translation found for pref_autologin_summary (8168866316823968574) -->
+ <!-- no translation found for autologin_bar_text (8013977161879448141) -->
<skip />
- <!-- no translation found for pref_autologin_progress (8643826219376543293) -->
+ <!-- no translation found for autologin_bar_login_text (7052816600314556734) -->
<skip />
- <!-- no translation found for pref_autologin_disable (3342145058494577628) -->
+ <!-- no translation found for autologin_bar_error (5132514366023044839) -->
<skip />
- <!-- no translation found for autofill_profile_editor_heading (5009490178189728877) -->
+ <!-- no translation found for autofill_profile_editor_heading (8392952553626722083) -->
<skip />
<!-- no translation found for autofill_profile_editor_name (8566130291459685955) -->
<skip />
@@ -255,11 +254,11 @@
<skip />
<!-- no translation found for autofill_setup_dialog_message (6605682320156223114) -->
<skip />
- <!-- no translation found for autofill_setup_dialog_negative_toast (4337372830506338827) -->
+ <!-- no translation found for autofill_setup_dialog_negative_toast (6990737008936188620) -->
<skip />
- <!-- no translation found for disable_autofill (3706426217720202898) -->
+ <!-- no translation found for disable_autofill (8305901059849400354) -->
<skip />
- <!-- no translation found for pref_privacy_security_title (1705642466867300373) -->
+ <!-- no translation found for pref_privacy_security_title (3480313968942160914) -->
<skip />
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Stizzar il cache"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Stizzar las bancas da datas ed il cuntegn ord il cache local"</string>
@@ -339,17 +338,17 @@
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Codaziun dal text"</string>
<!-- no translation found for pref_lab_title (5571091610359629423) -->
<skip />
- <!-- no translation found for pref_lab_quick_controls (2105979166017257647) -->
+ <!-- no translation found for pref_lab_quick_controls (3267606522082281367) -->
<skip />
- <!-- no translation found for pref_lab_quick_controls_summary (8025196176636589803) -->
+ <!-- no translation found for pref_lab_quick_controls_summary (1564546156544675707) -->
<skip />
- <!-- no translation found for pref_lab_most_visited_homepage (547134501893835512) -->
+ <!-- no translation found for pref_lab_most_visited_homepage (7597766876952506909) -->
<skip />
- <!-- no translation found for pref_lab_most_visited_homepage_summary (6857702350834122532) -->
+ <!-- no translation found for pref_lab_most_visited_homepage_summary (4132511544800457513) -->
<skip />
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
+ <!-- no translation found for pref_use_instant_search (1119176077760723740) -->
<skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
+ <!-- no translation found for pref_use_instant_search_summary (839320474961917522) -->
<skip />
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Problem da connectivitad da datas"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Problem da datoteca"</string>
@@ -449,9 +448,27 @@
<skip />
<!-- no translation found for import_bookmarks_dialog_title (3325557652271172128) -->
<skip />
- <!-- no translation found for import_bookmarks_dialog_description (2187665745413495303) -->
+ <!-- no translation found for import_bookmarks_dialog_description (1942452375564381488) -->
<skip />
- <!-- no translation found for import_bookmarks_dialog_remove (8105572409059113340) -->
+ <!-- no translation found for import_bookmarks_dialog_select_add_account (3102882579089291099) -->
+ <skip />
+ <!-- no translation found for import_bookmarks_dialog_delete_select_account (5192284761080626386) -->
+ <skip />
+ <!-- no translation found for import_bookmarks_dialog_confirm_delete (8854001080444749211) -->
+ <skip />
+ <!-- no translation found for import_bookmarks_dialog_confirm_add (5433677293195372675) -->
+ <skip />
+ <!-- no translation found for import_bookmarks_dialog_remove (5984607822851800902) -->
+ <skip />
+ <!-- no translation found for import_bookmarks_wizard_next (7578143961884352676) -->
+ <skip />
+ <!-- no translation found for import_bookmarks_wizard_previous (8551440353688257031) -->
+ <skip />
+ <!-- no translation found for import_bookmarks_wizard_cancel (4936061122806506634) -->
+ <skip />
+ <!-- no translation found for import_bookmarks_wizard_done (1446247092194489191) -->
+ <skip />
+ <!-- no translation found for import_bookmarks_dialog_add (7552306756868669353) -->
<skip />
<!-- no translation found for import_bookmarks_dialog_import (6933613853573899218) -->
<skip />
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 39f597c..8c3b329 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Browser"</string>
<string name="choose_upload" msgid="3649366287575002063">"Alegeţi fişierul pentru a fi încărcat"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"Încărcarea fişierelor este dezactivată."</string>
<string name="new_tab" msgid="4505722538297295141">"Fereastră nouă"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"Fereastră incognito nouă"</string>
<string name="active_tabs" msgid="3050623868203544623">"Windows"</string>
@@ -78,8 +77,7 @@
<string name="http" msgid="2163722670597250102">"http://"</string>
<string name="save_to_bookmarks" msgid="6101482434920313244">"Adăugaţi la marcaje"</string>
<string name="bookmark_this_page" msgid="7530739804320811054">"Marcaţi această pagină"</string>
- <!-- no translation found for remove (7820112494467011374) -->
- <skip />
+ <string name="remove" msgid="7820112494467011374">"Eliminaţi"</string>
<string name="edit_bookmark" msgid="5024089053490231905">"Modificaţi marcajul"</string>
<string name="create_shortcut_bookmark" msgid="1995095662095484289">"Adăugaţi o comandă rapidă pe ecranul de pornire"</string>
<string name="open_bookmark" msgid="8473581305759935790">"Deschideţi"</string>
@@ -100,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"Listă"</string>
<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-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>
@@ -113,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"Descărcări"</string>
<string name="copy_page_url" msgid="7635062169011319208">"Copiaţi adresa URL a paginii"</string>
<string name="share_page" msgid="593756995297268343">"Distribuiţi pagina"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"Salvaţi ca arhivă web"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"Arhiva web a fost salvată."</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"Salvarea arhivei web nu a reuşit."</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"Salvaţi pagina"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"Pagina a fost salvată."</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"Pagina nu a fost salvată."</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"<xliff:g id="BOOKMARK_COUNT">%d</xliff:g> (de) marcaje"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"Dosar gol"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"Deschideţi"</string>
@@ -140,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"Setările conţinutului paginii"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"Încărcaţi imagini"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"Afişaţi imagini din paginile web"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"Blocaţi ferestrele de tip pop-up"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"Blocaţi ferestre de tip pop-up"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"Activaţi JavaScript"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"Deschideţi în fundal"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"Activaţi pluginurile"</string>
@@ -150,7 +147,7 @@
<item msgid="8547442717307793863">"Dezactivat"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"Deschideţi noi ferestre în spatele celei curente"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"Setaţi pagina de pornire"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"Setaţi pagina de pornire"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"Setaţi motorul de căutare"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"Selectaţi un motor de căutare"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"Setaţi la..."</string>
@@ -161,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"Formataţi paginile web pentru a se potrivi cu ecranul"</string>
<string name="pref_general_title" msgid="1946872771219249323">"General"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"Sincronizaţi"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"Completare automată"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"Completare automată"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"Sincronizaţi cu Google Chrome"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"Distribuiţi marcaje şi alte date între browserul Android şi Google Chrome"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"Cont Google"</string>
@@ -169,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"Sincronizaţi marcaje între browserul Android şi Google Chrome"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"Începeţi sincroniz."</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"Sel. cont pt. dist."</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"Completare automată formulare"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"Completare automată formular"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"Completaţi formulare web cu un singur clic"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"Setări Completare automată"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"Configuraţi şi gestionaţi date pentru formularele cu completare automată"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Date conectare automată"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Introduceţi şi salvaţi date pentru completarea automată a câmpurilor din formularele web"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"Conectare automată la Google"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"Nu au fost găsite conturi"</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"Conectaţi-vă automat la site-urile Google utilizând <xliff:g id="ID_1">%s</xliff:g>"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"Se face conectarea la site-urile Google utilizând <xliff:g id="ID_1">%s</xliff:g>"\n"Setările dvs. de confidenţialitate şi securitate controlează conectarea automată la Google"</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"Nu doresc să mă conectez automat"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"Completarea automată va utiliza informaţiile din profilul dvs. pentru a vă ajuta să completaţi formularele de pe web cu un singur clic."</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"Se face conectarea la site-urile Google utilizând <xliff:g id="ID_1">%s</xliff:g>"\n"Setările dvs. de confidenţialitate şi securitate controlează conectarea automată la Google"</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"Este disponibilă conectarea automată."</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"Conectare"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"Conectare eşuată."</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"Introduceţi datele care se vor completa automat în câmpurile web, atunci când le atingeţi."</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"Numele complet:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"E-mail:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"Numele companiei:"</string>
@@ -197,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"Profilul a fost şters"</string>
<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>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Completarea automată poate fi configurată oricând din Setările browserului."</string>
- <string name="disable_autofill" msgid="3706426217720202898">"Dezactivaţi Completarea automată"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"Confidenţialitate şi securitate"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"Completarea automată poate fi configurată oricând din Setările browserului."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"Dezactivaţi completarea automată"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"Confidenţialitate şi securitate"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Goliţi memoria cache"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Ştergeţi conţinutul memoriei cache şi bazele de date"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"Conţinutul local al memoriei cache şi bazele de date se vor şterge."</string>
@@ -272,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Codificare text"</string>
<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">"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>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"Comenzi rapide"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"Glis. deg. mare din marg. st. sau dr. şi acc. com. rapide/asc. bar. Apl. şi URL"</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"Pagina de pornire cea mai accesată"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"Pagina dvs. de pornire afişează paginile web cele mai accesate."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Google Instant"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Utilizaţi Google Instant la căutare pe Google şi vedeţi rezultate pe măsură ce tastaţi (creşte vol. de date utilizate)."</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,11 +367,19 @@
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
<string name="account_chooser_dialog_title" msgid="3314204833188808194">"Alegeţi un cont"</string>
<string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"Sincronizaţi cu un Cont Google"</string>
- <string name="import_bookmarks_dialog_description" msgid="2187665745413495303">"Marcajele dvs. Android nu sunt asociate unui Cont Google"</string>
- <string name="import_bookmarks_dialog_remove" msgid="8105572409059113340">"Eliminaţi marcajele Android"</string>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"Marcajele de pe acest dispozitiv nu sunt asociate încă unui Cont Google. Salvaţi marcajele prin adăugarea lor într-un cont. Ştergeţi marcajele dacă nu doriţi sincronizarea acestora."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"Adăugaţi marcajele curente de pe acest dispozitiv şi începeţi sincronizarea cu Contul Google"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"Ştergeţi marcajele curente de pe acest dispozitiv şi începeţi sincronizarea cu Contul Google"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"Ştergeţi marcajele curente de pe acest dispozitiv şi începeţi sincronizarea marcajelor cu <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"Adăugaţi marcajele curente de pe acest dispozitiv şi începeţi sincronizarea acestora cu <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Ştergeţi marcajele"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Înainte"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Înapoi"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Anulaţi"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Terminat"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"Adăugaţi marcajele în Contul Google"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Adăugaţi marcajele Android la marcajele <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
<string name="menu_share_url" msgid="5851814357333739700">"Distribuiţi"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"Nu mai există file disponibile"</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Google cu Instant (Google Labs)"</string>
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index bf6cf72..ad70617 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Браузер"</string>
<string name="choose_upload" msgid="3649366287575002063">"Выберите файл для загрузки"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"Добавление файлов отключено."</string>
<string name="new_tab" msgid="4505722538297295141">"Новое окно"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"Новое окно в режиме инкогнито"</string>
<string name="active_tabs" msgid="3050623868203544623">"Окна"</string>
@@ -99,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"Список"</string>
<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>
<string name="open_all_in_new_window" msgid="6514602245828366045">"Открыть все в новых окнах"</string>
<string name="goto_dot" msgid="3895839050522602723">"Поиск"</string>
<string name="incognito_tab" msgid="5419458065370134289">"Открыть новую вкладку в режиме инкогнито"</string>
@@ -112,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"Загрузки"</string>
<string name="copy_page_url" msgid="7635062169011319208">"Копировать URL страницы"</string>
<string name="share_page" msgid="593756995297268343">"Отправить страницу"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"Сохранить как веб-архив"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"Веб-архив сохранен."</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"Не удалось сохранить веб-архив."</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"Сохранить страницу"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"Страница сохранена."</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"Не удалось сохранить страницу."</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"Закладок: <xliff:g id="BOOKMARK_COUNT">%d</xliff:g>"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"Папка пуста"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"Открыть"</string>
@@ -139,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"Настройки отображения"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"Загружать графику"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"Показывать изображения на веб-страницах"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"Блокир. всплыв. окна"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"Блокировать всплывающие окна"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"Разрешить JavaScript"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"Открывать в фоновом режиме"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"Разрешить плагины"</string>
@@ -149,7 +147,7 @@
<item msgid="8547442717307793863">"Нет"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"Открывать новые окна позади текущего окна"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"Домашняя страница"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"Настроить стартовую страницу"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"Поисковая система"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"Выберите поисковую систему"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"При запуске браузера"</string>
@@ -160,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"Адаптировать контент к размеру экрана мобильного устройства"</string>
<string name="pref_general_title" msgid="1946872771219249323">"Общие"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"Синхронизация"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"Автозаполнение"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"Автозаполнение"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"Синхронизировать с Google Chrome"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"Совместно использовать закладки и другие данные в браузере Android и Google Chrome"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"Аккаунт Google"</string>
@@ -168,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"Синхронизировать закладки браузера Android и Google Chrome"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"Синхронизировать"</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"Выберите аккаунт Google"</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"Автозаполнение форм"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"Автозаполнение форм"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"Заполнение веб-форм одним кликом"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"Настройки автозаполнения"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"Настройка и управление данными для автозаполняемых форм"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Автозаполнение"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Указание и сохранение данных для автозаполнения полей"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"Автоматический вход в Google"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"Аккаунты не найдены"</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"Автоматически входить на сайты Google с помощью аккаунта <xliff:g id="ID_1">%s</xliff:g>"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"Вход на сайты Google с использованием <xliff:g id="ID_1">%s</xliff:g>"\n"настроек функции \"Конфиденциальность и безопасность\" для автоматического входа в Google"</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"Запретить автоматический вход"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"Автозаполнение будет использовать ваш профиль, чтобы вы могли заполнять веб-формы одним щелчком."</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"Автоматический вход на сайты Google с использованием <xliff:g id="ID_1">%s</xliff:g>"\n"настроек \"Конфиденциальность и безопасность\" системы..."</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"Доступен автоматический вход."</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"Войти"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"Войти не удалось."</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"Вводите данные в веб-формы одним нажатием с помощью автозаполнения."</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"Полное имя:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"Эл. почта:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"Название компании:"</string>
@@ -196,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"Профиль удален"</string>
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Удалить профиль"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"Браузер может заполнять такие формы автоматически. Настроить профиль автозаполнения?"</string>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Автозаполнение настраивается в диалоговом окне \"Настройки браузера\""</string>
- <string name="disable_autofill" msgid="3706426217720202898">"Отключить автозаполнение"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"Конфиденциальность и безопасность"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"Автозаполнение настраивается в диалоговом окне \"Настройки браузера\"."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"Отключить автозаполнение"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"Конфиденциальность и безопасность"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Очистить кэш"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Удалить контент и данные, сохраненные браузером"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"Контент и данные, сохраненные браузером, будут удалены."</string>
@@ -271,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Кодировка текста"</string>
<string name="pref_lab_title" msgid="5571091610359629423">"Лаборатория Google"</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>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Настройка отображения часто посещаемых страниц на главной странице."</string>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"Панель инструментов"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"Чтобы открыть панель инструментов, скрыв адресную строку и панель приложений, проведите пальцем в правом или левом углу экрана"</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"Стартовая страница: самые посещаемые"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"Отображение на домашней странице наиболее посещаемых веб-сайтов."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Google Живой поиск"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Живой поиск Google отображает результаты поиска при наборе запроса (может привести к увеличению объема передачи данных)."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Проблема с подключением"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Проблема с файлом"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Подтвердить"</string>
@@ -371,11 +367,19 @@
<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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"Закладки на этом устройстве пока не связаны с аккаунтом Google. Сохраните эти закладки, добавив их в аккаунт. Удалите эти закладки, если вы не хотите синхронизировать их."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"Добавить закладки, имеющиеся на этом устройстве, и начать синхронизацию с аккаунтом Google"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"Удалить закладки, имеющиеся на этом устройстве, и начать синхронизацию с аккаунтом Google"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"Удалить закладки, имеющиеся на этом устройстве, и начать синхронизацию закладок с аккаунтом <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>?"</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"Добавить закладки, имеющиеся на этом устройстве, и начать синхронизацию закладок с аккаунтом <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>?"</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Удалить закладки"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Далее"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Назад"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Отмена"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Готово"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"Добавить закладки в аккаунт Google"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Добавить закладки Android в аккаунт <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
<string name="menu_share_url" msgid="5851814357333739700">"Отправить"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"Достигнут предел количества вкладок"</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Google с Живым поиском (Лаборатория Google)"</string>
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index b05a0bb..dc9778f 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Prehliadač"</string>
<string name="choose_upload" msgid="3649366287575002063">"Zvoliť súbor, ktorý chcete odovzdať"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"Odovzdávanie súborov je zakázané."</string>
<string name="new_tab" msgid="4505722538297295141">"Nové okno"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"Nové okno inkognito"</string>
<string name="active_tabs" msgid="3050623868203544623">"Windows"</string>
@@ -78,8 +77,7 @@
<string name="http" msgid="2163722670597250102">"http://"</string>
<string name="save_to_bookmarks" msgid="6101482434920313244">"Pridať medzi záložky"</string>
<string name="bookmark_this_page" msgid="7530739804320811054">"Uložiť stránku ako záložku"</string>
- <!-- no translation found for remove (7820112494467011374) -->
- <skip />
+ <string name="remove" msgid="7820112494467011374">"Odstrániť"</string>
<string name="edit_bookmark" msgid="5024089053490231905">"Upraviť záložku"</string>
<string name="create_shortcut_bookmark" msgid="1995095662095484289">"Pridať odkaz na plochu"</string>
<string name="open_bookmark" msgid="8473581305759935790">"Otvoriť"</string>
@@ -100,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"Zoznam"</string>
<string name="current_page" msgid="7510129573681663135">"od "</string>
<string name="delete_bookmark_warning" msgid="758043186202032205">"Záložka <xliff:g id="BOOKMARK">%s</xliff:g> bude odstránená."</string>
- <string name="open_in_new_window" msgid="6596775546468054510">"Otvoriť v novom okne"</string>
<string name="open_all_in_new_window" msgid="6514602245828366045">"Otvoriť všetky v nových oknách"</string>
<string name="goto_dot" msgid="3895839050522602723">"Hľadať"</string>
<string name="incognito_tab" msgid="5419458065370134289">"Nová karta v režime inkognito"</string>
@@ -113,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"Prevzatia"</string>
<string name="copy_page_url" msgid="7635062169011319208">"Kopírovať adresu URL stránky"</string>
<string name="share_page" msgid="593756995297268343">"Zdieľať stránku"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"Uložiť ako webový archív"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"Webový archív bol uložený."</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"Uloženie webového archívu zlyhalo."</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"Uložiť stránku"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"Stránka bola uložená."</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"Ukladanie stránky zlyhalo."</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"Počet záložiek: <xliff:g id="BOOKMARK_COUNT">%d</xliff:g>"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"Prázdny priečinok"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"Otvoriť"</string>
@@ -140,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"Nastavenia obsahu stránky"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"Načítať obrázky"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"Zobrazovať obrázky na webových stránkach"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"Blokovať kontextové okná"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"Blokovať kontextové okná"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"Povoliť JavaScript"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"Otvoriť na pozadí"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"Povoliť doplnky"</string>
@@ -150,7 +147,7 @@
<item msgid="8547442717307793863">"Vypnuté"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"Otvárať nové okná za aktuálnym oknom"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"Nastaviť domovskú stránku"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"Nastaviť domovskú stránku"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"Nastaviť vyhľadávací nástroj"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"Výber vyhľadávacieho nástroja"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"Nastaviť na..."</string>
@@ -161,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"Prispôsobiť veľkosť webových stránok obrazovke"</string>
<string name="pref_general_title" msgid="1946872771219249323">"Všeobecné"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"Synchronizácia"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"Automatické dopĺňanie"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"Automatické dopĺňanie"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"Synchronizovať s prehliadačom Google Chrome"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"Zdieľať záložky a iné údaje medzi Prehliadačom systému Android a prehliadačom Google Chrome"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"Účet Google"</string>
@@ -169,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"Synchronizovať záložky medzi Prehliadačom systému Android a aplikáciou Google Chrome"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"Synchronizovať"</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"Vyberte účet Google na zdieľ."</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"Automatické dopĺňanie formulárov"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"Automatické dopĺňanie formulárov"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"Vyplňovanie webových formulárov jediným kliknutím"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"Nastavenia autom. dopĺňania"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"Nastavenie a správa automaticky doplnených formulárov"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Automatické dopĺňanie údajov"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Zadajte a uložte údaje pre automatické dopĺňanie polí webových formulárov"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"Automatické prihlasovanie Google"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"Neboli nájdené žiadne účty"</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"Na webových stránkach Google sa automaticky prihlasovať pomocou účtu <xliff:g id="ID_1">%s</xliff:g>"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"Prihlásenie na stránky služby Google pomocou <xliff:g id="ID_1">%s</xliff:g>"\n"Automatického prihlásenia Google s vašimi nastaveniami ochrany osobných údajov a zabezpečenia"</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"Neprihlasovať sa automaticky"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"Funkcia Automatické dopĺňanie bude používať váš profil na dokončenie webových formulárov jediným kliknutím."</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"Prihlásenie na stránky služby Google pomocou <xliff:g id="ID_1">%s</xliff:g>"\n"Automatického prihlásenia Google s vašimi nastaveniami ochrany osobných údajov a zabezpečenia"</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"Automatické prihlásenie je k dispozícii."</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"Prihlásiť"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"Prihlásenie zlyhalo."</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"Zadajte údaje, ktoré sa majú pri dotyku automaticky doplniť do webových polí."</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"Celé meno:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"E-mail:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"Názov spoločnosti:"</string>
@@ -197,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"Profil bol odstránený."</string>
<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>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Automatické dopĺňanie môžete kedykoľvek nakonfigurovať v Nastaveniach prehliadača."</string>
- <string name="disable_autofill" msgid="3706426217720202898">"Zakázať Automatické dopĺňanie"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"Ochrana osobných údajov a zabezpečenie"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"Automatické dopĺňanie môžete kedykoľvek nakonfigurovať v Nastaveniach prehliadača."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"Zakázať automatické dopĺňanie"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"Ochrana osobných údajov a zabezpečenie"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Vymazať medzipamäť"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Vymazať všetok obsah a databázy uložené do miestnej medzipamäte"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"Obsah a databázy uložené v miestnej medzipamäti budú odstránené."</string>
@@ -272,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Kódovanie textu"</string>
<string name="pref_lab_title" msgid="5571091610359629423">"Labs"</string>
- <string name="pref_lab_quick_controls" msgid="2105979166017257647">"Rýchle ovládacie prvky"</string>
- <string name="pref_lab_quick_controls_summary" msgid="8025196176636589803">"Posunutím palca z ľavého alebo pravého okraja pristúpite k rýchlym ovl. prvkom"</string>
- <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"Najnavštevovanejšie na domovskej stránke"</string>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Nastaví na domovskej stránke zobrazovanie najviac navštevovaných stránok."</string>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"Rýchle ovládacie prvky"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"Posuňte prstom v smere od ľavého alebo pravého okraja, čím rýchlo pristúpite k ovládacím prvkom a skryjete panely aplikácií a adresy URL"</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"Najviac navštevovaná domovská stránka"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"Na vašej domovskej stránke sa zobrazujú najviac navštevované webové stránky."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Dynamické vyhľadávanie Google"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Ak chcete zobrazovať výsl. počas zadávania textu, použite vo vyhľ. Dynam. vyhľ. Google (môže sa zvýšiť spotr. údajov)."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Problémy s dátovým pripojením"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Problém so súborom"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Potvrdiť"</string>
@@ -372,11 +367,19 @@
<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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"Záložky na tomto zariadení ešte nie sú priradené k účtu Google. Pridaním záložiek k účtu ich uložíte. Ak záložky nechcete synchronizovať, odstráňte ich."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"Pridať záložky aktuálne sa nachádzajúce na tomto zariadení a začať synchronizáciu s účtom Google."</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"Odstrániť záložky aktuálne sa nachádzajúce na tomto zariadení a začať synchronizáciu s účtom Google."</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"Odstrániť záložky aktuálne sa nachádzajúce na tomto zariadení a začať synchronizáciu záložiek s účtom <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"Pridať záložky aktuálne sa nachádzajúce na tomto zariadení a začať synchronizáciu záložiek s účtom <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Odstrániť záložky"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Ďalej"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Predchádzajúca"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Zrušiť"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Hotovo"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"Pridať záložky do účtu Google"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Pridať všetky záložky systému Android medzi záložky účtu <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
<string name="menu_share_url" msgid="5851814357333739700">"Zdieľať"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"K dispozícii nie sú žiadne ďalšie záložky"</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Google s Dynamickým vyhľadávaním (Labs)"</string>
</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 1aecda6..7213575 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Brskalnik"</string>
<string name="choose_upload" msgid="3649366287575002063">"Izberite datoteko za prenos v strežnik"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"Prenosi datotek so onemogočeni."</string>
<string name="new_tab" msgid="4505722538297295141">"Novo okno"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"Novo okno brez belež. zgod."</string>
<string name="active_tabs" msgid="3050623868203544623">"Okna"</string>
@@ -78,8 +77,7 @@
<string name="http" msgid="2163722670597250102">"http://"</string>
<string name="save_to_bookmarks" msgid="6101482434920313244">"Dodaj med zaznamke"</string>
<string name="bookmark_this_page" msgid="7530739804320811054">"Zaznamuj to stran"</string>
- <!-- no translation found for remove (7820112494467011374) -->
- <skip />
+ <string name="remove" msgid="7820112494467011374">"Odstrani"</string>
<string name="edit_bookmark" msgid="5024089053490231905">"Uredi zaznamek"</string>
<string name="create_shortcut_bookmark" msgid="1995095662095484289">"Dodaj bližnjico do domače strani"</string>
<string name="open_bookmark" msgid="8473581305759935790">"Odpri"</string>
@@ -100,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"Seznam"</string>
<string name="current_page" msgid="7510129573681663135">"od "</string>
<string name="delete_bookmark_warning" msgid="758043186202032205">"Zaznamek »<xliff:g id="BOOKMARK">%s</xliff:g>« bo izbrisan"</string>
- <string name="open_in_new_window" msgid="6596775546468054510">"Odpri v novem oknu"</string>
<string name="open_all_in_new_window" msgid="6514602245828366045">"Odpri vse v novih oknih"</string>
<string name="goto_dot" msgid="3895839050522602723">"Pojdi"</string>
<string name="incognito_tab" msgid="5419458065370134289">"Odpri nov zav. brez bel. zg."</string>
@@ -113,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"Prenosi"</string>
<string name="copy_page_url" msgid="7635062169011319208">"Kopiraj URL strani"</string>
<string name="share_page" msgid="593756995297268343">"Stran deli z drugimi"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"Shrani kot spletni arhiv"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"Spletni arhiv je shranjen."</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"Spletnega arhiva ni bilo mogoče shraniti."</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"Shrani stran"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"Stran je shranjena."</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"Shranjevanje strani ni uspelo."</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"Število zaznamkov: <xliff:g id="BOOKMARK_COUNT">%d</xliff:g>"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"Prazna mapa"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"Odpri"</string>
@@ -140,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"Nastavitve vsebine strani"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"Naloži slike"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"Prikaži slike na spletnih straneh"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"Blokiraj pojavna okna"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"Blokiraj pojavna okna"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"Omogoči JavaScript"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"Odpri v ozadju"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"Omogoči vtičnike"</string>
@@ -150,7 +147,7 @@
<item msgid="8547442717307793863">"Izključen"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"Odpri nova okna za trenutnim"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"Nastavi domačo stran"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"Nastavi domačo stran"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"Nastavi iskalnik"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"Izberi iskalnik"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"Nastavi na ..."</string>
@@ -161,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"Oblikuj spletne strani, da se prilegajo zaslonu"</string>
<string name="pref_general_title" msgid="1946872771219249323">"Splošno"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"Sinhronizacija"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"Samodejno izpolnjevanje"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"Samodejno izpolnjevanje"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"Sinhroniziraj z Google Chromom"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"Delite si zaznamke in druge podatke med brskalnikom Android in Google Chromom"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"Google Račun"</string>
@@ -169,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"Sinhroniziraj zaznamke med brskalnikom Android in Google Chromom"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"Začni sinhronizacijo"</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"Google rač. za delj."</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"Samodejno izpolnjevanje obrazcev"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"Samodejno izpolnjevanje obrazcev"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"Izpolnite spletne obrazce z enim klikom"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"Nastavitve za sam. izpolnjevanje"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"Nastavi in upravljaj podatke za samodejno izpolnjene obrazce"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Samodejno izpolnjevanje podatkov"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Vnesite in shranite podatke za samodejno izpolnjevanje polj v spletnih obrazcih"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"Samodejna prijava v Google"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"Ni računov"</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"Samodejna prijava v spletna mesta Google z računom <xliff:g id="ID_1">%s</xliff:g>"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"Samodejna prijava v Googlova spletna mesta z <xliff:g id="ID_1">%s</xliff:g>"\n"Samodejna prijava v Google je določena v nastavitvah zasebnosti in varnosti"</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"Brez samodejne prijave"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"AutoFill bo uporabil vaš profil za izpolnjevanje spletnih obrazcev z enim klikom."</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"Samodejna prijava v Googlova spletna mesta z <xliff:g id="ID_1">%s</xliff:g>"\n"Samodejna prijava v Google je določena v nastavitvah zasebnosti in varnosti"</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"Na voljo je samodejna prijava."</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"Prijava"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"Prijava ni uspela."</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"Vnesite podatke, za katere želite, da se samodejno vnesejo v spletna polja, ko se jih dotaknete."</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"Polno ime:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"E-pošta:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"Ime podjetja:"</string>
@@ -197,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"Profil je izbrisan"</string>
<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>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Samodejno izpolnjevanje lahko nastavite v nastavitvah brskalnika."</string>
- <string name="disable_autofill" msgid="3706426217720202898">"Onemogoči samodejno izpolnjevanje"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"Zasebnost in varnost"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"Samodejno izpolnjevanje lahko nastavite v nastavitvah brskalnika."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"Onemogoči samodejno izpolnjevanje"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"Zasebnost in varnost"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Počisti predpomnilnik"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Počisti lokalno predpomnjeno vsebino in zbirke podatkov"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"Lokalno predpomnjena vsebina in zbirke podatkov bodo izbrisane."</string>
@@ -272,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Kodiranje besedila"</string>
<string name="pref_lab_title" msgid="5571091610359629423">"Laboratoriji"</string>
- <string name="pref_lab_quick_controls" msgid="2105979166017257647">"Hitro upravljanje"</string>
- <string name="pref_lab_quick_controls_summary" msgid="8025196176636589803">"Za dostop do hitrega upravljanja s palcem podrsajte od levega ali desnega roba"</string>
- <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"Najbolj obiskana domača stran"</string>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Nastavi domačo stran za prikaz najbolj obiskanih strani."</string>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"Hitri kontrolniki"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"Povlecite palec z l./d. roba za hitre kontr. in skrivanje vrstic Program in URL"</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"Stran »Najpogosteje obiskana mesta«"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"Na domači strani so prikazane najpogosteje obiskane spletne strani."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Google Dinamično iskanje"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Če uporabljate Google Dinamično iskanje, se rezultati prikazujejo že med tipkanjem, kar lahko poveča porabo podatkov."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Težava s povezljivostjo podatkov"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Težava z datoteko"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Potrdi"</string>
@@ -372,11 +367,19 @@
<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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"Zaznamki v tej napravi še niso povezani z Google Računom. Shranite jih tako, da jih dodate v račun. Če jih ne želite sinhronizirati, jih izbrišite."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"Dodaj zaznamke trenutno v napravi in začni sinhronizacijo z Google Računom"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"Izbriši zaznamke trenutno v napravi in začni sinhronizacijo z Google Računom"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"Izbriši trenutne zaznamke v napravi in začni sinhronizacijo zaznamkov z računom <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"Dodaj zaznamke trenutno v napravi in začni sinhronizacijo zaznamkov z računom <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Izbriši zaznamke"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Naprej"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Nazaj"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Prekliči"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Končano"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"Dodaj zaznamke v Google Račun"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Dodaj Androidove zaznamke k zaznamkom za <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
<string name="menu_share_url" msgid="5851814357333739700">"Skupna raba"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"Ni več razpoložljivih zavihkov"</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Google z Dinamičnim iskanjem (Labs)"</string>
</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index c8e6a07..34f67dc 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Прегледач"</string>
<string name="choose_upload" msgid="3649366287575002063">"Одаберите датотеку за отпремање"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"Отпремање датотека је онемогућено."</string>
<string name="new_tab" msgid="4505722538297295141">"Нови прозор"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"Нов прозор без архивирања"</string>
<string name="active_tabs" msgid="3050623868203544623">"Прозори"</string>
@@ -78,8 +77,7 @@
<string name="http" msgid="2163722670597250102">"http://"</string>
<string name="save_to_bookmarks" msgid="6101482434920313244">"Додај у обележиваче"</string>
<string name="bookmark_this_page" msgid="7530739804320811054">"Обележавање ове странице"</string>
- <!-- no translation found for remove (7820112494467011374) -->
- <skip />
+ <string name="remove" msgid="7820112494467011374">"Уклони"</string>
<string name="edit_bookmark" msgid="5024089053490231905">"Измени обележивач"</string>
<string name="create_shortcut_bookmark" msgid="1995095662095484289">"Додај пречицу на почетну"</string>
<string name="open_bookmark" msgid="8473581305759935790">"Отвори"</string>
@@ -100,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"Листа"</string>
<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>
<string name="open_all_in_new_window" msgid="6514602245828366045">"Отвори све у новим прозорима"</string>
<string name="goto_dot" msgid="3895839050522602723">"Иди"</string>
<string name="incognito_tab" msgid="5419458065370134289">"Нова картица без архивирања"</string>
@@ -113,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"Преузимања"</string>
<string name="copy_page_url" msgid="7635062169011319208">"Копирај URL адресу странице"</string>
<string name="share_page" msgid="593756995297268343">"Дели страницу"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"Сачувај као веб архиву"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"Сачувана је Веб архива"</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"Неуспешно чување Веб архиве."</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"Сачувај страницу"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"Страница је сачувана."</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"Чување странице није успело."</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"<xliff:g id="BOOKMARK_COUNT">%d</xliff:g> обележивача"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"Празан директоријум"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"Отвори"</string>
@@ -140,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"Подешавања садржаја странице"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"Учитај слике"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"Прикажи слике на веб страницама"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"Блокирај искачуће прозоре"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"Блокирај искачуће прозоре"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"Омогући JavaScript"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"Отвори у позадини"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"Омогући програмске додатке"</string>
@@ -150,7 +147,7 @@
<item msgid="8547442717307793863">"Искључено"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"Отварање нових прозора иза тренутног прозора"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"Постави почетну страницу"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"Подеси почетну страницу"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"Подешавање претраживача"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"Изаберите претраживач"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"Подеси на…"</string>
@@ -161,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"Подешавање формата веб страница тако да се уклопе на екран"</string>
<string name="pref_general_title" msgid="1946872771219249323">"Општa"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"Синхронизација"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"Аутоматско попуњавање"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"Аутоматско попуњавање"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"Синхронизуј са програмом Google Chrome"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"Делите обележиваче и друге податке између Android прегледача и програма Google Chrome"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"Google налог"</string>
@@ -169,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"Синхронизуј обележиваче између Android прегледача и програма Google Chrome"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"Започни синхронизацију"</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"Изаберите Google налог са којим ћете делити"</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"Аутоматско попуњавање обрасца"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"Аутоматско попуњавање обрасца"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"Попуните Веб обрасце само једним кликом"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"Подешавања аутоматског попуњавања"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"Подешавајте и управљајте подацима за аутоматски попуњене обрасце"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Аутоматски попуни податке"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Унесите и сачувајте податке за аутоматско попуњавање поља у веб обрасцима"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"Аутоматска пријава на Google"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"Није пронађен ниједан налог"</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"Пријавите се на Google сајтове аутоматски помоћу налога <xliff:g id="ID_1">%s</xliff:g>"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"Пријављивање на Google сајтове помоћу <xliff:g id="ID_1">%s</xliff:g>"\n"Подешавања приватности и безбедности контролишу аутоматско Google пријављивање"</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"Не пријављуј ме аутоматски"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"Аутоматско попуњавање ће користити ваш профил како би вам помогло у попуњавању веб образаца једним кликом."</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"Пријављивање на Google сајтове помоћу <xliff:g id="ID_1">%s</xliff:g>"\n"Подешавања приватности и безбедности контролишу аутоматско пријављивање на Google"</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"Аутоматско пријављивање је доступно."</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"Пријави ме"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"Пријављивање није успело."</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"Унесите податке које желите да аутоматски попуне веб поља када их додирнете."</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"Пуно име:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"Е-пошта:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"Назив предузећа:"</string>
@@ -197,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"Профил је избрисан"</string>
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Избриши профил"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"Прегледач може аутоматски да попуњава веб обрасце попут овог. Желите ли да подесите профил?"</string>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Аутоматско попуњавање увек можете да конфигуришете у Подешавањима прегледача."</string>
- <string name="disable_autofill" msgid="3706426217720202898">"Онемогући аутоматско попуњавање"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"Приватност и безбедност"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"Аутоматско попуњавање увек можете да конфигуришете у Подешавањима прегледача."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"Онемогући аутоматско попуњавање"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"Приватност и безбедност"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Обриши кеш"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Брисање садржаја и база података из локалног кеша"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"Садржај и базе података биће избрисани из локалног кеша."</string>
@@ -272,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Кодирање текста"</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>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Подешава почетну страницу тако да се на њој приказују најпосећеније странице."</string>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"Брзе контроле"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"Листањем са леве или десне ивице приступа се брзим контролама и сакривају траке Апликације и URL адресе"</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"Најпосећенија почетна страница"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"Почетна страница приказује веб странице које најчешће посећујете."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Google инстант"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Користите Google инстант са Google претрагом да бисте видели резултате док куцате (то може да повећа употребу података)."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Проблем при повезивању са подацима"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Проблем са датотеком"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Потврда"</string>
@@ -372,11 +367,19 @@
<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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"Обележивачи на овом уређају још увек нису повезани са Google налогом. Ове обележиваче сачувајте тако што ћете их додати на налог. Избришите их уколико не желите да их синхронизујете."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"Додајте обележиваче који се тренутно налазе на овом уређају и започните синхронизовање са Google налогом"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"Избришите обележиваче који се тренутно налазе на овом уређају и започните синхронизовање са Google налогом"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"Избришите обележиваче који се тренутно налазе на овом уређају и започните синхронизовање обележивача са налогом <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"Додајте обележиваче који се тренутно налазе на овом уређају и започните синхронизовање обележивача са налогом <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Избриши обележиваче"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Следеће"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Претходно"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Откажи"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Готово"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"Додај обележиваче на Google налог"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Додајте Android обележиваче у обележиваче за <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
<string name="menu_share_url" msgid="5851814357333739700">"Дели"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"Нема више доступних картица"</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Google са Инстантом (Labs)"</string>
</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 65b3820..11b52f0 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Webbläs."</string>
<string name="choose_upload" msgid="3649366287575002063">"Välj filen som du vill överföra"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"Filöverföringen har inaktiverats."</string>
<string name="new_tab" msgid="4505722538297295141">"Nytt fönster"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"Nytt inkognitofönster"</string>
<string name="active_tabs" msgid="3050623868203544623">"Fönster"</string>
@@ -99,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"Lista"</string>
<string name="current_page" msgid="7510129573681663135">"från "</string>
<string name="delete_bookmark_warning" msgid="758043186202032205">"Bokmärket <xliff:g id="BOOKMARK">%s</xliff:g> tas bort."</string>
- <string name="open_in_new_window" msgid="6596775546468054510">"Öppna i nytt fönster"</string>
<string name="open_all_in_new_window" msgid="6514602245828366045">"Öppna alla i nytt ett fönster"</string>
<string name="goto_dot" msgid="3895839050522602723">"Kör"</string>
<string name="incognito_tab" msgid="5419458065370134289">"Öppna ny inkognitoflik"</string>
@@ -112,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"Hämtningar"</string>
<string name="copy_page_url" msgid="7635062169011319208">"Kopiera sidans webbadress"</string>
<string name="share_page" msgid="593756995297268343">"Dela sida"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"Spara som webbarkiv"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"Webbarkivet har sparats"</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"Det gick inte att spara webbarkivet."</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"Spara sida"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"Sidan har sparats."</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"Sidan kunde inte sparas."</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"<xliff:g id="BOOKMARK_COUNT">%d</xliff:g> bokmärken"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"Tom mapp"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"Öppna"</string>
@@ -139,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"Inställningar för sidinnehåll"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"Överför bilder"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"Visa bilder på webbsidor"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"Blockera popup-fönster"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"Blockera popupfönster"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"Aktivera JavaScript"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"Öppen i bakgrunden"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"Aktivera plugin-program"</string>
@@ -149,7 +147,7 @@
<item msgid="8547442717307793863">"Av"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"Öppna nya fönster bakom det aktiva"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"Ange startsida"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"Ange startsida"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"Ange sökmotor"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"Välj en sökmotor"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"Ställ in på..."</string>
@@ -160,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"Anpassa webbsidor efter skärmen"</string>
<string name="pref_general_title" msgid="1946872771219249323">"Allmänt"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"Synka"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"Autofyll"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"Autofyll"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"Synkronisera med Google Chrome"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"Dela bokmärken och andra data mellan Androids webbläsare och Google Chrome"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"Google-konto"</string>
@@ -168,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"Synkronisera bokmärken mellan Androids webbläsare och Google Chrome"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"Synkronisera nu"</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"Välj Google-konto"</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"Automatisk ifyllning av formulär"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"Fyll i formulär automatiskt"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"Fyll i webbformulär med ett enda klick"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"Inställningar för Autofyll"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"Konfigurera och hantera data för automatisk ifyllning av formulär"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Fyll i data automatiskt"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Ange och spara data för automatisk ifyllning av webbformulärfält"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"Automatiskt inloggning på Google"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"Inga konton hittades"</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"Logga in automatiskt på Googles webbplatser med <xliff:g id="ID_1">%s</xliff:g>"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"Loggar in på Googles webbplatser med <xliff:g id="ID_1">%s</xliff:g>"\n"Automatisk inloggning på Google styrs med inställningarna i Sekretess och säkerhet"</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"Logga inte in automatiskt"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"Autofyll använder din profil och hjälper dig att fylla i webbformulär med ett enda klick."</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"Loggar in på Googles webbplatser med <xliff:g id="ID_1">%s</xliff:g>"\n"Automatisk inloggning på Google styrs med inställningarna i Sekretess och säkerhet"</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"Automatisk inloggning är tillgänglig."</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"Logga in"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"Misslyckad inloggning."</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"Ange de data som du vill ska fyllas i automatiskt i webbformulär när du trycker på dem."</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"Fullständigt namn:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"E-post:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"Företagsnamn:"</string>
@@ -196,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"Profilen har tagits bort"</string>
<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>
- <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."</string>
- <string name="disable_autofill" msgid="3706426217720202898">"Inaktivera Autofyll"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"Sekretess och säkerhet"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"Du kan när som helst ändra inställningarna för Autofyll bland inställningarna för webbläsaren."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"Inaktivera Autofyll"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"Sekretess och säkerhet"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Rensa cacheminne"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Ta bort innehåll och databaser som cachelagrats lokalt"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"Innehåll och databaser som cachelagrats lokalt tas bort."</string>
@@ -271,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Textkodning"</string>
<string name="pref_lab_title" msgid="5571091610359629423">"Labs"</string>
- <string name="pref_lab_quick_controls" msgid="2105979166017257647">"Snabbkontroller"</string>
- <string name="pref_lab_quick_controls_summary" msgid="8025196176636589803">"Svep tummen från vänster eller höger kant så kommer du åt snabbkontrollerna"</string>
- <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"Startsida med de mest besökta sidorna"</string>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"De mest besökta sidorna visas på startsidan."</string>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"Snabbkontroller"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"Svep från vänster eller höger så visas snabbkontrollerna och program- och adressfälten döljs"</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"Mest besökt startsida"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"På startsidan visas de webbplatser du besöker oftast."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Google Instant"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Använd Google Instant när du söker på Google så får du resultat medan du skriver (detta kan öka dataanvändningen)."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Problem med dataanslutning"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Problem med filen"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Bekräfta"</string>
@@ -371,11 +367,19 @@
<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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"Det finns bokmärken på enheten som inte har kopplats till något Google-konto än. Du sparar dessa bokmärken genom att lägga till dem i ett konto. Ta bort dem om du inte vill att de ska synkroniseras."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"Lägg till de bokmärken som finns på enheten för närvarande och börja synkronisera med Google-kontot"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"Ta bort de bokmärken som finns på enheten för närvarande och börja synkronisera med Google-kontot"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"Ta bort de bokmärken som finns på enheten för närvarande och börja synkronisera bokmärken med <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"Lägg till de bokmärken som finns på enheten för närvarande och börja synkronisera bokmärken med <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Ta bort bokmärken"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Nästa"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Föregående"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Avbryt"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Klar"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"Lägg till bokmärken i Google-kontot"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Lägg till dina Android-bokmärken i bokmärkena för <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
<string name="menu_share_url" msgid="5851814357333739700">"Dela"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"Det finnns inga fler flikar"</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Google med Instant (Labs)"</string>
</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index c1377b1..eb7e3f0 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"เบราว์เซอร์"</string>
<string name="choose_upload" msgid="3649366287575002063">"เลือกไฟล์ที่จะอัปโหลด"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"การอัปโหลดไฟล์ถูกปิดใช้งาน"</string>
<string name="new_tab" msgid="4505722538297295141">"หน้าต่างใหม่"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"หน้าต่างใหม่ที่ไม่ระบุตัวตน"</string>
<string name="active_tabs" msgid="3050623868203544623">"Windows"</string>
@@ -78,7 +77,7 @@
<string name="http" msgid="2163722670597250102">"http://"</string>
<string name="save_to_bookmarks" msgid="6101482434920313244">"เพิ่มลงในบุ๊กมาร์ก"</string>
<string name="bookmark_this_page" msgid="7530739804320811054">"บุ๊กมาร์กหน้าเว็บนี้"</string>
- <string name="remove" msgid="7820112494467011374">"ลบออก"</string>
+ <string name="remove" msgid="7820112494467011374">"นำออก"</string>
<string name="edit_bookmark" msgid="5024089053490231905">"แก้ไขบุ๊กมาร์ก"</string>
<string name="create_shortcut_bookmark" msgid="1995095662095484289">"เพิ่มทางลัดไปหน้าแรก"</string>
<string name="open_bookmark" msgid="8473581305759935790">"เปิด"</string>
@@ -99,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"รายการ"</string>
<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>
<string name="open_all_in_new_window" msgid="6514602245828366045">"เปิดทั้งหมดในหน้าต่างใหม่"</string>
<string name="goto_dot" msgid="3895839050522602723">"ไป"</string>
<string name="incognito_tab" msgid="5419458065370134289">"เปิดแท็บใหม่ที่ไม่ระบุตัวตน"</string>
@@ -112,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"สิ่งที่ดาวน์โหลด"</string>
<string name="copy_page_url" msgid="7635062169011319208">"คัดลอก URL หน้าเว็บ"</string>
<string name="share_page" msgid="593756995297268343">"แบ่งปันหน้าเว็บ"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"บันทึกเป็นที่เก็บถาวรเว็บ"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"บันทึกที่เก็บถาวรเว็บแล้ว"</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"บันทึกที่เก็บถาวรเว็บไม่สำเร็จ"</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"บันทึกหน้าเว็บ"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"บันทึกหน้าเว็บแล้ว"</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"ไม่สามารถบันทึกหน้าเว็บ"</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"บุ๊กมาร์ก <xliff:g id="BOOKMARK_COUNT">%d</xliff:g> รายการ"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"โฟลเดอร์ว่าง"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"เปิด"</string>
@@ -139,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"การตั้งค่าเนื้อหาหน้าเว็บ"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"โหลดภาพ"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"แสดงรูปภาพบนหน้าเว็บ"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"ปิดกั้นหน้าต่างป๊อปอัป"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"ปิดกั้นป๊อปอัป"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"เปิดการใช้งาน JavaScript"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"เปิดในพื้นหลัง"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"เปิดการใช้งานปลั๊กอิน"</string>
@@ -149,7 +147,7 @@
<item msgid="8547442717307793863">"ปิด"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"เปิดหน้าต่างใหม่ใต้หน้าต่างปัจจุบัน"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"ตั้งค่าหน้าแรก"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"ตั้งค่าหน้าแรก"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"ตั้งค่าเครื่องมือค้นหา"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"เลือกเครื่องมือค้นหา"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"ตั้งค่าเป็น ..."</string>
@@ -160,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"ปรับรูปแบบหน้าเว็บให้พอดีกับหน้าจอ"</string>
<string name="pref_general_title" msgid="1946872771219249323">"ทั่วไป"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"ซิงค์"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"ป้อนอัตโนมัติ"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"ป้อนอัตโนมัติ"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"ซิงค์กับ Google Chrome"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"แบ่งปันบุ๊กมาร์กและข้อมูลอื่นๆ ระหว่างเบราว์เซอร์ Android กับ Google Chrome"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"บัญชี Google"</string>
@@ -168,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"ซิงค์บุ๊กมาร์กระหว่างเบราว์เซอร์ Android และ Google Chrome"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"เริ่มการซิงค์"</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"เลือกบัญชี Google ที่จะแบ่งปัน"</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"ป้อนข้อมูลฟอร์มอัตโนมัติ"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"การป้อนฟอร์มอัตโนมัติ"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"กรอกข้อมูลเว็บฟอร์มได้ในคลิกเดียว"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"การตั้งค่าป้อนอัตโนมัติ"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"ตั้งค่าและจัดการข้อมูลสำหรับฟอร์มที่ป้อนข้อมูลอัตโนมัติ"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"ป้อนข้อมูลอัตโนมัติ"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"ป้อนและบันทึกข้อมูลสำหรับการป้อนฟิลด์ของเว็บฟอร์มอัตโนมัติ"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"ลงชื่อเข้าใช้ Google อัตโนมัติ"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"ไม่พบบัญชี"</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"ลงชื่อเข้าใช้ Google Sites อัตโนมัติโดยใช้ <xliff:g id="ID_1">%s</xliff:g>"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"กำลังลงชื่อเข้าใช้ Google Sites ด้วย <xliff:g id="ID_1">%s</xliff:g>"\n"การตั้งค่าข้อมูลส่วนบุคคลและความปลอดภัยจะควบคุมการลงชื่อเข้าใช้อัตโนมัติของ Google"</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"อย่าลงชื่อเข้าใช้โดยอัตโนมัติ"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"การป้อนอัตโนมัติจะใช้โปรไฟล์ของคุณเพื่อช่วยให้คุณกรอกเว็บฟอร์มได้ในคลิกเดียว"</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"กำลังลงชื่อเข้าใช้ Google Sites ด้วย <xliff:g id="ID_1">%s</xliff:g>"\n"การตั้งค่าข้อมูลส่วนบุคคลและความปลอดภัยจะควบคุมการลงชื่อเข้าใช้อัตโนมัติของ Google"</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"การลงชื่อเข้าใช้อัตโนมัติพร้อมใช้งาน"</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"ลงชื่อเข้าใช้"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"ลงชื่อเข้าใช้ล้มเหลว"</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"ป้อนข้อมูลที่คุณต้องการให้ป้อนอัตโนมัติในเว็บฟิลด์เมื่อคุณแตะฟิลด์เหล่านั้น"</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"ชื่อเต็ม:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"อีเมล:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"ชื่อบริษัท:"</string>
@@ -196,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"ลบโปรไฟล์แล้ว"</string>
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"ลบโปรไฟล์"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"เบราว์เซอร์จะกรอกเว็บฟอร์มให้โดยอัตโนมัติเช่นฟอร์มนี้ คุณต้องการตั้งค่าโปรไฟล์ของคุณหรือไม่"</string>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"ป้อนอัตโนมัติ สามารถกำหนดค่าผ่านการตั้งค่าเบราว์เซอร์"</string>
- <string name="disable_autofill" msgid="3706426217720202898">"ปิดใช้งานการป้อนอัตโนมัติ"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"ข้อมูลส่วนบุคคลและความปลอดภัย"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"การป้อนอัตโนมัติสามารถกำหนดค่าผ่านการตั้งค่าเบราว์เซอร์"</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"ปิดใช้งานการป้อนอัตโนมัติ"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"ข้อมูลส่วนบุคคลและความปลอดภัย"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"ล้างแคช"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"ล้างเนื้อหาและฐานข้อมูลที่เก็บไว้ในเครื่อง"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"เนื้อหาและฐานข้อมูลที่เก็บไว้ในเครื่องจะถูกลบ"</string>
@@ -271,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"การเข้ารหัสข้อความ"</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>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"ตั้งหน้าแรกของคุณให้แสดงหน้าเว็บที่มีผู้เข้าชมมากที่สุด"</string>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"การควบคุมอย่างรวดเร็ว"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"กวาดหัวแม่มือจากซ้ายหรือขวาเพื่อการควบคุมที่รวดเร็วและซ่อนแอปพลิเคชันและแถบ URL"</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"หน้าแรกที่เข้าชมบ่อยที่สุด"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"หน้าแรกของคุณจะแสดงหน้าเว็บที่เข้าชมบ่อยที่สุด"</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Google ค้นหาทันใจ"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"ใช้ Google ค้นหาทันใจเมื่อคุณใช้ค้นหาโดย Google เพื่อแสดงผลการค้นหาในขณะที่คุณพิมพ์ (ซึ่งสามารถเพิ่มการใช้งานข้อมูล)"</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"ปัญหาการเชื่อมต่อข้อมูล"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"ปัญหาเกี่ยวกับไฟล์"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"ยืนยัน"</string>
@@ -371,11 +367,19 @@
<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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"บุ๊กมาร์กในอุปกรณ์นี้ยังไม่ได้เชื่อมโยงกับบัญชี Google บันทึกบุ๊กมาร์กเหล่านี้โดยเพิ่มบุ๊กมาร์กไปยังบัญชี ลบบุ๊กมาร์กเหล่านี้หากคุณไม่ต้องการซิงค์"</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"เพิ่มบุ๊กมาร์กที่มีอยู่ในอุปกรณ์นี้และเริ่มซิงค์ข้อมูลกับบัญชี Google"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"ลบบุ๊กมาร์กที่มีอยู่ในอุปกรณ์นี้และเริ่มซิงค์ข้อมูลกับบัญชี Google"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"ลบบุ๊กมาร์กที่มีอยู่ในอุปกรณ์นี้และเริ่มซิงค์ข้อมูลบุ๊กมาร์กกับ <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"เพิ่มบุ๊กมาร์กที่มีอยู่ในอุปกรณ์นี้และเริ่มซิงค์ข้อมูลบุ๊กมาร์กกับ <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"ลบบุ๊กมาร์ก"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"ถัดไป"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"ก่อนหน้า"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"ยกเลิก"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"เสร็จสิ้น"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"เพิ่มบุ๊กมาร์กไปยังบัญชี Google"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"เพิ่มบุ๊กมาร์ก Android ของคุณลงในบุ๊กมาร์กสำหรับ <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
<string name="menu_share_url" msgid="5851814357333739700">"แบ่งปัน"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"ไม่สามารถใช้แท็บเพิ่มได้"</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Google พร้อมการค้นหาทันใจ (Labs)"</string>
</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index c4d37d2..5b3ffcc 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Browser"</string>
<string name="choose_upload" msgid="3649366287575002063">"Pumili ng file para sa pag-upload"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"Hindi pinagana ang mga pag-upload ng file."</string>
<string name="new_tab" msgid="4505722538297295141">"Bagong window"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"Bagong incognito window"</string>
<string name="active_tabs" msgid="3050623868203544623">"Windows"</string>
@@ -78,8 +77,7 @@
<string name="http" msgid="2163722670597250102">"http://"</string>
<string name="save_to_bookmarks" msgid="6101482434920313244">"Idagdag sa Mga Bookmark"</string>
<string name="bookmark_this_page" msgid="7530739804320811054">"I-bookmark ang pahinang ito"</string>
- <!-- no translation found for remove (7820112494467011374) -->
- <skip />
+ <string name="remove" msgid="7820112494467011374">"Alisin"</string>
<string name="edit_bookmark" msgid="5024089053490231905">"I-edit ang bookmark"</string>
<string name="create_shortcut_bookmark" msgid="1995095662095484289">"Magdagdag ng shortcut sa Home"</string>
<string name="open_bookmark" msgid="8473581305759935790">"Buksan"</string>
@@ -100,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"Listahan"</string>
<string name="current_page" msgid="7510129573681663135">"mula sa "</string>
<string name="delete_bookmark_warning" msgid="758043186202032205">"Tatanggalin ang bookmark na \"<xliff:g id="BOOKMARK">%s</xliff:g>\"."</string>
- <string name="open_in_new_window" msgid="6596775546468054510">"Buksan sa bagong window"</string>
<string name="open_all_in_new_window" msgid="6514602245828366045">"Buksan lahat sa bagong windows"</string>
<string name="goto_dot" msgid="3895839050522602723">"Pumunta"</string>
<string name="incognito_tab" msgid="5419458065370134289">"Magbukas ng bago incognito tab"</string>
@@ -113,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"Mga Pag-download"</string>
<string name="copy_page_url" msgid="7635062169011319208">"Kopyahin ang url ng pahina"</string>
<string name="share_page" msgid="593756995297268343">"Ibahagi ang pahina"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"I-save bilang Web Archive"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"Na-save na ang web archive."</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"Nabigong i-save ang web archive."</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"I-save ang pahina"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"Na-save na ang pahina."</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"Nabigong ma-save ang pahina."</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"<xliff:g id="BOOKMARK_COUNT">%d</xliff:g> (na) bookmark"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"Walang lamang folder"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"Buksan"</string>
@@ -140,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"Mga setting ng nilalaman ng pahina"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"I-load ang mga larawan"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"Ipakita ang mga larawan sa mga web page"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"I-block ang mga pop-up window"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"I-block ang mga pop-up"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"Paganahin ang JavaScript"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"Buksan sa background"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"Paganahin ang mga plug-in"</string>
@@ -150,7 +147,7 @@
<item msgid="8547442717307793863">"Naka-off"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"Buksan ang bagong windows sa likuran ng kasalukuyang isa"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"Itakda ang home page"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"Magtakda ng homepage"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"Itakda ang search engine"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"Pumili ng search engine"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"Itakda sa…"</string>
@@ -161,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"I-format ang mga web page upang iakma sa screen"</string>
<string name="pref_general_title" msgid="1946872771219249323">"Pangkalahatan"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"Sync"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"Autofill"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"Auto-fill"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"Mag-sync sa Google Chrome"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"Ibahagi ang mga bookmark & iba pang data sa pagitan ng Android Browser at Google Chrome"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"Google account"</string>
@@ -169,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"I-sync ang mga bookmark sa pagitan ng Android Browser at Google Chrome"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"Simulan ang pag-sync"</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"Pili Google account"</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"Form AutoFill"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"Bumuo ng auto-fill"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"Punan ang mga web form sa isang click"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"Mga Setting ng AutoFill"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"I-set up & pamahalaan ang data para sa mga Na-AutoFill na form"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Data ng auto-fill"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Ilagay at i-save ang data para sa mga field ng form ng web sa pag-auto-fill"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"Awtomatiko pag-sign in sa Google"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"Walang nakitang mga account"</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"Awtomatikong mag-sign in sa mga site ng Google gamit ang <xliff:g id="ID_1">%s</xliff:g>"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"Nagsa-sign in sa mga site ng Google gamit ang <xliff:g id="ID_1">%s</xliff:g>"\n"Kinokontrol ng iyong mga setting ng Privacy at Seguridad ang awtomatikong pag-sign-in ng Google"</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"Huwag awtomatikong mag-sign in"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"Gagamitin ng AutoFill ang iyong profile upang matulungan kang makumpleto ang mga form ng web sa isahang pag-click."</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"Pag-sign in sa mga site ng Google gamit ang <xliff:g id="ID_1">%s</xliff:g>"\n"Kinokontrol ng iyong mga setting ng privacy at seguridad ang awtomatikong pag-sign-in sa Google"</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"Available ang awtomatikong pag-sign in."</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"Mag-login"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"Nabigo ang pag-login."</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"Ilagay ang data na gusto mong i-auto-fill sa mga field ng web kapag hinawakan mo ang mga ito."</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"Buong pangalan:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"Email:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"Pangalan ng Kompanya:"</string>
@@ -197,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"Natanggal na ang profile"</string>
<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>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Palaging mako-configure ang AutoFill sa pamamagitan ng Mga Setting ng Browser."</string>
- <string name="disable_autofill" msgid="3706426217720202898">"Huwag paganahin ang AutoFill"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"Privacy at Seguridad"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"Mako-configure anumang oras ang auto-fill sa pamamagitan ng Mga Setting ng Browser."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"Huwag paganahin ang auto-fill"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"Privacy at seguridad"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"I-clear ang cache"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"I-clear ang lokal na naka-cache na nilalaman at mga database"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"Tatanggalin ang lokal na na-cache na nilalaman at mga database."</string>
@@ -272,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Pag-encode ng teksto"</string>
<string name="pref_lab_title" msgid="5571091610359629423">"Mga Lab"</string>
- <string name="pref_lab_quick_controls" msgid="2105979166017257647">"Mga Mabilisang Control"</string>
- <string name="pref_lab_quick_controls_summary" msgid="8025196176636589803">"I-swipe ang hinlalaki mula sa kaliwa hanggang sa kanang kanto upang ma-access ang mga mabilisang control"</string>
- <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"Pinaka-binibisitang Homepage"</string>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Itakda ang iyong homepage upang ipakita ang pinaka-binibisitang mga pahina."</string>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"Mga mabilis na pagkontrol"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"I-swipe thumb sa kaliwa o kanan gilid para access bilis kontrol at itago Application at URL bar"</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"Pinaka-nabibisitang homepage"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"Ipinapakita ng iyong homepage ang iyong pinaka-nabibisitang mga webpage."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Google Instant"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Gamit Google Instant pag gumamit ka Google Search, para magpakita resulta habang type ka (mapataas nito paggamit data)."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Problema sa pagkakakonekta ng data"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Problema sa file"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Kumpirmahin"</string>
@@ -372,11 +367,19 @@
<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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"Hindi pa nauugnay sa Google account ang mga bookmark sa device na ito. I-save ang mga bookmark na ito sa pamamagitan ng pagdaragdag sa mga ito sa isang account. Tanggalin ang mga bookmark na ito kung ayaw mong i-sync ang mga ito."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"Magdagdag ng mga bookmark na kasalukuyang nasa device na ito at simulan ang pag-sync sa Google Account"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"Magtanggal ng mga bookmark na kasalukuyang nasa device na ito at simulan ang pag-synchronize sa Google Account"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"Tanggalin ang mga bookmark na kasalukuyang nasa device na ito at simulan ang pag-synchronize ng mga bookmark gamit ang <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"Magdagdag ng mga bookmark na kasalukuyang nasa device na ito at simulan ang pag-synchronize ng mga bookmark sa <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Magtanggal ng mga bookmark"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Susunod"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Nakaraan"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Kanselahin"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Tapos na"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"Magdagdag ng mga bookmark sa Google Account"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Idagdag ang iyong mga Android bookmark sa mga bookmark para sa <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
<string name="menu_share_url" msgid="5851814357333739700">"Ibahagi"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"Wala nang available na mga tab"</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Google na mayroong Instant (Labs)"</string>
</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 449a6f5..2221edc 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Tarayıcı"</string>
<string name="choose_upload" msgid="3649366287575002063">"Yükleme için dosya seçin"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"Dosya Yüklemeleri devre dışı bırakıldı."</string>
<string name="new_tab" msgid="4505722538297295141">"Yeni pencere"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"Yeni gizli pencere"</string>
<string name="active_tabs" msgid="3050623868203544623">"Pencereler"</string>
@@ -99,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"Liste"</string>
<string name="current_page" msgid="7510129573681663135">"kaynak: "</string>
<string name="delete_bookmark_warning" msgid="758043186202032205">"Favori \"<xliff:g id="BOOKMARK">%s</xliff:g>\" silinecek."</string>
- <string name="open_in_new_window" msgid="6596775546468054510">"Yeni pencerede aç"</string>
<string name="open_all_in_new_window" msgid="6514602245828366045">"Tümünü yeni pencerelerde aç"</string>
<string name="goto_dot" msgid="3895839050522602723">"Git"</string>
<string name="incognito_tab" msgid="5419458065370134289">"Yeni gizli sekme aç"</string>
@@ -112,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"İndirme işlemleri"</string>
<string name="copy_page_url" msgid="7635062169011319208">"Sayfa url\'sini kopyala"</string>
<string name="share_page" msgid="593756995297268343">"Sayfayı paylaş"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"Web Arşivi olarak Kaydet"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"Web arşivi kaydedildi."</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"Web arşivi kaydedilemedi."</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"Sayfayı kaydet"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"Sayfa kaydedildi."</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"Sayfa kaydedilemedi."</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"<xliff:g id="BOOKMARK_COUNT">%d</xliff:g> yer işareti"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"Boş klasör"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"Aç"</string>
@@ -139,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"Sayfa içeriği ayarları"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"Görselleri yükle"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"Web sayfalarındaki görselleri görüntüle"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"Pop-up\'ları engelle"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"Pop-up\'ları engelle"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"JavaScript\'i etkinleştir"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"Arka planda aç"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"Eklentileri etkinleştir"</string>
@@ -149,7 +147,7 @@
<item msgid="8547442717307793863">"Kapalı"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"Geçerli pencerenin arkasında yeni pencereler aç"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"Ana sayfayı ayarla"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"Ana sayfayı ayarla"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"Arama motoru ayarlayın"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"Arama moturu seçin"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"Ana sayfayı ayarla..."</string>
@@ -160,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"Web sayfalarını ekrana sığacak şekilde biçimlendir"</string>
<string name="pref_general_title" msgid="1946872771219249323">"Genel"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"Senkronizasyon"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"Otomatik Doldur"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"Otomatik doldur"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"Google Chrome ile senkronize et"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"Yer işaretlerini ve diğer verileri Android Tarayıcı ile Google Chrome arasında paylaş"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"Google hesabı"</string>
@@ -168,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"Yer işaretlerini Android Tarayıcı ve Google Chrome arasında senkronize et"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"Senk. başlat"</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"Paylaşım için Google hesabını seçin"</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"Formu Otomatik Doldur"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"Formu otomatik doldur"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"Web formlarını tek bir tıklamayla doldurun"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"Otomatik Doldurma Ayarları"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"Otomatik Doldurulan formlara ilişkin verileri ayarlayın ve yönetin"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Otomatik doldurma verileri"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Web formu alanlarının otomatik olarak doldurulması için verileri girin ve kaydedin"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"Otomatik Google oturumu açma"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"Hesap bulunamadı"</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"<xliff:g id="ID_1">%s</xliff:g> adını kullanarak Google Sites\'da otomatik olarak oturum aç"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"<xliff:g id="ID_1">%s</xliff:g> hesabı ile Google Sites hizmetinde oturum açılıyor"\n"Google\'da otomatik oturum açmanız Gizlilik ve Güvenlik ayarlarınız tarafından denetlenir."</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"Otomatik olarak oturum açma"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"Otomatik Doldurma özelliği web formlarını tek bir tıklamayla doldurmanıza yardımcı olmak için profilinizi kullanır."</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"<xliff:g id="ID_1">%s</xliff:g> hesabı ile Google Sites hizmetinde oturum açılıyor"\n"Google\'da otomatik oturum açmanız gizlilik ve güvenlik ayarlarınız tarafından denetlenir."</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"Otomatik oturum açma kullanılabilir."</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"Giriş yap"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"Giriş yapılamadı."</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"Dokunduğunuz web alanlarına otomatik olarak doldurulmasını istediğiniz verileri girin."</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"Tam ad:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"E-posta:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"Şirket adı:"</string>
@@ -196,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"Profil silindi"</string>
<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>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Otomatik Doldurma\'yı istediğiniz zaman Tarayıcı Ayarları\'ndan yapılandırabilirsiniz."</string>
- <string name="disable_autofill" msgid="3706426217720202898">"Otomatik Doldurma\'yı devre dışı bırak"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"Gizlilik ve Güvenlik"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"Otomatik doldurmayı istediğiniz zaman Tarayıcı Ayarları\'ndan yapılandırabilirsiniz."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"Otomatik doldurmayı devre dışı bırak"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"Gizlilik ve güvenlik"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Önbelleği temizle"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Yerel olarak önbelleğe alınmış içeriği ve veritabanlarını temizle"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"Yerel olarak önbelleğe alınmış içerik ve veritabanları silinecek."</string>
@@ -271,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Metin kodlama"</string>
<string name="pref_lab_title" msgid="5571091610359629423">"Labs"</string>
- <string name="pref_lab_quick_controls" msgid="2105979166017257647">"Hızlı Denetimler"</string>
- <string name="pref_lab_quick_controls_summary" msgid="8025196176636589803">"Hızlı denetimlere erişmek için başparmağınızı soldan sağa doğru hızla kaydırın"</string>
- <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"En Çok Ziyaret Edilenler Ana Sayfası"</string>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Ana sayfanızı en çok ziyaret edilen sayfaları gösterecek şekilde ayarlar."</string>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"Hızlı denetimler"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"Hızlı dentmlr erşmk, Uyg ve URL çubklr gizlmk için başprmğnzı sol veya sağ kenrdn hızlc kaydrn"</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"En çok ziyaret edilen ana sayfa"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"Ana sayfanızda en sık ziyaret edilen web sayfaları görüntülenir."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Google Anında Arama"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Yazarken sonuçların görüntülenmesi için, Google Arama\'yı kullanırken Google Anında Arama\'dan yararlanın (veri kullanımını artırabilir)."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Veri bağlantısı sorunu"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Sorunlu dosya"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Doğrula"</string>
@@ -371,11 +367,19 @@
<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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"Bu cihazdaki yer işaretleri henüz bir Google hesabıyla ilişkilendirilmemiş. Yer işaretlerini bir hesaba ekleyerek kaydedin. Bu yer işaretlerini senkronize etmek istemiyorsanız silin."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"Bu cihazdaki mevcut yer işaretlerini ekleyin ve Google Hesabı ile senkronize etmeye başlayın"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"Bu cihazdaki mevcut yer işaretlerini silin ve Google Hesabı ile senkronize etmeye başlayın"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"Bu cihazdaki mevcut yer işaretlerini silin ve <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g> ile yer işaretlerini senkronize etmeye başlayın."</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"Bu cihazdaki mevcut yer işaretlerini ekleyin ve <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g> ile yer işaretlerini senkronize etmeye başlayın."</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Yer işaretlerini sil"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"İleri"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Önceki"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"İptal"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Bitti"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"Yer işaretlerini Google Hesabına ekle"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Android yer işaretlerinizi <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g> yer işaretlerine ekleyin"</string>
<string name="menu_share_url" msgid="5851814357333739700">"Paylaş"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"Kullanılabilir başka sekme yok"</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Anında Arama ile Google (Labs)"</string>
</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index f461ed1..dbd3f01 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Переглядач"</string>
<string name="choose_upload" msgid="3649366287575002063">"Вибер. файл для завантаж."</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"Завантаження файлів вимкнено."</string>
<string name="new_tab" msgid="4505722538297295141">"Нове вікно"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"Нове анонімне вікно"</string>
<string name="active_tabs" msgid="3050623868203544623">"Вікна"</string>
@@ -78,8 +77,7 @@
<string name="http" msgid="2163722670597250102">"http://"</string>
<string name="save_to_bookmarks" msgid="6101482434920313244">"Додати до закладок"</string>
<string name="bookmark_this_page" msgid="7530739804320811054">"Дод.стор. до закладок"</string>
- <!-- no translation found for remove (7820112494467011374) -->
- <skip />
+ <string name="remove" msgid="7820112494467011374">"Видалити"</string>
<string name="edit_bookmark" msgid="5024089053490231905">"Редаг. закладку"</string>
<string name="create_shortcut_bookmark" msgid="1995095662095484289">"Додати ярлик на головний екран"</string>
<string name="open_bookmark" msgid="8473581305759935790">"Відкр."</string>
@@ -100,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"Список"</string>
<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>
<string name="open_all_in_new_window" msgid="6514602245828366045">"Відкрити все в нових вікнах"</string>
<string name="goto_dot" msgid="3895839050522602723">"Викон."</string>
<string name="incognito_tab" msgid="5419458065370134289">"Відкрити нову анонімну вкладку"</string>
@@ -113,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"Завантаження"</string>
<string name="copy_page_url" msgid="7635062169011319208">"Копіюв. URL стор."</string>
<string name="share_page" msgid="593756995297268343">"Надісл. стор."</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"Зберегти як веб-архів"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"Веб-архів збережено."</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"Помилка збереження веб-архіву."</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"Зберегти сторінку"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"Сторінку збережено."</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"Не вдалося зберегти сторінку."</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"Закладок: <xliff:g id="BOOKMARK_COUNT">%d</xliff:g>"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"Порожня папка"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"Відкр."</string>
@@ -140,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"Налашт-ня вмісту стор."</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"Завантаж. зобр."</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"Відобр. зображ. на веб-стор."</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"Блок. спливаючі вікна"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"Блокувати спливаючі вікна"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"Увімк. JavaScript"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"Відкр. у фон. режимі"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"Увімкнути плагіни"</string>
@@ -150,7 +147,7 @@
<item msgid="8547442717307793863">"Вимк."</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"Відкривати нові вікна за поточним"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"Устан. дом. стор."</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"Установити домашню сторінку"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"Налашт. пошук. сист."</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"Виберіть пошукову систему"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"Установити…"</string>
@@ -161,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"Форматув. сторінки до розмірів екрана"</string>
<string name="pref_general_title" msgid="1946872771219249323">"Загальні"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"Синхронізація"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"Автозаповнення"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"Автозаповнення"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"Синхронізувати з Google Chrome"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"Здійснювати обмін закладками й іншими даними між веб-переглядачем Android і Google Chrome"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"Облік. запис Google"</string>
@@ -169,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"Синхронізуйте закладки у веб-переглядачі Android і Google Chrome"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"Почати синхронізацію"</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"Вибрати обл.зап. Google для надсил."</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"Автозаповнення форм"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"Автозаповнення форм"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"Заповнюйте веб-форми за допомогою лише одного кліка"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"Налаштування автозаповнення"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"Налаштовуйте дані для автозаповнення форм і керуйте ними"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Дані автозаповнення"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Введіть і збережіть дані для полів автоматичного заповнення веб-форм"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"Автоматичний вхід у Google"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"Облікових записів не знайдено"</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"Автоматично ввійти в Google Sites за допомогою <xliff:g id="ID_1">%s</xliff:g>"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"Вхід у Google Sites за допомогою <xliff:g id="ID_1">%s</xliff:g>"\n"Ваші налаштування конфіденційності та безпеки контролюють автоматичний вхід у Google"</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"Не входити автоматично"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"Функція \"Автозаповнення\" буде використовувати ваш профіль, щоб заповнювати веб-форми за допомогою лише одного кліка."</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"Вхід у Google Sites за допомогою <xliff:g id="ID_1">%s</xliff:g>"\n"Ваші налаштування конфіденційності та безпеки контролюють автоматичний вхід у Google"</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"Доступний автоматичний вхід."</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"Увійти"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"Помилка входу."</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"Введіть дані, які автоматично заповнюватимуть веб-поля, коли ви торкнетеся їх."</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"Повне ім\'я:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"Електронна адреса:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"Назва компанії:"</string>
@@ -197,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"Профіль видалено"</string>
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"Видалити профіль"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"Веб-переглядач може автоматично заповнювати подібні веб-форми. Налаштувати ваш профіль?"</string>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"Автозаповнення завжди можна налаштувати в налаштуваннях веб-переглядача."</string>
- <string name="disable_autofill" msgid="3706426217720202898">"Вимкнути автозаповнення"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"Конфіденційність і безпека"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"Автозаповнення завжди можна налаштувати в налаштуваннях веб-переглядача."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"Вимкнути автозаповнення"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"Конфіденційність і безпека"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Очистити кеш"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Очистити локально кешов. вміст і бази даних"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"Локально кешований вміст і бази даних буде видалено."</string>
@@ -272,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Кодування тексту"</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>
- <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"Дом. стор. функції \"Часто відвідувані\""</string>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Налаштовує на домашній сторінці показ найчастіше відвідуваних сторінок."</string>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"Швидкі елементи керування"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"Гортайте зліва чи справа, щоб відкрити швидкі елем. керування та сховати панелі програми й URL"</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"Найчастіше відвідувана домашня сторінка"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"На вашій домашній сторінці відображаються найчастіше відвідувані веб-сторінки."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Миттєвий пошук Google"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Викор. Миттєвий пошук у пошуку Google для відображ. рез. під час введення запиту (це призвод. до більшого викор. даних)."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Проблема з доступом до даних"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Проблема з файлом"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Підтверд."</string>
@@ -372,11 +367,19 @@
<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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"Закладки на цьому пристрої ще не пов’язано з обліковим записом Google. Збережіть ці закладки, додавши їх до облікового запису. Видаліть їх, якщо не хочете синхронізувати закладки."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"Додати поточні закладки на цьому пристрої та розпочати синхронізацію з обліковим записом Google"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"Видалити поточні закладки на цьому пристрої та розпочати синхронізацію з обліковим записом Google"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"Видалити поточні закладки на цьому пристрої та розпочати синхронізацію закладок із <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"Додати поточні закладки на цьому пристрої та розпочати синхронізацію закладок із <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Видалити закладки"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Далі"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Назад"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Скасувати"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Готово"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"Додати закладки до облікового запису Google"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Додати закладки Android до закладок для <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
<string name="menu_share_url" msgid="5851814357333739700">"Надіслати"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"Більше немає вкладок"</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Google із Миттєвим пошуком (Лабораторії)"</string>
</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index c7ea6d5..3f1addc 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"Trình duyệt"</string>
<string name="choose_upload" msgid="3649366287575002063">"Chọn tệp để tải lên"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"Nội dung tải lên của tệp bị vô hiệu hóa."</string>
<string name="new_tab" msgid="4505722538297295141">"Cửa sổ mới"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"Cửa sổ ẩn danh mới"</string>
<string name="active_tabs" msgid="3050623868203544623">"Windows"</string>
@@ -78,8 +77,7 @@
<string name="http" msgid="2163722670597250102">"http://"</string>
<string name="save_to_bookmarks" msgid="6101482434920313244">"Thêm vào dấu trang"</string>
<string name="bookmark_this_page" msgid="7530739804320811054">"Đánh dấu trang này"</string>
- <!-- no translation found for remove (7820112494467011374) -->
- <skip />
+ <string name="remove" msgid="7820112494467011374">"Xóa"</string>
<string name="edit_bookmark" msgid="5024089053490231905">"Chỉnh sửa dấu trang"</string>
<string name="create_shortcut_bookmark" msgid="1995095662095484289">"Thêm lối tắt tới màn hình trang chủ"</string>
<string name="open_bookmark" msgid="8473581305759935790">"Mở"</string>
@@ -100,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"Danh sách"</string>
<string name="current_page" msgid="7510129573681663135">"từ "</string>
<string name="delete_bookmark_warning" msgid="758043186202032205">"Dấu trang \"<xliff:g id="BOOKMARK">%s</xliff:g>\" sẽ bị xoá."</string>
- <string name="open_in_new_window" msgid="6596775546468054510">"Mở trong cửa sổ mới"</string>
<string name="open_all_in_new_window" msgid="6514602245828366045">"Mở tất cả trong cửa sổ mới"</string>
<string name="goto_dot" msgid="3895839050522602723">"Đến"</string>
<string name="incognito_tab" msgid="5419458065370134289">"Mở tab ẩn danh mới"</string>
@@ -113,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"Nội dung tải xuống"</string>
<string name="copy_page_url" msgid="7635062169011319208">"Sao chép url của trang"</string>
<string name="share_page" msgid="593756995297268343">"Chia sẻ trang"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"Lưu dưới dạng Lưu trữ web"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"Đã lưu kho lưu trữ web."</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"Không thể lưu kho lưu trữ web."</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"Lưu trang"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"Đã lưu trang."</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"Không thể lưu trang."</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"<xliff:g id="BOOKMARK_COUNT">%d</xliff:g> dấu trang"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"Thư mục trống"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"Mở"</string>
@@ -140,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"Cài đặt nội dung trang"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"Tải hình ảnh"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"Hiển thị hình ảnh trên trang web"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"Chặn cửa sổ bật lên"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"Chặn cửa sổ bật lên"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"Bật JavaScript"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"Mở dưới nền"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"Bật trình cắm"</string>
@@ -150,7 +147,7 @@
<item msgid="8547442717307793863">"Tắt"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"Mở cửa sổ mới phía sau cửa sổ hiện tại"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"Đặt trang chủ"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"Đặt trang chủ"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"Đặt công cụ tìm kiếm"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"Chọn công cụ tìm kiếm"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"Đặt thành…"</string>
@@ -161,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"Định dạng trang web để vừa với màn hình"</string>
<string name="pref_general_title" msgid="1946872771219249323">"Chung"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"Đồng bộ hóa"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"Tự động điền"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"Tự động điền"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"Đồng bộ hóa với Google Chrome"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"Chia sẻ dấu trang & các dữ liệu khác giữa Trình duyệt Android và Google Chrome"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"Tài khoản Google"</string>
@@ -169,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"Đồng bộ hóa dấu trang giữa Trình duyệt Android và Google Chrome"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"Bắt đầu đồng bộ hóa"</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"Chọn tk Google để c.sẻ"</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"Tự động điền biểu mẫu"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"Tự động điền biểu mẫu"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"Điền biểu mẫu web chỉ với một cú nhấp"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"Cài đặt tự động điền"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"Thiết lập & quản lý dữ liệu cho biểu mẫu Tự động điền"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"Tự động điền dữ liệu"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"Nhập và lưu dữ liệu cho các trường tự động điền biểu mẫu web"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"Tự động đăng nhập Google"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"Không tìm thấy tài khoản nào"</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"Tự động đăng nhập vào các trang của Google bằng <xliff:g id="ID_1">%s</xliff:g>"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"Đang đăng nhập vào các trang web của Google bằng <xliff:g id="ID_1">%s</xliff:g>"\n"Cài đặt Riêng tư & Bảo mật kiểm soát đăng nhập Google tự động"</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"Không đăng nhập tự động"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"Tự động điền sẽ sử dụng tiểu sử của bạn để giúp bạn hoàn thành biểu mẫu web chỉ bằng một cú nhấp chuột."</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"Đang đăng nhập vào các trang web của Google bằng <xliff:g id="ID_1">%s</xliff:g>"\n"Cài đặt riêng tư & bảo mật kiểm soát đăng nhập Google tự động"</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"Tính năng đăng nhập tự động hiện khả dụng."</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"Đăng nhập"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"Đăng nhập không thành công."</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"Nhập dữ liệu bạn muốn để tự động điền vào các trường trên web khi bạn gặp chúng."</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"Tên đầy đủ:"</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"Email:"</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"Tên công ty:"</string>
@@ -197,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"Đã xóa tiểu sử"</string>
<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>
- <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."</string>
- <string name="disable_autofill" msgid="3706426217720202898">"Tắt Tự động điền"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"Quyền riêng tư & Bảo mật"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"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."</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"Tắt tính năng tự động điền"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"Riêng tư & bảo mật"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Xoá bộ nhớ cache"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Xoá nội dung và cơ sở dữ liệu được lưu trong bộ nhớ cache cục bộ"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"Nội dung và cơ sở dữ liệu được lưu trong bộ nhớ cache cục bộ sẽ bị xoá."</string>
@@ -272,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"Mã hoá văn bản"</string>
<string name="pref_lab_title" msgid="5571091610359629423">"Lab"</string>
- <string name="pref_lab_quick_controls" msgid="2105979166017257647">"Điều khiển nhanh"</string>
- <string name="pref_lab_quick_controls_summary" msgid="8025196176636589803">"Ấn ngón tay từ cạnh trái hoặc phải để truy cập điều khiển nhanh"</string>
- <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"Trang chủ được truy cập nhiều nhất"</string>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"Đặt trang chủ của bạn để hiển thị các trang được truy cập nhiều nhất."</string>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"Các điều khiển nhanh"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"Trượt ngón tay từ cạnh trái hoặc phải để truy cập điều khiển nhanh và ẩn các thanh Ứng dụng và URL"</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"Trang chủ được truy cập nhiều nhất"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"Trang chủ hiển thị các trang web được truy cập nhiều nhất của bạn."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Google Instant"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Sử dụng Google Instant khi bạn sử dụng Tìm kiếm của Google để hiển thị kết quả khi nhập (điều này có thể tăng việc sử dụng dữ liệu)."</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"Sự cố kết nối dữ liệu"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"Sự cố với tệp"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"Xác nhận"</string>
@@ -372,11 +367,19 @@
<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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"Các dấu trang trên thiết bị này hiện chưa được liên kết với tài khoản Google. Lưu các dấu trang này bằng cách thêm chúng vào tài khoản. Xóa các dấu trang này nếu bạn không muốn đồng bộ hóa chúng."</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"Thêm dấu trang hiện tại trên thiết bị này và bắt đầu đồng bộ hóa với Tài khoản Google"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"Xóa dấu trang hiện tại trên thiết bị này và bắt đầu đồng bộ hóa với Tài khoản Google"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"Xóa dấu trang hiện tại trên thiết bị này và bắt đầu đồng bộ hóa dấu trang với <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"Thêm dấu trang hiện tại trên thiết bị này và bắt đầu đồng bộ hóa dấu trang với <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>."</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"Xóa dấu trang"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"Tiếp theo"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"Trước"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"Hủy"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"Xong"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"Thêm dấu trang vào Tài khoản Google"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Thêm dấu trang Android của bạn vào dấu trang cho <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
<string name="menu_share_url" msgid="5851814357333739700">"Chia sẻ"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"Không có thêm tab nào"</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"Google với tính năng Instant (Labs)"</string>
</resources>
diff --git a/res/values-xlarge-port/dimensions.xml b/res/values-xlarge-port/dimensions.xml
index f891396..7c0d447 100644
--- a/res/values-xlarge-port/dimensions.xml
+++ b/res/values-xlarge-port/dimensions.xml
@@ -12,8 +12,8 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<dimen name="widgetThumbnailHeight">84dip</dimen>
- <dimen name="widgetHorizontalSpacing">10dip</dimen>
- <dimen name="widgetVerticalSpacing">10dip</dimen>
+ <dimen name="widgetHorizontalSpacing">6dip</dimen>
+ <dimen name="widgetVerticalSpacing">6dip</dimen>
<dimen name="combo_paddingLeftRight">16dip</dimen>
<dimen name="combo_horizontalSpacing">8dip</dimen>
</resources>
diff --git a/res/values-xlarge/dimensions.xml b/res/values-xlarge/dimensions.xml
index 613c133..2549818 100644
--- a/res/values-xlarge/dimensions.xml
+++ b/res/values-xlarge/dimensions.xml
@@ -14,8 +14,8 @@
<dimen name="bookmarkThumbnailWidth">180dip</dimen>
<dimen name="bookmarkThumbnailHeight">120dip</dimen>
<dimen name="widgetThumbnailHeight">104dip</dimen>
- <dimen name="widgetHorizontalSpacing">14dip</dimen>
- <dimen name="widgetVerticalSpacing">12dip</dimen>
+ <dimen name="widgetHorizontalSpacing">6dip</dimen>
+ <dimen name="widgetVerticalSpacing">6dip</dimen>
<dimen name="favicon_padded_size">28dip</dimen>
<dimen name="add_bookmark_width">500dip</dimen>
<!-- For the most visited page -->
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 4cf62fd..93e541a 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"浏览器"</string>
<string name="choose_upload" msgid="3649366287575002063">"选择要上传的文件"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"文件上传功能已停用。"</string>
<string name="new_tab" msgid="4505722538297295141">"新窗口"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"新隐身窗口"</string>
<string name="active_tabs" msgid="3050623868203544623">"窗口"</string>
@@ -99,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"列表"</string>
<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>
<string name="open_all_in_new_window" msgid="6514602245828366045">"在新窗口中打开全部书签"</string>
<string name="goto_dot" msgid="3895839050522602723">"转至"</string>
<string name="incognito_tab" msgid="5419458065370134289">"打开新的隐身标签页"</string>
@@ -112,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"下载内容"</string>
<string name="copy_page_url" msgid="7635062169011319208">"复制网页网址"</string>
<string name="share_page" msgid="593756995297268343">"分享网页"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"另存为网络存档"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"网络存档已保存。"</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"保存网络存档失败。"</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"保存网页"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"网页已保存。"</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"保存网页时失败。"</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"<xliff:g id="BOOKMARK_COUNT">%d</xliff:g> 个书签"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"空文件夹"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"打开"</string>
@@ -139,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"网页内容设置"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"载入图片"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"显示网页上的图片"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"阻止弹出式窗口"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"阻止弹出式窗口"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"启用 JavaScript"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"在后方打开"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"启用插件"</string>
@@ -149,7 +147,7 @@
<item msgid="8547442717307793863">"关"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"在当前窗口后方打开新窗口"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"设置主页"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"设置主页"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"设置搜索引擎"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"选择搜索引擎"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"设置为..."</string>
@@ -160,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"调整网页版面以适合屏幕大小"</string>
<string name="pref_general_title" msgid="1946872771219249323">"常规"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"同步"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"自动填充"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"自动填充"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"与谷歌浏览器同步"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"在 Android 浏览器和谷歌浏览器之间共享书签和其他数据"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"Google 帐户"</string>
@@ -168,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"在 Android 浏览器和谷歌浏览器之间同步书签"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"开始同步"</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"选择要与其共享数据的 Google 帐户"</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"表单自动填充"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"表单自动填充"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"只需点击一下，即可填完网络表单"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"自动填充设置"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"设置和管理自动填充表单的数据"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"自动填充数据"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"输入并保存网络表单自动填充字段的数据"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"自动登录 Google"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"未找到帐户"</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"使用 <xliff:g id="ID_1">%s</xliff:g> 自动登录 Google 网站"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"使用 <xliff:g id="ID_1">%s</xliff:g> 登录 Google 网站"\n"您的“隐私权与安全”设置会控制 Google 自动登录功能"</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"不自动登录"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"只需点击一下，自动填充功能即可使用您的个人资料帮助您完成网络表单。"</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"使用 <xliff:g id="ID_1">%s</xliff:g> 登录 Google 网站"\n"Google 自动登录功能是由“隐私和安全”设置控制的"</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"自动登录已可使用。"</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"登录"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"登录失败。"</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"请在网络字段中输入希望触摸时自动填充的数据。"</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"全名："</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"电子邮件地址："</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"公司名称："</string>
@@ -196,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"个人资料已删除"</string>
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"删除个人资料"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"浏览器可自动填充网络表单（例如该表单）。您希望设置个人资料吗？"</string>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"您可以随时通过“浏览器设置”对自动填充功能进行配置。"</string>
- <string name="disable_autofill" msgid="3706426217720202898">"停用自动填充"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"隐私与安全"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"您可以随时通过“浏览器设置”对自动填充功能进行配置。"</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"停用自动填充"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"隐私和安全"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"清除缓存"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"清除存储在本地缓存中的内容和数据库"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"此操作将会刪除存储在本地缓存中的内容和数据库。"</string>
@@ -271,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"文字编码"</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>
- <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"“访问最多”首页"</string>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"设置您的主页，以显示访问最多的页面。"</string>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"快速控制"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"从左边缘或右边缘滑动拇指即可访问快速控制并隐藏应用程序和网址栏"</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"“最常访问的网页”主页"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"您的主页会显示最常访问的网页。"</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Google 即搜即得"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"借助 Google 即搜即得，您可以在使用 Google 搜索时一边键入内容一边查看结果（此功能可能会增加数据使用量）。"</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"数据连接性问题"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"文件有问题"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"确认"</string>
@@ -371,11 +367,19 @@
<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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"该设备上的书签尚未与 Google 帐户关联。可以通过将这些书签添加到帐户以进行保存。如果不希望同步书签，请将书签删除。"</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"添加当前设备上的书签，并开始与 Google 帐户同步"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"删除当前设备上的书签，并开始与 Google 帐户同步"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"删除当前设备上的书签，并开始与 <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g> 的书签同步。"</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"添加当前设备上的书签，并开始与 <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g> 的书签同步。"</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"删除书签"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"下一页"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"上一页"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"取消"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"完成"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"将书签添加到 Google 帐户"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"将 Android 书签添加到 <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g> 的书签中"</string>
<string name="menu_share_url" msgid="5851814357333739700">"分享"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"没有更多标签可用"</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"具有即搜即得功能的 Google（实验室）"</string>
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 3f4c88e..394d5b9 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -18,8 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"瀏覽器"</string>
<string name="choose_upload" msgid="3649366287575002063">"選擇要上載的檔案"</string>
- <!-- no translation found for uploads_disabled (463761197575372994) -->
- <skip />
+ <string name="uploads_disabled" msgid="463761197575372994">"檔案上傳功能已停用。"</string>
<string name="new_tab" msgid="4505722538297295141">"新視窗"</string>
<string name="new_incognito_tab" msgid="5821404839654751753">"新的無痕式視窗"</string>
<string name="active_tabs" msgid="3050623868203544623">"視窗"</string>
@@ -99,7 +98,6 @@
<string name="bookmark_list_view" msgid="7848510619500937839">"清單"</string>
<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>
<string name="open_all_in_new_window" msgid="6514602245828366045">"於新視窗開啟所有書籤"</string>
<string name="goto_dot" msgid="3895839050522602723">"前往"</string>
<string name="incognito_tab" msgid="5419458065370134289">"開啟新的無痕式分頁"</string>
@@ -112,9 +110,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"下載"</string>
<string name="copy_page_url" msgid="7635062169011319208">"複製網頁網址"</string>
<string name="share_page" msgid="593756995297268343">"分享網頁"</string>
- <!-- outdated translation 8958653585486282458 --> <string name="menu_save_webarchive" msgid="2474117375302625691">"另存為網頁封存"</string>
- <!-- outdated translation 5802751653711363507 --> <string name="webarchive_saved" msgid="2212053339474523406">"已儲存網頁封存。"</string>
- <!-- outdated translation 2203934475956524304 --> <string name="webarchive_failed" msgid="19950914584285713">"無法儲存網頁封存。"</string>
+ <string name="menu_save_webarchive" msgid="2474117375302625691">"儲存網頁"</string>
+ <string name="webarchive_saved" msgid="2212053339474523406">"網頁已儲存。"</string>
+ <string name="webarchive_failed" msgid="19950914584285713">"無法儲存網頁。"</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"<xliff:g id="BOOKMARK_COUNT">%d</xliff:g> 個書籤"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"空資料夾"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"開啟"</string>
@@ -139,7 +137,7 @@
<string name="pref_content_title" msgid="722227111894838633">"頁面內容設定"</string>
<string name="pref_content_load_images" msgid="2125616852957377561">"載入圖片"</string>
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"顯示網頁上的圖片"</string>
- <string name="pref_content_block_popups" msgid="7808433807197256726">"封鎖快顯視窗"</string>
+ <string name="pref_content_block_popups" msgid="4158524847764470895">"封鎖彈出式視窗"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"啟用 JavaScript"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"在背景中開啟"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"啟用外掛程式"</string>
@@ -149,7 +147,7 @@
<item msgid="8547442717307793863">"關閉"</item>
</string-array>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"在目前視窗的後面開啟新視窗"</string>
- <string name="pref_content_homepage" msgid="6082437160778559806">"設定首頁"</string>
+ <string name="pref_content_homepage" msgid="3324574611613105696">"設定首頁"</string>
<string name="pref_content_search_engine" msgid="1620101310821644144">"設定搜尋引擎"</string>
<string name="pref_content_search_engine_summary" msgid="5162667665858487316">"選取搜尋引擎"</string>
<string name="pref_set_homepage_to" msgid="7196350233061395098">"設為..."</string>
@@ -160,7 +158,7 @@
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"配合螢幕大小調整網頁版面"</string>
<string name="pref_general_title" msgid="1946872771219249323">"一般設定"</string>
<string name="pref_general_sync_title" msgid="3138637035975860324">"同步處理"</string>
- <string name="pref_general_autofill_title" msgid="64638897890112873">"自動填入功能"</string>
+ <string name="pref_general_autofill_title" msgid="547881256865816858">"自動填入"</string>
<string name="pref_personal_sync_with_chrome" msgid="1695182180332194033">"與Google 瀏覽器保持同步"</string>
<string name="pref_personal_sync_with_chrome_summary" msgid="7414133931827321055">"共享「Android 瀏覽器」和「Google 瀏覽器」之間的書籤及其他資料"</string>
<string name="pref_personal_google_account" msgid="952360133341490071">"Google 帳戶"</string>
@@ -168,16 +166,16 @@
<string name="pref_personal_sync_bookmarks_summary" msgid="4791767605662205482">"同步處理「Android 瀏覽器」和「Google 瀏覽器」之間的書籤"</string>
<string name="pref_personal_start_syncing" msgid="6046972042512655232">"開始同步"</string>
<string name="pref_personal_account_dialog_title" msgid="1390867119887955530">"請選取要與其共用的 Google 帳戶"</string>
- <string name="pref_autofill_enabled" msgid="1174197447388234595">"表單自動填入"</string>
+ <string name="pref_autofill_enabled" msgid="1015751713312396713">"表單自動填入"</string>
<string name="pref_autofill_enabled_summary" msgid="422640696197018914">"輕按一下即可填妥網頁表單"</string>
- <string name="pref_autofill_profile_editor" msgid="1350709161524642663">"自動填入設定"</string>
- <string name="pref_autofill_profile_editor_summary" msgid="6748434431641768870">"設定和管理自動填入的表單資料"</string>
+ <string name="pref_autofill_profile_editor" msgid="3864116896052437796">"自動填入資料"</string>
+ <string name="pref_autofill_profile_editor_summary" msgid="3653552312512743181">"輸入並儲存資料，以供自動填入表單欄位時使用"</string>
<string name="pref_autologin_title" msgid="2362827272595366379">"自動登入 Google"</string>
- <string name="pref_autologin_no_account" msgid="4409223615542478868">"找不到帳戶"</string>
- <string name="pref_autologin_summary" msgid="8168866316823968574">"自動使用 <xliff:g id="ID_1">%s</xliff:g> 登入 Google 網站"</string>
- <string name="pref_autologin_progress" msgid="8643826219376543293">"使用 <xliff:g id="ID_1">%s</xliff:g> 登入 Google 網站"\n"可讓您運用「隱私權與安全性」設定來控制 Google 自動登入程序"</string>
- <string name="pref_autologin_disable" msgid="3342145058494577628">"不要自動登入"</string>
- <string name="autofill_profile_editor_heading" msgid="5009490178189728877">"自動填入功能會運用您的設定檔，讓您輕按一下即可填妥網頁表單。"</string>
+ <string name="pref_autologin_progress" msgid="4975430912641403743">"使用 <xliff:g id="ID_1">%s</xliff:g> 登入 Google 網站"\n"可讓您運用「隱私權與安全性」設定來控制 Google 自動登入程序"</string>
+ <string name="autologin_bar_text" msgid="8013977161879448141">"可讓您自動登入。"</string>
+ <string name="autologin_bar_login_text" msgid="7052816600314556734">"登入"</string>
+ <string name="autologin_bar_error" msgid="5132514366023044839">"登入失敗。"</string>
+ <string name="autofill_profile_editor_heading" msgid="8392952553626722083">"輸入您輕觸網頁欄位時要自動填入的資料。"</string>
<string name="autofill_profile_editor_name" msgid="8566130291459685955">"全名："</string>
<string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"電子郵件："</string>
<string name="autofill_profile_editor_company_name" msgid="2813443159949210417">"公司名稱："</string>
@@ -196,9 +194,9 @@
<string name="autofill_profile_successful_delete" msgid="2421442112954362732">"個人資料已刪除"</string>
<string name="autofill_profile_editor_delete_profile" msgid="2754563301088418752">"刪除設定檔"</string>
<string name="autofill_setup_dialog_message" msgid="6605682320156223114">"瀏覽器可以自動填寫這類網路表單，您要建立個人資料嗎？"</string>
- <string name="autofill_setup_dialog_negative_toast" msgid="4337372830506338827">"您可隨時透過 [瀏覽器設定] 設定自動填入功能。"</string>
- <string name="disable_autofill" msgid="3706426217720202898">"停用自動填入功能"</string>
- <string name="pref_privacy_security_title" msgid="1705642466867300373">"隱私權與安全性"</string>
+ <string name="autofill_setup_dialog_negative_toast" msgid="6990737008936188620">"您可隨時透過 [瀏覽器設定] 設定自動填入功能。"</string>
+ <string name="disable_autofill" msgid="8305901059849400354">"停用自動填入功能"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"隱私權與安全性"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"清除快取"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"清除本機快取內容與資料庫"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="5541011591300753881">"即將刪除本機快取內容與資料庫。"</string>
@@ -271,14 +269,12 @@
</string-array>
<string name="pref_default_text_encoding_dialogtitle" msgid="5508255018084978547">"文字編碼"</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>
- <string name="pref_lab_most_visited_homepage" msgid="547134501893835512">"以造訪最多的網頁為首頁"</string>
- <string name="pref_lab_most_visited_homepage_summary" msgid="6857702350834122532">"將造訪次數最多的網頁設為您要顯示的首頁。"</string>
- <!-- no translation found for pref_use_instant_search (7216222748559622611) -->
- <skip />
- <!-- no translation found for pref_use_instant_search_summary (768187623253522262) -->
- <skip />
+ <string name="pref_lab_quick_controls" msgid="3267606522082281367">"快速控制項"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="1564546156544675707">"於左右邊緣滑動拇指即可使用快速控制項，以及隱藏應用程式列和網址列"</string>
+ <string name="pref_lab_most_visited_homepage" msgid="7597766876952506909">"最常瀏覽首頁"</string>
+ <string name="pref_lab_most_visited_homepage_summary" msgid="4132511544800457513">"首頁會顯示您最常瀏覽的網頁。"</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Google 互動智慧搜尋"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"使用「Google 搜尋」時啟用「Google 互動智慧搜尋」功能，即可在您輸入查詢時即時顯示搜尋結果 (這會增加資料傳輸量)。"</string>
<string name="browserFrameNetworkErrorLabel" msgid="126892350904924893">"資料連線問題"</string>
<string name="browserFrameFileErrorLabel" msgid="8063691502792670367">"檔案有問題"</string>
<string name="browserFrameFormResubmitLabel" msgid="2685923472682180360">"確認"</string>
@@ -371,11 +367,19 @@
<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>
+ <string name="import_bookmarks_dialog_description" msgid="1942452375564381488">"這個裝置上的書籤尚未與 Google 帳戶建立關聯。您可將這些書籤新增至帳戶中加以儲存；如果您不想同步處理這些書籤，只需將其刪除即可。"</string>
+ <string name="import_bookmarks_dialog_select_add_account" msgid="3102882579089291099">"新增這個裝置上現有的書籤，並開始與 Google 帳戶保持同步"</string>
+ <string name="import_bookmarks_dialog_delete_select_account" msgid="5192284761080626386">"刪除這個裝置上現有的書籤，並開始與 Google 帳戶保持同步"</string>
+ <string name="import_bookmarks_dialog_confirm_delete" msgid="8854001080444749211">"刪除這個裝置上現有的書籤，並開始與 <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g> 的書籤保持同步。"</string>
+ <string name="import_bookmarks_dialog_confirm_add" msgid="5433677293195372675">"新增這個裝置上現有的書籤，並開始與 <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g> 的書籤保持同步。"</string>
+ <string name="import_bookmarks_dialog_remove" msgid="5984607822851800902">"刪除書籤"</string>
+ <string name="import_bookmarks_wizard_next" msgid="7578143961884352676">"繼續"</string>
+ <string name="import_bookmarks_wizard_previous" msgid="8551440353688257031">"返回"</string>
+ <string name="import_bookmarks_wizard_cancel" msgid="4936061122806506634">"取消"</string>
+ <string name="import_bookmarks_wizard_done" msgid="1446247092194489191">"完成"</string>
+ <string name="import_bookmarks_dialog_add" msgid="7552306756868669353">"將書籤新增至 Google 帳戶中"</string>
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"將您的 Android 書籤新增至 <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g> 的書籤"</string>
<string name="menu_share_url" msgid="5851814357333739700">"分享"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"已無分頁可供使用"</string>
- <!-- no translation found for instant_search_label (8769284297650716935) -->
- <skip />
+ <string name="instant_search_label" msgid="8769284297650716935">"使用 Google 互動智慧搜尋 (研究室)"</string>
</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 6fa0840..6a7c578 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -29,10 +29,11 @@
<color name="bookmarkWidgetDivider">#383847</color>
<color name="bookmarkWidgetItemBackground">#2b2b3c</color>
<color name="bookmarkWidgetFolderBackground">#A0383847</color>
- <color name="qc_slice_normal">#E0A0A0A0</color>
- <color name="qc_slice_active">#E02090FF</color>
<color name="bookmarkWidgetFaviconBackground">#23ffffff</color>
<color name="bookmarkListFaviconBackground">#23ffffff</color>
<color name="tabFaviconBackground">#FF555555</color>
<color name="tabFocusHighlight">#FF99CC00</color>
+ <color name="qcMenuBackground">#C0000000</color>
+ <color name="qc_normal">#C02447B2</color>
+ <color name="qc_selected">#D0102052</color>
</resources>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index 5054254..99eb43e 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -30,9 +30,14 @@
<dimen name="widgetItemMinHeight">48dip</dimen>
<dimen name="favicon_size">16dip</dimen>
<dimen name="favicon_padded_size">20dip</dimen>
- <dimen name="qc_radius">130dip</dimen>
- <dimen name="qc_radius_inc">100dip</dimen>
+ <dimen name="qc_radius_start">50dip</dimen>
+ <dimen name="qc_radius_increment">70dip</dimen>
<dimen name="qc_slop">15dip</dimen>
+ <dimen name="qc_touch_offset">15dip</dimen>
+ <dimen name="qc_tab_title_height">30dip</dimen>
+ <dimen name="qc_thumb_width">240dip</dimen>
+ <dimen name="qc_thumb_height">160dip</dimen>
+ <dimen name="qc_item_size">48dip</dimen>
<dimen name="bookmark_widget_thumb_size">32dip</dimen>
<dimen name="bookmark_widget_favicon_size">26dip</dimen>
<!-- For the most visited page -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 28fe407..e754ea9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -207,8 +207,6 @@
<!-- Confirmation dialog message confirming that the user wishes to delete
the bookmark they selected for deletion -->
<string name="delete_bookmark_warning">Bookmark \"<xliff:g id="bookmark">%s</xliff:g>\" will be deleted.</string>
- <!-- Context Menu item to open the selected link in a new window -->
- <string name="open_in_new_window">Open in new window</string>
<!-- Context menu item to open every bookmark in a folder in new windows [CHAR LIMIT=50] -->
<string name="open_all_in_new_window">Open all in new windows</string>
<!-- Menu item to open a dialog which allows the user to enter a url or do search-->
@@ -310,8 +308,8 @@
<string name="pref_content_load_images">Load images</string>
<!-- Settings label -->
<string name="pref_content_load_images_summary">Display images on web pages</string>
- <!-- Settings label -->
- <string name="pref_content_block_popups">Block pop-up windows</string>
+ <!-- Settings label [CHAR LIMIT=30] -->
+ <string name="pref_content_block_popups">Block pop-ups</string>
<!-- Settings label -->
<string name="pref_content_javascript">Enable JavaScript</string>
<!-- Settings label -->
@@ -331,8 +329,8 @@
</string-array>
<!-- Settings summary [CHAR LIMIT=50]-->
<string name="pref_content_open_in_background_summary">Open new windows behind the current one</string>
- <!-- Settings label -->
- <string name="pref_content_homepage">Set home page</string>
+ <!-- Settings label [CHAR LIMIT=50] -->
+ <string name="pref_content_homepage">Set homepage</string>
<!-- Settings label -->
<string name="pref_content_search_engine">Set search engine</string>
<!-- Settings summary -->
@@ -356,7 +354,7 @@
<!-- Settings category for sync under general settings. This includes bookmark sync with Chrome [CHAR-LIMIT=50] -->
<string name="pref_general_sync_title">Sync</string>
<!-- Settings category for autofill under general. [CHAR-LIMIT=50] -->
- <string name="pref_general_autofill_title">Autofill</string>
+ <string name="pref_general_autofill_title">Auto-fill</string>
<!-- Checkbox setting to enable or disable syncing bookmarks and other data with Google Chrome. [CHAR-LIMIT=48] -->
<string name="pref_personal_sync_with_chrome">Sync with Google Chrome</string>
<!-- Checkbox setting to enable or disable syncing bookmarks and other data with Google Chrome. [CHAR-LIMIT=none] -->
@@ -373,27 +371,27 @@
<string name="pref_personal_account_dialog_title">Select Google account to share with</string>
<!-- Checkbox setting for enabling/disabling the form AutoFill feature [CHAR-LIMIT=32] -->
- <string name="pref_autofill_enabled">Form AutoFill</string>
+ <string name="pref_autofill_enabled">Form auto-fill</string>
<!-- Settings summary for the form AutoFill feature. [CHAR-LIMIT=none] -->
<string name="pref_autofill_enabled_summary">Fill out web forms in a single click</string>
<!-- Label for option that when clicked opens the AutoFill settings screen. Also used as the title of that AutoFill Settings screen. [CHAR-LIMIT=32] -->
- <string name="pref_autofill_profile_editor">AutoFill Settings</string>
+ <string name="pref_autofill_profile_editor">Auto-fill data</string>
<!-- Summary for the AutoFill Settings preference [CHAR-LIMIT=none] -->
- <string name="pref_autofill_profile_editor_summary">Set up & manage data for AutoFilled forms</string>
+ <string name="pref_autofill_profile_editor_summary">Enter and save data for auto-filling web form fields</string>
<!-- Auto login preference title [CHAR-LIMIT=32] -->
<string name="pref_autologin_title">Automatic Google sign-in</string>
- <!-- Summary when no accounts are found [CHAR-LIMIT=32] -->
- <string name="pref_autologin_no_account">No accounts found</string>
- <!-- Summary when there is an account available [CHAR-LIMIT=none] -->
- <string name="pref_autologin_summary">Sign into Google sites automatically using <xliff:g>%s</xliff:g></string>
<!-- Message shown during auto login [CHAR-LIMIT=none] -->
- <string name="pref_autologin_progress">Signing into Google sites using <xliff:g>%s</xliff:g>\nYour Privacy & Security settings control automatic Google sign-in</string>
- <!-- Option in account list to disable autologin [CHAR-LIMIT=50] -->
- <string name="pref_autologin_disable">Don\'t sign in automatically</string>
+ <string name="pref_autologin_progress">Signing into Google sites using <xliff:g>%s</xliff:g></string>
+ <!-- Auto-login bar description [CHAR-LIMIT=40] -->
+ <string name="autologin_bar_text">Automatic sign-in is available.</string>
+ <!-- Login button [CHAR-LIMIT=10] -->
+ <string name="autologin_bar_login_text">Login</string>
+ <!-- Login failure text [CHAR-LIMIT=25] -->
+ <string name="autologin_bar_error">Login failed.</string>
<!-- Heading for the AutoFill profile editor to tell the user what AutoFill does and why they should fill out the profile. [CHAR-LIMIT=None] -->
- <string name="autofill_profile_editor_heading">AutoFill will use your profile to help you complete web forms in a single click.</string>
+ <string name="autofill_profile_editor_heading">Enter the data you want to auto-fill in web fields when you touch them.</string>
<!-- String for the user's full name in the AutoFill profile editor. [CHAR-LIMIT=32] -->
<string name="autofill_profile_editor_name">Full name:</string>
<!-- String for the user's e-mail address in the AutoFill profile editor. [CHAR-LIMIT=32] -->
@@ -434,13 +432,13 @@
<string name="autofill_setup_dialog_message">Browser can automatically complete web forms like this one. Would you like to set up your profile?</string>
<!-- Toast message displayed when the user decides to not set up autofill at this time. We want to remind them that they can configure
it through the Browser Settings menu. [CHAR-LIMIT=NONE] -->
- <string name="autofill_setup_dialog_negative_toast">AutoFill can always be configured through Browser Settings.</string>
+ <string name="autofill_setup_dialog_negative_toast">Auto-fill can always be configured through Browser Settings.</string>
<!-- Text on a checkbox in the "setup autofill" dialog which is shown to the user when they are prompted to set up the autofill feature.
The checkbox allows them to specify they would like to disable the feature altogether [CHAR-LIMIT=NONE] -->
- <string name="disable_autofill">Disable AutoFill</string>
+ <string name="disable_autofill">Disable auto-fill</string>
<!-- Settings screen, section title [CHAR-LIMIT=50] -->
- <string name="pref_privacy_security_title">Privacy & Security</string>
+ <string name="pref_privacy_security_title">Privacy & security</string>
<!-- Settings label -->
<string name="pref_privacy_clear_cache">Clear cache</string>
<!-- Settings summary -->
@@ -630,21 +628,21 @@
<!-- Title for lab settings [CHAR LIMIT=25] -->
<string name="pref_lab_title">Labs</string>
<!-- Title for lab quick controls feature [CHAR LIMIT=40] -->
- <string name="pref_lab_quick_controls">Quick Controls</string>
+ <string name="pref_lab_quick_controls">Quick controls</string>
<!-- Summary for lab quick controls feature [CHAR LIMIT=80] -->
<string name="pref_lab_quick_controls_summary">
- Swipe thumb from left or right edge to access quick controls</string>
+ Swipe thumb from left or right edge to access quick controls and hide Application and URL bars</string>
<!-- Title for lab "Most Visited" homepage feature [CHAR LIMIT=40] -->
- <string name="pref_lab_most_visited_homepage">Most Visited Homepage</string>
+ <string name="pref_lab_most_visited_homepage">Most-visited homepage</string>
<!-- Summary for lab "Most Visited" homepage feature [CHAR LIMIT=80] -->
<string name="pref_lab_most_visited_homepage_summary">
- Sets your homepage to show the most visited pages.</string>
+ Your homepage displays your most-visited webpages.</string>
<!-- Title for the "Instant search" lab feature [CHAR LIMIT=40] -->
- <string name="pref_use_instant_search">Use Instant Search</string>
+ <string name="pref_use_instant_search">Google Instant</string>
<!-- Summary for the "Instant search" lab feature [CHAR LIMIT=120] -->
<string name="pref_use_instant_search_summary">
- Enable instant for faster searching and browsing. This might result
- in higher data and bandwidth usage.</string>
+ Use Google Instant when you use Google Search, to show results as you
+ type (this can increase data use).</string>
<!-- Title for a dialog displayed when the browser has a data connectivity
problem -->
<string name="browserFrameNetworkErrorLabel">Data connectivity problem</string>
@@ -929,10 +927,37 @@
<string name="import_bookmarks_dialog_title">Sync with Google account</string>
<!-- Description for a dialog asking the user what they want to do with their bookmarks when adding a sync account [CHAR-LIMIT=none] -->
- <string name="import_bookmarks_dialog_description">Your Android bookmarks are not associated with a Google account</string>
+ <string name="import_bookmarks_dialog_description">Bookmarks on this device are not yet associated with a Google account. Save these bookmarks by adding them to an account. Delete these bookmarks if you do not want to sync them.</string>
+
+ <!-- Description for selecting the account to add bookmarks to and begin syncing with [CHAR-LIMIT=none] -->
+ <string name="import_bookmarks_dialog_select_add_account">Add bookmarks currently on this device and begin syncing with Google Account</string>
+
+ <!-- Description for selecting the account to sync with and delete local bookmarks [CHAR-LIMIT=none] -->
+ <string name="import_bookmarks_dialog_delete_select_account">Delete bookmarks currently on this device and begin synchronizing with Google Account</string>
+
+ <!-- Description confirming user's choice to delete bookmarks [CHAR-LIMIT=none] -->
+ <string name="import_bookmarks_dialog_confirm_delete">Delete bookmarks currently on this device and begin synchronizing bookmarks with <xliff:g id="Google account" example="account@example.com">%s</xliff:g>.</string>
+
+ <!-- Description confirming user's choice to add bookmarks to an account [CHAR-LIMIT=none] -->
+ <string name="import_bookmarks_dialog_confirm_add">Add bookmarks currently on this device and begin synchronizing bookmarks with <xliff:g id="Google account" example="account@example.com">%s</xliff:g>.</string>
<!-- Button allowing users to remove all of their existing bookmarks when setting up syncing with their bookmarks stored in Google Chrome [CHAR-LIMIT=64] -->
- <string name="import_bookmarks_dialog_remove">Remove your Android bookmarks</string>
+ <string name="import_bookmarks_dialog_remove">Delete bookmarks</string>
+
+ <!-- Sync bookmarks wizard option to go to the next screen [CHAR-LIMIT=30] -->
+ <string name="import_bookmarks_wizard_next">Next</string>
+
+ <!-- Sync bookmarks wizard option to go to the previous screen [CHAR-LIMIT=30] -->
+ <string name="import_bookmarks_wizard_previous">Previous</string>
+
+ <!-- Sync bookmarks wizard option to cancel sync setup [CHAR-LIMIT=30] -->
+ <string name="import_bookmarks_wizard_cancel">Cancel</string>
+
+ <!-- Sync bookmarks wizard option to finish sync setup [CHAR-LIMIT=30] -->
+ <string name="import_bookmarks_wizard_done">Done</string>
+
+ <!-- Button allowing users to import all of their existing bookmarks into an account when setting up syncing with their bookmarks stored in Google Chrome [CHAR-LIMIT=64] -->
+ <string name="import_bookmarks_dialog_add">Add bookmarks to Google Account</string>
<!-- Button allowing users to import all of their existing bookmarks into an account when setting up syncing with their bookmarks stored in Google Chrome [CHAR-LIMIT=64] -->
<string name="import_bookmarks_dialog_import">Add your Android bookmarks to bookmarks for <xliff:g id="Google account" example="account@example.com">%s</xliff:g></string>
diff --git a/res/xml/privacy_security_preferences.xml b/res/xml/privacy_security_preferences.xml
index 9bff4b8..50802ca 100644
--- a/res/xml/privacy_security_preferences.xml
+++ b/res/xml/privacy_security_preferences.xml
@@ -39,10 +39,6 @@
android:title="@string/pref_security_show_security_warning"
android:summary="@string/pref_security_show_security_warning_summary" />
- <ListPreference
- android:key="autologin_account"
- android:title="@string/pref_autologin_title" />
-
<PreferenceCategory android:title="@string/pref_privacy_cookies_title">
<CheckBoxPreference
android:key="accept_cookies"
diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index c01ec06..71346ae 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -240,6 +240,7 @@
onProgressChanged(tab);
boolean incognito = mActiveTab.getWebView().isPrivateBrowsingEnabled();
getTitleBar().setIncognitoMode(incognito);
+ updateAutoLogin(tab, false);
}
Tab getActiveTab() {
@@ -468,6 +469,10 @@
mContentView.addView(mComboView, COVER_SCREEN_PARAMS);
}
+ public boolean isComboViewShowing() {
+ return (mComboView != null);
+ }
+
/**
* dismiss the ComboPage
*/
@@ -542,11 +547,23 @@
&& mComboView == null;
}
+ @Override
+ public void showAutoLogin(Tab tab) {
+ updateAutoLogin(tab, true);
+ }
+
+ @Override
+ public void hideAutoLogin(Tab tab) {
+ updateAutoLogin(tab, true);
+ }
+
// -------------------------------------------------------------------------
protected void updateNavigationState(Tab tab) {
}
+ protected void updateAutoLogin(Tab tab, boolean animate) {}
+
/**
* Update the lock icon to correspond to our latest state.
*/
@@ -612,6 +629,11 @@
// menu handling callbacks
@Override
+ public boolean onPrepareOptionsMenu(Menu menu) {
+ return true;
+ }
+
+ @Override
public void onOptionsMenuOpened() {
}
diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java
index 98b25a8..de28d0d 100644
--- a/src/com/android/browser/BrowserBookmarksPage.java
+++ b/src/com/android/browser/BrowserBookmarksPage.java
@@ -453,7 +453,7 @@
}
private void loadUrl(int position) {
- if (mCallbacks != null) {
+ if (mCallbacks != null && mAdapter != null) {
mCallbacks.onBookmarkSelected(mAdapter.getItem(position), false);
}
}
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 75e0cfb..357d1e9 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -92,9 +92,6 @@
private String databasePath; // default value set in loadFromDb()
private String geolocationDatabasePath; // default value set in loadFromDb()
private WebStorageSizeManager webStorageSizeManager;
- // Autologin settings
- private boolean autoLoginEnabled;
- private String autoLoginAccount;
private String jsFlags = "";
@@ -168,8 +165,6 @@
public final static String PREF_QUICK_CONTROLS = "enable_quick_controls";
public final static String PREF_MOST_VISITED_HOMEPAGE = "use_most_visited_homepage";
- public final static String PREF_AUTOLOGIN = "enable_autologin";
- public final static String PREF_AUTOLOGIN_ACCOUNT = "autologin_account";
public final static String PREF_PLUGIN_STATE = "plugin_state";
public final static String PREF_USE_INSTANT = "use_instant_search";
@@ -537,11 +532,6 @@
geolocationEnabled = p.getBoolean("enable_geolocation", geolocationEnabled);
workersEnabled = p.getBoolean("enable_workers", workersEnabled);
- // Autologin account settings. The account preference may be null until
- // the user explicitly changes the account in the settings.
- autoLoginEnabled = p.getBoolean(PREF_AUTOLOGIN, autoLoginEnabled);
- autoLoginAccount = p.getString(PREF_AUTOLOGIN_ACCOUNT, autoLoginAccount);
-
update();
}
@@ -632,32 +622,6 @@
update();
}
- public boolean isAutoLoginEnabled() {
- return autoLoginEnabled;
- }
-
- public String getAutoLoginAccount(Context context) {
- // Each time we attempt to get the account, we need to verify that the
- // account is still valid.
- return GoogleAccountLogin.validateAccount(context, autoLoginAccount);
- }
-
- public void setAutoLoginAccount(Context context, String name) {
- Editor ed = PreferenceManager.
- getDefaultSharedPreferences(context).edit();
- ed.putString(PREF_AUTOLOGIN_ACCOUNT, name);
- ed.apply();
- autoLoginAccount = name;
- }
-
- public void setAutoLoginEnabled(Context context, boolean enable) {
- Editor ed = PreferenceManager.
- getDefaultSharedPreferences(context).edit();
- ed.putBoolean(PREF_AUTOLOGIN, enable);
- ed.apply();
- autoLoginEnabled = enable;
- }
-
public void setAutoFillProfile(Context ctx, AutoFillProfile profile, Message msg) {
if (profile != null) {
setActiveAutoFillProfileId(ctx, profile.getUniqueId());
@@ -854,9 +818,6 @@
domStorageEnabled = true;
geolocationEnabled = true;
workersEnabled = true; // only affects V8. JSC does not have a similar setting
- // Autologin default is true. The account will be populated when
- // reading from the DB as that is when a context is available.
- autoLoginEnabled = true;
}
private abstract class AutoFillProfileDbTask<T> extends AsyncTask<T, Void, Void> {
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 9f614b0..a028882 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -161,9 +161,6 @@
private int mOldMenuState = EMPTY_MENU;
private Menu mCachedMenu;
- // Used to prevent chording to result in firing two shortcuts immediately
- // one after another. Fixes bug 1211714.
- boolean mCanChord;
private boolean mMenuIsDown;
// For select and find, we keep track of the ActionMode so that
@@ -279,7 +276,7 @@
CookieManager.getInstance().removeSessionCookie();
}
- GoogleAccountLogin.startLoginIfNeeded(mActivity, mSettings,
+ GoogleAccountLogin.startLoginIfNeeded(mActivity,
new Runnable() {
@Override public void run() {
start(icicle, intent, currentTab, restoreIncognitoTabs);
@@ -996,6 +993,19 @@
mPageDialogsHandler.showSSLCertificateOnError(view, handler, error);
}
+ @Override
+ public void showAutoLogin(Tab tab) {
+ assert tab.inForeground();
+ // Update the title bar to show the auto-login request.
+ mUi.showAutoLogin(tab);
+ }
+
+ @Override
+ public void hideAutoLogin(Tab tab) {
+ assert tab.inForeground();
+ mUi.hideAutoLogin(tab);
+ }
+
// helper method
/*
@@ -1412,9 +1422,6 @@
if (mOptionsMenuHandler != null) {
return mOptionsMenuHandler.onPrepareOptionsMenu(menu);
}
- // This happens when the user begins to hold down the menu key, so
- // allow them to chord to get a shortcut.
- mCanChord = true;
// Note: setVisible will decide whether an item is visible; while
// setEnabled() will decide whether an item is enabled, which also means
// whether the matching shortcut key will function.
@@ -1479,7 +1486,7 @@
break;
}
mCurrentMenuState = mMenuState;
- return true;
+ return mUi.onPrepareOptionsMenu(menu);
}
public boolean onOptionsItemSelected(MenuItem item) {
@@ -1493,11 +1500,6 @@
// if main menu option is selected
removeComboView();
}
- if (!mCanChord) {
- // The user has already fired a shortcut with this hold down of the
- // menu key.
- return false;
- }
if (null == getCurrentTopWebView()) {
return false;
}
@@ -1613,7 +1615,8 @@
new Thread("Add WebArchive to download manager") {
@Override
public void run() {
- manager.completedDownload(null == title ? value : title,
+ manager.addCompletedDownload(
+ null == title ? value : title,
value, true, "application/x-webarchive-xml",
value, length, true);
}
@@ -1640,7 +1643,6 @@
case R.id.share_page_menu_id:
Tab currentTab = mTabControl.getCurrentTab();
if (null == currentTab) {
- mCanChord = false;
return false;
}
shareCurrentPage(currentTab);
@@ -1692,7 +1694,6 @@
default:
return false;
}
- mCanChord = false;
return true;
}
@@ -1702,9 +1703,6 @@
return false;
}
- // chording is not an issue with context menus, but we use the same
- // options selector, so set mCanChord to true so we can access them.
- mCanChord = true;
int id = item.getItemId();
boolean result = true;
switch (id) {
@@ -1743,7 +1741,6 @@
// For other context menus
result = onOptionsItemSelected(item);
}
- mCanChord = false;
return result;
}
@@ -1930,6 +1927,13 @@
R.dimen.bookmarkThumbnailHeight);
}
+ static Bitmap createScreenshot(Tab tab, int width, int height) {
+ if ((tab != null) && (tab.getWebView() != null)) {
+ return createScreenshot(tab.getWebView(), width, height);
+ }
+ return null;
+ }
+
private static Bitmap createScreenshot(WebView view, int width, int height) {
// We render to a bitmap 2x the desired size so that we can then
// re-scale it with filtering since canvas.scale doesn't filter
@@ -1948,17 +1952,17 @@
int thumbnailWidth = thumbnail.getWidth();
int thumbnailHeight = thumbnail.getHeight();
float scaleFactor = 1.0f;
- if (thumbnailWidth > 0) {
+ if (thumbnailWidth > 0 && thumbnailHeight > 0) {
scaleFactor = (float) width / (float)thumbnailWidth;
} else {
return null;
}
- if (view.getWidth() > view.getHeight() &&
- thumbnailHeight < view.getHeight() && thumbnailHeight > 0) {
- // If the device is in landscape and the page is shorter
- // than the height of the view, center the thumnail and crop the sides
- scaleFactor = (float) height / (float)thumbnailHeight;
+ float scaleFactorY = (float) height / (float)thumbnailHeight;
+ if (scaleFactorY > scaleFactor) {
+ // The picture is narrower than the requested AR
+ // Center the thumnail and crop the sides
+ scaleFactor = scaleFactorY;
float wx = (thumbnailWidth * scaleFactor) - width;
canvas.translate((int) -(wx / 2), 0);
}
@@ -2208,17 +2212,9 @@
// animation behavior.
addTab(tab);
setActiveTab(tab);
-
- // Callback to load the url data.
- final Runnable load = new Runnable() {
- @Override public void run() {
- if (!urlData.isEmpty()) {
- loadUrlDataIn(tab, urlData);
- }
- }
- };
-
- GoogleAccountLogin.startLoginIfNeeded(mActivity, mSettings, load);
+ if (!urlData.isEmpty()) {
+ loadUrlDataIn(tab, urlData);
+ }
return tab;
} else {
// Get rid of the subwindow if it exists
@@ -2446,6 +2442,23 @@
}
/**
+ * helper method for key handler
+ * returns the current tab if it can't advance
+ */
+ private int getNextTabIndex() {
+ return Math.min(mTabControl.getTabCount() - 1,
+ mTabControl.getCurrentIndex() + 1);
+ }
+
+ /**
+ * helper method for key handler
+ * returns the current tab if it can't advance
+ */
+ private int getPrevTabIndex() {
+ return Math.max(0, mTabControl.getCurrentIndex() - 1);
+ }
+
+ /**
* handle key events in browser
*
* @param keyCode
@@ -2472,10 +2485,18 @@
boolean shift = event.hasModifiers(KeyEvent.META_SHIFT_ON);
switch(keyCode) {
- case KeyEvent.KEYCODE_ESCAPE:
- if (!noModifiers) break;
- stopLoading();
- return true;
+ case KeyEvent.KEYCODE_TAB:
+ if (event.isCtrlPressed()) {
+ if (event.isShiftPressed()) {
+ // prev tab
+ switchToTab(getPrevTabIndex());
+ } else {
+ // next tab
+ switchToTab(getNextTabIndex());
+ }
+ return true;
+ }
+ break;
case KeyEvent.KEYCODE_SPACE:
// WebView/WebTextView handle the keys in the KeyDown. As
// the Activity's shortcut keys are only handled when WebView
@@ -2545,7 +2566,12 @@
break;
// case KeyEvent.KEYCODE_U: // in Chrome: opens source of page
// case KeyEvent.KEYCODE_V: // text view intercepts to paste
-// case KeyEvent.KEYCODE_W: // menu
+ case KeyEvent.KEYCODE_W: // in Chrome: close tab
+ if (ctrl) {
+ closeCurrentTab();
+ return true;
+ }
+ break;
// case KeyEvent.KEYCODE_X: // text view intercepts to cut
// case KeyEvent.KEYCODE_Y: // unused
// case KeyEvent.KEYCODE_Z: // unused
diff --git a/src/com/android/browser/DeviceAccountLogin.java b/src/com/android/browser/DeviceAccountLogin.java
new file mode 100644
index 0000000..8d734c2
--- /dev/null
+++ b/src/com/android/browser/DeviceAccountLogin.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.browser;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.accounts.AccountManagerCallback;
+import android.accounts.AccountManagerFuture;
+import android.app.Activity;
+import android.os.Bundle;
+import android.webkit.WebView;
+
+public class DeviceAccountLogin implements
+ AccountManagerCallback<Bundle> {
+
+ private final Activity mActivity;
+ private final WebView mWebView;
+ private final Tab mTab;
+ private final WebViewController mWebViewController;
+ private final AccountManager mAccountManager;
+ Account[] mAccounts;
+ private AutoLoginCallback mCallback;
+ private String mAuthToken;
+
+ // Current state of the login.
+ private int mState = INITIAL;
+
+ public static final int INITIAL = 0;
+ public static final int FAILED = 1;
+ public static final int PROCESSING = 2;
+
+ public interface AutoLoginCallback {
+ public void loginFailed();
+ }
+
+ public DeviceAccountLogin(Activity activity, WebView view, Tab tab,
+ WebViewController controller) {
+ mActivity = activity;
+ mWebView = view;
+ mTab = tab;
+ mWebViewController = controller;
+ mAccountManager = AccountManager.get(activity);
+ }
+
+ public void handleLogin(String realm, String account, String args) {
+ mAccounts = mAccountManager.getAccountsByType(realm);
+ mAuthToken = "weblogin:" + args;
+
+ // No need to display UI if there are no accounts.
+ if (mAccounts.length == 0) {
+ return;
+ }
+
+ // Verify the account before using it.
+ for (Account a : mAccounts) {
+ if (a.name.equals(account)) {
+ // Handle the automatic login case where the service gave us an
+ // account to use.
+ mAccountManager.getAuthToken(a, mAuthToken, null,
+ mActivity, this, null);
+ return;
+ }
+ }
+
+ displayLoginUi();
+ }
+
+ @Override
+ public void run(AccountManagerFuture<Bundle> value) {
+ try {
+ String result = value.getResult().getString(
+ AccountManager.KEY_AUTHTOKEN);
+ if (result == null) {
+ loginFailed();
+ } else {
+ mWebView.loadUrl(result);
+ mTab.setDeviceAccountLogin(null);
+ if (mTab.inForeground()) {
+ mWebViewController.hideAutoLogin(mTab);
+ }
+ }
+ } catch (Exception e) {
+ loginFailed();
+ }
+ }
+
+ public int getState() {
+ return mState;
+ }
+
+ private void loginFailed() {
+ mState = FAILED;
+ if (mTab.getDeviceAccountLogin() == null) {
+ displayLoginUi();
+ } else {
+ if (mCallback != null) {
+ mCallback.loginFailed();
+ }
+ }
+ }
+
+ private void displayLoginUi() {
+ // Display the account picker.
+ mTab.setDeviceAccountLogin(this);
+ if (mTab.inForeground()) {
+ mWebViewController.showAutoLogin(mTab);
+ }
+ }
+
+ public void cancel() {
+ mTab.setDeviceAccountLogin(null);
+ }
+
+ public void login(int accountIndex, AutoLoginCallback cb) {
+ mState = PROCESSING;
+ mCallback = cb;
+ mAccountManager.getAuthToken(
+ mAccounts[accountIndex], mAuthToken, null,
+ mActivity, this, null);
+ }
+
+ public String[] getAccountNames() {
+ String[] names = new String[mAccounts.length];
+ for (int i = 0; i < mAccounts.length; i++) {
+ names[i] = mAccounts[i].name;
+ }
+ return names;
+ }
+}
diff --git a/src/com/android/browser/GoogleAccountLogin.java b/src/com/android/browser/GoogleAccountLogin.java
index f4ccfd1..0bde010 100644
--- a/src/com/android/browser/GoogleAccountLogin.java
+++ b/src/com/android/browser/GoogleAccountLogin.java
@@ -40,7 +40,6 @@
import android.os.Handler;
import android.preference.PreferenceManager;
import android.util.Log;
-import android.webkit.CookieManager;
import android.webkit.CookieSyncManager;
import android.webkit.WebView;
import android.webkit.WebViewClient;
@@ -80,10 +79,10 @@
private int mState; // {NONE(0), SID(1), LSID(2)}
private boolean mTokensInvalidated;
- private GoogleAccountLogin(Activity activity, String name,
+ private GoogleAccountLogin(Activity activity, Account account,
Runnable runnable) {
mActivity = activity;
- mAccount = new Account(name, GOOGLE);
+ mAccount = account;
mWebView = new WebView(mActivity);
mRunnable = runnable;
@@ -233,28 +232,22 @@
// Start the login process if auto-login is enabled and the user is not
// already logged in.
public static void startLoginIfNeeded(Activity activity,
- BrowserSettings settings, Runnable runnable) {
- // Auto login not enabled?
- if (!settings.isAutoLoginEnabled()) {
- runnable.run();
- return;
- }
-
- // No account found?
- String account = settings.getAutoLoginAccount(activity);
- if (account == null) {
- runnable.run();
- return;
- }
-
+ Runnable runnable) {
// Already logged in?
if (isLoggedIn(activity)) {
runnable.run();
return;
}
+ // No account found?
+ Account[] accounts = getAccounts(activity);
+ if (accounts == null || accounts.length == 0) {
+ runnable.run();
+ return;
+ }
+
GoogleAccountLogin login =
- new GoogleAccountLogin(activity, account, runnable);
+ new GoogleAccountLogin(activity, accounts[0], runnable);
login.startLogin();
}
@@ -271,31 +264,12 @@
mAccount, "SID", null, mActivity, this, null);
}
- // Returns the account name passed in if the account exists, otherwise
- // returns the default account.
- public static String validateAccount(Context ctx, String name) {
- Account[] accounts = getAccounts(ctx);
- if (accounts.length == 0) {
- return null;
- }
- if (name != null) {
- // Make sure the account still exists.
- for (Account a : accounts) {
- if (a.name.equals(name)) {
- return name;
- }
- }
- }
- // Return the first entry.
- return accounts[0].name;
- }
-
- public static Account[] getAccounts(Context ctx) {
+ private static Account[] getAccounts(Context ctx) {
return AccountManager.get(ctx).getAccountsByType(GOOGLE);
}
- // Checks for the presence of the SID cookie on google.com.
- public static boolean isLoggedIn(Context ctx) {
+ // Checks if we already did pre-login.
+ private static boolean isLoggedIn(Context ctx) {
// See if we last logged in less than a week ago.
long lastLogin = PreferenceManager.
getDefaultSharedPreferences(ctx).
@@ -303,31 +277,7 @@
if (lastLogin == -1) {
return false;
}
- long diff = System.currentTimeMillis() - lastLogin;
- if (diff > WEEK_IN_MILLIS) {
- Log.d(LOGTAG, "Forcing login after " + diff + "ms");
- return false;
- }
-
- // This will potentially block the UI thread but we have to have the
- // most updated cookies.
- // FIXME: Figure out how to avoid waiting to clear session cookies.
- CookieManager.getInstance().waitForCookieOperationsToComplete();
-
- // Use /a/ to grab hosted cookies as well as the base set of google.com
- // cookies.
- String cookies = CookieManager.getInstance().getCookie(
- "http://www.google.com/a/");
- if (cookies != null) {
- StringTokenizer tokenizer = new StringTokenizer(cookies, ";");
- while (tokenizer.hasMoreTokens()) {
- String cookie = tokenizer.nextToken().trim();
- if (cookie.startsWith("SID=") || cookie.startsWith("ASIDAP=")) {
- return true;
- }
- }
- }
- return false;
+ return true;
}
// Used to indicate that the Browser should continue loading the main page.
diff --git a/src/com/android/browser/InstantSearchEngine.java b/src/com/android/browser/InstantSearchEngine.java
index 128997c..85e494a 100644
--- a/src/com/android/browser/InstantSearchEngine.java
+++ b/src/com/android/browser/InstantSearchEngine.java
@@ -15,13 +15,9 @@
*/
package com.android.browser;
-import com.google.android.collect.Maps;
-import com.google.common.collect.Lists;
-
import com.android.browser.Controller;
import com.android.browser.R;
import com.android.browser.UI.DropdownChangeListener;
-import com.android.browser.search.DefaultSearchEngine;
import com.android.browser.search.SearchEngine;
import android.app.SearchManager;
@@ -81,7 +77,7 @@
// If for some reason we are in a bad state, ensure that the
// user gets default search results at the very least.
- if (mSearchBox == null & !isInstantPage()) {
+ if (mSearchBox == null || !isInstantPage()) {
mWrapped.startSearch(context, query, appData, extraData);
return;
}
@@ -238,6 +234,10 @@
mController.registerDropdownChangeListener(this);
+ if (mSearchBox == null) {
+ return mWrapped.getSuggestions(context, query);
+ }
+
mSearchBox.setDimensions(0, 0, 0, mHeight);
mSearchBox.onresize();
diff --git a/src/com/android/browser/IntentHandler.java b/src/com/android/browser/IntentHandler.java
index 77db538..fa8bfbc 100644
--- a/src/com/android/browser/IntentHandler.java
+++ b/src/com/android/browser/IntentHandler.java
@@ -145,14 +145,18 @@
|| (activateVoiceSearch && appId != null))
&& !mActivity.getPackageName().equals(appId)
&& (flags & Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT) != 0) {
- Tab appTab = mTabControl.getTabFromId(appId);
- if (appTab != null) {
- mController.reuseTab(appTab, appId, urlData);
- return;
+ if (activateVoiceSearch) {
+ Tab appTab = mTabControl.getTabFromId(appId);
+ if (appTab != null) {
+ mController.reuseTab(appTab, appId, urlData);
+ return;
+ } else {
+ mController.openTabAndShow(null, urlData, false, appId);
+ }
} else {
// No matching application tab, try to find a regular tab
// with a matching url.
- appTab = mTabControl.findUnusedTabWithUrl(urlData.mUrl);
+ Tab appTab = mTabControl.findUnusedTabWithUrl(urlData.mUrl);
if (appTab != null) {
if (current != appTab) {
mController.switchToTab(mTabControl.getTabIndex(appTab));
@@ -164,7 +168,7 @@
// MAX_TABS. Then the url will be opened in the current
// tab. If a new tab is created, it will have "true" for
// exit on close.
- mController.openTabAndShow(null, urlData, true, appId);
+ mController.openTabAndShow(null, urlData, false, appId);
}
}
} else {
diff --git a/src/com/android/browser/PieControl.java b/src/com/android/browser/PieControl.java
index 2e2eba4..38ed1bb 100644
--- a/src/com/android/browser/PieControl.java
+++ b/src/com/android/browser/PieControl.java
@@ -16,18 +16,32 @@
package com.android.browser;
+import com.android.browser.view.PieItem;
+import com.android.browser.view.PieListView;
import com.android.browser.view.PieMenu;
+import com.android.browser.view.PieMenu.PieView.OnLayoutListener;
+import com.android.browser.view.PieStackView;
+import com.android.browser.view.PieStackView.OnCurrentListener;
import android.app.Activity;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
import android.view.View;
import android.view.View.OnClickListener;
+import android.view.ViewGroup;
import android.view.ViewGroup.LayoutParams;
import android.webkit.WebView;
+import android.widget.BaseAdapter;
import android.widget.FrameLayout;
import android.widget.ImageView;
+import android.widget.ImageView.ScaleType;
+import android.widget.TextView;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.ArrayList;
+import java.util.List;
/**
* controller for Quick Controls pie menu
@@ -38,24 +52,25 @@
private UiController mUiController;
private XLargeUi mUi;
private PieMenu mPie;
- private ImageView mBack;
- private ImageView mForward;
- private ImageView mRefresh;
- private ImageView mUrl;
- private ImageView mOptions;
- private ImageView mBookmarks;
- private ImageView mNewTab;
- private ImageView mClose;
-
- private Map<View,Tab> mTabItems;
-
- boolean mNewTabMode = true;
+ private PieItem mBack;
+ private PieItem mForward;
+ private PieItem mRefresh;
+ private PieItem mUrl;
+ private PieItem mOptions;
+ private PieItem mBookmarks;
+ private PieItem mNewTab;
+ private PieItem mClose;
+ private MenuAdapter mMenuAdapter;
+ private PieItem mShowTabs;
+ private TabAdapter mTabAdapter;
+ private TextView mTabsCount;
+ private int mItemSize;
public PieControl(Activity activity, UiController controller, XLargeUi ui) {
mActivity = activity;
mUiController = controller;
mUi = ui;
- mTabItems = new HashMap<View, Tab>();
+ mItemSize = (int) activity.getResources().getDimension(R.dimen.qc_item_size);
}
protected void attachToContainer(FrameLayout container) {
@@ -64,42 +79,107 @@
LayoutParams lp = new LayoutParams(LayoutParams.MATCH_PARENT,
LayoutParams.MATCH_PARENT);
mPie.setLayoutParams(lp);
- mNewTab = makeMenuView(R.drawable.ic_pie_new_tab);
- mPie.addItem(mNewTab);
- mBack = makeMenuView(R.drawable.ic_pie_back);
- mPie.addItem(mBack);
- mUrl = makeMenuView(R.drawable.ic_pie_web);
- mPie.addItem(mUrl);
- mBookmarks = makeMenuView(R.drawable.ic_pie_bookmarks);
- mPie.addItem(mBookmarks);
- mOptions = makeMenuView(R.drawable.ic_pie_more);
- mPie.addItem(mOptions);
+ mBack = makeItem(R.drawable.ic_back_holo_dark, 1);
+ mUrl = makeItem(R.drawable.ic_web_holo_dark, 1);
+ mBookmarks = makeItem(R.drawable.ic_bookmarks_holo_dark, 1);
+ mRefresh = makeItem(R.drawable.ic_refresh_holo_dark, 2);
+ mForward = makeItem(R.drawable.ic_forward_holo_dark, 2);
+ mNewTab = makeItem(R.drawable.ic_new_window_holo_dark, 2);
+ mClose = makeItem(R.drawable.ic_close_window_holo_dark, 2);
+ View tabs = makeTabsView();
+ mShowTabs = new PieItem(tabs, 2);
+ mOptions = makeItem(
+ com.android.internal.R.drawable.ic_menu_moreoverflow_normal_holo_dark,
+ 2);
+ mMenuAdapter = new MenuAdapter(mActivity, mUiController);
+ mTabAdapter = new TabAdapter(mActivity, mUiController);
+ PieStackView stack = new PieStackView(mActivity);
+ stack.setLayoutListener(new OnLayoutListener() {
+ @Override
+ public void onLayout(int ax, int ay, boolean left) {
+ buildTabs();
+ }
+ });
+ stack.setOnCurrentListener(mTabAdapter);
+ stack.setAdapter(mTabAdapter);
+ mShowTabs.setPieView(stack);
+ PieListView menuview = new PieListView(mActivity);
+ menuview.setLayoutListener(new OnLayoutListener() {
+ @Override
+ public void onLayout(int ax, int ay, boolean left) {
+ mActivity.openOptionsMenu();
+ }
+ });
+
+ mOptions.setPieView(menuview);
+ menuview.setAdapter(mMenuAdapter);
setClickListener(mBack,
+ mRefresh,
+ mForward,
mUrl,
- mOptions,
mBookmarks,
- mNewTab
+ mNewTab,
+ mClose
);
+ // level 1
+ mPie.addItem(mBack);
+ mPie.addItem(mUrl);
+ mPie.addItem(mBookmarks);
+ // level 2
+ mPie.addItem(mForward);
+ mPie.addItem(mRefresh);
+ mPie.addItem(mShowTabs);
+ mPie.addItem(mNewTab);
+ mPie.addItem(mClose);
+ mPie.addItem(mOptions);
mPie.setController(this);
}
container.addView(mPie);
}
+ private void buildTabs() {
+ final List<Tab> tabs = mUiController.getTabs();
+ mUi.captureTab(mUi.getActiveTab());
+ mTabAdapter.setTabs(tabs);
+ PieStackView sym = (PieStackView) mShowTabs.getPieView();
+ sym.setCurrent(mUiController.getTabControl().getCurrentIndex());
+
+ }
+
+ protected void onMenuOpened(Menu menu) {
+ mMenuAdapter.setMenu(menu);
+ }
+
protected void removeFromContainer(FrameLayout container) {
container.removeView(mPie);
}
- private ImageView makeMenuView(int image) {
- ImageView item = new ImageView(mActivity);
- item.setImageResource(image);
- LayoutParams lp = new LayoutParams(48, 48);
- item.setLayoutParams(lp);
- return item;
+ private View makeTabsView() {
+ View v = mActivity.getLayoutInflater().inflate(R.layout.qc_tabs_view, null);
+ mTabsCount = (TextView) v.findViewById(R.id.label);
+ mTabsCount.setText("1");
+ ImageView image = (ImageView) v.findViewById(R.id.icon);
+ image.setImageResource(R.drawable.ic_windows_holo_dark);
+ image.setScaleType(ScaleType.CENTER);
+ LayoutParams lp = new LayoutParams(mItemSize, mItemSize);
+ v.setLayoutParams(lp);
+ return v;
}
- private void setClickListener(View... views) {
- for (View view : views) {
- view.setOnClickListener(this);
+ private PieItem makeItem(int image, int l) {
+ ImageView view = new ImageView(mActivity);
+ view.setImageResource(image);
+ view.setMinimumWidth(mItemSize);
+ view.setMinimumHeight(mItemSize);
+ view.setScaleType(ScaleType.CENTER);
+ LayoutParams lp = new LayoutParams(mItemSize, mItemSize);
+ view.setLayoutParams(lp);
+ return new PieItem(view, l);
+ }
+
+ private void setClickListener(PieItem... items) {
+ for (PieItem item : items) {
+ item.getView().setOnClickListener(this);
}
}
@@ -112,41 +192,167 @@
@Override
public void onClick(View v) {
- mPie.show(false);
Tab tab = mUiController.getTabControl().getCurrentTab();
WebView web = tab.getWebView();
- if (mBack == v) {
+ if (mBack.getView() == v) {
web.goBack();
- } else if (mForward == v) {
+ } else if (mForward.getView() == v) {
web.goForward();
- } else if (mRefresh == v) {
+ } else if (mRefresh.getView() == v) {
if (tab.inPageLoad()) {
web.stopLoading();
} else {
web.reload();
}
- } else if (mUrl == v) {
+ } else if (mUrl.getView() == v) {
mUi.showTitleBarAndEdit();
- } else if (mOptions == v) {
- mActivity.openOptionsMenu();
- } else if (mBookmarks == v) {
+ } else if (mBookmarks.getView() == v) {
mUiController.bookmarksOrHistoryPicker(false);
- } else if (mNewTab == v) {
+ } else if (mNewTab.getView() == v) {
mUiController.openTabToHomePage();
mUi.showTitleBarAndEdit();
- } else if (mClose == v) {
+ } else if (mClose.getView() == v) {
mUiController.closeCurrentTab();
- } else {
- Tab ntab = mTabItems.get(v);
- if (ntab != null) {
- mUiController.switchToTab(mUiController.getTabControl().getTabIndex(ntab));
- }
}
}
@Override
public boolean onOpen() {
+ int n = mUiController.getTabControl().getTabCount();
+ mTabsCount.setText(Integer.toString(n));
return true;
}
+ private static class TabAdapter extends BaseAdapter implements OnCurrentListener {
+
+ LayoutInflater mInflater;
+ UiController mUiController;
+ private List<Tab> mTabs;
+ private int mCurrent;
+
+ public TabAdapter(Context ctx, UiController ctl) {
+ mInflater = LayoutInflater.from(ctx);
+ mUiController = ctl;
+ mTabs = new ArrayList<Tab>();
+ mCurrent = -1;
+ }
+
+ public void setTabs(List<Tab> tabs) {
+ mTabs = tabs;
+ notifyDataSetChanged();
+ }
+
+ @Override
+ public int getCount() {
+ return mTabs.size();
+ }
+
+ @Override
+ public Tab getItem(int position) {
+ return mTabs.get(position);
+ }
+
+ @Override
+ public long getItemId(int position) {
+ return position;
+ }
+
+ @Override
+ public View getView(int position, View convertView, ViewGroup parent) {
+ final Tab tab = mTabs.get(position);
+ View view = mInflater.inflate(R.layout.qc_tab,
+ null);
+ ImageView thumb = (ImageView) view.findViewById(R.id.thumb);
+ TextView title1 = (TextView) view.findViewById(R.id.title1);
+ TextView title2 = (TextView) view.findViewById(R.id.title2);
+ Bitmap b = tab.getScreenshot();
+ if (b != null) {
+ thumb.setImageBitmap(b);
+ }
+ if (position > mCurrent) {
+ title1.setVisibility(View.GONE);
+ title2.setText(tab.getTitle());
+ } else {
+ title2.setVisibility(View.GONE);
+ title1.setText(tab.getTitle());
+ }
+ view.setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ mUiController.switchToTab(mUiController.getTabControl()
+ .getTabIndex(tab));
+ }
+ });
+ return view;
+ }
+
+ @Override
+ public void onSetCurrent(int index) {
+ mCurrent = index;
+ }
+
+ }
+
+ private static class MenuAdapter extends BaseAdapter
+ implements OnClickListener {
+
+ List<MenuItem> mItems;
+ UiController mUiController;
+ LayoutInflater mInflater;
+
+ public MenuAdapter(Context ctx, UiController ctl) {
+ mUiController = ctl;
+ mInflater = LayoutInflater.from(ctx);
+ mItems = new ArrayList<MenuItem>();
+ }
+
+ public void setMenu(Menu menu) {
+ mItems.clear();
+ for (int i = 0; i < menu.size(); i++) {
+ MenuItem item = menu.getItem(i);
+ if (item.isEnabled() && item.isVisible()) {
+ mItems.add(item);
+ }
+ }
+ notifyDataSetChanged();
+ }
+
+ @Override
+ public int getCount() {
+ return mItems.size();
+ }
+
+ @Override
+ public MenuItem getItem(int position) {
+ return mItems.get(position);
+ }
+
+ @Override
+ public long getItemId(int position) {
+ return position;
+ }
+
+ @Override
+ public void onClick(View v) {
+ if (v.getTag() != null) {
+ mUiController.onOptionsItemSelected((MenuItem) v.getTag());
+ }
+ }
+
+ @Override
+ public View getView(int position, View convertView, ViewGroup parent) {
+ final MenuItem item = mItems.get(position);
+ View view = mInflater.inflate(
+ R.layout.qc_menu_item, null);
+ TextView label =
+ (TextView) view.findViewById(R.id.title);
+ label.setText(item.getTitle());
+ label.setTag(item);
+ label.setOnClickListener(this);
+ label.setLayoutParams(new LayoutParams(240, 32));
+ return label;
+ }
+
+ }
+
}
diff --git a/src/com/android/browser/ScrollWebView.java b/src/com/android/browser/ScrollWebView.java
index 2ee2ac0..8c89e51 100644
--- a/src/com/android/browser/ScrollWebView.java
+++ b/src/com/android/browser/ScrollWebView.java
@@ -18,7 +18,6 @@
import android.content.Context;
import android.graphics.Bitmap;
-import android.graphics.Paint;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.View;
@@ -36,9 +35,7 @@
private boolean mBackgroundRemoved = false;
private boolean mUserInitiated = false;
private TitleBarBase mTitleBar;
- private boolean mDrawCached = false;
private Bitmap mBitmap;
- private Paint mCachePaint = new Paint();
/**
* @param context
@@ -137,46 +134,22 @@
mScrollListener = l;
}
- @Override
- public void invalidate() {
- if (!mDrawCached) {
- super.invalidate();
- }
- }
-
// callback for scroll events
interface ScrollListener {
public void onScroll(int visibleTitleHeight, boolean userInitiated);
}
- void setDrawCached(boolean cached) {
- if (cached == mDrawCached) return;
- if (cached) {
- buildDrawingCache();
- mBitmap = getDrawingCache(false);
- mDrawCached = (mBitmap != null);
- } else {
- mDrawCached = false;
- mBitmap = null;
- destroyDrawingCache();
- }
- }
-
@Override
protected void onDraw(android.graphics.Canvas c) {
- if (mDrawCached) {
- c.drawBitmap(mBitmap, getScrollX(), getScrollY(), mCachePaint);
- } else {
- super.onDraw(c);
- if (!mBackgroundRemoved && getRootView().getBackground() != null) {
- mBackgroundRemoved = true;
- post(new Runnable() {
- public void run() {
- getRootView().setBackgroundDrawable(null);
- }
- });
- }
+ super.onDraw(c);
+ if (!mBackgroundRemoved && getRootView().getBackground() != null) {
+ mBackgroundRemoved = true;
+ post(new Runnable() {
+ public void run() {
+ getRootView().setBackgroundDrawable(null);
+ }
+ });
}
}
diff --git a/src/com/android/browser/SuggestionsAdapter.java b/src/com/android/browser/SuggestionsAdapter.java
index 6a9111f..ecdaa15 100644
--- a/src/com/android/browser/SuggestionsAdapter.java
+++ b/src/com/android/browser/SuggestionsAdapter.java
@@ -70,7 +70,6 @@
final int mLinesLandscape;
final Object mResultsLock = new Object();
List<String> mVoiceResults;
- boolean mReverseResults;
boolean mIncognitoMode;
interface CompletionListener {
@@ -137,9 +136,6 @@
@Override
public SuggestItem getItem(int position) {
- if (mReverseResults) {
- position = (getCount() - 1) - position;
- }
if (mVoiceResults != null) {
SuggestItem item = new SuggestItem(mVoiceResults.get(position),
null, TYPE_VOICE_SEARCH);
@@ -152,10 +148,6 @@
return mMixedResults.items.get(position);
}
- public void setReverseResults(boolean reverse) {
- mReverseResults = reverse;
- }
-
@Override
public long getItemId(int position) {
return position;
diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index 47cefbc..863fc95 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -132,10 +132,14 @@
// Listener used to know when we move forward or back in the history list.
private final WebBackForwardListClient mWebBackForwardListClient;
private DataController mDataController;
+ // State of the auto-login request.
+ private DeviceAccountLogin mDeviceAccountLogin;
// AsyncTask for downloading touch icons
DownloadTouchIcon mTouchIconLoader;
+ private Bitmap mScreenshot;
+
// All the state needed for a page
private static class PageState {
String mUrl;
@@ -191,6 +195,7 @@
static final String APPID = "appid";
static final String ORIGINALURL = "originalUrl";
static final String INCOGNITO = "privateBrowsingEnabled";
+ static final String SCREENSHOT = "screenshot";
// -------------------------------------------------------------------------
@@ -527,6 +532,13 @@
}
}
+ // Cancel the auto-login process.
+ if (mDeviceAccountLogin != null) {
+ mDeviceAccountLogin.cancel();
+ mDeviceAccountLogin = null;
+ mWebViewController.hideAutoLogin(Tab.this);
+ }
+
// finally update the UI in the activity if it is in the foreground
mWebViewController.onPageStarted(Tab.this, view, favicon);
@@ -809,8 +821,27 @@
}
mWebViewController.onUnhandledKeyEvent(event);
}
+
+ @Override
+ public void onReceivedLoginRequest(WebView view, String realm,
+ String account, String args) {
+ new DeviceAccountLogin(mActivity, view, Tab.this, mWebViewController)
+ .handleLogin(realm, account, args);
+ }
+
};
+ // Called by DeviceAccountLogin when the Tab needs to have the auto-login UI
+ // displayed.
+ void setDeviceAccountLogin(DeviceAccountLogin login) {
+ mDeviceAccountLogin = login;
+ }
+
+ // Returns non-null if the title bar should display the auto-login UI.
+ DeviceAccountLogin getDeviceAccountLogin() {
+ return mDeviceAccountLogin;
+ }
+
// -------------------------------------------------------------------------
// WebChromeClient implementation for the main WebView
// -------------------------------------------------------------------------
@@ -1720,6 +1751,9 @@
mSavedState.putInt(PARENTTAB, mWebViewController.getTabControl().getTabIndex(
mParentTab));
}
+ if (mScreenshot != null) {
+ mSavedState.putParcelable(SCREENSHOT, mScreenshot);
+ }
return true;
}
@@ -1735,6 +1769,7 @@
mSavedState = null;
mCloseOnExit = b.getBoolean(CLOSEONEXIT);
mAppId = b.getString(APPID);
+ mScreenshot = b.getParcelable(SCREENSHOT);
final WebBackForwardList list = mMainView.restoreState(b);
if (list == null) {
@@ -1757,4 +1792,13 @@
}
}
};
+
+ public void setScreenshot(Bitmap screenshot) {
+ mScreenshot = screenshot;
+ }
+
+ public Bitmap getScreenshot() {
+ return mScreenshot;
+ }
+
}
diff --git a/src/com/android/browser/TitleBarXLarge.java b/src/com/android/browser/TitleBarXLarge.java
index 8a715b1..5f02002 100644
--- a/src/com/android/browser/TitleBarXLarge.java
+++ b/src/com/android/browser/TitleBarXLarge.java
@@ -16,38 +16,46 @@
package com.android.browser;
-import com.android.browser.autocomplete.SuggestedTextController.TextChangeWatcher;
import com.android.browser.UI.DropdownChangeListener;
+import com.android.browser.autocomplete.SuggestedTextController.TextChangeWatcher;
import com.android.browser.search.SearchEngine;
+import android.accounts.Account;
import android.app.Activity;
import android.content.Context;
import android.content.res.Resources;
-import android.database.DataSetObserver;
import android.graphics.Bitmap;
-import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.text.TextUtils;
+import android.view.ContextThemeWrapper;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.View.OnFocusChangeListener;
import android.view.ViewGroup;
+import android.view.animation.Animation;
+import android.view.animation.Animation.AnimationListener;
+import android.view.animation.AnimationUtils;
import android.webkit.WebView;
import android.widget.AbsoluteLayout;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
import android.widget.FrameLayout;
import android.widget.ImageButton;
import android.widget.ImageView;
+import android.widget.ProgressBar;
+import android.widget.Spinner;
+import android.widget.TextView;
-import java.util.ArrayList;
import java.util.List;
/**
* tabbed title bar for xlarge screen browser
*/
public class TitleBarXLarge extends TitleBarBase
- implements OnClickListener, OnFocusChangeListener, TextChangeWatcher {
+ implements OnClickListener, OnFocusChangeListener, TextChangeWatcher,
+ DeviceAccountLogin.AutoLoginCallback {
private XLargeUi mUi;
@@ -69,6 +77,15 @@
private PageProgressView mProgressView;
private Drawable mFocusDrawable;
private Drawable mUnfocusDrawable;
+ // Auto-login UI
+ private View mAutoLogin;
+ private Spinner mAutoLoginAccount;
+ private Button mAutoLoginLogin;
+ private ProgressBar mAutoLoginProgress;
+ private TextView mAutoLoginError;
+ private ImageButton mAutoLoginCancel;
+ private DeviceAccountLogin mAutoLoginHandler;
+ private ArrayAdapter<String> mAccountsAdapter;
private boolean mInLoad;
private boolean mUseQuickControls;
@@ -84,8 +101,8 @@
R.drawable.textfield_active_holo_dark);
mUnfocusDrawable = resources.getDrawable(
R.drawable.textfield_default_holo_dark);
- initLayout(activity);
mInVoiceMode = false;
+ initLayout(activity);
}
@Override
@@ -136,6 +153,17 @@
mUrlInput.setOnFocusChangeListener(this);
mUrlInput.setSelectAllOnFocus(true);
mUrlInput.addQueryTextWatcher(this);
+ mAutoLogin = findViewById(R.id.autologin);
+ mAutoLoginAccount = (Spinner) findViewById(R.id.autologin_account);
+ mAutoLoginLogin = (Button) findViewById(R.id.autologin_login);
+ mAutoLoginLogin.setOnClickListener(this);
+ mAutoLoginProgress =
+ (ProgressBar) findViewById(R.id.autologin_progress);
+ mAutoLoginError = (TextView) findViewById(R.id.autologin_error);
+ mAutoLoginCancel =
+ (ImageButton) mAutoLogin.findViewById(R.id.autologin_close);
+ mAutoLoginCancel.setOnClickListener(this);
+
setFocusState(false);
}
@@ -151,6 +179,67 @@
}
}
+ void updateAutoLogin(Tab tab, boolean animate) {
+ DeviceAccountLogin login = tab.getDeviceAccountLogin();
+ if (login != null) {
+ mAutoLoginHandler = login;
+ mAutoLogin.setVisibility(View.VISIBLE);
+ ContextThemeWrapper wrapper = new ContextThemeWrapper(mContext,
+ android.R.style.Theme_Holo_Light);
+ mAccountsAdapter = new ArrayAdapter<String>(wrapper,
+ android.R.layout.simple_spinner_item, login.getAccountNames());
+ mAccountsAdapter.setDropDownViewResource(
+ android.R.layout.simple_spinner_dropdown_item);
+ mAutoLoginAccount.setAdapter(mAccountsAdapter);
+ mAutoLoginAccount.setSelection(0);
+ mAutoLoginAccount.setEnabled(true);
+ mAutoLoginLogin.setEnabled(true);
+ mAutoLoginProgress.setVisibility(View.GONE);
+ mAutoLoginError.setVisibility(View.GONE);
+ switch (login.getState()) {
+ case DeviceAccountLogin.PROCESSING:
+ mAutoLoginAccount.setEnabled(false);
+ mAutoLoginLogin.setEnabled(false);
+ mAutoLoginProgress.setVisibility(View.VISIBLE);
+ break;
+ case DeviceAccountLogin.FAILED:
+ mAutoLoginProgress.setVisibility(View.GONE);
+ mAutoLoginError.setVisibility(View.VISIBLE);
+ break;
+ case DeviceAccountLogin.INITIAL:
+ break;
+ default:
+ throw new IllegalStateException();
+ }
+ if (mUseQuickControls) {
+ mUi.showTitleBar();
+ } else {
+ if (animate) {
+ mAutoLogin.startAnimation(AnimationUtils.loadAnimation(
+ getContext(), R.anim.autologin_enter));
+ }
+ }
+ } else {
+ mAutoLoginHandler = null;
+ if (mUseQuickControls) {
+ mUi.hideTitleBar();
+ mAutoLogin.setVisibility(View.GONE);
+ mUi.refreshWebView();
+ } else {
+ if (animate) {
+ hideAutoLogin();
+ } else if (mAutoLogin.getAnimation() == null) {
+ mAutoLogin.setVisibility(View.GONE);
+ mUi.refreshWebView();
+ }
+ }
+ }
+ }
+
+ boolean inAutoLogin() {
+ return mAutoLoginHandler != null;
+ }
+
private ViewGroup.LayoutParams makeLayoutParams() {
if (mUseQuickControls) {
return new FrameLayout.LayoutParams(LayoutParams.MATCH_PARENT,
@@ -164,17 +253,20 @@
@Override
public int getEmbeddedHeight() {
- return mContainer.getHeight();
+ int height = mContainer.getHeight();
+ if (mAutoLogin.getVisibility() == View.VISIBLE) {
+ height += mAutoLogin.getHeight();
+ }
+ return height;
}
void setUseQuickControls(boolean useQuickControls) {
mUseQuickControls = useQuickControls;
- mUrlInput.setUseQuickControls(mUseQuickControls);
setLayoutParams(makeLayoutParams());
}
void setShowProgressOnly(boolean progress) {
- if (progress) {
+ if (progress && !inAutoLogin()) {
mContainer.setVisibility(View.GONE);
} else {
mContainer.setVisibility(View.VISIBLE);
@@ -200,6 +292,13 @@
if (mUseQuickControls) {
mUi.hideTitleBar();
}
+
+ if (mUrlInput.getText().length() == 0) {
+ Tab currentTab = mUiController.getTabControl().getCurrentTab();
+ if (currentTab != null) {
+ mUrlInput.setText(currentTab.getUrl(), false);
+ }
+ }
}
mUrlInput.clearNeedsUpdate();
}
@@ -237,6 +336,20 @@
mUrlInput.clearFocus();
}
+ private void hideAutoLogin() {
+ Animation anim = AnimationUtils.loadAnimation(
+ getContext(), R.anim.autologin_exit);
+ anim.setAnimationListener(new AnimationListener() {
+ @Override public void onAnimationEnd(Animation a) {
+ mAutoLogin.setVisibility(View.GONE);
+ mUi.refreshWebView();
+ }
+ @Override public void onAnimationStart(Animation a) {}
+ @Override public void onAnimationRepeat(Animation a) {}
+ });
+ mAutoLogin.startAnimation(anim);
+ }
+
@Override
public void onClick(View v) {
if (mBackButton == v) {
@@ -261,10 +374,33 @@
clearOrClose();
} else if (mVoiceSearch == v) {
mUiController.startVoiceSearch();
+ } else if (mAutoLoginCancel == v) {
+ if (mAutoLoginHandler != null) {
+ mAutoLoginHandler.cancel();
+ mAutoLoginHandler = null;
+ }
+ hideAutoLogin();
+ } else if (mAutoLoginLogin == v) {
+ if (mAutoLoginHandler != null) {
+ mAutoLoginAccount.setEnabled(false);
+ mAutoLoginLogin.setEnabled(false);
+ mAutoLoginProgress.setVisibility(View.VISIBLE);
+ mAutoLoginError.setVisibility(View.GONE);
+ mAutoLoginHandler.login(
+ mAutoLoginAccount.getSelectedItemPosition(), this);
+ }
}
}
@Override
+ public void loginFailed() {
+ mAutoLoginAccount.setEnabled(true);
+ mAutoLoginLogin.setEnabled(true);
+ mAutoLoginProgress.setVisibility(View.GONE);
+ mAutoLoginError.setVisibility(View.VISIBLE);
+ }
+
+ @Override
void setFavicon(Bitmap icon) { }
private void clearOrClose() {
@@ -380,7 +516,9 @@
public void setInVoiceMode(boolean voicemode, List<String> voiceResults) {
mInVoiceMode = voicemode;
mUrlInput.setVoiceResults(voiceResults);
- mUrlIcon.setImageDrawable(mSearchButton.getDrawable());
+ if (voicemode) {
+ mUrlIcon.setImageDrawable(mSearchButton.getDrawable());
+ }
}
@Override
@@ -396,6 +534,10 @@
return super.focusSearch(focused, dir);
}
+ void clearCompletions() {
+ mUrlInput.setSuggestedText(null);
+ }
+
@Override
public boolean dispatchKeyEventPreIme(KeyEvent evt) {
if (evt.getKeyCode() == KeyEvent.KEYCODE_BACK) {
diff --git a/src/com/android/browser/UI.java b/src/com/android/browser/UI.java
index bec7034..368c829 100644
--- a/src/com/android/browser/UI.java
+++ b/src/com/android/browser/UI.java
@@ -89,6 +89,8 @@
public void revertVoiceTitleBar(Tab tab);
+ public boolean onPrepareOptionsMenu(Menu menu);
+
public void onOptionsMenuOpened();
public void onExtendedMenuOpened();
@@ -122,9 +124,12 @@
boolean dispatchKey(int code, KeyEvent event);
-
public static interface DropdownChangeListener {
void onNewDropdownDimensions(int height);
}
void registerDropdownChangeListener(DropdownChangeListener d);
+
+ void showAutoLogin(Tab tab);
+
+ void hideAutoLogin(Tab tab);
}
diff --git a/src/com/android/browser/UiController.java b/src/com/android/browser/UiController.java
index 551d0ce..65fa5f8 100644
--- a/src/com/android/browser/UiController.java
+++ b/src/com/android/browser/UiController.java
@@ -19,6 +19,7 @@
import com.android.browser.UI.DropdownChangeListener;
import android.content.Intent;
+import android.view.MenuItem;
import android.webkit.WebView;
import java.util.List;
@@ -88,4 +89,7 @@
void unregisterOptionsMenuHandler(OptionsMenuHandler handler);
void registerDropdownChangeListener(DropdownChangeListener d);
+
+ boolean onOptionsItemSelected(MenuItem item);
+
}
diff --git a/src/com/android/browser/UrlInputView.java b/src/com/android/browser/UrlInputView.java
index b7f2bff..350d772 100644
--- a/src/com/android/browser/UrlInputView.java
+++ b/src/com/android/browser/UrlInputView.java
@@ -127,10 +127,6 @@
setCustomSelectionActionModeCallback(urlSelectionMode);
}
- void setUseQuickControls(boolean useQuickControls) {
- mAdapter.setReverseResults(useQuickControls);
- }
-
void setContainer(View container) {
mContainer = container;
}
diff --git a/src/com/android/browser/WebViewController.java b/src/com/android/browser/WebViewController.java
index 813b63b..6b44207 100644
--- a/src/com/android/browser/WebViewController.java
+++ b/src/com/android/browser/WebViewController.java
@@ -112,4 +112,7 @@
void bookmarkedStatusHasChanged(Tab tab);
+ void showAutoLogin(Tab tab);
+
+ void hideAutoLogin(Tab tab);
}
diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index 371e649..13018af 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -17,7 +17,6 @@
package com.android.browser;
import com.android.browser.ScrollWebView.ScrollListener;
-import com.android.browser.UI.DropdownChangeListener;
import android.animation.Animator;
import android.animation.Animator.AnimatorListener;
@@ -25,11 +24,14 @@
import android.app.ActionBar;
import android.app.Activity;
import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
import android.os.Bundle;
+import android.os.Handler;
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.webkit.WebChromeClient.CustomViewCallback;
import android.webkit.WebView;
@@ -48,10 +50,12 @@
private TabBar mTabBar;
private TitleBarXLarge mTitleBar;
+ private Animator mTitleBarAnimator;
+ private boolean mSkipTitleBarAnimations;
private boolean mUseQuickControls;
private PieControl mPieControl;
- private boolean mInAnimation = false;
+ private Handler mHandler;
/**
* @param browser
@@ -59,6 +63,7 @@
*/
public XLargeUi(Activity browser, UiController controller) {
super(browser, controller);
+ mHandler = new Handler();
mTitleBar = new TitleBarXLarge(mActivity, mUiController, this);
mTitleBar.setProgress(100);
mTabBar = new TabBar(mActivity, mUiController, this);
@@ -83,10 +88,12 @@
@Override
public void hideComboView() {
- checkTabCount();
- super.hideComboView();
- // ComboView changes the action bar, set it back up to what we want
- setupActionBar();
+ if (isComboViewShowing()) {
+ super.hideComboView();
+ // ComboView changes the action bar, set it back up to what we want
+ setupActionBar();
+ checkTabCount();
+ }
}
private void setUseQuickControls(boolean useQuickControls) {
@@ -100,29 +107,35 @@
if ((tab != null) && (tab.getWebView() != null)) {
tab.getWebView().setEmbeddedTitleBar(null);
}
- setTitleGravity(Gravity.BOTTOM);
} else {
mActivity.getActionBar().show();
if (mPieControl != null) {
mPieControl.removeFromContainer(mContentView);
}
- setTitleGravity(Gravity.TOP);
WebView web = mTabControl.getCurrentWebView();
if (web != null) {
web.setEmbeddedTitleBar(mTitleBar);
}
+ setTitleGravity(Gravity.NO_GRAVITY);
}
mTabBar.setUseQuickControls(mUseQuickControls);
}
private void checkTabCount() {
if (mUseQuickControls) {
- int n = mTabBar.getTabCount();
- if (n >= 2) {
- mActivity.getActionBar().show();
- } else if (n == 1) {
- mActivity.getActionBar().hide();
- }
+ mHandler.post(new Runnable() {
+ public void run() {
+ mActionBar.hide();
+ }
+ });
+ }
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ if (!BrowserSettings.getInstance().useInstant()) {
+ mTitleBar.clearCompletions();
}
}
@@ -176,11 +189,10 @@
if (tab.inForeground()) {
mTitleBar.setProgress(progress);
if (progress == 100) {
- if (!mTitleBar.isEditingUrl()) {
+ if (!mTitleBar.isEditingUrl() && !mTitleBar.inAutoLogin()) {
hideTitleBar();
if (mUseQuickControls) {
mTitleBar.setShowProgressOnly(false);
- setTitleGravity(Gravity.BOTTOM);
}
}
} else {
@@ -211,56 +223,16 @@
@Override
public void setActiveTab(final Tab tab) {
- if (mInAnimation) return;
- if ((tab != mActiveTab) && (mActiveTab != null)) {
- mInAnimation = true;
- // animate between the two
- final ScrollWebView fromWV = (ScrollWebView) mActiveTab.getWebView();
- fromWV.setDrawCached(true);
- fromWV.setEmbeddedTitleBar(null);
- final ScrollWebView toWV = (ScrollWebView) tab.getWebView();
- if (!mUseQuickControls) {
- if (mTitleBar.getParent() == null) {
- toWV.setEmbeddedTitleBar(mTitleBar);
- }
+ cancelTitleBarAnimation(true);
+ mSkipTitleBarAnimations = true;
+ if (mUseQuickControls) {
+ if (mActiveTab != null) {
+ captureTab(mActiveTab);
}
- toWV.setDrawCached(true);
- attachTabToContentView(tab);
- super.setActiveTab(tab, false);
- ObjectAnimator transition = ObjectAnimator.ofFloat(
- toWV, "alpha", 0f, 1f);
- transition.setDuration(mActivity.getResources()
- .getInteger(R.integer.tabFadeDuration));
- transition.addListener(new AnimatorListener() {
- @Override
- public void onAnimationCancel(Animator animation) {
- fromWV.setDrawCached(false);
- toWV.setDrawCached(false);
- setActiveTab(tab, false);
- mInAnimation = false;
- }
-
- @Override
- public void onAnimationEnd(Animator animation) {
- fromWV.setDrawCached(false);
- toWV.setDrawCached(false);
- setActiveTab(tab, false);
- mInAnimation = false;
- }
-
- @Override
- public void onAnimationRepeat(Animator animation) {
- }
-
- @Override
- public void onAnimationStart(Animator animation) {
- }
- });
- transition.start();
- } else {
- super.setActiveTab(tab, true);
- setActiveTab(tab, true);
}
+ super.setActiveTab(tab, true);
+ setActiveTab(tab, true);
+ mSkipTitleBarAnimations = false;
}
@Override
@@ -294,6 +266,15 @@
tab.getTopWindow().requestFocus();
}
+ public void captureTab(final Tab tab) {
+ Bitmap sshot = Controller.createScreenshot(tab,
+ (int) mActivity.getResources()
+ .getDimension(R.dimen.qc_thumb_width),
+ (int) mActivity.getResources()
+ .getDimension(R.dimen.qc_thumb_height));
+ tab.setScreenshot(sshot);
+ }
+
@Override
public void updateTabs(List<Tab> tabs) {
mTabBar.updateTabs(tabs);
@@ -302,8 +283,11 @@
@Override
public void removeTab(Tab tab) {
+ cancelTitleBarAnimation(true);
+ mSkipTitleBarAnimations = true;
super.removeTab(tab);
mTabBar.onRemoveTab(tab);
+ mSkipTitleBarAnimations = false;
}
protected void onRemoveTabCompleted(Tab tab) {
@@ -342,6 +326,18 @@
if (mUseQuickControls) {
mContentView.addView(mTitleBar);
} else {
+ if (!mSkipTitleBarAnimations) {
+ cancelTitleBarAnimation(false);
+ int visibleHeight = getVisibleTitleHeight();
+ float startPos = (-mTitleBar.getEmbeddedHeight() + visibleHeight);
+ if (mTitleBar.getTranslationY() != 0) {
+ startPos = Math.max(startPos, mTitleBar.getTranslationY());
+ }
+ mTitleBarAnimator = ObjectAnimator.ofFloat(mTitleBar,
+ "translationY",
+ startPos, 0);
+ mTitleBarAnimator.start();
+ }
setTitleGravity(Gravity.TOP);
}
super.showTitleBar();
@@ -356,12 +352,63 @@
if (mUseQuickControls) {
mContentView.removeView(mTitleBar);
} else {
- setTitleGravity(Gravity.NO_GRAVITY);
+ if (!mSkipTitleBarAnimations) {
+ cancelTitleBarAnimation(false);
+ int visibleHeight = getVisibleTitleHeight();
+ mTitleBarAnimator = ObjectAnimator.ofFloat(mTitleBar,
+ "translationY", mTitleBar.getTranslationY(),
+ (-mTitleBar.getEmbeddedHeight() + visibleHeight));
+ mTitleBarAnimator.addListener(mHideTileBarAnimatorListener);
+ mTitleBarAnimator.start();
+ } else {
+ setTitleGravity(Gravity.NO_GRAVITY);
+ }
}
super.hideTitleBar();
}
}
+ private void cancelTitleBarAnimation(boolean reset) {
+ if (mTitleBarAnimator != null) {
+ mTitleBarAnimator.cancel();
+ mTitleBarAnimator = null;
+ }
+ if (reset) {
+ mTitleBar.setTranslationY(0);
+ }
+ }
+
+ private int getVisibleTitleHeight() {
+ WebView webview = mActiveTab != null ? mActiveTab.getWebView() : null;
+ return webview != null ? webview.getVisibleTitleHeight() : 0;
+ }
+
+ private AnimatorListener mHideTileBarAnimatorListener = new AnimatorListener() {
+
+ boolean mWasCanceled;
+ @Override
+ public void onAnimationStart(Animator animation) {
+ mWasCanceled = false;
+ }
+
+ @Override
+ public void onAnimationRepeat(Animator animation) {
+ }
+
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ if (!mWasCanceled) {
+ mTitleBar.setTranslationY(0);
+ }
+ setTitleGravity(Gravity.NO_GRAVITY);
+ }
+
+ @Override
+ public void onAnimationCancel(Animator animation) {
+ mWasCanceled = true;
+ }
+ };
+
public boolean isEditingUrl() {
return mTitleBar.isEditingUrl();
}
@@ -399,9 +446,8 @@
if (inLoad) {
// the titlebar was removed when the CAB was shown
// if the page is loading, show it again
- mTitleBar.setShowProgressOnly(true);
- if (!isTitleBarShowing()) {
- setTitleGravity(Gravity.TOP);
+ if (mUseQuickControls) {
+ mTitleBar.setShowProgressOnly(true);
}
showTitleBar();
}
@@ -413,6 +459,18 @@
}
@Override
+ protected void updateAutoLogin(Tab tab, boolean animate) {
+ mTitleBar.updateAutoLogin(tab, animate);
+ }
+
+ protected void refreshWebView() {
+ Tab tab = getActiveTab();
+ if ((tab != null) && (tab.getWebView() != null)) {
+ tab.getWebView().invalidate();
+ }
+ }
+
+ @Override
public void setUrlTitle(Tab tab) {
super.setUrlTitle(tab);
mTabBar.onUrlAndTitle(tab, tab.getUrl(), tab.getTitle());
@@ -460,22 +518,23 @@
@Override
public boolean dispatchKey(int code, KeyEvent event) {
- WebView web = getActiveTab().getWebView();
- if (event.getAction() == KeyEvent.ACTION_DOWN) {
-
- switch (code) {
- case KeyEvent.KEYCODE_TAB:
- case KeyEvent.KEYCODE_DPAD_UP:
- case KeyEvent.KEYCODE_DPAD_LEFT:
- if ((web != null) && web.hasFocus() && !mTitleBar.hasFocus()) {
- editUrl(false);
- return true;
- }
- }
- boolean ctrl = event.hasModifiers(KeyEvent.META_CTRL_ON);
- if (!ctrl && isTypingKey(event) && !mTitleBar.isEditingUrl()) {
- editUrl(true);
- return mContentView.dispatchKeyEvent(event);
+ if (mActiveTab != null) {
+ WebView web = mActiveTab.getWebView();
+ if (event.getAction() == KeyEvent.ACTION_DOWN) {
+ switch (code) {
+ case KeyEvent.KEYCODE_TAB:
+ case KeyEvent.KEYCODE_DPAD_UP:
+ case KeyEvent.KEYCODE_DPAD_LEFT:
+ if ((web != null) && web.hasFocus() && !mTitleBar.hasFocus()) {
+ editUrl(false);
+ return true;
+ }
+ }
+ boolean ctrl = event.hasModifiers(KeyEvent.META_CTRL_ON);
+ if (!ctrl && isTypingKey(event) && !mTitleBar.isEditingUrl()) {
+ editUrl(true);
+ return mContentView.dispatchKeyEvent(event);
+ }
}
}
return false;
@@ -493,4 +552,15 @@
public void registerDropdownChangeListener(DropdownChangeListener d) {
mTitleBar.registerDropdownChangeListener(d);
}
+
+ @Override
+ public boolean onPrepareOptionsMenu(Menu menu) {
+ if (mUseQuickControls) {
+ mPieControl.onMenuOpened(menu);
+ return false;
+ } else {
+ return true;
+ }
+ }
+
}
diff --git a/src/com/android/browser/autocomplete/SuggestiveAutoCompleteTextView.java b/src/com/android/browser/autocomplete/SuggestiveAutoCompleteTextView.java
index e8ca980..e51a629 100644
--- a/src/com/android/browser/autocomplete/SuggestiveAutoCompleteTextView.java
+++ b/src/com/android/browser/autocomplete/SuggestiveAutoCompleteTextView.java
@@ -782,6 +782,7 @@
super.setText(text, type);
} else {
buffer.replace(0, buffer.length(), text);
+ invalidate();
}
}
@@ -790,7 +791,21 @@
setText(text);
} else {
mBlockCompletion = true;
+ // If cursor movement handling was suspended (the view is
+ // not in focus), resume it and apply the pending change.
+ // Since we don't want to perform any filtering, this change
+ // is safe.
+ boolean wasSuspended = false;
+ if (mController.isCursorHandlingSuspended()) {
+ mController.resumeCursorMovementHandlingAndApplyChanges();
+ wasSuspended = true;
+ }
+
setText(text);
+
+ if (wasSuspended) {
+ mController.suspendCursorMovementHandling();
+ }
mBlockCompletion = false;
}
}
diff --git a/src/com/android/browser/preferences/GeneralPreferencesFragment.java b/src/com/android/browser/preferences/GeneralPreferencesFragment.java
index 9c763e9..d64f062 100644
--- a/src/com/android/browser/preferences/GeneralPreferencesFragment.java
+++ b/src/com/android/browser/preferences/GeneralPreferencesFragment.java
@@ -30,35 +30,19 @@
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.DialogFragment;
-import android.app.Fragment;
-import android.content.ContentProviderOperation;
-import android.content.ContentResolver;
-import android.content.ContentValues;
import android.content.Context;
import android.content.DialogInterface;
-import android.content.OperationApplicationException;
import android.content.SharedPreferences;
import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
-import android.database.Cursor;
import android.os.AsyncTask;
import android.os.Bundle;
-import android.os.RemoteException;
import android.preference.Preference;
import android.preference.Preference.OnPreferenceClickListener;
import android.preference.PreferenceFragment;
import android.preference.PreferenceManager;
import android.preference.PreferenceScreen;
import android.provider.BrowserContract;
-import android.provider.BrowserContract.Bookmarks;
-import android.provider.BrowserContract.ChromeSyncColumns;
import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.LinearLayout;
-
-import java.util.ArrayList;
public class GeneralPreferencesFragment extends PreferenceFragment
implements OnPreferenceClickListener, Preference.OnPreferenceChangeListener {
@@ -69,6 +53,7 @@
Preference mChromeSync;
boolean mEnabled;
SharedPreferences mSharedPrefs;
+ Account[] mAccounts;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -144,13 +129,9 @@
String name = bundle.getString(AccountManager.KEY_ACCOUNT_NAME);
String type = bundle.getString(AccountManager.KEY_ACCOUNT_TYPE);
Account account = new Account(name, type);
- Fragment frag = new ImportWizardDialog();
- Bundle extras = mChromeSync.getExtras();
- extras.putParcelableArray("accounts", new Account[] { account });
- frag.setArguments(extras);
- getFragmentManager().beginTransaction()
- .add(frag, null)
- .commit();
+ mAccounts = new Account[] { account };
+ ImportWizard wizard = ImportWizard.newInstance(mAccounts);
+ wizard.show(getFragmentManager(), null);
} catch (Exception ex) {
// Canceled or failed to login, doesn't matter to us
}
@@ -186,6 +167,7 @@
}
} else {
// Google accounts are present.
+ mAccounts = accounts;
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext);
Bundle args = mChromeSync.getExtras();
args.putParcelableArray("accounts", accounts);
@@ -226,16 +208,18 @@
@Override
public boolean onPreferenceClick(Preference preference) {
- Fragment frag;
+ if (mAccounts == null) {
+ Log.w(TAG, "NULL accounts!");
+ return true;
+ }
+ DialogFragment frag;
if (mEnabled) {
frag = new AccountChooserDialog();
+ frag.setArguments(preference.getExtras());
} else {
- frag = new ImportWizardDialog();
+ frag = ImportWizard.newInstance(mAccounts);
}
- frag.setArguments(preference.getExtras());
- getFragmentManager().beginTransaction()
- .add(frag, null)
- .commit();
+ frag.show(getFragmentManager(), null);
return true;
}
@@ -276,196 +260,4 @@
dismiss();
}
}
-
- public static class ImportWizardDialog extends DialogFragment implements OnClickListener {
- View mRemoveButton;
- View mCancelButton;
- String mDefaultAccount;
-
- @Override
- public Dialog onCreateDialog(Bundle savedInstanceState) {
- Context context = getActivity();
- Dialog dialog = new Dialog(context);
- dialog.setTitle(R.string.import_bookmarks_dialog_title);
- dialog.setContentView(R.layout.import_bookmarks_dialog);
- mRemoveButton = dialog.findViewById(R.id.remove);
- mRemoveButton.setOnClickListener(this);
- mCancelButton = dialog.findViewById(R.id.cancel);
- mCancelButton.setOnClickListener(this);
-
- LayoutInflater inflater = dialog.getLayoutInflater();
- LinearLayout accountList = (LinearLayout) dialog.findViewById(R.id.accountList);
- Account[] accounts = (Account[]) getArguments().getParcelableArray("accounts");
- mDefaultAccount = accounts[0].name;
- int length = accounts.length;
- for (int i = 0; i < length; i++) {
- Button button = (Button) inflater.inflate(R.layout.import_bookmarks_dialog_button,
- null);
- button.setText(context.getString(R.string.import_bookmarks_dialog_import,
- accounts[i].name));
- button.setTag(accounts[i].name);
- button.setOnClickListener(this);
- accountList.addView(button);
- }
-
- return dialog;
- }
-
- @Override
- public void onClick(View view) {
- if (view == mCancelButton) {
- dismiss();
- return;
- }
-
- ContentResolver resolver = getActivity().getContentResolver();
- SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
- String accountName;
- if (view == mRemoveButton) {
- // The user chose to remove their old bookmarks, delete them now
- resolver.delete(Bookmarks.CONTENT_URI,
- Bookmarks.PARENT + "=1 AND " + Bookmarks.ACCOUNT_NAME + " IS NULL", null);
- accountName = mDefaultAccount;
- } else {
- // The user chose to migrate their old bookmarks to the account they're syncing
- accountName = view.getTag().toString();
- migrateBookmarks(resolver, accountName);
- }
-
- // Record the fact that we turned on sync
- BrowserContract.Settings.setSyncEnabled(getActivity(), true);
- prefs.edit()
- .putString(BrowserBookmarksPage.PREF_ACCOUNT_TYPE, "com.google")
- .putString(BrowserBookmarksPage.PREF_ACCOUNT_NAME, accountName)
- .apply();
-
- // Enable bookmark sync on all accounts
- Account[] accounts = (Account[]) getArguments().getParcelableArray("accounts");
- for (Account account : accounts) {
- if (ContentResolver.getIsSyncable(account, BrowserContract.AUTHORITY) == 0) {
- // Account wasn't syncable, enable it
- ContentResolver.setIsSyncable(account, BrowserContract.AUTHORITY, 1);
- ContentResolver.setSyncAutomatically(account, BrowserContract.AUTHORITY, true);
- }
- }
-
- dismiss();
- }
-
- /**
- * Migrates bookmarks to the given account
- */
- void migrateBookmarks(ContentResolver resolver, String accountName) {
- Cursor cursor = null;
- try {
- // Re-parent the bookmarks in the default root folder
- cursor = resolver.query(Bookmarks.CONTENT_URI, new String[] { Bookmarks._ID },
- Bookmarks.ACCOUNT_NAME + " =? AND " +
- ChromeSyncColumns.SERVER_UNIQUE + " =?",
- new String[] { accountName,
- ChromeSyncColumns.FOLDER_NAME_BOOKMARKS_BAR },
- null);
- ContentValues values = new ContentValues();
- if (cursor == null || !cursor.moveToFirst()) {
- // The root folders don't exist for the account, create them now
- ArrayList<ContentProviderOperation> ops =
- new ArrayList<ContentProviderOperation>();
-
- // Chrome sync root folder
- values.clear();
- values.put(ChromeSyncColumns.SERVER_UNIQUE, ChromeSyncColumns.FOLDER_NAME_ROOT);
- values.put(Bookmarks.TITLE, "Google Chrome");
- values.put(Bookmarks.POSITION, 0);
- values.put(Bookmarks.IS_FOLDER, true);
- values.put(Bookmarks.DIRTY, true);
- ops.add(ContentProviderOperation.newInsert(
- Bookmarks.CONTENT_URI.buildUpon().appendQueryParameter(
- BrowserContract.CALLER_IS_SYNCADAPTER, "true").build())
- .withValues(values)
- .build());
-
- // Bookmarks folder
- values.clear();
- values.put(ChromeSyncColumns.SERVER_UNIQUE,
- ChromeSyncColumns.FOLDER_NAME_BOOKMARKS);
- values.put(Bookmarks.TITLE, "Bookmarks");
- values.put(Bookmarks.POSITION, 0);
- values.put(Bookmarks.IS_FOLDER, true);
- values.put(Bookmarks.DIRTY, true);
- ops.add(ContentProviderOperation.newInsert(Bookmarks.CONTENT_URI)
- .withValues(values)
- .withValueBackReference(Bookmarks.PARENT, 0)
- .build());
-
- // Bookmarks Bar folder
- values.clear();
- values.put(ChromeSyncColumns.SERVER_UNIQUE,
- ChromeSyncColumns.FOLDER_NAME_BOOKMARKS_BAR);
- values.put(Bookmarks.TITLE, "Bookmarks Bar");
- values.put(Bookmarks.POSITION, 0);
- values.put(Bookmarks.IS_FOLDER, true);
- values.put(Bookmarks.DIRTY, true);
- ops.add(ContentProviderOperation.newInsert(Bookmarks.CONTENT_URI)
- .withValues(values)
- .withValueBackReference(Bookmarks.PARENT, 1)
- .build());
-
- // Other Bookmarks folder
- values.clear();
- values.put(ChromeSyncColumns.SERVER_UNIQUE,
- ChromeSyncColumns.FOLDER_NAME_OTHER_BOOKMARKS);
- values.put(Bookmarks.TITLE, "Other Bookmarks");
- values.put(Bookmarks.POSITION, 1000);
- values.put(Bookmarks.IS_FOLDER, true);
- values.put(Bookmarks.DIRTY, true);
- ops.add(ContentProviderOperation.newInsert(Bookmarks.CONTENT_URI)
- .withValues(values)
- .withValueBackReference(Bookmarks.PARENT, 1)
- .build());
-
- // Re-parent the existing bookmarks to the newly create bookmarks bar folder
- ops.add(ContentProviderOperation.newUpdate(Bookmarks.CONTENT_URI)
- .withValueBackReference(Bookmarks.PARENT, 2)
- .withSelection(Bookmarks.ACCOUNT_NAME + " IS NULL AND " +
- Bookmarks.PARENT + "=?",
- new String[] { Integer.toString(1) })
- .build());
-
- // Mark all non-root folder items as belonging to the new account
- values.clear();
- values.put(Bookmarks.ACCOUNT_TYPE, "com.google");
- values.put(Bookmarks.ACCOUNT_NAME, accountName);
- ops.add(ContentProviderOperation.newUpdate(Bookmarks.CONTENT_URI)
- .withValues(values)
- .withSelection(Bookmarks.ACCOUNT_NAME + " IS NULL AND " +
- Bookmarks._ID + "<>1", null)
- .build());
-
- try {
- resolver.applyBatch(BrowserContract.AUTHORITY, ops);
- } catch (RemoteException e) {
- Log.e(TAG, "failed to create root folder for account " + accountName, e);
- return;
- } catch (OperationApplicationException e) {
- Log.e(TAG, "failed to create root folder for account " + accountName, e);
- return;
- }
- } else {
- values.put(Bookmarks.PARENT, cursor.getLong(0));
- resolver.update(Bookmarks.CONTENT_URI, values, Bookmarks.PARENT + "=?",
- new String[] { Integer.toString(1) });
-
- // Mark all bookmarks at all levels as part of the new account
- values.clear();
- values.put(Bookmarks.ACCOUNT_TYPE, "com.google");
- values.put(Bookmarks.ACCOUNT_NAME, accountName);
- resolver.update(Bookmarks.CONTENT_URI, values,
- Bookmarks.ACCOUNT_NAME + " IS NULL AND " + Bookmarks._ID + "<>1",
- null);
- }
- } finally {
- if (cursor != null) cursor.close();
- }
- }
- }
}
diff --git a/src/com/android/browser/preferences/ImportWizard.java b/src/com/android/browser/preferences/ImportWizard.java
new file mode 100644
index 0000000..7105f4d
--- /dev/null
+++ b/src/com/android/browser/preferences/ImportWizard.java
@@ -0,0 +1,491 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.browser.preferences;
+
+import com.android.browser.BrowserBookmarksPage;
+import com.android.browser.R;
+import com.android.browser.view.EventRedirectingFrameLayout;
+
+import android.accounts.Account;
+import android.animation.LayoutTransition;
+import android.animation.ObjectAnimator;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.content.ContentProviderOperation;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnKeyListener;
+import android.content.DialogInterface.OnShowListener;
+import android.content.OperationApplicationException;
+import android.content.SharedPreferences;
+import android.content.res.Resources;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.preference.PreferenceManager;
+import android.provider.BrowserContract;
+import android.provider.BrowserContract.Bookmarks;
+import android.provider.BrowserContract.ChromeSyncColumns;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+
+public class ImportWizard extends DialogFragment implements OnClickListener,
+ OnItemClickListener {
+
+ static final String TAG = "BookmarkImportWizard";
+
+ static final int PAGE_IMPORT_OR_DELETE = 0;
+ static final int PAGE_SELECT_ACCOUNT = 1;
+ static final int PAGE_CONFIRMATION = 2;
+
+ static final String STATE_CURRENT_PAGE = "wizard.current_page";
+ static final String STATE_IMPORT_OR_DELETE = "wizard.import_or_delete";
+ static final String STATE_SELECTED_ACCOUNT = "wizard.selected_account";
+
+ static final String ARG_ACCOUNTS = "accounts";
+
+ AlertDialog mDialog;
+ EventRedirectingFrameLayout mPages;
+ int mCurrentPage;
+ Button mPositiveButton, mNegativeButton;
+ ListView mImportOrDelete, mSelectAccount;
+ Account[] mAccounts;
+ TextView mSelectAccountDescription, mConfirmation;
+
+ static ImportWizard newInstance(Account[] accounts) {
+ ImportWizard wizard = new ImportWizard();
+ Bundle args = new Bundle();
+ args.putParcelableArray(ARG_ACCOUNTS, accounts);
+ wizard.setArguments(args);
+ return wizard;
+ }
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ mAccounts = (Account[]) getArguments().getParcelableArray(ARG_ACCOUNTS);
+ }
+
+ @Override
+ public Dialog onCreateDialog(Bundle savedInstanceState) {
+ mDialog = new AlertDialog.Builder(getActivity())
+ .setTitle(R.string.import_bookmarks_dialog_title)
+ .setView(createView(savedInstanceState))
+ .setPositiveButton("?", null) // This is just a placeholder
+ .setNegativeButton("?", null) // Ditto
+ .setOnKeyListener(new OnKeyListener() {
+ @Override
+ public boolean onKey(DialogInterface arg0, int arg1, KeyEvent key) {
+ if (key.getKeyCode() == KeyEvent.KEYCODE_BACK) {
+ if (key.getAction() == KeyEvent.ACTION_UP
+ && !key.isCanceled()) {
+ mNegativeButton.performClick();
+ }
+ return true;
+ }
+ return false;
+ }
+ })
+ .create();
+ mDialog.setOnShowListener(new OnShowListener() {
+ @Override
+ public void onShow(DialogInterface dialog) {
+ mPositiveButton = mDialog.getButton(AlertDialog.BUTTON_POSITIVE);
+ mNegativeButton = mDialog.getButton(AlertDialog.BUTTON_NEGATIVE);
+ mPositiveButton.setOnClickListener(ImportWizard.this);
+ mNegativeButton.setOnClickListener(ImportWizard.this);
+ setupAnimations();
+ updateNavigation();
+ }
+ });
+ return mDialog;
+ }
+
+ @Override
+ public void onSaveInstanceState(Bundle outState) {
+ super.onSaveInstanceState(outState);
+ outState.putInt(STATE_CURRENT_PAGE, mCurrentPage);
+ outState.putInt(STATE_IMPORT_OR_DELETE, mImportOrDelete.getCheckedItemPosition());
+ outState.putInt(STATE_SELECTED_ACCOUNT, mSelectAccount.getCheckedItemPosition());
+ }
+
+ public View createView(Bundle savedInstanceState) {
+ LayoutInflater inflater = LayoutInflater.from(getActivity());
+ View root = inflater.inflate(R.layout.bookmark_sync_wizard, null);
+ mPages = (EventRedirectingFrameLayout) root.findViewById(R.id.pages);
+ if (mPages.getChildCount() < 1) {
+ throw new IllegalStateException("no pages in wizard!");
+ }
+ if (savedInstanceState != null) {
+ mCurrentPage = savedInstanceState.getInt(STATE_CURRENT_PAGE);
+ } else {
+ mCurrentPage = 0;
+ }
+ setupPage1(savedInstanceState);
+ setupPage2(savedInstanceState);
+ setupPage3(savedInstanceState);
+ for (int i = 0; i < mPages.getChildCount(); i++) {
+ View v = mPages.getChildAt(i);
+ if (i <= mCurrentPage) {
+ preparePage();
+ v.setVisibility(View.VISIBLE);
+ } else {
+ v.setVisibility(View.GONE);
+ }
+ }
+ mPages.setTargetChild(mCurrentPage);
+ return root;
+ }
+
+ void setupPage1(Bundle savedInstanceState) {
+ mImportOrDelete = (ListView) mPages.findViewById(R.id.add_remove_bookmarks);
+ // Add an empty header so we get a divider above the list
+ mImportOrDelete.addHeaderView(new View(getActivity()));
+ Resources res = getActivity().getResources();
+ String[] choices = new String[] {
+ res.getString(R.string.import_bookmarks_dialog_add),
+ res.getString(R.string.import_bookmarks_dialog_remove)
+ };
+ ArrayAdapter<String> adapter = new ArrayAdapter<String>(getActivity(),
+ R.layout.bookmark_sync_wizard_item, choices);
+ mImportOrDelete.setAdapter(adapter);
+ if (savedInstanceState != null) {
+ int position = savedInstanceState.getInt(STATE_IMPORT_OR_DELETE);
+ if (position == ListView.INVALID_POSITION) {
+ mImportOrDelete.clearChoices();
+ } else {
+ mImportOrDelete.setItemChecked(position, true);
+ }
+ }
+ mImportOrDelete.setOnItemClickListener(this);
+ }
+
+ void setupPage2(Bundle savedInstanceState) {
+ mSelectAccount = (ListView) mPages.findViewById(R.id.select_account);
+ mSelectAccountDescription =
+ (TextView) mPages.findViewById(R.id.select_account_description);
+ // Add an empty header so we get a divider above the list
+ mSelectAccount.addHeaderView(new View(getActivity()));
+ Resources res = getActivity().getResources();
+ String[] accountNames = new String[mAccounts.length];
+ for (int i = 0; i < mAccounts.length; i++) {
+ accountNames[i] = mAccounts[i].name;
+ }
+ ArrayAdapter<String> adapter = new ArrayAdapter<String>(getActivity(),
+ R.layout.bookmark_sync_wizard_item, accountNames);
+ mSelectAccount.setAdapter(adapter);
+ mSelectAccount.setItemChecked(mSelectAccount.getHeaderViewsCount(), true);
+ if (savedInstanceState != null) {
+ int position = savedInstanceState.getInt(STATE_SELECTED_ACCOUNT);
+ if (position != ListView.INVALID_POSITION) {
+ mSelectAccount.setItemChecked(position, true);
+ }
+ }
+ mSelectAccount.setOnItemClickListener(this);
+ }
+
+ void setupPage3(Bundle savedInstanceState) {
+ mConfirmation = (TextView) mPages.findViewById(R.id.confirm);
+ }
+
+ void preparePage() {
+ switch (mCurrentPage) {
+ case PAGE_SELECT_ACCOUNT:
+ if (shouldDeleteBookmarks()) {
+ mSelectAccountDescription.setText(
+ R.string.import_bookmarks_dialog_delete_select_account);
+ } else {
+ mSelectAccountDescription.setText(
+ R.string.import_bookmarks_dialog_select_add_account);
+ }
+ break;
+ case PAGE_CONFIRMATION:
+ String account = getSelectedAccount().name;
+ String confirmationMessage;
+ if (shouldDeleteBookmarks()) {
+ confirmationMessage = getActivity().getString(
+ R.string.import_bookmarks_dialog_confirm_delete, account);
+ } else {
+ confirmationMessage = getActivity().getString(
+ R.string.import_bookmarks_dialog_confirm_add, account);
+ }
+ mConfirmation.setText(confirmationMessage);
+ break;
+ }
+ }
+
+ int getAdjustedCheckedItemPosition(ListView list) {
+ int position = list.getCheckedItemPosition();
+ if (position != ListView.INVALID_POSITION) {
+ position -= list.getHeaderViewsCount();
+ }
+ return position;
+ }
+
+ Account getSelectedAccount() {
+ return mAccounts[getAdjustedCheckedItemPosition(mSelectAccount)];
+ }
+
+ boolean shouldDeleteBookmarks() {
+ return getAdjustedCheckedItemPosition(mImportOrDelete) == 1;
+ }
+
+ @Override
+ public void onItemClick(
+ AdapterView<?> parent, View view, int position, long id) {
+ validate();
+ }
+
+ void updateNavigation() {
+ if (mCurrentPage == 0) {
+ mNegativeButton.setText(R.string.import_bookmarks_wizard_cancel);
+ } else {
+ mNegativeButton.setText(R.string.import_bookmarks_wizard_previous);
+ }
+ if ((mCurrentPage + 1) == mPages.getChildCount()) {
+ mPositiveButton.setText(R.string.import_bookmarks_wizard_done);
+ } else {
+ mPositiveButton.setText(R.string.import_bookmarks_wizard_next);
+ }
+ validate();
+ }
+
+ void validate() {
+ switch (mCurrentPage) {
+ case PAGE_IMPORT_OR_DELETE:
+ mPositiveButton.setEnabled(
+ mImportOrDelete.getCheckedItemPosition() != ListView.INVALID_POSITION);
+ break;
+ case PAGE_SELECT_ACCOUNT:
+ mPositiveButton.setEnabled(
+ mSelectAccount.getCheckedItemPosition() != ListView.INVALID_POSITION);
+ break;
+ }
+ }
+
+ void setupAnimations() {
+ float animX = mPages.getMeasuredWidth();
+ final LayoutTransition transitioner = new LayoutTransition();
+ ObjectAnimator appearing = ObjectAnimator.ofFloat(this, "translationX",
+ animX, 0);
+ ObjectAnimator disappearing = ObjectAnimator.ofFloat(this, "translationX",
+ 0, animX);
+ transitioner.setAnimator(LayoutTransition.APPEARING, appearing);
+ transitioner.setAnimator(LayoutTransition.DISAPPEARING, disappearing);
+ mPages.setLayoutTransition(transitioner);
+ }
+
+ boolean next() {
+ if (mCurrentPage + 1 < mPages.getChildCount()) {
+ mCurrentPage++;
+ preparePage();
+ mPages.getChildAt(mCurrentPage).setVisibility(View.VISIBLE);
+ mPages.setTargetChild(mCurrentPage);
+ return true;
+ }
+ return false;
+ }
+
+ boolean prev() {
+ if (mCurrentPage > 0) {
+ mPages.getChildAt(mCurrentPage).setVisibility(View.GONE);
+ mCurrentPage--;
+ mPages.setTargetChild(mCurrentPage);
+ return true;
+ }
+ return false;
+ }
+
+ void done() {
+ ContentResolver resolver = getActivity().getContentResolver();
+ SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
+ String accountName = getSelectedAccount().name;
+ if (shouldDeleteBookmarks()) {
+ // The user chose to remove their old bookmarks, delete them now
+ resolver.delete(Bookmarks.CONTENT_URI,
+ Bookmarks.PARENT + "=1 AND " + Bookmarks.ACCOUNT_NAME + " IS NULL", null);
+ } else {
+ // The user chose to migrate their old bookmarks to the account they're syncing
+ migrateBookmarks(resolver, accountName);
+ }
+
+ // Record the fact that we turned on sync
+ BrowserContract.Settings.setSyncEnabled(getActivity(), true);
+ prefs.edit()
+ .putString(BrowserBookmarksPage.PREF_ACCOUNT_TYPE, "com.google")
+ .putString(BrowserBookmarksPage.PREF_ACCOUNT_NAME, accountName)
+ .apply();
+
+ // Enable bookmark sync on all accounts
+ Account[] accounts = (Account[]) getArguments().getParcelableArray("accounts");
+ for (Account account : accounts) {
+ if (ContentResolver.getIsSyncable(account, BrowserContract.AUTHORITY) == 0) {
+ // Account wasn't syncable, enable it
+ ContentResolver.setIsSyncable(account, BrowserContract.AUTHORITY, 1);
+ ContentResolver.setSyncAutomatically(account, BrowserContract.AUTHORITY, true);
+ }
+ }
+
+ dismiss();
+ }
+
+ @Override
+ public void onClick(View v) {
+ if (v == mNegativeButton) {
+ if (prev()) {
+ updateNavigation();
+ } else {
+ dismiss();
+ }
+ } else if (v == mPositiveButton) {
+ if (next()) {
+ updateNavigation();
+ } else {
+ done();
+ }
+ }
+ }
+
+ /**
+ * Migrates bookmarks to the given account
+ */
+ void migrateBookmarks(ContentResolver resolver, String accountName) {
+ Cursor cursor = null;
+ try {
+ // Re-parent the bookmarks in the default root folder
+ cursor = resolver.query(Bookmarks.CONTENT_URI, new String[] { Bookmarks._ID },
+ Bookmarks.ACCOUNT_NAME + " =? AND " +
+ ChromeSyncColumns.SERVER_UNIQUE + " =?",
+ new String[] { accountName,
+ ChromeSyncColumns.FOLDER_NAME_BOOKMARKS_BAR },
+ null);
+ ContentValues values = new ContentValues();
+ if (cursor == null || !cursor.moveToFirst()) {
+ // The root folders don't exist for the account, create them now
+ ArrayList<ContentProviderOperation> ops =
+ new ArrayList<ContentProviderOperation>();
+
+ // Chrome sync root folder
+ values.clear();
+ values.put(ChromeSyncColumns.SERVER_UNIQUE, ChromeSyncColumns.FOLDER_NAME_ROOT);
+ values.put(Bookmarks.TITLE, "Google Chrome");
+ values.put(Bookmarks.POSITION, 0);
+ values.put(Bookmarks.IS_FOLDER, true);
+ values.put(Bookmarks.DIRTY, true);
+ ops.add(ContentProviderOperation.newInsert(
+ Bookmarks.CONTENT_URI.buildUpon().appendQueryParameter(
+ BrowserContract.CALLER_IS_SYNCADAPTER, "true").build())
+ .withValues(values)
+ .build());
+
+ // Bookmarks folder
+ values.clear();
+ values.put(ChromeSyncColumns.SERVER_UNIQUE,
+ ChromeSyncColumns.FOLDER_NAME_BOOKMARKS);
+ values.put(Bookmarks.TITLE, "Bookmarks");
+ values.put(Bookmarks.POSITION, 0);
+ values.put(Bookmarks.IS_FOLDER, true);
+ values.put(Bookmarks.DIRTY, true);
+ ops.add(ContentProviderOperation.newInsert(Bookmarks.CONTENT_URI)
+ .withValues(values)
+ .withValueBackReference(Bookmarks.PARENT, 0)
+ .build());
+
+ // Bookmarks Bar folder
+ values.clear();
+ values.put(ChromeSyncColumns.SERVER_UNIQUE,
+ ChromeSyncColumns.FOLDER_NAME_BOOKMARKS_BAR);
+ values.put(Bookmarks.TITLE, "Bookmarks Bar");
+ values.put(Bookmarks.POSITION, 0);
+ values.put(Bookmarks.IS_FOLDER, true);
+ values.put(Bookmarks.DIRTY, true);
+ ops.add(ContentProviderOperation.newInsert(Bookmarks.CONTENT_URI)
+ .withValues(values)
+ .withValueBackReference(Bookmarks.PARENT, 1)
+ .build());
+
+ // Other Bookmarks folder
+ values.clear();
+ values.put(ChromeSyncColumns.SERVER_UNIQUE,
+ ChromeSyncColumns.FOLDER_NAME_OTHER_BOOKMARKS);
+ values.put(Bookmarks.TITLE, "Other Bookmarks");
+ values.put(Bookmarks.POSITION, 1000);
+ values.put(Bookmarks.IS_FOLDER, true);
+ values.put(Bookmarks.DIRTY, true);
+ ops.add(ContentProviderOperation.newInsert(Bookmarks.CONTENT_URI)
+ .withValues(values)
+ .withValueBackReference(Bookmarks.PARENT, 1)
+ .build());
+
+ // Re-parent the existing bookmarks to the newly create bookmarks bar folder
+ ops.add(ContentProviderOperation.newUpdate(Bookmarks.CONTENT_URI)
+ .withValueBackReference(Bookmarks.PARENT, 2)
+ .withSelection(Bookmarks.ACCOUNT_NAME + " IS NULL AND " +
+ Bookmarks.PARENT + "=?",
+ new String[] { Integer.toString(1) })
+ .build());
+
+ // Mark all non-root folder items as belonging to the new account
+ values.clear();
+ values.put(Bookmarks.ACCOUNT_TYPE, "com.google");
+ values.put(Bookmarks.ACCOUNT_NAME, accountName);
+ ops.add(ContentProviderOperation.newUpdate(Bookmarks.CONTENT_URI)
+ .withValues(values)
+ .withSelection(Bookmarks.ACCOUNT_NAME + " IS NULL AND " +
+ Bookmarks._ID + "<>1", null)
+ .build());
+
+ try {
+ resolver.applyBatch(BrowserContract.AUTHORITY, ops);
+ } catch (RemoteException e) {
+ Log.e(TAG, "failed to create root folder for account " + accountName, e);
+ return;
+ } catch (OperationApplicationException e) {
+ Log.e(TAG, "failed to create root folder for account " + accountName, e);
+ return;
+ }
+ } else {
+ values.put(Bookmarks.PARENT, cursor.getLong(0));
+ resolver.update(Bookmarks.CONTENT_URI, values, Bookmarks.PARENT + "=?",
+ new String[] { Integer.toString(1) });
+
+ // Mark all bookmarks at all levels as part of the new account
+ values.clear();
+ values.put(Bookmarks.ACCOUNT_TYPE, "com.google");
+ values.put(Bookmarks.ACCOUNT_NAME, accountName);
+ resolver.update(Bookmarks.CONTENT_URI, values,
+ Bookmarks.ACCOUNT_NAME + " IS NULL AND " + Bookmarks._ID + "<>1",
+ null);
+ }
+ } finally {
+ if (cursor != null) cursor.close();
+ }
+ }
+}
diff --git a/src/com/android/browser/preferences/PrivacySecurityPreferencesFragment.java b/src/com/android/browser/preferences/PrivacySecurityPreferencesFragment.java
index 2b2ee3e..2266608 100644
--- a/src/com/android/browser/preferences/PrivacySecurityPreferencesFragment.java
+++ b/src/com/android/browser/preferences/PrivacySecurityPreferencesFragment.java
@@ -17,14 +17,11 @@
package com.android.browser.preferences;
import com.android.browser.BrowserSettings;
-import com.android.browser.GoogleAccountLogin;
import com.android.browser.R;
-import android.accounts.Account;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
-import android.preference.ListPreference;
import android.preference.Preference;
import android.preference.PreferenceFragment;
@@ -44,53 +41,11 @@
Preference e = findPreference(BrowserSettings.PREF_CLEAR_HISTORY);
e.setOnPreferenceChangeListener(this);
- setupAutoLoginPreference();
}
@Override
public void onResume() {
super.onResume();
- setupAutoLoginPreference();
- }
-
- void setupAutoLoginPreference() {
- ListPreference autologinPref = (ListPreference) findPreference(
- BrowserSettings.PREF_AUTOLOGIN_ACCOUNT);
- autologinPref.setOnPreferenceChangeListener(this);
- updateAutoLoginSummary(autologinPref);
- Account[] accounts = GoogleAccountLogin.getAccounts(getActivity());
- // +1 for disable
- CharSequence[] names = new CharSequence[accounts.length + 1];
- CharSequence[] values = new CharSequence[names.length];
- int i = 0;
- int defaultAccount = 0;
- for (Account a : accounts) {
- values[i] = names[i] = a.name;
- i++;
- }
- names[i] = getResources().getString(R.string.pref_autologin_disable);
- values[i] = "";
- autologinPref.setEntries(names);
- autologinPref.setEntryValues(values);
- BrowserSettings bs = BrowserSettings.getInstance();
- if (bs.isAutoLoginEnabled()) {
- autologinPref.setValue(bs.getAutoLoginAccount(getActivity()));
- } else {
- autologinPref.setValue("");
- }
- }
-
- private void updateAutoLoginSummary(Preference pref) {
- if (!mSettings.isAutoLoginEnabled()) {
- pref.setSummary(R.string.pref_autologin_disable);
- } else {
- String account = mSettings.getAutoLoginAccount(getActivity());
- if (account == null) {
- pref.setSummary(R.string.pref_autologin_no_account);
- } else {
- pref.setSummary(getString(R.string.pref_autologin_summary, account));
- }
- }
}
@Override
@@ -102,17 +57,6 @@
getActivity().setResult(Activity.RESULT_OK, (new Intent()).putExtra(Intent.EXTRA_TEXT,
pref.getKey()));
return true;
- } else if (pref.getKey().equals(BrowserSettings.PREF_AUTOLOGIN_ACCOUNT)) {
- String account = (String) objValue;
- if (account.length() == 0) {
- // Disable
- mSettings.setAutoLoginEnabled(getActivity(), false);
- } else {
- mSettings.setAutoLoginEnabled(getActivity(), true);
- }
- mSettings.setAutoLoginAccount(getActivity(), account);
- updateAutoLoginSummary(pref);
- return true;
}
return false;
diff --git a/src/com/android/browser/provider/BrowserProvider2.java b/src/com/android/browser/provider/BrowserProvider2.java
index e632fca..d154f20 100644
--- a/src/com/android/browser/provider/BrowserProvider2.java
+++ b/src/com/android/browser/provider/BrowserProvider2.java
@@ -1236,6 +1236,9 @@
private boolean isValidParent(String accountType, String accountName,
long parentId) {
+ if (parentId <= 0) {
+ return false;
+ }
Uri uri = ContentUris.withAppendedId(Bookmarks.CONTENT_URI, parentId);
Cursor c = query(uri,
new String[] { Bookmarks.ACCOUNT_NAME, Bookmarks.ACCOUNT_TYPE },
diff --git a/src/com/android/browser/view/BasePieView.java b/src/com/android/browser/view/BasePieView.java
new file mode 100644
index 0000000..ec02e3a
--- /dev/null
+++ b/src/com/android/browser/view/BasePieView.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.browser.view;
+
+import android.database.DataSetObserver;
+import android.graphics.Canvas;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.Adapter;
+
+import java.util.ArrayList;
+
+/**
+ * common code for pie views
+ */
+public abstract class BasePieView implements PieMenu.PieView {
+
+ protected Adapter mAdapter;
+ private DataSetObserver mObserver;
+ protected ArrayList<View> mViews;
+
+ protected OnLayoutListener mListener;
+
+ protected int mCurrent;
+ protected int mChildWidth;
+ protected int mChildHeight;
+ protected int mWidth;
+ protected int mHeight;
+ protected int mLeft;
+ protected int mTop;
+
+ public BasePieView() {
+ }
+
+ public void setLayoutListener(OnLayoutListener l) {
+ mListener = l;
+ }
+
+ public void setAdapter(Adapter adapter) {
+ mAdapter = adapter;
+ if (adapter == null) {
+ if (mAdapter != null) {
+ mAdapter.unregisterDataSetObserver(mObserver);
+ }
+ mViews = null;
+ mCurrent = -1;
+ } else {
+ mObserver = new DataSetObserver() {
+ @Override
+ public void onChanged() {
+ buildViews();
+ }
+
+ @Override
+ public void onInvalidated() {
+ mViews.clear();
+ }
+ };
+ mAdapter.registerDataSetObserver(mObserver);
+ setCurrent(0);
+ }
+ }
+
+ public void setCurrent(int ix) {
+ mCurrent = ix;
+ }
+
+ public Adapter getAdapter() {
+ return mAdapter;
+ }
+
+ protected void buildViews() {
+ if (mAdapter != null) {
+ final int n = mAdapter.getCount();
+ if (mViews == null) {
+ mViews = new ArrayList<View>(n);
+ } else {
+ mViews.clear();
+ }
+ mChildWidth = 0;
+ mChildHeight = 0;
+ for (int i = 0; i < n; i++) {
+ View view = mAdapter.getView(i, null, null);
+ view.measure(View.MeasureSpec.UNSPECIFIED,
+ View.MeasureSpec.UNSPECIFIED);
+ mChildWidth = Math.max(mChildWidth, view.getMeasuredWidth());
+ mChildHeight = Math.max(mChildHeight, view.getMeasuredHeight());
+ mViews.add(view);
+ }
+ }
+ }
+
+ /**
+ * this will be called before the first draw call
+ * needs to set top, left, width, height
+ */
+ @Override
+ public void layout(int anchorX, int anchorY, boolean left, float angle) {
+ if (mListener != null) {
+ mListener.onLayout(anchorX, anchorY, left);
+ }
+ }
+
+
+ @Override
+ public abstract void draw(Canvas canvas);
+
+ protected void drawView(View view, Canvas canvas) {
+ final int state = canvas.save();
+ canvas.translate(view.getLeft(), view.getTop());
+ view.draw(canvas);
+ canvas.restoreToCount(state);
+ }
+
+ protected abstract int findChildAt(int y);
+
+ @Override
+ public boolean onTouchEvent(MotionEvent evt) {
+ int action = evt.getActionMasked();
+ int evtx = (int) evt.getX();
+ int evty = (int) evt.getY();
+ if ((evtx < mLeft) || (evtx >= mLeft + mWidth)
+ || (evty < mTop) || (evty >= mTop + mHeight)) {
+ return false;
+ }
+ switch (action) {
+ case MotionEvent.ACTION_MOVE:
+ View v = mViews.get(mCurrent);
+ setCurrent(Math.max(0, Math.min(mViews.size() -1,
+ findChildAt(evty))));
+ View v1 = mViews.get(mCurrent);
+ if (v != v1) {
+ v.setPressed(false);
+ v1.setPressed(true);
+ }
+ break;
+ case MotionEvent.ACTION_UP:
+ mViews.get(mCurrent).performClick();
+ mViews.get(mCurrent).setPressed(false);
+ break;
+ default:
+ break;
+ }
+ return true;
+ }
+
+}
diff --git a/src/com/android/browser/view/EventRedirectingFrameLayout.java b/src/com/android/browser/view/EventRedirectingFrameLayout.java
new file mode 100644
index 0000000..901b021
--- /dev/null
+++ b/src/com/android/browser/view/EventRedirectingFrameLayout.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.browser.view;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.FrameLayout;
+
+public class EventRedirectingFrameLayout extends FrameLayout {
+
+ private int mTargetChild;
+
+ public EventRedirectingFrameLayout(Context context) {
+ super(context);
+ }
+
+ public EventRedirectingFrameLayout(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ }
+
+ public EventRedirectingFrameLayout(
+ Context context, AttributeSet attrs, int defStyle) {
+ super(context, attrs, defStyle);
+ }
+
+ public void setTargetChild(int index) {
+ if (index >= 0 && index < getChildCount()) {
+ mTargetChild = index;
+ getChildAt(mTargetChild).requestFocus();
+ }
+ }
+
+ @Override
+ public boolean dispatchTouchEvent(MotionEvent ev) {
+ View child = getChildAt(mTargetChild);
+ if (child != null)
+ return child.dispatchTouchEvent(ev);
+ return false;
+ }
+
+ @Override
+ public boolean dispatchKeyEvent(KeyEvent event) {
+ View child = getChildAt(mTargetChild);
+ if (child != null)
+ return child.dispatchKeyEvent(event);
+ return false;
+ }
+
+ @Override
+ public boolean dispatchKeyEventPreIme(KeyEvent event) {
+ View child = getChildAt(mTargetChild);
+ if (child != null)
+ return child.dispatchKeyEventPreIme(event);
+ return false;
+ }
+
+}
diff --git a/src/com/android/browser/view/PieItem.java b/src/com/android/browser/view/PieItem.java
new file mode 100644
index 0000000..3674447
--- /dev/null
+++ b/src/com/android/browser/view/PieItem.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.android.browser.view;
+
+import com.android.browser.view.PieMenu.PieView;
+
+import android.graphics.Path;
+import android.view.View;
+
+/**
+ * Pie menu item
+ */
+public class PieItem {
+
+ private View mView;
+ private PieView mPieView;
+ private int level;
+ private float start;
+ private float sweep;
+ private int inner;
+ private int outer;
+ private boolean mSelected;
+ private Path mPath;
+
+ public PieItem(View view, int level) {
+ mView = view;
+ this.level = level;
+ }
+
+ public PieItem(View view, int level, PieView sym) {
+ mView = view;
+ this.level = level;
+ mPieView = sym;
+ }
+
+ public void setSelected(boolean s) {
+ mSelected = s;
+ if (mView != null) {
+ mView.setSelected(s);
+ }
+ }
+
+ public boolean isSelected() {
+ return mSelected;
+ }
+
+ public int getLevel() {
+ return level;
+ }
+
+ public void setGeometry(float st, float sw, int inside, int outside, Path p) {
+ start = st;
+ sweep = sw;
+ inner = inside;
+ outer = outside;
+ mPath = p;
+ }
+
+ public float getStartAngle() {
+ return start;
+ }
+
+ public float getSweep() {
+ return sweep;
+ }
+
+ public int getInnerRadius() {
+ return inner;
+ }
+
+ public int getOuterRadius() {
+ return outer;
+ }
+
+ public boolean isPieView() {
+ return (mPieView != null);
+ }
+
+ public View getView() {
+ return mView;
+ }
+
+ public void setPieView(PieView sym) {
+ mPieView = sym;
+ }
+
+ public PieView getPieView() {
+ return mPieView;
+ }
+
+ public Path getPath() {
+ return mPath;
+ }
+
+}
diff --git a/src/com/android/browser/view/PieListView.java b/src/com/android/browser/view/PieListView.java
new file mode 100644
index 0000000..04b512b
--- /dev/null
+++ b/src/com/android/browser/view/PieListView.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.browser.view;
+
+import com.android.browser.R;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.view.View;
+
+/**
+ * shows views in a menu style list
+ */
+public class PieListView extends BasePieView {
+
+ private Paint mBgPaint;
+
+ public PieListView(Context ctx) {
+ mBgPaint = new Paint();
+ mBgPaint.setColor(ctx.getResources().getColor(R.color.qcMenuBackground));
+ }
+
+ /**
+ * this will be called before the first draw call
+ */
+ @Override
+ public void layout(int anchorX, int anchorY, boolean left, float angle) {
+ super.layout(anchorX, anchorY, left, angle);
+ buildViews();
+ mWidth = mChildWidth;
+ mHeight = mChildHeight * mAdapter.getCount();
+ mLeft = anchorX + (left ? 0 : - mChildWidth);
+ mTop = anchorY - mHeight / 2;
+ if (mViews != null) {
+ layoutChildrenLinear();
+ }
+ }
+
+ protected void layoutChildrenLinear() {
+ final int n = mViews.size();
+ int top = mTop;
+ for (View view : mViews) {
+ view.layout(mLeft, top, mLeft + mChildWidth, top + mChildHeight);
+ top += mChildHeight;
+ }
+ }
+
+ @Override
+ public void draw(Canvas canvas) {
+ canvas.drawRect(mLeft, mTop, mLeft + mWidth, mTop + mHeight, mBgPaint);
+ if (mViews != null) {
+ for (View view : mViews) {
+ drawView(view, canvas);
+ }
+ }
+ }
+
+ @Override
+ protected int findChildAt(int y) {
+ final int ix = (y - mTop) * mViews.size() / mHeight;
+ return ix;
+ }
+
+}
diff --git a/src/com/android/browser/view/PieMenu.java b/src/com/android/browser/view/PieMenu.java
index 080c257..cded435 100644
--- a/src/com/android/browser/view/PieMenu.java
+++ b/src/com/android/browser/view/PieMenu.java
@@ -20,17 +20,12 @@
import android.content.Context;
import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.BitmapShader;
import android.graphics.Canvas;
-import android.graphics.Matrix;
import android.graphics.Paint;
import android.graphics.Path;
import android.graphics.Point;
import android.graphics.PointF;
-import android.graphics.Rect;
import android.graphics.RectF;
-import android.graphics.Shader;
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
import android.view.MotionEvent;
@@ -40,13 +35,11 @@
import android.widget.FrameLayout;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
public class PieMenu extends FrameLayout {
- private static final int RADIUS_GAP = 10;
+ private static final int MAX_LEVELS = 5;
public interface PieController {
/**
@@ -55,31 +48,46 @@
*/
public boolean onOpen();
}
+
+ /**
+ * A view like object that lives off of the pie menu
+ */
+ public interface PieView {
+
+ public interface OnLayoutListener {
+ public void onLayout(int ax, int ay, boolean left);
+ }
+
+ public void setLayoutListener(OnLayoutListener l);
+
+ public void layout(int anchorX, int anchorY, boolean onleft, float angle);
+
+ public void draw(Canvas c);
+
+ public boolean onTouchEvent(MotionEvent evt);
+
+ }
+
private Point mCenter;
private int mRadius;
private int mRadiusInc;
private int mSlop;
+ private int mTouchOffset;
private boolean mOpen;
- private Paint mPaint;
- private Paint mSelectedPaint;
private PieController mController;
- private Map<View, List<View>> mMenu;
- private List<View> mStack;
+ private List<PieItem> mItems;
+ private int mLevels;
+ private int[] mCounts;
+ private PieView mPieView = null;
- private boolean mDirty;
+ private Drawable mBackground;
+ private Paint mNormalPaint;
+ private Paint mSelectedPaint;
- private Drawable mActiveDrawable;
- private Drawable mInactiveDrawable;
- private final Paint mActiveShaderPaint = new Paint();
- private final Paint mInactiveShaderPaint = new Paint();
- private final Matrix mActiveMatrix = new Matrix();
- private final Matrix mInactiveMatrix = new Matrix();
-
- private BitmapShader mActiveShader;
- private BitmapShader mInactiveShader;
-
+ // touch handling
+ PieItem mCurrentItem;
/**
* @param context
@@ -109,130 +117,66 @@
}
private void init(Context ctx) {
- this.setTag(new MenuTag(0));
- mStack = new ArrayList<View>();
- mStack.add(this);
+ mItems = new ArrayList<PieItem>();
+ mLevels = 0;
+ mCounts = new int[MAX_LEVELS];
Resources res = ctx.getResources();
- mRadius = (int) res.getDimension(R.dimen.qc_radius);
- mRadiusInc = (int) res.getDimension(R.dimen.qc_radius_inc);
+ mRadius = (int) res.getDimension(R.dimen.qc_radius_start);
+ mRadiusInc = (int) res.getDimension(R.dimen.qc_radius_increment);
mSlop = (int) res.getDimension(R.dimen.qc_slop);
- mPaint = new Paint();
- mPaint.setAntiAlias(true);
- mPaint.setColor(res.getColor(R.color.qc_slice_normal));
- mSelectedPaint = new Paint();
- mSelectedPaint.setAntiAlias(true);
- mSelectedPaint.setColor(res.getColor(R.color.qc_slice_active));
+ mTouchOffset = (int) res.getDimension(R.dimen.qc_touch_offset);
mOpen = false;
- mMenu = new HashMap<View, List<View>>();
setWillNotDraw(false);
setDrawingCacheEnabled(false);
mCenter = new Point(0,0);
- mDirty = true;
- mActiveShaderPaint.setStyle(Paint.Style.FILL);
- mActiveShaderPaint.setAntiAlias(true);
-
- mInactiveShaderPaint.setStyle(Paint.Style.FILL);
- mInactiveShaderPaint.setAntiAlias(true);
- mActiveDrawable = res.getDrawable(R.drawable.qc_background_selected);
- mInactiveDrawable = res.getDrawable(R.drawable.qc_background_normal);
-
- Bitmap activeTexture = getDrawableAsBitmap(mActiveDrawable,
- mActiveDrawable.getIntrinsicWidth(),
- mActiveDrawable.getIntrinsicHeight());
- Bitmap inactiveTexture = getDrawableAsBitmap(mInactiveDrawable,
- mInactiveDrawable.getIntrinsicWidth(),
- mInactiveDrawable.getIntrinsicHeight());
-
- mActiveShader = new BitmapShader(activeTexture,
- Shader.TileMode.CLAMP, Shader.TileMode.CLAMP);
- mActiveShaderPaint.setShader(mActiveShader);
-
- mInactiveShader = new BitmapShader(inactiveTexture,
- Shader.TileMode.CLAMP, Shader.TileMode.CLAMP);
- mInactiveShaderPaint.setShader(mInactiveShader);
-
- }
-
- private static Bitmap getDrawableAsBitmap(Drawable drawable, int width, int height) {
- Bitmap b = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
- Canvas c = new Canvas(b);
- drawable.setBounds(0, 0, width, height);
- drawable.draw(c);
- return b;
+ mBackground = res.getDrawable(R.drawable.qc_background_normal);
+ mNormalPaint = new Paint();
+ mNormalPaint.setColor(res.getColor(R.color.qc_normal));
+ mNormalPaint.setAntiAlias(true);
+ mSelectedPaint = new Paint();
+ mSelectedPaint.setColor(res.getColor(R.color.qc_selected));
+ mSelectedPaint.setAntiAlias(true);
}
public void setController(PieController ctl) {
mController = ctl;
}
- public void setRadius(int r) {
- mRadius = r;
- requestLayout();
- }
-
- public void setRadiusIncrement(int ri) {
- mRadiusInc = ri;
- requestLayout();
- }
-
- /**
- * add a menu item to another item as a submenu
- * @param item
- * @param parent
- */
- public void addItem(View item, View parent) {
- List<View> subs = mMenu.get(parent);
- if (subs == null) {
- subs = new ArrayList<View>();
- mMenu.put(parent, subs);
- }
- subs.add(item);
- MenuTag tag = new MenuTag(((MenuTag) parent.getTag()).level + 1);
- item.setTag(tag);
- }
-
- public void addItem(View view) {
+ public void addItem(PieItem item) {
// add the item to the pie itself
- addItem(view, this);
+ mItems.add(item);
+ int l = item.getLevel();
+ mLevels = Math.max(mLevels, l);
+ mCounts[l]++;
}
- public void removeItem(View view) {
- List<View> subs = mMenu.get(view);
- mMenu.remove(view);
- for (View p : mMenu.keySet()) {
- List<View> sl = mMenu.get(p);
- if (sl != null) {
- sl.remove(view);
- }
- }
- }
-
- public void clearItems(View parent) {
- List<View> subs = mMenu.remove(parent);
- if (subs != null) {
- for (View sub: subs) {
- clearItems(sub);
- }
- }
+ public void removeItem(PieItem item) {
+ mItems.remove(item);
}
public void clearItems() {
- mMenu.clear();
+ mItems.clear();
}
+ private boolean onTheLeft() {
+ return mCenter.x < mSlop;
+ }
- public void show(boolean show) {
+ /**
+ * guaranteed has center set
+ * @param show
+ */
+ private void show(boolean show) {
mOpen = show;
if (mOpen) {
if (mController != null) {
boolean changed = mController.onOpen();
}
- mDirty = true;
+ layoutPie();
}
if (!show) {
- // hide sub items
- mStack.clear();
- mStack.add(this);
+ mCurrentItem = null;
+ mPieView = null;
}
invalidate();
}
@@ -246,151 +190,121 @@
mCenter.y = y;
}
- private boolean onTheLeft() {
- return mCenter.x < mSlop;
- }
-
- @Override
- protected void onDraw(Canvas canvas) {
- if (mOpen) {
- int radius = mRadius;
- // start in the center for 0 level menu
- float anchor = (float) Math.PI / 2;
- PointF angles = new PointF();
- int state = canvas.save();
- if (onTheLeft()) {
- // left handed
- canvas.scale(-1, 1);
- }
- for (View parent : mStack) {
- List<View> subs = mMenu.get(parent);
- if (subs != null) {
- setGeometry(anchor, subs.size(), angles);
+ private void layoutPie() {
+ float emptyangle = (float) Math.PI / 16;
+ int rgap = 2;
+ int inner = mRadius + rgap;
+ int outer = mRadius + mRadiusInc - rgap;
+ int radius = mRadius;
+ int gap = 1;
+ for (int i = 0; i < mLevels; i++) {
+ int level = i + 1;
+ float sweep = (float) (Math.PI - 2 * emptyangle) / mCounts[level];
+ float angle = emptyangle + sweep / 2;
+ for (PieItem item : mItems) {
+ if (item.getLevel() == level) {
+ View view = item.getView();
+ view.measure(view.getLayoutParams().width,
+ view.getLayoutParams().height);
+ int w = view.getMeasuredWidth();
+ int h = view.getMeasuredHeight();
+ int r = inner + (outer - inner) * 2 / 3;
+ int x = (int) (r * Math.sin(angle));
+ int y = mCenter.y - (int) (r * Math.cos(angle)) - h / 2;
+ if (onTheLeft()) {
+ x = mCenter.x + x - w / 2;
+ } else {
+ x = mCenter.x - x - w / 2;
+ }
+ view.layout(x, y, x + w, y + h);
+ float itemstart = angle - sweep / 2;
+ Path slice = makeSlice(getDegrees(itemstart) - gap,
+ getDegrees(itemstart + sweep) + gap,
+ outer, inner, mCenter);
+ item.setGeometry(itemstart, sweep, inner, outer, slice);
+ angle += sweep;
}
- anchor = drawSlices(canvas, subs, radius, angles.x, angles.y);
- radius += mRadiusInc + RADIUS_GAP;
}
- canvas.restoreToCount(state);
- mDirty = false;
+ inner += mRadiusInc;
+ outer += mRadiusInc;
}
}
- /**
- * draw the set of slices
- * @param canvas
- * @param items
- * @param radius
- * @param start
- * @param sweep
- * @return the angle of the selected slice
- */
- private float drawSlices(Canvas canvas, List<View> items, int radius,
- float start, float sweep) {
- float angle = start + sweep / 2;
- // gap between slices in degrees
- float gap = 1f;
- float newanchor = 0f;
- for (View item : items) {
- if (mDirty) {
- item.measure(item.getLayoutParams().width,
- item.getLayoutParams().height);
- int w = item.getMeasuredWidth();
- int h = item.getMeasuredHeight();
- int x = (int) (radius * Math.sin(angle));
- int y = mCenter.y - (int) (radius * Math.cos(angle)) - h / 2;
- if (onTheLeft()) {
- x = mCenter.x + x - w / 2;
- } else {
- x = mCenter.x - x - w / 2;
- }
- item.layout(x, y, x + w, y + h);
- }
- float itemstart = angle - sweep / 2;
- int inner = radius - mRadiusInc / 2;
- int outer = radius + mRadiusInc / 2;
- Path slice = makeSlice(getDegrees(itemstart) - gap,
- getDegrees(itemstart + sweep) + gap,
- outer, inner, mCenter);
- MenuTag tag = (MenuTag) item.getTag();
- tag.start = itemstart;
- tag.sweep = sweep;
- tag.inner = inner;
- tag.outer = outer;
- int state = canvas.save();
- int[] topLeft = new int[2];
- getLocationInWindow(topLeft);
- topLeft[0] = mCenter.x - outer;
- topLeft[1] = mCenter.y - outer;
- Paint paint = item.isPressed() ? mActiveShaderPaint : mInactiveShaderPaint;
- drawClipped(canvas, paint, slice, topLeft, item.isPressed());
- canvas.restoreToCount(state);
- state = canvas.save();
- if (onTheLeft()) {
- canvas.scale(-1, 1);
- }
- canvas.translate(item.getX(), item.getY());
- item.draw(canvas);
- canvas.restoreToCount(state);
- if (mStack.contains(item)) {
- // item is anchor for sub menu
- newanchor = angle;
- }
- angle += sweep;
- }
- return newanchor;
- }
-
- private void drawClipped(Canvas canvas, Paint paint, Path clipPath, int[] pos,
- boolean selected) {
- // TODO: We should change the matrix/shader only when needed
- final Matrix matrix = selected ? mActiveMatrix : mInactiveMatrix;
- matrix.setTranslate(pos[0], pos[1]);
- (selected ? mActiveShader : mInactiveShader).setLocalMatrix(matrix);
- canvas.drawPath(clipPath, paint);
- }
-
/**
* converts a
- * @param angle from 0..PI to Android degrees (clockwise starting at 3 o'clock)
+ *
+ * @param angle from 0..PI to Android degrees (clockwise starting at 3
+ * o'clock)
* @return skia angle
*/
private float getDegrees(double angle) {
return (float) (270 - 180 * angle / Math.PI);
}
- private Path makeSlice(float startangle, float endangle, int outerradius,
- int innerradius, Point center) {
- RectF bb = new RectF(center.x - outerradius, center.y - outerradius,
- center.x + outerradius, center.y + outerradius);
- RectF bbi = new RectF(center.x - innerradius, center.y - innerradius,
- center.x + innerradius, center.y + innerradius);
+ @Override
+ protected void onDraw(Canvas canvas) {
+ if (mOpen) {
+ int w = mBackground.getIntrinsicWidth();
+ int h = mBackground.getIntrinsicHeight();
+ int left = mCenter.x - w;
+ int top = mCenter.y - h / 2;
+ mBackground.setBounds(left, top, left + w, top + h);
+ int state;
+ state = canvas.save();
+ if (onTheLeft()) {
+ canvas.scale(-1, 1);
+ }
+ mBackground.draw(canvas);
+ canvas.restoreToCount(state);
+ for (PieItem item : mItems) {
+ Paint p = item.isSelected() ? mSelectedPaint : mNormalPaint;
+ state = canvas.save();
+ if (onTheLeft()) {
+ canvas.scale(-1, 1);
+ }
+ drawPath(canvas, item.getPath(), p);
+ canvas.restoreToCount(state);
+ drawItem(canvas, item);
+ }
+ if (mPieView != null) {
+ mPieView.draw(canvas);
+ }
+ }
+ }
+
+ private void drawItem(Canvas canvas, PieItem item) {
+ int outer = item.getOuterRadius();
+ int left = mCenter.x - outer;
+ int top = mCenter.y - outer;
+ // draw the item view
+ View view = item.getView();
+ int state = canvas.save();
+ canvas.translate(view.getX(), view.getY());
+ view.draw(canvas);
+ canvas.restoreToCount(state);
+ }
+
+ private void drawPath(Canvas canvas, Path path, Paint paint) {
+ canvas.drawPath(path, paint);
+ }
+
+ private Path makeSlice(float start, float end, int outer, int inner, Point center) {
+ RectF bb =
+ new RectF(center.x - outer, center.y - outer, center.x + outer,
+ center.y + outer);
+ RectF bbi =
+ new RectF(center.x - inner, center.y - inner, center.x + inner,
+ center.y + inner);
Path path = new Path();
- path.arcTo(bb, startangle, endangle - startangle, true);
- path.arcTo(bbi, endangle, startangle - endangle);
+ path.arcTo(bb, start, end - start, true);
+ path.arcTo(bbi, end, start - end);
path.close();
return path;
}
- /**
- * all angles are 0 .. MATH.PI where 0 points up, and rotate counterclockwise
- * set the startangle and slice sweep in result
- * @param anchorangle : angle at which the menu is anchored
- * @param nslices
- * @param result : x : start, y : sweep
- */
- private void setGeometry(float anchorangle, int nslices, PointF result) {
- float span = (float) Math.min(anchorangle, Math.PI - anchorangle);
- float sweep = 2 * span / (nslices + 1);
- result.x = anchorangle - span + sweep / 2;
- result.y = sweep;
- }
-
// touch handling for pie
- View mCurrentView;
- Rect mHitRect = new Rect();
-
@Override
public boolean onTouchEvent(MotionEvent evt) {
float x = evt.getX();
@@ -405,12 +319,16 @@
}
} else if (MotionEvent.ACTION_UP == action) {
if (mOpen) {
- View v = mCurrentView;
- deselect();
- if (v != null) {
- v.performClick();
+ boolean handled = false;
+ if (mPieView != null) {
+ handled = mPieView.onTouchEvent(evt);
}
+ PieItem item = mCurrentItem;
+ deselect();
show(false);
+ if (!handled && (item != null)) {
+ item.getView().performClick();
+ }
return true;
}
} else if (MotionEvent.ACTION_CANCEL == action) {
@@ -420,19 +338,36 @@
deselect();
return false;
} else if (MotionEvent.ACTION_MOVE == action) {
+ boolean handled = false;
PointF polar = getPolar(x, y);
- if (polar.y > mRadius + 2 * mRadiusInc) {
- show(false);
+ int maxr = mRadius + mLevels * mRadiusInc + 50;
+ if (mPieView != null) {
+ handled = mPieView.onTouchEvent(evt);
+ }
+ if (handled) {
+ invalidate();
+ return false;
+ }
+ if (polar.y > maxr) {
deselect();
+ show(false);
evt.setAction(MotionEvent.ACTION_DOWN);
if (getParent() != null) {
((ViewGroup) getParent()).dispatchTouchEvent(evt);
}
return false;
}
- View v = findView(polar);
- if (mCurrentView != v) {
- onEnter(v);
+ PieItem item = findItem(polar);
+ if (mCurrentItem != item) {
+ onEnter(item);
+ if ((item != null) && item.isPieView()) {
+ int cx = item.getView().getLeft() + (onTheLeft()
+ ? item.getView().getWidth() : 0);
+ int cy = item.getView().getTop();
+ mPieView = item.getPieView();
+ layoutPieView(mPieView, cx, cy,
+ (item.getStartAngle() + item.getSweep()) / 2);
+ }
invalidate();
}
}
@@ -440,53 +375,35 @@
return false;
}
+ private void layoutPieView(PieView pv, int x, int y, float angle) {
+ pv.layout(x, y, onTheLeft(), angle);
+ }
+
/**
* enter a slice for a view
* updates model only
- * @param view
+ * @param item
*/
- private void onEnter(View view) {
+ private void onEnter(PieItem item) {
// deselect
- if (mCurrentView != null) {
- if (getLevel(mCurrentView) >= getLevel(view)) {
- mCurrentView.setPressed(false);
- }
+ if (mCurrentItem != null) {
+ mCurrentItem.setSelected(false);
}
- if (view != null) {
+ if (item != null) {
// clear up stack
playSoundEffect(SoundEffectConstants.CLICK);
- MenuTag tag = (MenuTag) view.getTag();
- int i = mStack.size() - 1;
- while (i > 0) {
- View v = mStack.get(i);
- if (((MenuTag) v.getTag()).level >= tag.level) {
- v.setPressed(false);
- mStack.remove(i);
- } else {
- break;
- }
- i--;
- }
- List<View> items = mMenu.get(view);
- if (items != null) {
- mStack.add(view);
- mDirty = true;
- }
- view.setPressed(true);
+ item.setSelected(true);
+ mPieView = null;
}
- mCurrentView = view;
+ mCurrentItem = item;
}
private void deselect() {
- if (mCurrentView != null) {
- mCurrentView.setPressed(false);
+ if (mCurrentItem != null) {
+ mCurrentItem.setSelected(false);
}
- mCurrentView = null;
- }
-
- private int getLevel(View v) {
- if (v == null) return -1;
- return ((MenuTag) v.getTag()).level;
+ mCurrentItem = null;
+ mPieView = null;
}
private PointF getPolar(float x, float y) {
@@ -510,39 +427,19 @@
/**
*
* @param polar x: angle, y: dist
- * @return
+ * @return the item at angle/dist or null
*/
- private View findView(PointF polar) {
+ private PieItem findItem(PointF polar) {
// find the matching item:
- for (View parent : mStack) {
- List<View> subs = mMenu.get(parent);
- if (subs != null) {
- for (View item : subs) {
- MenuTag tag = (MenuTag) item.getTag();
- if ((tag.inner < polar.y)
- && (tag.outer > polar.y)
- && (tag.start < polar.x)
- && (tag.start + tag.sweep > polar.x)) {
- return item;
- }
- }
+ for (PieItem item : mItems) {
+ if ((item.getInnerRadius() - mTouchOffset < polar.y)
+ && (item.getOuterRadius() - mTouchOffset > polar.y)
+ && (item.getStartAngle() < polar.x)
+ && (item.getStartAngle() + item.getSweep() > polar.x)) {
+ return item;
}
}
return null;
}
- class MenuTag {
-
- int level;
- float start;
- float sweep;
- int inner;
- int outer;
-
- public MenuTag(int l) {
- level = l;
- }
-
- }
-
}
diff --git a/src/com/android/browser/view/PieStackView.java b/src/com/android/browser/view/PieStackView.java
new file mode 100644
index 0000000..ca641f9
--- /dev/null
+++ b/src/com/android/browser/view/PieStackView.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.browser.view;
+
+import com.android.browser.R;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.view.View;
+
+/**
+ * shows views in a stack
+ */
+public class PieStackView extends BasePieView {
+
+ private static final int SLOP = 5;
+
+ private OnCurrentListener mCurrentListener;
+ private int mMinHeight;
+
+ public interface OnCurrentListener {
+ public void onSetCurrent(int index);
+ }
+
+ public PieStackView(Context ctx) {
+ mMinHeight = (int) ctx.getResources()
+ .getDimension(R.dimen.qc_tab_title_height);
+ }
+
+ public void setOnCurrentListener(OnCurrentListener l) {
+ mCurrentListener = l;
+ }
+
+ @Override
+ public void setCurrent(int ix) {
+ super.setCurrent(ix);
+ if (mCurrentListener != null) {
+ mCurrentListener.onSetCurrent(ix);
+ buildViews();
+ layoutChildrenLinear();
+ }
+ }
+
+ /**
+ * this will be called before the first draw call
+ */
+ @Override
+ public void layout(int anchorX, int anchorY, boolean left, float angle) {
+ super.layout(anchorX, anchorY, left, angle);
+ buildViews();
+ mWidth = mChildWidth;
+ mHeight = mChildHeight + (mViews.size() - 1) * mMinHeight;
+ mLeft = anchorX + (left ? SLOP : -(SLOP + mChildWidth));
+ mTop = anchorY - mHeight / 2;
+ if (mViews != null) {
+ layoutChildrenLinear();
+ }
+ }
+
+ private void layoutChildrenLinear() {
+ final int n = mViews.size();
+ int top = mTop;
+ int dy = (n == 1) ? 0 : (mHeight - mChildHeight) / (n - 1);
+ for (View view : mViews) {
+ int x = mLeft;
+ view.layout(x, top, x + mChildWidth, top + mChildHeight);
+ top += dy;
+ }
+ }
+
+ @Override
+ public void draw(Canvas canvas) {
+ if (mViews != null) {
+ final int n = mViews.size();
+ for (int i = 0; i < mCurrent; i++) {
+ drawView(mViews.get(i), canvas);
+ }
+ for (int i = n - 1; i > mCurrent; i--) {
+ drawView(mViews.get(i), canvas);
+ }
+ drawView(mViews.get(mCurrent), canvas);
+ }
+ }
+
+ @Override
+ protected int findChildAt(int y) {
+ final int ix = (y - mTop) * mViews.size() / mHeight;
+ return ix;
+ }
+
+}
