diff options
70 files changed, 2 insertions, 1281 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 3ba817c5..34677ff6 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -33,8 +33,6 @@ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/> - <uses-permission android:name="android.permission.GET_ACCOUNTS"/> - <uses-permission android:name="android.permission.USE_CREDENTIALS"/> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.NFC" /> <uses-permission android:name="android.permission.SEND_DOWNLOAD_COMPLETED_INTENTS" /> @@ -45,7 +43,6 @@ <uses-permission android:name="android.permission.WRITE_SETTINGS" /> <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" /> <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" /> - <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" /> <uses-permission android:name="android.permission.READ_PROFILE" /> <uses-permission android:name="android.permission.READ_CONTACTS" /> <uses-permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS"/> diff --git a/res/anim/autologin_enter.xml b/res/anim/autologin_enter.xml deleted file mode 100644 index 45e52040..00000000 --- a/res/anim/autologin_enter.xml +++ /dev/null @@ -1,19 +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. ---> - -<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 deleted file mode 100644 index 6faa715d..00000000 --- a/res/anim/autologin_exit.xml +++ /dev/null @@ -1,19 +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. ---> - -<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/layout-sw600dp/title_bar_autologin.xml b/res/layout-sw600dp/title_bar_autologin.xml deleted file mode 100644 index 10657567..00000000 --- a/res/layout-sw600dp/title_bar_autologin.xml +++ /dev/null @@ -1,69 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright 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. ---> -<com.android.browser.AutologinBar - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="#FBF0A0" - android:gravity="center_vertical" - android:visibility="gone"> - <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"/> -</com.android.browser.AutologinBar> diff --git a/res/layout/title_bar.xml b/res/layout/title_bar.xml index acc49e65..6a628944 100644 --- a/res/layout/title_bar.xml +++ b/res/layout/title_bar.xml @@ -29,13 +29,6 @@ android:layout="@layout/title_bar_snapshot" android:layout_width="match_parent" android:layout_height="@dimen/toolbar_height" /> - <ViewStub - android:id="@+id/autologin_stub" - android:layout="@layout/title_bar_autologin" - android:paddingTop="3dip" - android:layout_below="@id/taburlbar" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> <com.android.browser.PageProgressView android:id="@+id/progress" android:layout_width="match_parent" diff --git a/res/layout/title_bar_autologin.xml b/res/layout/title_bar_autologin.xml deleted file mode 100644 index 22da6302..00000000 --- a/res/layout/title_bar_autologin.xml +++ /dev/null @@ -1,78 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright 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. ---> -<com.android.browser.AutologinBar - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="#FBF0A0" - android:gravity="center_vertical" - android:visibility="gone" - android:orientation="vertical"> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingLeft="8dip" - android:paddingRight="8dip"> - <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:textAppearance="?android:attr/textAppearanceMedium" /> - <Spinner - android:id="@+id/autologin_account" - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:paddingLeft="8dp" - android:paddingRight="24dp" - style="@android:style/Widget.Holo.Light.Spinner" /> - </LinearLayout> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingLeft="8dip" - android:paddingRight="8dip"> - <Button - android:id="@+id/autologin_close" - android:layout_width="0dip" - android:layout_weight="1" - android:layout_height="wrap_content" - android:text="@string/autologin_bar_hide_text" - style="@android:style/Widget.Holo.Light.Button" /> - <ProgressBar - android:id="@+id/autologin_progress" - android:indeterminateOnly="true" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:visibility="invisible" /> - <Button - android:id="@+id/autologin_login" - android:text="@string/autologin_bar_login_text" - style="@android:style/Widget.Holo.Light.Button" - android:layout_height="wrap_content" - android:layout_width="0dip" - android:layout_weight="1" /> - </LinearLayout> - <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" /> -</com.android.browser.AutologinBar> diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index 592d2bd3..7987c09e 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Vul webvorms in met \'n enkele raak"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Outo-invul-teks"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Stel teks op om outomaties by webvorms te outo-invul"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Outomatiese Google-aanmelding"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Meld aan by Google-werwe met <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Meld aan as"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Meld aan"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Versteek"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"Kon nie aanmeld nie."</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Voer die teks in wat jy in webvorms wil laat outo-invul."</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"Volle naam:"</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"E-pos:"</string> diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index 010b581d..ce57d670 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"በነጠላ ጠቅታ የድረ ቅፆችን ሙላ"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"ራስ ሰር-ሙላ ጽሑፍ"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"በድር ቅርጾች ላይ በራስሰር ለመሙላት ጽሑፍ ያዘጋጁ"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"ራስሰር Google በመለያ ግባ"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"<xliff:g id="ID_1">%s</xliff:g> በመጠቀም ወደ Google ገፆች ይገባል"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"ግባ እንደ"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"በመለያ ግባ"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"ደብቅ"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"በመለያ መግባት አልተቻለም።"</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"በድር ቅርጾች ላይ በራስሰር እንዲሞላ የሚፈልጉትን ጽሑፍ ትተይቡ።"</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"ሙሉ ስም፡"</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"ኢሜይል:"</string> diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index b1766cc7..23d25624 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -180,12 +180,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"ملء نماذج الويب بلمسة واحدة"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"نص الملء التلقائي"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"إعداد النص المراد ملؤه تلقائيًا في نماذج الويب"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"تسجيل الدخول إلى Google تلقائيًا"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"تسجيل الدخول إلى مواقع Google باستخدام <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"تسجيل الدخول كـ"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"تسجيل الدخول"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"إخفاء"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"تعذر تسجيل الدخول."</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"اكتب النص الذي تريد ملأه تلقائيًا في نماذج الويب."</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"الاسم بالكامل:"</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"البريد الإلكتروني:"</string> diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml index 74ca2d76..37708371 100644 --- a/res/values-be/strings.xml +++ b/res/values-be/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Запаўняць вэб-формы адным дакрананнем"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Аўтазапаўненне тэксту"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Усталяваць тэкст, каб аўтаматычна запаўняць вэб-формы"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Аўтаматычны ўваход у Google"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Уваходзіць на сайты Google з уліковага запісу <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Увайсці як"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Уваход"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Схаваць"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"Не атрымалася ўвайсці"</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Увядзіце тэкст, які вы хочаце выкарыстоўваць для аўтазапаўнення вэб-формаў."</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"Поўнае імя:"</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"Электронная пошта:"</string> diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index 1c59490c..924acf96 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Попълване на уеб формуляри с едно докосване"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Текст за автоматично попълване"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Задаване на текст за автоматично попълване в уеб формулярите"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Автоматичен вход в Google"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Влизате в сайтове на Google посредством <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Влезте като"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Вход"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Скриване"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"Не можахте да влезете."</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Въведете текста, който искате да се попълва автоматично в уеб формулярите."</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"Пълно име:"</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"Имейл адрес:"</string> diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index afa967f0..72baf6fb 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Emplena formularis web amb només un toc"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Text d\'emplenament automàtic"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Configura el text per a l\'emplenament automàtic de formularis web"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Inici de sessió autom. de Google"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Inici de la sessió a Google Sites amb <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Inicia la sessió com a"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Inic sess"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Amaga"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"No es pot ini. la sessió."</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Escriu el text que vols que s\'empleni automàticament als formularis web."</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> diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 6e1becd6..bcfb45f1 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Vyplňování webových formulářů jediným dotykem"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Text pro autovyplňování"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Nastavte text, který se má vyplňovat do webových formulářů"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Automatické přihlašování Google"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Přihlašování na Google pomocí uživatelského jména <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Přihlásit se jako"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Přihlásit se"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Skrýt"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"Přihlášení se nezdařilo."</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Zadejte text, který chcete automaticky vyplňovat do webových formulářů."</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> diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index c83dcfbc..3cb9c476 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Udfyld webformularer med et enkelt tryk"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"AutoFyld-tekst"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Opret tekst, som skal indsættes i webformularer med AutoFyld"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Automatisk Google-login"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Logger ind på Google-websites med <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Log ind som"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Log ind"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Skjul"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"Login mislykkedes."</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Angiv den tekst, du vil indsætte i webformularer med AutoFyld."</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"Fulde navn:"</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"E-mail:"</string> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 663a47f4..f293ae4e 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Webformulare mit einer einzigen Berührung ausfüllen"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"AutoFill-Text"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"AutoFill-Text für Webformulare festlegen"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Automatische Google-Anmeldung"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Anmeldung bei Google-Websites mit <xliff:g id="ID_1">%s</xliff:g>..."</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Anmelden als"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Anmelden"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Ausblenden"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"Anmeldung nicht möglich"</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Geben Sie den gewünschten AutoFill-Text für Webformulare ein."</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> diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index cdfe907a..a7dabc33 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Συμπληρώστε φόρμες ιστού με ένα απλό άγγιγμα"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Κείμενο αυτόματης συμπλήρωσης"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Ρύθμιση κειμένου για αυτόματη συμπλήρωση στις φόρμες ιστού"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Αυτόματη σύνδεση Google"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Συνδεθείτε σε Ιστότοπους Google χρησιμοποιώντας το <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Σύνδεση ως"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Σύνδεση"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Απόκρυψη"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"Δεν συνδεθήκατε"</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Πληκτρολογήστε το κείμενο που θέλετε να συμπληρώνεται αυτόματα στις φόρμες ιστού."</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"Πλήρες όνομα:"</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"Ηλεκτρονικό ταχυδρομείο:"</string> diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index 7cffaf98..30991353 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -162,12 +162,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Fill in web forms with a single touch"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Auto-fill text"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Set up text to auto-fill in web forms"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Automatic Google sign-in"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Signing in to Google sites using <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Sign in as"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Sign in"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Hide"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"Couldn\'t sign in."</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Type the text that you want to auto-fill in web forms."</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"Full name:"</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"Email:"</string> diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index f84cbae0..c49c507e 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Completa formularios web con un solo toque"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Texto para autocompletar"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Configurar texto para autocompletar formularios web"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Acceso automático a Google"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Accediendo a Google Sites utilizando <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Iniciar sesión como"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Acceder"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Ocultar"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"No se pudo acceder."</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Escribe el texto que deseas autocompletar en los formularios web."</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"Nombre completo:"</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"Correo:"</string> diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index b86e4e3e..b92723e8 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -181,12 +181,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Rellenar formularios web con un solo toque"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Texto para autocompletar"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Configurar texto con el que quieres completar automáticamente los formularios web"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Acceso de Google automático"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Accediendo a Google Sites mediante <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Iniciar sesión como"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Iniciar sesión"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Ocultar"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"No se ha podido iniciar sesión."</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Escribe el texto con el que quieres completar automáticamente los formularios web."</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"Nombre completo:"</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"Correo:"</string> diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml index 66451657..b1e290ce 100644 --- a/res/values-et/strings.xml +++ b/res/values-et/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Täitke veebivorme ühe puudutusega"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Automaatse täitmise tekst"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Seadistage tekst, mida soovite automaatselt lisada veebivormidesse."</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Auto. sisselogimine Google\'isse"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Google\'i saitidele sisselogimine, kasutades kontot <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Logi sisse kasutajanimega"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Logi sisse"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Peida"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"Sisselogimine ebaõnnestus"</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Tippige tekst, mida soovite automaatselt lisada veebivormidesse."</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"Täisnimi:"</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"E-post:"</string> diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index d0562455..6fde355f 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"تکمیل فرمهای وب با یک لمس"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"تکمیل خودکار نوشتار"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"تنظیم نوشتار برای تکمیل خودکار در فرمهای وب"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"ورود خودکار به Google"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"ورود به سیستم سایتهای Google با استفاده از <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"ورود به سیستم بهعنوان"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"ورود به سیستم"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"پنهان کردن"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"ورود به سیستم ممکن نیست."</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"نوشتاری را که میخواهید در فرمهای وب بطور خودکار تکمیل شود تایپ کنید."</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"نام کامل:"</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"ایمیل:"</string> diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 74ec8ed4..fd452f2a 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Täytä verkkolomakkeita yhdellä kosketuksella"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Automaattisen täytön teksti"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Määritä teksti, jonka haluat täyttää automaattisesti verkkolomakkeisiin."</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Automaattinen Google-kirj."</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Kirjaudutaan Google-sivustoihin käyttäjänimellä <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Kirjautunut käyttäjänä"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Kirjaudu"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Piilota"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"Kirjautuminen ei onnistu."</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Kirjoita teksti, jonka haluat täyttää automaattisesti verkkolomakkeisiin."</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> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index bf1ea780..94030cd5 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Remplir les formulaires Web en un seul geste"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Texte de saisie automatique"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Définir le texte à saisir automatiquement dans les formulaires Web"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Connexion automatique à Google"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Connexion à Google Sites avec le compte <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Se connecter à l\'aide du compte"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Connexion"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Masquer"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"Connexion impossible."</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Indiquez le texte à saisir automatiquement dans les formulaires Web"</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> diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index 3f97ef6d..d3ed91f0 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -180,12 +180,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"एक बार स्पर्श करके वेब फ़ॉर्म भरें"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"स्वत: भरण पाठ"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"वेब फ़ॉर्म में स्वत: भरण के लिए पाठ सेट करें"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"स्वचालित Google साइन इन"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"<xliff:g id="ID_1">%s</xliff:g> का उपयोग करते हुए Google साइटें में साइन इन कर रहा है"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"इस रूप में साइन इन करें"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"साइन इन"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"छुपाएं"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"साइन इन नहीं हो सका."</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"वह पाठ लिखें जो आप वेब फ़ॉर्म में स्वचालित रूप से भरना चाहते हैं."</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"पूरा नाम:"</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"ईमेल:"</string> diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index c5883cd5..6c9c08a8 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Ispunite web-obrasce jednim dodirom"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Tekst automatskog ispunjavanja"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Postavljanje teksta za automatsko ispunjavanje web-obrazaca"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Automatska prijava na Google"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Prijava na Google web-lokacije putem <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Prijavite se kao"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Prijava"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Sakrij"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"Neuspjela prijava."</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Upišite tekst kojim želite automatski ispuniti web-obrasce."</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> diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index 050848ae..7ac0d6ee 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Töltse ki a webes űrlapokat egyetlen érintéssel"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Automatikus kitöltés szövege"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Szöveg beállítása webes űrlapok automatikus kitöltéséhez"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Automatikus Google bejelentkezés"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Bejelentkezés Google-webhelyekre a következők használatával: <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Bejelentkezés mint"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Belépés"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Elrejtés"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"Sikertelen bejelentkezés"</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Írja be a kívánt szöveget a webes űrlapok automatikus kitöltéséhez."</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> diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index c7a76ae7..2dc122d9 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Mengisi formulir web dengan satu sentuhan"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Teks isi-otomatis"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Menyiapkan teks untuk mengisi otomatis di formulir web"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Info masuk otomatis Google"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Masuk ke situs Google dengan <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Masuk sebagai"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Masuk"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Sembunyikan"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"Tidak dapat masuk."</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Ketik teks yang Anda inginkan untuk mengisi otomatis di formulir web."</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"Nama lengkap:"</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"Email:"</string> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 740c57d6..359587bf 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Compila i moduli web con un tocco"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Testo per compilazione automatica"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Imposta il testo per la compilazione automatica dei moduli web"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Accesso automatico a Google"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Accesso ai siti Google utilizzando <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Accesso eseguito come"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Accedi"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Nascondi"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"Accesso non riuscito."</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Digita il testo con cui compilare automaticamente i moduli web."</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"Nome e cognome:"</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"Email:"</string> diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 09bfb98e..65fc8f9b 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"מלא טופסי אינטרנט בנגיעה אחת"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"מילוי אוטומטי של טקסט"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"הגדר מילוי אוטומטי של טקסט בטופסי אינטרנט"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"כניסה אוטומטית ל-Google"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"נכנס אל Google Sites באמצעות <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"היכנס כ:"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"כניסה"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"הסתר"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"לא ניתן להיכנס"</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"הקלד את הטקסט שברצונך למלא באופן אוטומטי בטופסי אינטרנט."</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"שם מלא:"</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"דוא\"ל:"</string> diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 4f6ba320..cb9496e0 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"シングルタップでウェブフォームに入力する"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"自動入力テキスト"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"ウェブフォームに自動入力するテキストの設定"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Googleへの自動ログイン"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"<xliff:g id="ID_1">%s</xliff:g>を使用してGoogleサイトにログインしています"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"次のアカウントでログイン"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"ログイン"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"表示しない"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"ログインに失敗しました。"</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"ウェブフォームに自動入力するテキストを入力してください。"</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"氏名:"</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"メール:"</string> diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index d5b41460..f5aa3254 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"터치 한 번으로 웹 양식 작성"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"자동 입력 텍스트"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"웹 양식에 자동 입력하려는 텍스트 설정"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Google 자동 로그인"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"<xliff:g id="ID_1">%s</xliff:g>(으)로 Google 사이트에 로그인 중"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"다음 사용자로 로그인:"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"로그인"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"숨기기"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"로그인하지 못했습니다."</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"웹 양식에 자동 입력하려는 텍스트를 입력하세요."</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"이름:"</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"이메일:"</string> diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index 657b01e3..698e6840 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Užpildykite žiniatinklio formas vienu palietimu"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Automatiškai pildyti tekstą"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Nustatyti tekstą, kuriuo bus automatiškai užpildomos žiniatinklio formos."</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Automatinis „Google“ prisijung."</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Prisijungiama prie „Google“ svetainių naudojant <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Prisijungti kaip"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Prisij."</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Slėpti"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"Nepavyko prisijungti."</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Įveskite tekstą, kuriuo norite automatiškai užpildyti žiniatinklio formas."</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> diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index d6fe54aa..94555177 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Tīmekļa veidlapu aizpildīšana ar vienu skārienu"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Automātiskās aizpildes teksts"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Iestatīt automātiskās aizpildes tekstu tīmekļa veidlapām"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Autom. pieraksts Google tīklā"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Pierakstīšanās pakalpojumā Google vietnes, izmantojot <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Pierakstīties kā"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Pierakst."</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Paslēpt"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"Nevarēja pierakstīties."</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Ierakstiet tekstu, kuru vēlaties izmantot, lai automātiski aizpildītu tīmekļa veidlapas."</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> diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml index 68a2f61f..b335d623 100644 --- a/res/values-ms/strings.xml +++ b/res/values-ms/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Mengisi borang web dengan satu sentuhan"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Teks auto isi"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Sediakan teks untuk auto isi borang web"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Log masuk Google automatik"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Melog masuk ke dalam tapak Google menggunakan <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Log masuk sebagai"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Log masuk"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Sembunyikn"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"Tidak dapat melog masuk."</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Taipkan teks yang anda ingin auto isi pada borang web."</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"Nama penuh:"</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"E-mel:"</string> diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 24c85e8c..7c9b61ad 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Fyll ut nettskjemaer med ett trykk"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Tekst for automatisk utfylling"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Konfigurer tekst for automatisk utfylling i nettskjemaer"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Automatisk Google-pålogging"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Pålogging til Google-nettsteder ved hjelp av <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Logg på som"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Logg på"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Skjul"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"Kunne ikke logge på"</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Skriv inn teksten du vil automatisk fylle inn i skjemaer."</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"Fullt navn:"</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"E-post:"</string> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 1f3a85e4..ce069c67 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Webformulieren invullen met één aanraking"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Automatisch tekst aanvullen"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Tekst instellen die automatisch in webformulieren kan worden ingevuld"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Automatische Google-aanmelding"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Aanmelden bij Google-sites met <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Inloggen als"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Inloggen"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Verbergen"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"Kan niet inloggen."</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Typ de tekst die u automatisch in webformulieren wilt laten invullen."</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"Volledige naam:"</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"E-mail:"</string> diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index e594bbb6..43431035 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Wypełniaj formularze internetowe za pomocą jednego dotknięcia."</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Autouzupełniany tekst"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Skonfiguruj tekst autouzupełniany w formularzach internetowych"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Automatyczne logowanie Google"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Logowanie w witrynach Google za pomocą identyfikatora <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Zaloguj jako"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Zaloguj"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Ukryj"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"Nie można się zalogować"</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Wpisz tekst, który będzie autouzupełniany w formularzach 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> diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 77b0caeb..c0af9b0c 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Preencher formulários Web com um único toque"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Texto de preenchimento automático"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Configurar texto para preencher automaticamente formulários Web"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Início de sessão automático do Google"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Iniciar sessão em Web sites do Google utilizando <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Iniciar sessão como"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Aceder"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Ocultar"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"Falha ao iniciar sessão."</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Escreva o texto pretendido para preencher automaticamente formulários Web."</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"Nome completo:"</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"Email:"</string> diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 0b786756..f8316efa 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Preencher formulários da web com um único toque"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Preenchimento automát. de texto"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Configurar preenchimento automático de texto em formulários da web"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Login automático do Google"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Faça login nos sites do Google usando <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Fazer login como"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Login"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Ocultar"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"Falha ao fazer login."</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Digite o texto que deseja que seja preenchido automaticamente nos formulários da web."</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"Nome completo:"</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"E-mail:"</string> diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml index 64ed24b4..19c322a6 100644 --- a/res/values-rm/strings.xml +++ b/res/values-rm/strings.xml @@ -198,7 +198,7 @@ <skip /> <!-- no translation found for pref_set_homepage_to (7838684355145561242) --> <skip /> - <!-- no translation found for pref_homepage_choices:0 (844041670142910837) --> + <!-- no translation found for pref_homepage_choices:0 (84404167ou0142910837) --> <!-- no translation found for pref_homepage_choices:1 (4430498748295169195) --> <!-- no translation found for pref_homepage_choices:2 (5747608191946904074) --> <!-- no translation found for pref_homepage_choices:3 (6092441301001006473) --> @@ -220,18 +220,6 @@ <skip /> <!-- no translation found for pref_autofill_profile_editor_summary (4864447251676856190) --> <skip /> - <!-- no translation found for pref_autologin_title (4421187193809267096) --> - <skip /> - <!-- no translation found for pref_autologin_progress (8333244467048833461) --> - <skip /> - <!-- no translation found for autologin_bar_text (3684581827167173371) --> - <skip /> - <!-- no translation found for autologin_bar_login_text (3336615320510851879) --> - <skip /> - <!-- no translation found for autologin_bar_hide_text (3629355974385859580) --> - <skip /> - <!-- no translation found for autologin_bar_error (7470001207395920811) --> - <skip /> <!-- no translation found for autofill_profile_editor_heading (4798644544927738078) --> <skip /> <!-- no translation found for autofill_profile_editor_name (8566130291459685955) --> diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 5e4d782c..f93f268d 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Completaţi formularele web cu o singură atingere"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Text pentru completare automată"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Configuraţi textul de completat automat în formularele web"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Conectare automată Google"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Se conectează la site-urile Google utilizând <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Conectaţi-vă ca"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Conectaţ."</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Ascundeţi"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"Nu s-a putut conecta."</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Introduceţi textul care doriţi să fie completat automat în formularele web."</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"Numele complet:"</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"E-mail:"</string> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 51672a23..e8a17e61 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -180,12 +180,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Быстрое заполнение веб-форм"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Текст автозаполнения"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Настроить текст для автозаполнения веб-форм"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Автоматический вход в систему"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Вход в Сайты Google с помощью аккаунта <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Войти как"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Войти"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Скрыть"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"Не удалось войти."</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Введите текст для автозаполнения."</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"Полное имя:"</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"Эл. почта:"</string> diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index f6978779..75c9942d 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Vyplňovanie webových formulárov jediným dotykom"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Automatické dopĺňanie textu"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Nastaviť text, ktorý sa má automaticky dopĺňať do webových formulárov"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Automatické prihlasovanie Google"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Prihlasovanie na stránky Google pomocou používateľského mena <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Prihlásený/-á ako"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Prihlásiť sa"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Skryť"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"Prihlásenie sa nepodarilo."</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Zadajte text, ktorý chcete automaticky dopĺňať do webových formulárov."</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"Celé meno:"</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"E-mail:"</string> diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index d0601de5..b20ccac0 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Izpolnite spletne obrazce z enim dotikom"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Besedilo za samod. izpolnjevanje"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Nastavi besedilo za samodejno izpolnjevanje spletnih obrazcev"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Samodejna prijava v Google"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Prijavljanje v Google Spletna mesta z <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Prijava kot"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Prijava"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Skrij"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"Prijava ni uspela."</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Vnesite besedilo za samodejno izpolnjevanje spletnih obrazcev."</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> diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 7832ad43..0d1c4db9 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Попуњавање веб-образаца једним додиром"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Текст за аутоматско попуњавање"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Подешавање текста за аутоматско попуњавање веб-образаца"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Аутоматско Google пријављивање"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Пријављивање на Google сајтове помоћу <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Пријављивање као"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Пријави ме"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Сакриј"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"Пријављивање није могуће."</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Унесите текст који желите да користите за аутоматско попуњавање веб-образаца."</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"Пуно име:"</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"Е-пошта:"</string> diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 553dc073..ca14ad6b 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Fyll i webbformulär med ett enda klick"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Text för autofyll"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Ange text som ska fyllas i automatiskt i webbformulär"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Automatisk inloggning på Google"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Loggar in på Google Sites med <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Logga in som"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Logga in"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Dölj"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"Det gick inte att logga in."</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Ange texten som du vill fylla i automatiskt i webbformulär."</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> diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index 9ea75327..afb0d04e 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Kujaza fomu za wavuti kwa mguso moja"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Maandishi ya oto-kujaza"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Sanidi kujaza-oto katika fomu za wavuti"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Automatic Google signin"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Kuingia kwa tovuti za Google kwa kutumia <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Ingia kama"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Ingia"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Ficha"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"Haingeweza kuinga ndani"</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Andika maandishi unataka kujaza-oto katika fomu za wavuti."</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"Jina kamili:"</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"Barua pepe"</string> diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index 82523c3e..745d87e2 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -180,12 +180,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"กรอกเว็บฟอร์มด้วยการแตะครั้งเดียว"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"ป้อนข้อความอัตโนมัติ"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"ตั้งค่าข้อความเพื่อป้อนอัตโนมัติในเว็บฟอร์ม"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"ลงชื่อเข้าใช้ Google อัตโนมัติ"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"ลงชื่อเข้าใช้ Google Sites โดยใช้ <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"ลงชื่อเข้าใช้ในฐานะ"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"ลงชื่อใช้"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"ซ่อน"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"ลงชื่อเข้าใช้ไม่ได้"</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"พิมพ์ข้อความที่คุณต้องการป้อนอัตโนมัติในเว็บฟอร์ม"</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"ชื่อเต็ม:"</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"อีเมล:"</string> diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index 733e6e0a..96188c13 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -180,12 +180,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Punan ang mga web form sa iisang pagpindot"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Auto-fill text"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"I-set up ang teksto upang i-auto-fill sa mga web form"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Awtomatikong pag-signin sa Google"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Pag-sign in sa mga site ng Google gamit ang <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Mag-sign in bilang"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Mg-sign in"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Itago"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"Hindi makapag-sign in."</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"I-type ang tekstong gusto mong i-auto-fill sa mga web form."</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"Buong pangalan:"</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"Email:"</string> diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index b39ed176..d5a2e6f6 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -180,12 +180,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Web formlarını tek bir dokunmayla doldurun"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Otomatik doldurma metni"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Web formlarına otomatik girilecek metni ayarlayın"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Google\'da otomatik oturum açma"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"<xliff:g id="ID_1">%s</xliff:g> kullanılarak Google sitelerinde oturum açılıyor"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Farklı kullanıcı olarak oturum aç"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Oturum aç"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Gizle"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"Oturum açılamadı."</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Web formlarına otomatik olarak girilmesini istediğiniz metni yazın."</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"Tam ad:"</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"E-posta:"</string> diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 0b9b98e3..d0cba6d7 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Заповнювати веб-форми лише одним дотиком"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Текст автозаповнення"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Налаштувати текст для автоматичного заповнення веб-форм"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Автоматичний вхід у Google"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Вхід у Google Sites за допомогою <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Вхід із використанням облікового запису"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Увійти"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Сховати"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"Не вдалося ввійти"</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Введіть текст для автоматичного заповнення веб-форм."</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"Повне ім\'я:"</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"Електронна адреса:"</string> diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index fb3c4541..38ae6f5c 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -180,12 +180,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Điền biểu mẫu web chỉ với một cú chạm"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Văn bản tự động điền"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Thiết lập văn bản để tự động điền vào biểu mẫu web"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Tự động đăng nhập vào Google"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Đang đăng nhập vào trang web Google bằng <xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Đăng nhập với tên"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Đ.nhập"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Ẩn"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"Không thể đăng nhập."</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Nhập văn bản bạn muốn tự động điền vào biểu mẫu web."</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"Tên đầy đủ:"</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"Email:"</string> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 11058b10..103643a0 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"只需触摸一下，即可填完网络表单"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"自动填充文本"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"设置要用于自动填充网络表单的文本"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"自动登录 Google"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"正使用 <xliff:g id="ID_1">%s</xliff:g> 登录 Google 网站"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"使用以下身份登录："</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"登录"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"隐藏"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"无法登录。"</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"键入您要用于自动填充网络表单的文本。"</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"全名："</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"电子邮件地址："</string> diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index 1f3d5320..b8678a7b 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"輕觸一下即可填妥網上表格"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"自動填入文字"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"設定要在網上表格中自動填入的文字"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"自動登入 Google"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"正使用 <xliff:g id="ID_1">%s</xliff:g> 登入 Google 網站"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"登入身分"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"登入"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"隱藏"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"無法登入。"</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"輸入您要在網上表格中自動填入的文字。"</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"全名："</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"電郵地址："</string> diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 0dda47e0..0ae51f42 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"輕觸一下即可填妥網頁表單"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"自動填入文字"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"設定要在網路表單中自動填入的文字"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"自動登入 Google"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"正使用 <xliff:g id="ID_1">%s</xliff:g> 登入 Google 網站"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"登入身分"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"登入"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"隱藏"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"無法登入。"</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"輸入您要在網路表單中自動填入的文字。"</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"全名："</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"電子郵件："</string> diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index 1320460f..718dcb2a 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -161,12 +161,6 @@ <string name="pref_autofill_enabled_summary" msgid="7659954073892471496">"Gcwalisa amafomu ewebhu ngokuthinta kanye"</string> <string name="pref_autofill_profile_editor" msgid="8934844472922113166">"Ubhalo ozenzakalelayo"</string> <string name="pref_autofill_profile_editor_summary" msgid="4864447251676856190">"Setha ukuzilayisha kombhalo emafomini ewebhu"</string> - <string name="pref_autologin_title" msgid="4421187193809267096">"Ukusayinda ku-Google okuzenzakalelayo"</string> - <string name="pref_autologin_progress" msgid="8333244467048833461">"Ingena ngemvume kumasayithi e-Google isebenzisa i-<xliff:g id="ID_1">%s</xliff:g>"</string> - <string name="autologin_bar_text" msgid="3684581827167173371">"Ngena ngemvume njengo"</string> - <string name="autologin_bar_login_text" msgid="3336615320510851879">"Ngena"</string> - <string name="autologin_bar_hide_text" msgid="3629355974385859580">"Fihla"</string> - <string name="autologin_bar_error" msgid="7470001207395920811">"Ayikwazanga ukungena ngemvume."</string> <string name="autofill_profile_editor_heading" msgid="4798644544927738078">"Bhala umbhalo owufunayo ukuzigcwalisela aafomu ewebhu."</string> <string name="autofill_profile_editor_name" msgid="8566130291459685955">"Igama eliphelele:"</string> <string name="autofill_profile_editor_email_address" msgid="7967585896612797173">"I-imeyili:"</string> diff --git a/res/values/strings.xml b/res/values/strings.xml index 76cdf73c..e4718bfc 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -381,19 +381,6 @@ <!-- Summary for the AutoFill Settings preference [CHAR-LIMIT=none] --> <string name="pref_autofill_profile_editor_summary">Set up text to auto-fill in web forms</string> - <!-- Auto login preference title [CHAR-LIMIT=32] --> - <string name="pref_autologin_title">Automatic Google signin</string> - <!-- Message shown during auto login [CHAR-LIMIT=none] --> - <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">Sign in as</string> - <!-- Login button [CHAR-LIMIT=10] --> - <string name="autologin_bar_login_text">Sign in</string> - <!-- Hide button [CHAR-LIMIT=10] --> - <string name="autologin_bar_hide_text">Hide</string> - <!-- Login failure text [CHAR-LIMIT=25] --> - <string name="autologin_bar_error">Couldn\'t sign in.</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">Type the text you want to auto-fill in web forms.</string> <!-- String for the user's full name in the AutoFill profile editor. [CHAR-LIMIT=32] --> diff --git a/res/xml/debug_preferences.xml b/res/xml/debug_preferences.xml index 029bc4fc..8e169bd7 100644 --- a/res/xml/debug_preferences.xml +++ b/res/xml/debug_preferences.xml @@ -87,8 +87,4 @@ android:title="@string/js_engine_flags" android:singleLine="true" /> - <Preference - android:key="reset_prelogin" - android:title="@string/pref_development_reset_prelogin" /> - </PreferenceScreen> diff --git a/src/com/android/browser/AutologinBar.java b/src/com/android/browser/AutologinBar.java deleted file mode 100644 index 3bbfcd96..00000000 --- a/src/com/android/browser/AutologinBar.java +++ /dev/null @@ -1,146 +0,0 @@ -/* - * Copyright (C) 2011 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.browser; - -import android.content.Context; -import android.util.AttributeSet; -import android.view.ContextThemeWrapper; -import android.view.View; -import android.view.View.OnClickListener; -import android.widget.ArrayAdapter; -import android.widget.Button; -import android.widget.LinearLayout; -import android.widget.ProgressBar; -import android.widget.Spinner; -import android.widget.TextView; - -import com.android.browser.R; -import com.android.browser.DeviceAccountLogin.AutoLoginCallback; - -public class AutologinBar extends LinearLayout implements OnClickListener, - AutoLoginCallback { - - protected Spinner mAutoLoginAccount; - protected Button mAutoLoginLogin; - protected ProgressBar mAutoLoginProgress; - protected TextView mAutoLoginError; - protected View mAutoLoginCancel; - protected DeviceAccountLogin mAutoLoginHandler; - protected ArrayAdapter<String> mAccountsAdapter; - protected TitleBar mTitleBar; - - public AutologinBar(Context context) { - super(context); - } - - public AutologinBar(Context context, AttributeSet attrs) { - super(context, attrs); - } - - public AutologinBar(Context context, AttributeSet attrs, int defStyle) { - super(context, attrs, defStyle); - } - - @Override - protected void onFinishInflate() { - super.onFinishInflate(); - 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 = findViewById(R.id.autologin_close); - mAutoLoginCancel.setOnClickListener(this); - } - - public void setTitleBar(TitleBar titleBar) { - mTitleBar = titleBar; - } - - @Override - public void onClick(View v) { - if (mAutoLoginCancel == v) { - if (mAutoLoginHandler != null) { - mAutoLoginHandler.cancel(); - mAutoLoginHandler = null; - } - hideAutoLogin(true); - } 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); - } - } - } - - public void updateAutoLogin(Tab tab, boolean animate) { - DeviceAccountLogin login = tab.getDeviceAccountLogin(); - if (login != null) { - mAutoLoginHandler = login; - ContextThemeWrapper wrapper = new ContextThemeWrapper(getContext(), - 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.INVISIBLE); - 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.INVISIBLE); - mAutoLoginError.setVisibility(View.VISIBLE); - break; - case DeviceAccountLogin.INITIAL: - break; - default: - throw new IllegalStateException(); - } - showAutoLogin(animate); - } else { - hideAutoLogin(animate); - } - } - - void showAutoLogin(boolean animate) { - mTitleBar.showAutoLogin(animate); - } - - void hideAutoLogin(boolean animate) { - mTitleBar.hideAutoLogin(animate); - } - - @Override - public void loginFailed() { - mAutoLoginAccount.setEnabled(true); - mAutoLoginLogin.setEnabled(true); - mAutoLoginProgress.setVisibility(View.INVISIBLE); - mAutoLoginError.setVisibility(View.VISIBLE); - } - -} diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java index f5ccb427..2b4b1709 100644 --- a/src/com/android/browser/BaseUi.java +++ b/src/com/android/browser/BaseUi.java @@ -298,7 +298,6 @@ public abstract class BaseUi implements UI { onTabDataChanged(tab); onProgressChanged(tab); mNavigationBar.setIncognitoMode(tab.isPrivateBrowsingEnabled()); - updateAutoLogin(tab, false); mBlockFocusAnimations = false; } @@ -573,25 +572,11 @@ public abstract class BaseUi implements UI { return mCustomView == 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) { - mTitleBar.updateAutoLogin(tab, animate); - } - /** * Update the lock icon to correspond to our latest state. */ diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java index 319ded5f..34ba56ba 100644 --- a/src/com/android/browser/BrowserSettings.java +++ b/src/com/android/browser/BrowserSettings.java @@ -621,11 +621,8 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener, } public void resetDefaultPreferences() { - // Preserve autologin setting - long gal = mPrefs.getLong(GoogleAccountLogin.PREF_AUTOLOGIN_TIME, -1); mPrefs.edit() .clear() - .putLong(GoogleAccountLogin.PREF_AUTOLOGIN_TIME, gal) .apply(); resetCachedValues(); syncManagedSettings(); diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java index c3553d49..4d96cf54 100644 --- a/src/com/android/browser/Controller.java +++ b/src/com/android/browser/Controller.java @@ -325,20 +325,6 @@ public class Controller // must do this before trying to login the user as we don't want to // clear any session cookies set during login. CookieManager.getInstance().removeSessionCookie(); - } - - GoogleAccountLogin.startLoginIfNeeded(mActivity, - new Runnable() { - @Override public void run() { - onPreloginFinished(icicle, intent, currentTabId, - restoreIncognitoTabs); - } - }); - } - - private void onPreloginFinished(Bundle icicle, Intent intent, long currentTabId, - boolean restoreIncognitoTabs) { - if (currentTabId == -1) { BackgroundHandler.execute(new PruneThumbnails(mActivity, null)); if (intent == null) { // This won't happen under common scenarios. The icicle is @@ -1255,19 +1241,6 @@ public class Controller 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 /* diff --git a/src/com/android/browser/DeviceAccountLogin.java b/src/com/android/browser/DeviceAccountLogin.java deleted file mode 100644 index 0638f97e..00000000 --- a/src/com/android/browser/DeviceAccountLogin.java +++ /dev/null @@ -1,143 +0,0 @@ -/* - * Copyright (C) 2011 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.browser; - -import android.accounts.Account; -import android.accounts.AccountManager; -import android.accounts.AccountManagerCallback; -import android.accounts.AccountManagerFuture; -import android.app.Activity; -import android.os.Bundle; -import org.codeaurora.swe.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 deleted file mode 100644 index f6056719..00000000 --- a/src/com/android/browser/GoogleAccountLogin.java +++ /dev/null @@ -1,296 +0,0 @@ -/* - * Copyright (C) 2010 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.browser; - -import android.accounts.Account; -import android.accounts.AccountManager; -import android.accounts.AccountManagerCallback; -import android.accounts.AccountManagerFuture; -import android.app.Activity; -import android.app.ProgressDialog; -import android.content.Context; -import android.content.DialogInterface; -import android.content.DialogInterface.OnCancelListener; -import android.content.SharedPreferences.Editor; -import android.net.Uri; -import android.net.http.AndroidHttpClient; -import android.os.Bundle; -import android.util.Log; -import org.codeaurora.swe.CookieSyncManager; -import org.codeaurora.swe.WebView; -import org.codeaurora.swe.WebViewClient; - -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.HttpStatus; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.util.EntityUtils; - -import com.android.browser.R; - -public class GoogleAccountLogin implements Runnable, - AccountManagerCallback<Bundle>, OnCancelListener { - - private static final String LOGTAG = "BrowserLogin"; - - // Url for issuing the uber token. - private Uri ISSUE_AUTH_TOKEN_URL = Uri.parse( - "https://www.google.com/accounts/IssueAuthToken?service=gaia&Session=false"); - // Url for signing into a particular service. - private static final Uri TOKEN_AUTH_URL = Uri.parse( - "https://www.google.com/accounts/TokenAuth"); - // Google account type - private static final String GOOGLE = "com.google"; - // Last auto login time - public static final String PREF_AUTOLOGIN_TIME = "last_autologin_time"; - - private final Activity mActivity; - private final Account mAccount; - private final WebView mWebView; - private Runnable mRunnable; - private ProgressDialog mProgressDialog; - - // SID and LSID retrieval process. - private String mSid; - private String mLsid; - private int mState; // {NONE(0), SID(1), LSID(2)} - private boolean mTokensInvalidated; - private String mUserAgent; - - private GoogleAccountLogin(Activity activity, Account account, - Runnable runnable) { - mActivity = activity; - mAccount = account; - mWebView = new WebView(mActivity); - mRunnable = runnable; - mUserAgent = mWebView.getSettings().getUserAgentString(); - - // XXX: Doing pre-login causes onResume to skip calling - // resumeWebViewTimers. So to avoid problems with timers not running, we - // duplicate the work here using the off-screen WebView. - CookieSyncManager.getInstance().startSync(); - WebViewTimersControl.getInstance().onBrowserActivityResume(mWebView); - - mWebView.setWebViewClient(new WebViewClient() { - @Override - public boolean shouldOverrideUrlLoading(WebView view, String url) { - return false; - } - @Override - public void onPageFinished(WebView view, String url) { - done(); - } - }); - } - - private void saveLoginTime() { - Editor ed = BrowserSettings.getInstance().getPreferences().edit(); - ed.putLong(PREF_AUTOLOGIN_TIME, System.currentTimeMillis()); - ed.apply(); - } - - // Runnable - @Override - public void run() { - String url = ISSUE_AUTH_TOKEN_URL.buildUpon() - .appendQueryParameter("SID", mSid) - .appendQueryParameter("LSID", mLsid) - .build().toString(); - // Intentionally not using Proxy. - AndroidHttpClient client = AndroidHttpClient.newInstance(mUserAgent); - HttpPost request = new HttpPost(url); - - String result = null; - try { - HttpResponse response = client.execute(request); - int status = response.getStatusLine().getStatusCode(); - if (status != HttpStatus.SC_OK) { - Log.d(LOGTAG, "LOGIN_FAIL: Bad status from auth url " - + status + ": " - + response.getStatusLine().getReasonPhrase()); - // Invalidate the tokens once just in case the 403 was for other - // reasons. - if (status == HttpStatus.SC_FORBIDDEN && !mTokensInvalidated) { - Log.d(LOGTAG, "LOGIN_FAIL: Invalidating tokens..."); - // Need to regenerate the auth tokens and try again. - invalidateTokens(); - // XXX: Do not touch any more member variables from this - // thread as a second thread will handle the next login - // attempt. - return; - } - done(); - return; - } - HttpEntity entity = response.getEntity(); - if (entity == null) { - Log.d(LOGTAG, "LOGIN_FAIL: Null entity in response"); - done(); - return; - } - result = EntityUtils.toString(entity, "UTF-8"); - } catch (Exception e) { - Log.d(LOGTAG, "LOGIN_FAIL: Exception acquiring uber token " + e); - request.abort(); - done(); - return; - } finally { - client.close(); - } - final String newUrl = TOKEN_AUTH_URL.buildUpon() - .appendQueryParameter("source", "android-browser") - .appendQueryParameter("auth", result) - .appendQueryParameter("continue", - BrowserSettings.getFactoryResetHomeUrl(mActivity)) - .build().toString(); - mActivity.runOnUiThread(new Runnable() { - @Override public void run() { - // Check mRunnable in case the request has been canceled. This - // is most likely not necessary as run() is the only non-UI - // thread that calls done() but I am paranoid. - synchronized (GoogleAccountLogin.this) { - if (mRunnable == null) { - return; - } - mWebView.loadUrl(newUrl); - } - } - }); - } - - private void invalidateTokens() { - AccountManager am = AccountManager.get(mActivity); - am.invalidateAuthToken(GOOGLE, mSid); - am.invalidateAuthToken(GOOGLE, mLsid); - mTokensInvalidated = true; - mState = 1; // SID - am.getAuthToken(mAccount, "SID", null, mActivity, this, null); - } - - // AccountManager callbacks. - @Override - public void run(AccountManagerFuture<Bundle> value) { - try { - String id = value.getResult().getString( - AccountManager.KEY_AUTHTOKEN); - switch (mState) { - default: - case 0: - throw new IllegalStateException( - "Impossible to get into this state"); - case 1: - mSid = id; - mState = 2; // LSID - AccountManager.get(mActivity).getAuthToken( - mAccount, "LSID", null, mActivity, this, null); - break; - case 2: - mLsid = id; - new Thread(this).start(); - break; - } - } catch (Exception e) { - Log.d(LOGTAG, "LOGIN_FAIL: Exception in state " + mState + " " + e); - // For all exceptions load the original signin page. - // TODO: toast login failed? - done(); - } - } - - // Start the login process if auto-login is enabled and the user is not - // already logged in. - public static void startLoginIfNeeded(Activity activity, - Runnable runnable) { - // Already logged in? - if (isLoggedIn()) { - runnable.run(); - return; - } - - // No account found? - Account[] accounts = getAccounts(activity); - if (accounts == null || accounts.length == 0) { - runnable.run(); - return; - } - - GoogleAccountLogin login = - new GoogleAccountLogin(activity, accounts[0], runnable); - login.startLogin(); - } - - private void startLogin() { - saveLoginTime(); - mProgressDialog = ProgressDialog.show(mActivity, - mActivity.getString(R.string.pref_autologin_title), - mActivity.getString(R.string.pref_autologin_progress, - mAccount.name), - true /* indeterminate */, - true /* cancelable */, - this); - mState = 1; // SID - AccountManager.get(mActivity).getAuthToken( - mAccount, "SID", null, mActivity, this, null); - } - - private static Account[] getAccounts(Context ctx) { - return AccountManager.get(ctx).getAccountsByType(GOOGLE); - } - - // Checks if we already did pre-login. - private static boolean isLoggedIn() { - // See if we last logged in less than a week ago. - long lastLogin = BrowserSettings.getInstance().getPreferences() - .getLong(PREF_AUTOLOGIN_TIME, -1); - if (lastLogin == -1) { - return false; - } - return true; - } - - // Used to indicate that the Browser should continue loading the main page. - // This can happen on success, error, or timeout. - private synchronized void done() { - if (mRunnable != null) { - Log.d(LOGTAG, "Finished login attempt for " + mAccount.name); - mActivity.runOnUiThread(mRunnable); - - try { - mProgressDialog.dismiss(); - } catch (Exception e) { - // TODO: Switch to a managed dialog solution (DialogFragment?) - // Also refactor this class, it doesn't - // play nice with the activity lifecycle, leading to issues - // with the dialog it manages - Log.w(LOGTAG, "Failed to dismiss mProgressDialog: " + e.getMessage()); - } - mRunnable = null; - mActivity.runOnUiThread(new Runnable() { - @Override - public void run() { - mWebView.destroy(); - } - }); - } - } - - // Called by the progress dialog on startup. - public void onCancel(DialogInterface unused) { - done(); - } - -} diff --git a/src/com/android/browser/PreloadController.java b/src/com/android/browser/PreloadController.java index b5643187..3290611c 100644 --- a/src/com/android/browser/PreloadController.java +++ b/src/com/android/browser/PreloadController.java @@ -256,16 +256,6 @@ public class PreloadController implements WebViewController { } @Override - public void showAutoLogin(Tab tab) { - if (LOGD_ENABLED) Log.d(LOGTAG, "showAutoLogin()"); - } - - @Override - public void hideAutoLogin(Tab tab) { - if (LOGD_ENABLED) Log.d(LOGTAG, "hideAutoLogin()"); - } - - @Override public boolean shouldCaptureThumbnails() { return false; } diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java index 6d36d9c9..4889efe2 100644 --- a/src/com/android/browser/Tab.java +++ b/src/com/android/browser/Tab.java @@ -185,8 +185,6 @@ class Tab implements PictureListener { // 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; @@ -399,13 +397,6 @@ class Tab implements PictureListener { } } - // 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); @@ -706,14 +697,6 @@ class Tab implements PictureListener { super.onUnhandledKeyEvent(view, event); } } - - @Override - public void onReceivedLoginRequest(WebView view, String realm, - String account, String args) { - new DeviceAccountLogin(mWebViewController.getActivity(), view, Tab.this, mWebViewController) - .handleLogin(realm, account, args); - } - }; private void syncCurrentState(WebView view, String url) { @@ -734,17 +717,6 @@ class Tab implements PictureListener { mCurrentState.mIncognito = view.isPrivateBrowsingEnabled(); } - // 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 // ------------------------------------------------------------------------- diff --git a/src/com/android/browser/TitleBar.java b/src/com/android/browser/TitleBar.java index 1f9ec231..7438d26b 100644 --- a/src/com/android/browser/TitleBar.java +++ b/src/com/android/browser/TitleBar.java @@ -53,7 +53,6 @@ public class TitleBar extends RelativeLayout { private PageProgressView mProgress; private AccessibilityManager mAccessibilityManager; - private AutologinBar mAutoLogin; private NavigationBarBase mNavBar; private boolean mUseQuickControls; private SnapshotBar mSnapshotBar; @@ -84,16 +83,6 @@ public class TitleBar extends RelativeLayout { mNavBar.setTitleBar(this); } - private void inflateAutoLoginBar() { - if (mAutoLogin != null) { - return; - } - - ViewStub stub = (ViewStub) findViewById(R.id.autologin_stub); - mAutoLogin = (AutologinBar) stub.inflate(); - mAutoLogin.setTitleBar(this); - } - private void inflateSnapshotBar() { if (mSnapshotBar != null) { return; @@ -309,78 +298,14 @@ public class TitleBar extends RelativeLayout { int calculateEmbeddedHeight() { int height = mNavBar.getHeight(); - if (mAutoLogin != null && mAutoLogin.getVisibility() == View.VISIBLE) { - height += mAutoLogin.getHeight(); - } return height; } - public void updateAutoLogin(Tab tab, boolean animate) { - if (mAutoLogin == null) { - if (tab.getDeviceAccountLogin() == null) { - return; - } - inflateAutoLoginBar(); - } - mAutoLogin.updateAutoLogin(tab, animate); - } - - public void showAutoLogin(boolean animate) { - if (mUseQuickControls) { - mBaseUi.showTitleBar(); - } - if (mAutoLogin == null) { - inflateAutoLoginBar(); - } - mAutoLogin.setVisibility(View.VISIBLE); - if (animate) { - mAutoLogin.startAnimation(AnimationUtils.loadAnimation( - getContext(), R.anim.autologin_enter)); - } - } - - public void hideAutoLogin(boolean animate) { - if (mUseQuickControls) { - mBaseUi.hideTitleBar(); - mAutoLogin.setVisibility(View.GONE); - mBaseUi.refreshWebView(); - } else { - if (animate) { - Animation anim = AnimationUtils.loadAnimation(getContext(), - R.anim.autologin_exit); - anim.setAnimationListener(new AnimationListener() { - @Override - public void onAnimationEnd(Animation a) { - mAutoLogin.setVisibility(View.GONE); - mBaseUi.refreshWebView(); - } - - @Override - public void onAnimationStart(Animation a) { - } - - @Override - public void onAnimationRepeat(Animation a) { - } - }); - mAutoLogin.startAnimation(anim); - } else if (mAutoLogin.getAnimation() == null) { - mAutoLogin.setVisibility(View.GONE); - mBaseUi.refreshWebView(); - } - } - } - public boolean wantsToBeVisible() { - return inAutoLogin() - || (mSnapshotBar != null && mSnapshotBar.getVisibility() == View.VISIBLE + return (mSnapshotBar != null && mSnapshotBar.getVisibility() == View.VISIBLE && mSnapshotBar.isAnimating()); } - private boolean inAutoLogin() { - return mAutoLogin != null && mAutoLogin.getVisibility() == View.VISIBLE; - } - public boolean isEditingUrl() { return mNavBar.isEditingUrl(); } diff --git a/src/com/android/browser/UI.java b/src/com/android/browser/UI.java index 00dacdb3..70f0880d 100644 --- a/src/com/android/browser/UI.java +++ b/src/com/android/browser/UI.java @@ -136,10 +136,6 @@ public interface UI { boolean dispatchKey(int code, KeyEvent event); - void showAutoLogin(Tab tab); - - void hideAutoLogin(Tab tab); - void setFullscreen(boolean enabled); void setUseQuickControls(boolean enabled); diff --git a/src/com/android/browser/WebViewController.java b/src/com/android/browser/WebViewController.java index 6864470a..c5e3bc00 100644 --- a/src/com/android/browser/WebViewController.java +++ b/src/com/android/browser/WebViewController.java @@ -116,9 +116,5 @@ public interface WebViewController { void bookmarkedStatusHasChanged(Tab tab); - void showAutoLogin(Tab tab); - - void hideAutoLogin(Tab tab); - boolean shouldCaptureThumbnails(); } diff --git a/src/com/android/browser/preferences/DebugPreferencesFragment.java b/src/com/android/browser/preferences/DebugPreferencesFragment.java index 24821d16..3a0b32f6 100644 --- a/src/com/android/browser/preferences/DebugPreferencesFragment.java +++ b/src/com/android/browser/preferences/DebugPreferencesFragment.java @@ -22,7 +22,6 @@ import android.preference.Preference.OnPreferenceClickListener; import android.preference.PreferenceFragment; import com.android.browser.BrowserSettings; -import com.android.browser.GoogleAccountLogin; import com.android.browser.PreferenceKeys; import com.android.browser.R; @@ -34,19 +33,10 @@ public class DebugPreferencesFragment extends PreferenceFragment // Load the XML preferences file addPreferencesFromResource(R.xml.debug_preferences); - - Preference e = findPreference(PreferenceKeys.PREF_RESET_PRELOGIN); - e.setOnPreferenceClickListener(this); } @Override public boolean onPreferenceClick(Preference preference) { - if (PreferenceKeys.PREF_RESET_PRELOGIN.equals(preference.getKey())) { - BrowserSettings.getInstance().getPreferences().edit() - .remove(GoogleAccountLogin.PREF_AUTOLOGIN_TIME) - .apply(); - return true; - } return false; } } |