diff options
64 files changed, 281 insertions, 1229 deletions
diff --git a/res/layout-land/ssl_certificate.xml b/res/layout-land/ssl_certificate.xml deleted file mode 100644 index 6505fe5..0000000 --- a/res/layout-land/ssl_certificate.xml +++ /dev/null @@ -1,228 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<ScrollView - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" > - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - - <!-- Placeholder for the success message or one or more warnings --> - <LinearLayout - android:id="@+id/placeholder" - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:layout_marginTop="12dip" - android:orientation="vertical" /> - - <!-- Dialog-title line separator --> - <ImageView - android:id="@+id/title_separator" - android:src="@android:drawable/divider_horizontal_dark" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:scaleType="fitXY" - android:layout_weight="1" - android:gravity="fill_horizontal" - android:layout_marginLeft="20dip" - android:layout_marginRight="20dip" - android:layout_marginBottom="12dip" /> - - <TableLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:shrinkColumns="1" - android:orientation="vertical"> - - <!-- Issued to: --> - <TextView - android:id="@+id/issued_to_header" - android:text="@string/issued_to" - android:textStyle="bold" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:layout_marginLeft="20dip" - android:layout_marginRight="20dip" - android:layout_marginBottom="7dip" /> - - <!-- Common name: --> - <TableRow> - <TextView - android:id="@+id/to_common_header" - android:text="@string/common_name" - android:gravity="left" - android:layout_marginLeft="20dip" /> - - <TextView - android:id="@+id/to_common" - android:gravity="left" - android:layout_marginLeft="10dip" - android:layout_marginRight="20dip" - android:layout_marginBottom="7dip" /> - </TableRow> - - <!-- Organization: --> - <TableRow> - <TextView - android:id="@+id/to_org_header" - android:text="@string/org_name" - android:gravity="left" - android:layout_marginLeft="20dip" /> - - <TextView - android:id="@+id/to_org" - android:gravity="left" - android:layout_marginLeft="10dip" - android:layout_marginRight="20dip" - android:layout_marginBottom="7dip" /> - </TableRow> - - <!-- Organizational unit: --> - <TableRow> - <TextView - android:id="@+id/to_org_unit_header" - android:text="@string/org_unit" - android:gravity="left" - android:layout_marginLeft="20dip" /> - - <TextView - android:id="@+id/to_org_unit" - android:gravity="left" - android:layout_marginLeft="10dip" - android:layout_marginRight="20dip" - android:layout_marginBottom="12dip" /> - </TableRow> - - <!-- Issued by: --> - <TextView - android:id="@+id/issued_to_header" - android:text="@string/issued_by" - android:textStyle="bold" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:layout_marginLeft="20dip" - android:layout_marginRight="20dip" - android:layout_marginBottom="7dip" /> - - <!-- Common name: --> - <TableRow> - <TextView - android:id="@+id/by_common_header" - android:text="@string/common_name" - android:gravity="left" - android:layout_marginLeft="20dip" /> - - <TextView - android:id="@+id/by_common" - android:gravity="left" - android:layout_marginLeft="10dip" - android:layout_marginRight="20dip" - android:layout_marginBottom="7dip" /> - </TableRow> - - <!-- Organization: --> - <TableRow> - <TextView - android:id="@+id/by_org_header" - android:text="@string/org_name" - android:gravity="left" - android:layout_marginLeft="20dip" /> - - <TextView - android:id="@+id/by_org" - android:gravity="left" - android:layout_marginLeft="10dip" - android:layout_marginRight="20dip" - android:layout_marginBottom="7dip" /> - </TableRow> - - <!-- Organizational unit: --> - <TableRow> - <TextView - android:id="@+id/by_org_unit_header" - android:text="@string/org_unit" - android:gravity="left" - android:layout_marginLeft="20dip" /> - - <TextView - android:id="@+id/by_org_unit" - android:gravity="left" - android:layout_marginLeft="10dip" - android:layout_marginRight="20dip" - android:layout_marginBottom="12dip" /> - </TableRow> - - <!-- Validity Dates: --> - <TextView - android:id="@+id/validity_header" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:text="@string/validity_period" - android:textStyle="bold" - android:layout_marginLeft="20dip" - android:layout_marginRight="20dip" - android:layout_marginBottom="7dip" /> - - <!-- Issued On: --> - <TableRow> - <TextView - android:id="@+id/issued_on_header" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/issued_on" - android:gravity="left" - android:layout_marginLeft="20dip" /> - - <TextView - android:id="@+id/issued_on" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:gravity="left" - android:layout_marginLeft="10dip" - android:layout_marginRight="20dip" - android:layout_marginBottom="7dip" /> - - </TableRow> - - <!-- Expires On: --> - <TableRow> - <TextView - android:id="@+id/expires_on_header" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/expires_on" - android:gravity="left" - android:layout_marginLeft="20dip" /> - - <TextView - android:id="@+id/expires_on" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:gravity="left" - android:layout_marginLeft="10dip" - android:layout_marginRight="20dip" - android:layout_marginBottom="12dip" /> - </TableRow> - - </TableLayout> - - </LinearLayout> - -</ScrollView> diff --git a/res/layout/ssl_certificate.xml b/res/layout/ssl_certificate.xml deleted file mode 100644 index 28f50a3..0000000 --- a/res/layout/ssl_certificate.xml +++ /dev/null @@ -1,242 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<ScrollView - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" > - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - - <!-- Placeholder for the success message or one or more warnings --> - <LinearLayout - android:id="@+id/placeholder" - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:layout_marginTop="12dip" - android:orientation="vertical" /> - - <!-- Dialog-title line separator --> - <ImageView - android:id="@+id/title_separator" - android:src="@android:drawable/divider_horizontal_dark" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:scaleType="fitXY" - android:layout_weight="1" - android:gravity="fill_horizontal" - android:layout_marginRight="20dip" - android:layout_marginLeft="20dip" - android:layout_marginBottom="12dip" /> - - <TableLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <!-- Issued to: --> - <TextView - android:id="@+id/issued_to_header" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:text="@string/issued_to" - android:textStyle="bold" - android:layout_marginLeft="20dip" - android:layout_marginRight="20dip" - android:layout_marginBottom="10dip" /> - - <!-- Common name: --> - <TextView - android:id="@+id/to_common_header" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:text="@string/common_name" - android:gravity="left" - android:layout_marginLeft="20dip" - android:layout_marginRight="20dip" /> - - <TextView - android:id="@+id/to_common" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:gravity="left" - android:layout_marginLeft="20dip" - android:layout_marginRight="20dip" - android:layout_marginBottom="10dip" /> - - <!-- Organization: --> - <TextView - android:id="@+id/to_org_header" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:text="@string/org_name" - android:gravity="left" - android:layout_marginLeft="20dip" - android:layout_marginRight="20dip" /> - - <TextView - android:id="@+id/to_org" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:gravity="left" - android:layout_marginLeft="20dip" - android:layout_marginRight="20dip" - android:layout_marginBottom="10dip" /> - - <!-- Organizational unit: --> - <TextView - android:id="@+id/to_org_unit_header" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:text="@string/org_unit" - android:gravity="left" - android:layout_marginLeft="20dip" - android:layout_marginRight="20dip" /> - - <TextView - android:id="@+id/to_org_unit" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:gravity="left" - android:layout_marginLeft="20dip" - android:layout_marginRight="20dip" - android:layout_marginBottom="12dip" /> - - <!-- Issued by: --> - <TextView - android:id="@+id/issued_to_header" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:text="@string/issued_by" - android:textStyle="bold" - android:layout_marginLeft="20dip" - android:layout_marginRight="20dip" - android:layout_marginBottom="10dip" /> - - <!-- Common name: --> - <TextView - android:id="@+id/by_common_header" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/common_name" - android:gravity="left" - android:layout_marginLeft="20dip" - android:layout_marginRight="20dip" /> - - <TextView - android:id="@+id/by_common" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:gravity="left" - android:layout_marginLeft="20dip" - android:layout_marginRight="20dip" - android:layout_marginBottom="10dip" /> - - <!-- Organization: --> - <TextView - android:id="@+id/by_org_header" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:text="@string/org_name" - android:gravity="left" - android:layout_marginLeft="20dip" - android:layout_marginRight="20dip" /> - - <TextView - android:id="@+id/by_org" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:gravity="left" - android:layout_marginLeft="20dip" - android:layout_marginRight="20dip" - android:layout_marginBottom="10dip" /> - - <!-- Organizational unit: --> - <TextView - android:id="@+id/by_org_unit_header" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:text="@string/org_unit" - android:gravity="left" - android:layout_marginLeft="20dip" - android:layout_marginRight="20dip" /> - - <TextView - android:id="@+id/by_org_unit" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:gravity="left" - android:layout_marginLeft="20dip" - android:layout_marginRight="20dip" - android:layout_marginBottom="12dip" /> - - <!-- Validity Dates: --> - <TextView - android:id="@+id/validity_header" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:text="@string/validity_period" - android:textStyle="bold" - android:layout_marginLeft="20dip" - android:layout_marginRight="20dip" - android:layout_marginBottom="10dip" /> - - <!-- Issued On: --> - <TextView - android:id="@+id/issued_on_header" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/issued_on" - android:gravity="left" - android:layout_marginLeft="20dip" - android:layout_marginRight="20dip" /> - - <TextView - android:id="@+id/issued_on" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:gravity="left" - android:layout_marginLeft="20dip" - android:layout_marginRight="20dip" - android:layout_marginBottom="10dip" /> - - <!-- Expires On: --> - <TextView - android:id="@+id/expires_on_header" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/expires_on" - android:gravity="left" - android:layout_marginLeft="20dip" - android:layout_marginRight="20dip" /> - - <TextView - android:id="@+id/expires_on" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:gravity="left" - android:layout_marginLeft="20dip" - android:layout_marginRight="20dip" - android:layout_marginBottom="12dip" /> - - </TableLayout> - - </LinearLayout> - -</ScrollView> diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index ca16ccd..73b25b9 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"اسم الموقع لا يتطابق مع الاسم على الشهادة."</string> <string name="ssl_expired" msgid="5739349389499575559">"انتهت صلاحية هذه الشهادة."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"هذه الشهادة ليست صالحة بعد."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"شهادة الأمان"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"هذه الشهادة صالحة."</string> - <string name="issued_to" msgid="9032338008819841339">"تم الإصدار إلى:"</string> - <string name="common_name" msgid="5745530093500062357">"الاسم الشائع:"</string> - <string name="org_name" msgid="8868889052889991293">"المؤسسة:"</string> - <string name="org_unit" msgid="4489056376307768196">"وحدة تنظيمية:"</string> - <string name="issued_by" msgid="6959484326943152487">"تم الإصدار بواسطة:"</string> - <string name="validity_period" msgid="57988851973181309">"الصلاحية:"</string> - <string name="issued_on" msgid="2082890654801808368">"تم الإصدار في:"</string> - <string name="expires_on" msgid="8061200430557020704">"تنتهي الصلاحية في:"</string> <string name="stopping" msgid="4839698519340302982">"جارٍ الإيقاف..."</string> <string name="stop" msgid="5687251076030630074">"إيقاف"</string> <string name="reload" msgid="8585220783228408062">"تحديث"</string> diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index 1b66113..64f27e4 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"Името на сайта не съответства на името в сертификата."</string> <string name="ssl_expired" msgid="5739349389499575559">"Сертификатът е изтекъл."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"Сертификатът още не е валиден."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"Сертификат за сигурност"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Сертификатът е валиден."</string> - <string name="issued_to" msgid="9032338008819841339">"Издаден на:"</string> - <string name="common_name" msgid="5745530093500062357">"Общо име:"</string> - <string name="org_name" msgid="8868889052889991293">"Организация:"</string> - <string name="org_unit" msgid="4489056376307768196">"Организационна единица:"</string> - <string name="issued_by" msgid="6959484326943152487">"Издаден от:"</string> - <string name="validity_period" msgid="57988851973181309">"Валидност:"</string> - <string name="issued_on" msgid="2082890654801808368">"Издаден на:"</string> - <string name="expires_on" msgid="8061200430557020704">"Изтича на:"</string> <string name="stopping" msgid="4839698519340302982">"Спира се..."</string> <string name="stop" msgid="5687251076030630074">"Стоп"</string> <string name="reload" msgid="8585220783228408062">"Опресняване"</string> diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 6e3f83b..d649439 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"El nom del lloc no coincideix amb el nom que consta al certificat."</string> <string name="ssl_expired" msgid="5739349389499575559">"Aquest certificat ha caducat."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"Aquest certificat encara no és vàlid."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"Certificat de seguretat"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Aquest certificat és vàlid."</string> - <string name="issued_to" msgid="9032338008819841339">"Emès per a:"</string> - <string name="common_name" msgid="5745530093500062357">"Nom comú:"</string> - <string name="org_name" msgid="8868889052889991293">"Organització:"</string> - <string name="org_unit" msgid="4489056376307768196">"Unitat organitzativa:"</string> - <string name="issued_by" msgid="6959484326943152487">"Publicat per:"</string> - <string name="validity_period" msgid="57988851973181309">"Validesa:"</string> - <string name="issued_on" msgid="2082890654801808368">"Publicat el:"</string> - <string name="expires_on" msgid="8061200430557020704">"Caduca el:"</string> <string name="stopping" msgid="4839698519340302982">"S\'està aturant..."</string> <string name="stop" msgid="5687251076030630074">"Atura"</string> <string name="reload" msgid="8585220783228408062">"Actualitza"</string> diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index eed6828..5790da3 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"Název webu se neshoduje s názvem uvedeným v certifikátu."</string> <string name="ssl_expired" msgid="5739349389499575559">"Platnost certifikátu vypršela."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"Tento certifikát zatím není platný."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"Certifikát zabezpečení"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Tento certifikát je platný."</string> - <string name="issued_to" msgid="9032338008819841339">"Vydáno komu:"</string> - <string name="common_name" msgid="5745530093500062357">"Běžný název:"</string> - <string name="org_name" msgid="8868889052889991293">"Organizace:"</string> - <string name="org_unit" msgid="4489056376307768196">"Organizační jednotka:"</string> - <string name="issued_by" msgid="6959484326943152487">"Vydal:"</string> - <string name="validity_period" msgid="57988851973181309">"Platnost:"</string> - <string name="issued_on" msgid="2082890654801808368">"Datum vydání:"</string> - <string name="expires_on" msgid="8061200430557020704">"Platnost vyprší:"</string> <string name="stopping" msgid="4839698519340302982">"Zastavuji..."</string> <string name="stop" msgid="5687251076030630074">"Zastavit"</string> <string name="reload" msgid="8585220783228408062">"Aktualizovat"</string> diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 5fe93b5..a0181cc 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"Navnet på dette websted stemmer ikke overens med navnet på certifikatet."</string> <string name="ssl_expired" msgid="5739349389499575559">"Dette certifikat er udløbet."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"Dette certifikat er ikke gyldigt endnu."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"Sikkerhedscertifikat"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Dette certifikat er gyldigt."</string> - <string name="issued_to" msgid="9032338008819841339">"Udstedt til:"</string> - <string name="common_name" msgid="5745530093500062357">"Fællesnavn:"</string> - <string name="org_name" msgid="8868889052889991293">"Organisation:"</string> - <string name="org_unit" msgid="4489056376307768196">"Organisatorisk enhed:"</string> - <string name="issued_by" msgid="6959484326943152487">"Udstedt af:"</string> - <string name="validity_period" msgid="57988851973181309">"Gyldighed:"</string> - <string name="issued_on" msgid="2082890654801808368">"Udstedt den:"</string> - <string name="expires_on" msgid="8061200430557020704">"Udløber den:"</string> <string name="stopping" msgid="4839698519340302982">"Stopper ..."</string> <string name="stop" msgid="5687251076030630074">"Stop"</string> <string name="reload" msgid="8585220783228408062">"Opdater"</string> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 3797a50..30400e7 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"Der Name der Website stimmt nicht mit dem Namen auf dem Zertifikat überein."</string> <string name="ssl_expired" msgid="5739349389499575559">"Dieses Zertifikat ist abgelaufen."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"Dieses Zertifikat ist noch nicht gültig."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"Sicherheitszertifikat"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Dies ist ein gültiges Zertifikat."</string> - <string name="issued_to" msgid="9032338008819841339">"Ausgegeben an:"</string> - <string name="common_name" msgid="5745530093500062357">"Allgemeiner Name."</string> - <string name="org_name" msgid="8868889052889991293">"Organisation:"</string> - <string name="org_unit" msgid="4489056376307768196">"Organisationseinheit:"</string> - <string name="issued_by" msgid="6959484326943152487">"Ausgegeben von:"</string> - <string name="validity_period" msgid="57988851973181309">"Gültigkeit:"</string> - <string name="issued_on" msgid="2082890654801808368">"Ausgegeben am:"</string> - <string name="expires_on" msgid="8061200430557020704">"Läuft ab am:"</string> <string name="stopping" msgid="4839698519340302982">"Wird angehalten..."</string> <string name="stop" msgid="5687251076030630074">"Anhalten"</string> <string name="reload" msgid="8585220783228408062">"Aktualisieren"</string> diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 9e687cc..07c47f7 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"Το όνομα του ιστότοπου δεν αντιστοιχεί στο όνομα του πιστοποιητικού."</string> <string name="ssl_expired" msgid="5739349389499575559">"Αυτό το πιστοποιητικό έχει λήξει."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"Αυτό το πιστοποιητικό δεν είναι έγκυρο ακόμα."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"Πιστοποιητικό ασφαλείας"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Αυτό το πιστοποιητικό είναι έγκυρο."</string> - <string name="issued_to" msgid="9032338008819841339">"Εκδόθηκε στις:"</string> - <string name="common_name" msgid="5745530093500062357">"Κοινό όνομα:"</string> - <string name="org_name" msgid="8868889052889991293">"Οργανισμός:"</string> - <string name="org_unit" msgid="4489056376307768196">"Μονάδα οργάνωσης:"</string> - <string name="issued_by" msgid="6959484326943152487">"Εκδόθηκε:"</string> - <string name="validity_period" msgid="57988851973181309">"Ισχύς:"</string> - <string name="issued_on" msgid="2082890654801808368">"Εκδόθηκε στις:"</string> - <string name="expires_on" msgid="8061200430557020704">"Λήγει:"</string> <string name="stopping" msgid="4839698519340302982">"Διακοπή..."</string> <string name="stop" msgid="5687251076030630074">"Διακοπή"</string> <string name="reload" msgid="8585220783228408062">"Ανανέωση"</string> diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index d402192..e9f9ee5 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"The name of the site does not match the name on the certificate."</string> <string name="ssl_expired" msgid="5739349389499575559">"This certificate has expired."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"This certificate is not valid yet."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"Security certificate"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"This certificate is valid."</string> - <string name="issued_to" msgid="9032338008819841339">"Issued to:"</string> - <string name="common_name" msgid="5745530093500062357">"Common name:"</string> - <string name="org_name" msgid="8868889052889991293">"Organisation:"</string> - <string name="org_unit" msgid="4489056376307768196">"Organisational unit:"</string> - <string name="issued_by" msgid="6959484326943152487">"Issued by:"</string> - <string name="validity_period" msgid="57988851973181309">"Validity:"</string> - <string name="issued_on" msgid="2082890654801808368">"Issued on:"</string> - <string name="expires_on" msgid="8061200430557020704">"Expires on:"</string> <string name="stopping" msgid="4839698519340302982">"Stopping…"</string> <string name="stop" msgid="5687251076030630074">"Stop"</string> <string name="reload" msgid="8585220783228408062">"Refresh"</string> diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 4c9cef2..ae34625 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"El nombre del sitio no coincide con el nombre del certificado."</string> <string name="ssl_expired" msgid="5739349389499575559">"Este certificado ha expirado."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"Este certificado aún no es válido."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"Certificado de seguridad"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Este certificado es válido."</string> - <string name="issued_to" msgid="9032338008819841339">"Emitido a:"</string> - <string name="common_name" msgid="5745530093500062357">"Nombre habitual:"</string> - <string name="org_name" msgid="8868889052889991293">"Organización:"</string> - <string name="org_unit" msgid="4489056376307768196">"Unidad organizativa"</string> - <string name="issued_by" msgid="6959484326943152487">"Emitido por:"</string> - <string name="validity_period" msgid="57988851973181309">"Validez:"</string> - <string name="issued_on" msgid="2082890654801808368">"Enviado el:"</string> - <string name="expires_on" msgid="8061200430557020704">"Expira el:"</string> <string name="stopping" msgid="4839698519340302982">"Deteniendo..."</string> <string name="stop" msgid="5687251076030630074">"Detener"</string> <string name="reload" msgid="8585220783228408062">"Actualizar"</string> diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 0b7cae9..3b4e9a0 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"El nombre del sitio no coincide con el del certificado."</string> <string name="ssl_expired" msgid="5739349389499575559">"Este certificado ha caducado."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"Este certificado aún no es válido."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"Certificado de seguridad"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Este certificado es válido."</string> - <string name="issued_to" msgid="9032338008819841339">"Emitido para:"</string> - <string name="common_name" msgid="5745530093500062357">"Nombre común:"</string> - <string name="org_name" msgid="8868889052889991293">"Organización:"</string> - <string name="org_unit" msgid="4489056376307768196">"Departamento:"</string> - <string name="issued_by" msgid="6959484326943152487">"Emitido por:"</string> - <string name="validity_period" msgid="57988851973181309">"Validez:"</string> - <string name="issued_on" msgid="2082890654801808368">"Fecha de emisión:"</string> - <string name="expires_on" msgid="8061200430557020704">"Fecha de caducidad:"</string> <string name="stopping" msgid="4839698519340302982">"Deteniendo..."</string> <string name="stop" msgid="5687251076030630074">"Detener"</string> <string name="reload" msgid="8585220783228408062">"Actualizar"</string> diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 62b7514..0fdf327 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"نام سایت با نام موجود در گواهی مطابقت ندارد."</string> <string name="ssl_expired" msgid="5739349389499575559">"این گواهی منقضی شده است."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"این گواهی هنوز معتبر نیست."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"گواهی امنیتی"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"این گواهی معتبر است."</string> - <string name="issued_to" msgid="9032338008819841339">"صدور برای:"</string> - <string name="common_name" msgid="5745530093500062357">"نام عادی:"</string> - <string name="org_name" msgid="8868889052889991293">"سازمان:"</string> - <string name="org_unit" msgid="4489056376307768196">"واحد سازمانی:"</string> - <string name="issued_by" msgid="6959484326943152487">"صدور توسط:"</string> - <string name="validity_period" msgid="57988851973181309">"اعتبار:"</string> - <string name="issued_on" msgid="2082890654801808368">"صدور در:"</string> - <string name="expires_on" msgid="8061200430557020704">"تاریخ انقضا:"</string> <string name="stopping" msgid="4839698519340302982">"در حال توقف..."</string> <string name="stop" msgid="5687251076030630074">"توقف"</string> <string name="reload" msgid="8585220783228408062">"تازه کردن"</string> diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index e89dc69..9a2eeb9 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"Sivuston nimi ei vastaa varmenteessa olevaa nimeä."</string> <string name="ssl_expired" msgid="5739349389499575559">"Varmenne ei ole enää voimassa."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"Varmenne ei ole vielä voimassa."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"Suojausvarmenne"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Varmenne on voimassa."</string> - <string name="issued_to" msgid="9032338008819841339">"Varmenteen saaja:"</string> - <string name="common_name" msgid="5745530093500062357">"Yleinen nimi:"</string> - <string name="org_name" msgid="8868889052889991293">"Organisaatio:"</string> - <string name="org_unit" msgid="4489056376307768196">"Organisaatioyksikkö:"</string> - <string name="issued_by" msgid="6959484326943152487">"Myöntäjä:"</string> - <string name="validity_period" msgid="57988851973181309">"Voimassa:"</string> - <string name="issued_on" msgid="2082890654801808368">"Myönnetty:"</string> - <string name="expires_on" msgid="8061200430557020704">"Vanhenee:"</string> <string name="stopping" msgid="4839698519340302982">"Lopetetaan…"</string> <string name="stop" msgid="5687251076030630074">"Lopeta"</string> <string name="reload" msgid="8585220783228408062">"Päivitä"</string> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 26adda7..d7665f7 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"Le nom du site ne correspond pas au nom indiqué dans le certificat."</string> <string name="ssl_expired" msgid="5739349389499575559">"Le certificat a expiré."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"Ce certificat n\'est pas encore valide."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"Certificat de sécurité"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Ce certificat est valide."</string> - <string name="issued_to" msgid="9032338008819841339">"Émis à :"</string> - <string name="common_name" msgid="5745530093500062357">"Nom commun :"</string> - <string name="org_name" msgid="8868889052889991293">"Organisation :"</string> - <string name="org_unit" msgid="4489056376307768196">"Unité d\'organisation :"</string> - <string name="issued_by" msgid="6959484326943152487">"Émis par :"</string> - <string name="validity_period" msgid="57988851973181309">"Validité :"</string> - <string name="issued_on" msgid="2082890654801808368">"Émis le :"</string> - <string name="expires_on" msgid="8061200430557020704">"Expire le :"</string> <string name="stopping" msgid="4839698519340302982">"Arrêt..."</string> <string name="stop" msgid="5687251076030630074">"Interrompre"</string> <string name="reload" msgid="8585220783228408062">"Actualiser"</string> diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index 7fa4ebd..bf270c0 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"Naziv web-lokacije ne podudara se s nazivom na certifikatu."</string> <string name="ssl_expired" msgid="5739349389499575559">"Ovaj je certifikat istekao."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"Ovaj certifikat još nije važeći."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"Certifikat o sigurnosti"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Ovaj je certifikat valjan."</string> - <string name="issued_to" msgid="9032338008819841339">"Izdano do:"</string> - <string name="common_name" msgid="5745530093500062357">"Zajednički naziv:"</string> - <string name="org_name" msgid="8868889052889991293">"Tvrtka ili ustanova:"</string> - <string name="org_unit" msgid="4489056376307768196">"Organizacijska jedinica:"</string> - <string name="issued_by" msgid="6959484326943152487">"Izdao:"</string> - <string name="validity_period" msgid="57988851973181309">"Vrijedi do:"</string> - <string name="issued_on" msgid="2082890654801808368">"Izdano dana:"</string> - <string name="expires_on" msgid="8061200430557020704">"Ističe dana:"</string> <string name="stopping" msgid="4839698519340302982">"Zaustavljanje..."</string> <string name="stop" msgid="5687251076030630074">"Zaustavi"</string> <string name="reload" msgid="8585220783228408062">"Osvježi"</string> diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index d91ea0b..d24d713 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"A webhely neve nem egyezik a tanúsítványon lévő névvel."</string> <string name="ssl_expired" msgid="5739349389499575559">"A tanúsítvány lejárt."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"A tanúsítvány még nem érvényes."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"Biztonsági tanúsítvány"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"A tanúsítvány érvényes."</string> - <string name="issued_to" msgid="9032338008819841339">"Kiállítva a következőnek:"</string> - <string name="common_name" msgid="5745530093500062357">"Név:"</string> - <string name="org_name" msgid="8868889052889991293">"Szervezet:"</string> - <string name="org_unit" msgid="4489056376307768196">"Szervezeti egység:"</string> - <string name="issued_by" msgid="6959484326943152487">"Kiállította:"</string> - <string name="validity_period" msgid="57988851973181309">"Érvényesség:"</string> - <string name="issued_on" msgid="2082890654801808368">"Kiállítva:"</string> - <string name="expires_on" msgid="8061200430557020704">"Lejár:"</string> <string name="stopping" msgid="4839698519340302982">"Leállítás..."</string> <string name="stop" msgid="5687251076030630074">"Leállítás"</string> <string name="reload" msgid="8585220783228408062">"Frissítés"</string> diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 670b1db..68dc4e3 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"Nama situs tidak cocok dengan nama pada sertifikat."</string> <string name="ssl_expired" msgid="5739349389499575559">"Sertifikat ini telah kedaluwarsa."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"Sertifikat ini belum valid."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"Sertifikat keamanan"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Sertifikat ini valid."</string> - <string name="issued_to" msgid="9032338008819841339">"Diterbitkan ke:"</string> - <string name="common_name" msgid="5745530093500062357">"Nama umum:"</string> - <string name="org_name" msgid="8868889052889991293">"Organisasi:"</string> - <string name="org_unit" msgid="4489056376307768196">"Unit organisasi:"</string> - <string name="issued_by" msgid="6959484326943152487">"Diterbitkan oleh:"</string> - <string name="validity_period" msgid="57988851973181309">"Validitas:"</string> - <string name="issued_on" msgid="2082890654801808368">"Diterbitkan pada:"</string> - <string name="expires_on" msgid="8061200430557020704">"Kedaluwarsa pada:"</string> <string name="stopping" msgid="4839698519340302982">"Menghentikan"</string> <string name="stop" msgid="5687251076030630074">"Berhenti"</string> <string name="reload" msgid="8585220783228408062">"Segarkan"</string> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 68d2de0..5a4d578 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"Il nome del sito non corrisponde al nome nel certificato."</string> <string name="ssl_expired" msgid="5739349389499575559">"Il certificato è scaduto."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"Questo certificato non è ancora valido."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"Certificato di protezione"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Questo certificato è valido."</string> - <string name="issued_to" msgid="9032338008819841339">"Rilasciato a:"</string> - <string name="common_name" msgid="5745530093500062357">"Nome comune:"</string> - <string name="org_name" msgid="8868889052889991293">"Organizzazione:"</string> - <string name="org_unit" msgid="4489056376307768196">"Unità organizzativa:"</string> - <string name="issued_by" msgid="6959484326943152487">"Rilasciato da:"</string> - <string name="validity_period" msgid="57988851973181309">"Validità:"</string> - <string name="issued_on" msgid="2082890654801808368">"Rilasciato il:"</string> - <string name="expires_on" msgid="8061200430557020704">"Scade il:"</string> <string name="stopping" msgid="4839698519340302982">"Interruzione..."</string> <string name="stop" msgid="5687251076030630074">"Interrompi"</string> <string name="reload" msgid="8585220783228408062">"Aggiorna"</string> diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 3588a8f..3ab5441 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"שם האתר לא תואם לשם באישור."</string> <string name="ssl_expired" msgid="5739349389499575559">"פג תוקפו של אישור זה."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"אישור זה אינו חוקי עדיין."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"אישור אבטחה"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"אישור זה תקף."</string> - <string name="issued_to" msgid="9032338008819841339">"הופק עבור:"</string> - <string name="common_name" msgid="5745530093500062357">"שם משותף:"</string> - <string name="org_name" msgid="8868889052889991293">"ארגון:"</string> - <string name="org_unit" msgid="4489056376307768196">"יחידה ארגונית:"</string> - <string name="issued_by" msgid="6959484326943152487">"הופק על ידי:"</string> - <string name="validity_period" msgid="57988851973181309">"חוקיות:"</string> - <string name="issued_on" msgid="2082890654801808368">"הונפק בתאריך:"</string> - <string name="expires_on" msgid="8061200430557020704">"פג תוקף ב:"</string> <string name="stopping" msgid="4839698519340302982">"נעצרת."</string> <string name="stop" msgid="5687251076030630074">"עצור"</string> <string name="reload" msgid="8585220783228408062">"רענן"</string> diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 7d94111..699257a 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"サイト名と証明書上の名前が一致しません。"</string> <string name="ssl_expired" msgid="5739349389499575559">"この証明書は有効期限切れです。"</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"この証明書はまだ有効ではありません。"</string> - <string name="ssl_certificate" msgid="5226747157992111668">"セキュリティ証明書"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"この証明書は有効です。"</string> - <string name="issued_to" msgid="9032338008819841339">"発行先:"</string> - <string name="common_name" msgid="5745530093500062357">"共通名:"</string> - <string name="org_name" msgid="8868889052889991293">"組織:"</string> - <string name="org_unit" msgid="4489056376307768196">"組織単位:"</string> - <string name="issued_by" msgid="6959484326943152487">"発行者:"</string> - <string name="validity_period" msgid="57988851973181309">"有効期間:"</string> - <string name="issued_on" msgid="2082890654801808368">"発行:"</string> - <string name="expires_on" msgid="8061200430557020704">"有効期限:"</string> <string name="stopping" msgid="4839698519340302982">"停止中..."</string> <string name="stop" msgid="5687251076030630074">"停止"</string> <string name="reload" msgid="8585220783228408062">"再読み込み"</string> diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 971957c..4824898 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"사이트 이름이 인증서에 있는 것과 일치하지 않습니다."</string> <string name="ssl_expired" msgid="5739349389499575559">"인증서가 만료되었습니다."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"인증서가 아직 유효하지 않습니다."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"보안 인증서"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"유효한 인증서입니다."</string> - <string name="issued_to" msgid="9032338008819841339">"발급 대상:"</string> - <string name="common_name" msgid="5745530093500062357">"일반 이름:"</string> - <string name="org_name" msgid="8868889052889991293">"조직:"</string> - <string name="org_unit" msgid="4489056376307768196">"조직 구성 단위:"</string> - <string name="issued_by" msgid="6959484326943152487">"발급 기관:"</string> - <string name="validity_period" msgid="57988851973181309">"유효성:"</string> - <string name="issued_on" msgid="2082890654801808368">"발급 날짜:"</string> - <string name="expires_on" msgid="8061200430557020704">"만료 날짜:"</string> <string name="stopping" msgid="4839698519340302982">"중지하는 중..."</string> <string name="stop" msgid="5687251076030630074">"중지"</string> <string name="reload" msgid="8585220783228408062">"새로고침"</string> diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index b9c0da5..1d0e852 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"Svetainės pavadinimas neatitinka sertifikate nurodyto pavadinimo."</string> <string name="ssl_expired" msgid="5739349389499575559">"Šio sertifikato galiojimo laikas baigėsi."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"Šis sertifikatas dar negalioja."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"Saugos sertifikatas"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Šis sertifikatas galioja."</string> - <string name="issued_to" msgid="9032338008819841339">"Išduota:"</string> - <string name="common_name" msgid="5745530093500062357">"Bendras pavadinimas:"</string> - <string name="org_name" msgid="8868889052889991293">"Organizacija:"</string> - <string name="org_unit" msgid="4489056376307768196">"Organizacinis vienetas:"</string> - <string name="issued_by" msgid="6959484326943152487">"Išdavė:"</string> - <string name="validity_period" msgid="57988851973181309">"Galiojimas:"</string> - <string name="issued_on" msgid="2082890654801808368">"Išduota:"</string> - <string name="expires_on" msgid="8061200430557020704">"Galiojimas baigiasi:"</string> <string name="stopping" msgid="4839698519340302982">"Sustabdoma..."</string> <string name="stop" msgid="5687251076030630074">"Sustabdyti"</string> <string name="reload" msgid="8585220783228408062">"Atnaujinti"</string> diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index 9d7dbc7..dca1c57 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"Vietnes nosaukums neatbilst nosaukumam sertifikātā."</string> <string name="ssl_expired" msgid="5739349389499575559">"Šī sertifikāta derīguma termiņš ir beidzies."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"Šis sertifikāts vēl nav derīgs."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"Drošības sertifikāts"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Sertifikāts ir derīgs."</string> - <string name="issued_to" msgid="9032338008819841339">"Izdots:"</string> - <string name="common_name" msgid="5745530093500062357">"Kopējais nosaukums:"</string> - <string name="org_name" msgid="8868889052889991293">"Organizācija:"</string> - <string name="org_unit" msgid="4489056376307768196">"Organizācijas vienība:"</string> - <string name="issued_by" msgid="6959484326943152487">"Izsniedzējs:"</string> - <string name="validity_period" msgid="57988851973181309">"Derīgums:"</string> - <string name="issued_on" msgid="2082890654801808368">"Izsniegšanas datums:"</string> - <string name="expires_on" msgid="8061200430557020704">"Derīguma termiņš:"</string> <string name="stopping" msgid="4839698519340302982">"Notiek apturēšana..."</string> <string name="stop" msgid="5687251076030630074">"Apturēt"</string> <string name="reload" msgid="8585220783228408062">"Atsvaidzināt"</string> diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml index 5c869a5..adcc60b 100644 --- a/res/values-ms/strings.xml +++ b/res/values-ms/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"Nama tapak tidak sepadan dengan nama pada sijil."</string> <string name="ssl_expired" msgid="5739349389499575559">"Sijil ini telah tamat tempoh."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"Sijil ini belum lagi sah."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"Sijil keselamatan"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Sijil ini sah."</string> - <string name="issued_to" msgid="9032338008819841339">"Dikeluarkan kepada:"</string> - <string name="common_name" msgid="5745530093500062357">"Nama biasa:"</string> - <string name="org_name" msgid="8868889052889991293">"Organisasi:"</string> - <string name="org_unit" msgid="4489056376307768196">"Unit Organisasi:"</string> - <string name="issued_by" msgid="6959484326943152487">"Dikeluarkan oleh:"</string> - <string name="validity_period" msgid="57988851973181309">"Kesahan:"</string> - <string name="issued_on" msgid="2082890654801808368">"Dikeluarkan pada:"</string> - <string name="expires_on" msgid="8061200430557020704">"Tamat tempoh pada:"</string> <string name="stopping" msgid="4839698519340302982">"Menghentikan…"</string> <string name="stop" msgid="5687251076030630074">"Henti"</string> <string name="reload" msgid="8585220783228408062">"Muat semula"</string> diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 0c077e3..9ed0233 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"Navnet på siden stemmer ikke med navnet på sertifikatet."</string> <string name="ssl_expired" msgid="5739349389499575559">"Sertifikatet er utløpt."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"Sertifikatet er ikke gyldig ennå."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"Sikkerhetssertifikat"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Sertifikatet er gyldig."</string> - <string name="issued_to" msgid="9032338008819841339">"Utstedt til:"</string> - <string name="common_name" msgid="5745530093500062357">"Ordinært navn:"</string> - <string name="org_name" msgid="8868889052889991293">"Organisasjon:"</string> - <string name="org_unit" msgid="4489056376307768196">"Organisasjonsenhet:"</string> - <string name="issued_by" msgid="6959484326943152487">"Utstedt av:"</string> - <string name="validity_period" msgid="57988851973181309">"Gyldighet:"</string> - <string name="issued_on" msgid="2082890654801808368">"Utstedt:"</string> - <string name="expires_on" msgid="8061200430557020704">"Utløper den:"</string> <string name="stopping" msgid="4839698519340302982">"Avbryter…"</string> <string name="stop" msgid="5687251076030630074">"Avbryt"</string> <string name="reload" msgid="8585220783228408062">"Oppdater"</string> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 7b6e875..5997e3c 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"De naam van deze site komt niet overeen met de naam op het certificaat."</string> <string name="ssl_expired" msgid="5739349389499575559">"Dit certificaat is verlopen."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"Dit certificaat is nog niet geldig."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"Beveiligingscertificaat"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Dit certificaat is geldig."</string> - <string name="issued_to" msgid="9032338008819841339">"Uitgegeven voor:"</string> - <string name="common_name" msgid="5745530093500062357">"Algemene naam:"</string> - <string name="org_name" msgid="8868889052889991293">"Organisatie:"</string> - <string name="org_unit" msgid="4489056376307768196">"Organisatie-eenheid:"</string> - <string name="issued_by" msgid="6959484326943152487">"Uitgegeven door:"</string> - <string name="validity_period" msgid="57988851973181309">"Geldigheid:"</string> - <string name="issued_on" msgid="2082890654801808368">"Uitgegeven op:"</string> - <string name="expires_on" msgid="8061200430557020704">"Verloopt op:"</string> <string name="stopping" msgid="4839698519340302982">"Stoppen..."</string> <string name="stop" msgid="5687251076030630074">"Stoppen"</string> <string name="reload" msgid="8585220783228408062">"Vernieuwen"</string> diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 11c6261..7257963 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"Nazwa witryny nie odpowiada nazwie podanej w certyfikacie."</string> <string name="ssl_expired" msgid="5739349389499575559">"Ten certyfikat wygasł."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"Ten certyfikat nie jest jeszcze prawidłowy."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"Certyfikat zabezpieczeń"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Ten certyfikat jest prawidłowy."</string> - <string name="issued_to" msgid="9032338008819841339">"Otrzymujący:"</string> - <string name="common_name" msgid="5745530093500062357">"Nazwa pospolita:"</string> - <string name="org_name" msgid="8868889052889991293">"Organizacja:"</string> - <string name="org_unit" msgid="4489056376307768196">"Jednostka organizacyjna:"</string> - <string name="issued_by" msgid="6959484326943152487">"Wystawca:"</string> - <string name="validity_period" msgid="57988851973181309">"Poprawność:"</string> - <string name="issued_on" msgid="2082890654801808368">"Data wystawienia:"</string> - <string name="expires_on" msgid="8061200430557020704">"Wygasa:"</string> <string name="stopping" msgid="4839698519340302982">"Trwa zatrzymywanie…"</string> <string name="stop" msgid="5687251076030630074">"Zatrzymaj"</string> <string name="reload" msgid="8585220783228408062">"Odśwież"</string> diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 5be076e..0ae4868 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"O nome do site não corresponde ao nome constante no certificado."</string> <string name="ssl_expired" msgid="5739349389499575559">"Este certificado expirou."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"Este certificado ainda não é válido."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"Certificado de segurança"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Este certificado é válido."</string> - <string name="issued_to" msgid="9032338008819841339">"Emitido para:"</string> - <string name="common_name" msgid="5745530093500062357">"Nome comum:"</string> - <string name="org_name" msgid="8868889052889991293">"Organização:"</string> - <string name="org_unit" msgid="4489056376307768196">"Unidade organizacional:"</string> - <string name="issued_by" msgid="6959484326943152487">"Emitido por:"</string> - <string name="validity_period" msgid="57988851973181309">"Validade:"</string> - <string name="issued_on" msgid="2082890654801808368">"Emitido em:"</string> - <string name="expires_on" msgid="8061200430557020704">"Expira em:"</string> <string name="stopping" msgid="4839698519340302982">"A interromper..."</string> <string name="stop" msgid="5687251076030630074">"Parar"</string> <string name="reload" msgid="8585220783228408062">"Actualizar"</string> diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index a0e6553..01dc807 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"O nome do site não corresponde ao nome no certificado."</string> <string name="ssl_expired" msgid="5739349389499575559">"Este certificado expirou."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"Este certificado ainda não é válido."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"Certificado de segurança"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Este certificado é válido."</string> - <string name="issued_to" msgid="9032338008819841339">"Emitido para:"</string> - <string name="common_name" msgid="5745530093500062357">"Nome comum:"</string> - <string name="org_name" msgid="8868889052889991293">"Organização:"</string> - <string name="org_unit" msgid="4489056376307768196">"Unidade organizacional:"</string> - <string name="issued_by" msgid="6959484326943152487">"Emitido por:"</string> - <string name="validity_period" msgid="57988851973181309">"Validade:"</string> - <string name="issued_on" msgid="2082890654801808368">"Emitido em:"</string> - <string name="expires_on" msgid="8061200430557020704">"Expira em:"</string> <string name="stopping" msgid="4839698519340302982">"Parando…"</string> <string name="stop" msgid="5687251076030630074">"Parar"</string> <string name="reload" msgid="8585220783228408062">"Atualizar"</string> diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml index b9bcdc9..870558e 100644 --- a/res/values-rm/strings.xml +++ b/res/values-rm/strings.xml @@ -49,16 +49,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"Il num da la website na correspunda betg al num sin il certificat."</string> <string name="ssl_expired" msgid="5739349389499575559">"Quest certificat è scrudà."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"Quest certificat n\'è anc betg valid."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"Certificat da segirezza"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Quest certificat è valid."</string> - <string name="issued_to" msgid="9032338008819841339">"Emess a:"</string> - <string name="common_name" msgid="5745530093500062357">"Num general:"</string> - <string name="org_name" msgid="8868889052889991293">"Organisaziun:"</string> - <string name="org_unit" msgid="4489056376307768196">"Unitad d\'organisaziun:"</string> - <string name="issued_by" msgid="6959484326943152487">"Emess da:"</string> - <string name="validity_period" msgid="57988851973181309">"Validitad:"</string> - <string name="issued_on" msgid="2082890654801808368">"Emess ils:"</string> - <string name="expires_on" msgid="8061200430557020704">"Scroda ils:"</string> <string name="stopping" msgid="4839698519340302982">"Fermar…"</string> <string name="stop" msgid="5687251076030630074">"Fermar"</string> <string name="reload" msgid="8585220783228408062">"Actualisar"</string> diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 50e9691..b73936c 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"Numele acestui site nu se potriveşte cu numele de pe certificat."</string> <string name="ssl_expired" msgid="5739349389499575559">"Acest certificat a expirat."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"Acest certificat nu este încă valid."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"Certificat de securitate"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Certificatul este valid."</string> - <string name="issued_to" msgid="9032338008819841339">"Emis de:"</string> - <string name="common_name" msgid="5745530093500062357">"Nume comun:"</string> - <string name="org_name" msgid="8868889052889991293">"Organizaţie:"</string> - <string name="org_unit" msgid="4489056376307768196">"Organizaţie:"</string> - <string name="issued_by" msgid="6959484326943152487">"Emis de:"</string> - <string name="validity_period" msgid="57988851973181309">"Validitate:"</string> - <string name="issued_on" msgid="2082890654801808368">"Emis pe:"</string> - <string name="expires_on" msgid="8061200430557020704">"Expiră pe:"</string> <string name="stopping" msgid="4839698519340302982">"Se opreşte..."</string> <string name="stop" msgid="5687251076030630074">"Opriţi"</string> <string name="reload" msgid="8585220783228408062">"Actualizaţi"</string> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 1f8ec53..f887b46 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"Название сайта не соответствует названию в сертификате."</string> <string name="ssl_expired" msgid="5739349389499575559">"Срок действия сертификата истек."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"Данный сертификат еще недействителен."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"Сертификат безопасности"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Этот сертификат действителен."</string> - <string name="issued_to" msgid="9032338008819841339">"Владелец сертификата:"</string> - <string name="common_name" msgid="5745530093500062357">"Стандартное имя:"</string> - <string name="org_name" msgid="8868889052889991293">"Организация:"</string> - <string name="org_unit" msgid="4489056376307768196">"Подразделение организации:"</string> - <string name="issued_by" msgid="6959484326943152487">"Выпущен:"</string> - <string name="validity_period" msgid="57988851973181309">"Срок действия:"</string> - <string name="issued_on" msgid="2082890654801808368">"Дата издания:"</string> - <string name="expires_on" msgid="8061200430557020704">"Дата окончания действия:"</string> <string name="stopping" msgid="4839698519340302982">"Остановка..."</string> <string name="stop" msgid="5687251076030630074">"Стоп"</string> <string name="reload" msgid="8585220783228408062">"Обновить"</string> diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 2238fc7..4c33a5f 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"Názov webu sa nezhoduje s názvom uvedeným v certifikáte."</string> <string name="ssl_expired" msgid="5739349389499575559">"Platnosť certifikátu skončila."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"Tento certifikát zatiaľ nie je platný."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"Certifikát zabezpečenia"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Certifikát je platný."</string> - <string name="issued_to" msgid="9032338008819841339">"Vydané pre:"</string> - <string name="common_name" msgid="5745530093500062357">"Bežný názov:"</string> - <string name="org_name" msgid="8868889052889991293">"Organizácia:"</string> - <string name="org_unit" msgid="4489056376307768196">"Organizačná jednotka:"</string> - <string name="issued_by" msgid="6959484326943152487">"Vydal:"</string> - <string name="validity_period" msgid="57988851973181309">"Platnosť:"</string> - <string name="issued_on" msgid="2082890654801808368">"Dátum vydania:"</string> - <string name="expires_on" msgid="8061200430557020704">"Platnosť vyprší:"</string> <string name="stopping" msgid="4839698519340302982">"Prebieha zastavenie..."</string> <string name="stop" msgid="5687251076030630074">"Zastaviť"</string> <string name="reload" msgid="8585220783228408062">"Obnoviť"</string> diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 5d740e7..a330a1f 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"Ime mesta se ne ujema z imenom potrdila."</string> <string name="ssl_expired" msgid="5739349389499575559">"Potrdilo je poteklo."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"Potrdilo še ni veljavno."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"Varnostno potrdilo"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Potrdilo je veljavno."</string> - <string name="issued_to" msgid="9032338008819841339">"Izdano za:"</string> - <string name="common_name" msgid="5745530093500062357">"Pogosto ime:"</string> - <string name="org_name" msgid="8868889052889991293">"Organizacija:"</string> - <string name="org_unit" msgid="4489056376307768196">"Organizacijska enota:"</string> - <string name="issued_by" msgid="6959484326943152487">"Izdal:"</string> - <string name="validity_period" msgid="57988851973181309">"Veljavnost:"</string> - <string name="issued_on" msgid="2082890654801808368">"Izdano:"</string> - <string name="expires_on" msgid="8061200430557020704">"Velja do:"</string> <string name="stopping" msgid="4839698519340302982">"Ustavljanje ..."</string> <string name="stop" msgid="5687251076030630074">"Ustavi"</string> <string name="reload" msgid="8585220783228408062">"Osveži"</string> diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 6986ec9..01c2a9e 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"Назив сајта се не подудара са називом на сертификату."</string> <string name="ssl_expired" msgid="5739349389499575559">"Овај сертификат је истекао."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"Овај сертификат још увек није важећи."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"Безбедносни сертификат"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Овај сертификат је важећи."</string> - <string name="issued_to" msgid="9032338008819841339">"Издато за:"</string> - <string name="common_name" msgid="5745530093500062357">"Уобичајени назив:"</string> - <string name="org_name" msgid="8868889052889991293">"Организација:"</string> - <string name="org_unit" msgid="4489056376307768196">"Организациона јединица:"</string> - <string name="issued_by" msgid="6959484326943152487">"Издавалац:"</string> - <string name="validity_period" msgid="57988851973181309">"Ваљаност:"</string> - <string name="issued_on" msgid="2082890654801808368">"Издато дана:"</string> - <string name="expires_on" msgid="8061200430557020704">"Датум истека:"</string> <string name="stopping" msgid="4839698519340302982">"Заустављање…"</string> <string name="stop" msgid="5687251076030630074">"Заустави"</string> <string name="reload" msgid="8585220783228408062">"Освежи"</string> diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 7938854..e6bb183 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"Webbplatsens namn stämmer inte med namnet på certifikatet."</string> <string name="ssl_expired" msgid="5739349389499575559">"Certifikatet har upphört att gälla."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"Certifikatet är inte giltigt än."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"Säkerhetscertifikat"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Detta certifikat är giltigt."</string> - <string name="issued_to" msgid="9032338008819841339">"Utfärdat till:"</string> - <string name="common_name" msgid="5745530093500062357">"Nätverksnamn:"</string> - <string name="org_name" msgid="8868889052889991293">"Organisation:"</string> - <string name="org_unit" msgid="4489056376307768196">"Organisationsenhet:"</string> - <string name="issued_by" msgid="6959484326943152487">"Utfärdat av:"</string> - <string name="validity_period" msgid="57988851973181309">"Giltighet:"</string> - <string name="issued_on" msgid="2082890654801808368">"Utfärdat den:"</string> - <string name="expires_on" msgid="8061200430557020704">"Upphör att gälla:"</string> <string name="stopping" msgid="4839698519340302982">"Avbryter…"</string> <string name="stop" msgid="5687251076030630074">"Stoppa"</string> <string name="reload" msgid="8585220783228408062">"Uppdatera"</string> diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index 2cb0e4d..89eea40 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"ชื่อไซต์ไม่ตรงกับในใบรับรอง"</string> <string name="ssl_expired" msgid="5739349389499575559">"ใบรับรองนี้หมดอายุแล้ว"</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"ใบรับรองนี้ยังใช้งานไม่ได้"</string> - <string name="ssl_certificate" msgid="5226747157992111668">"ใบรับรองความปลอดภัย"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"ใบรับรองนี้ใช้งานได้"</string> - <string name="issued_to" msgid="9032338008819841339">"ออกให้แก่:"</string> - <string name="common_name" msgid="5745530093500062357">"ชื่อทั่วไป:"</string> - <string name="org_name" msgid="8868889052889991293">"องค์กร:"</string> - <string name="org_unit" msgid="4489056376307768196">"หน่วยองค์กร:"</string> - <string name="issued_by" msgid="6959484326943152487">"ออกโดย:"</string> - <string name="validity_period" msgid="57988851973181309">"อายุการใช้งาน:"</string> - <string name="issued_on" msgid="2082890654801808368">"ออกเมื่อ:"</string> - <string name="expires_on" msgid="8061200430557020704">"หมดอายุวันที่:"</string> <string name="stopping" msgid="4839698519340302982">"กำลังหยุด..."</string> <string name="stop" msgid="5687251076030630074">"หยุด"</string> <string name="reload" msgid="8585220783228408062">"รีเฟรช"</string> diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index 5c57318..9389ac2 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"Hindi tumutugma ang pangalan ng site sa pangalan sa certificate."</string> <string name="ssl_expired" msgid="5739349389499575559">"Nag-expire na ang certificate na ito."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"Hindi pa wasto ang certificate na ito."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"Certificate na pangseguridad"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Wasto ang certificate na ito."</string> - <string name="issued_to" msgid="9032338008819841339">"Ibinigay kay:"</string> - <string name="common_name" msgid="5745530093500062357">"Karaniwang pangalan:"</string> - <string name="org_name" msgid="8868889052889991293">"Samahan:"</string> - <string name="org_unit" msgid="4489056376307768196">"Unit na pangsamahan:"</string> - <string name="issued_by" msgid="6959484326943152487">"Ibinigay ni:"</string> - <string name="validity_period" msgid="57988851973181309">"Pagpapatunay:"</string> - <string name="issued_on" msgid="2082890654801808368">"Ibinigay noong:"</string> - <string name="expires_on" msgid="8061200430557020704">"Mag-e-expire sa:"</string> <string name="stopping" msgid="4839698519340302982">"Tumitigil..."</string> <string name="stop" msgid="5687251076030630074">"Huminto"</string> <string name="reload" msgid="8585220783228408062">"I-refresh"</string> diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 7c71bcd..4e0bea8 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"Sitenin adı sertifika üzerindeki adla eşleşmiyor."</string> <string name="ssl_expired" msgid="5739349389499575559">"Bu sertifikanın süresi dolmuş."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"Bu sertifika henüz geçerli değil."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"Güvenlik sertifikası"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Bu sertifika geçerli."</string> - <string name="issued_to" msgid="9032338008819841339">"Alıcı:"</string> - <string name="common_name" msgid="5745530093500062357">"Ortak ad:"</string> - <string name="org_name" msgid="8868889052889991293">"Kuruluş:"</string> - <string name="org_unit" msgid="4489056376307768196">"Kuruluş birimi:"</string> - <string name="issued_by" msgid="6959484326943152487">"Yayınlayan:"</string> - <string name="validity_period" msgid="57988851973181309">"Geçerlilik:"</string> - <string name="issued_on" msgid="2082890654801808368">"Yayınlanma tarihi:"</string> - <string name="expires_on" msgid="8061200430557020704">"Sona erme tarihi:"</string> <string name="stopping" msgid="4839698519340302982">"Durduruluyor..."</string> <string name="stop" msgid="5687251076030630074">"Durdur"</string> <string name="reload" msgid="8585220783228408062">"Yenile"</string> diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 73df9d4..c0f2fd2 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"Назва сайту не відповідає назві в сертифікаті."</string> <string name="ssl_expired" msgid="5739349389499575559">"Термін дії сертиф. завершився."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"Цей сертифікат ще недійсний."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"Сертифікат безпеки"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Цей сертифікат є дійсним."</string> - <string name="issued_to" msgid="9032338008819841339">"Кому видано:"</string> - <string name="common_name" msgid="5745530093500062357">"Загальне ім\'я:"</string> - <string name="org_name" msgid="8868889052889991293">"Організація:"</string> - <string name="org_unit" msgid="4489056376307768196">"Організац. підрозділ:"</string> - <string name="issued_by" msgid="6959484326943152487">"Ким видано:"</string> - <string name="validity_period" msgid="57988851973181309">"Чинність:"</string> - <string name="issued_on" msgid="2082890654801808368">"Дата видачі:"</string> - <string name="expires_on" msgid="8061200430557020704">"Діє до:"</string> <string name="stopping" msgid="4839698519340302982">"Зупинка..."</string> <string name="stop" msgid="5687251076030630074">"Зупин."</string> <string name="reload" msgid="8585220783228408062">"Оновити"</string> diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index ebd2196..76aff04 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"Tên của trang web không khớp với tên trên chứng chỉ."</string> <string name="ssl_expired" msgid="5739349389499575559">"Chứng chỉ này đã hết hạn."</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"Chứng chỉ này chưa hợp lệ."</string> - <string name="ssl_certificate" msgid="5226747157992111668">"Chứng chỉ bảo mật"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Chứng chỉ này hợp lệ."</string> - <string name="issued_to" msgid="9032338008819841339">"Cấp cho:"</string> - <string name="common_name" msgid="5745530093500062357">"Tên chung:"</string> - <string name="org_name" msgid="8868889052889991293">"Tổ chức:"</string> - <string name="org_unit" msgid="4489056376307768196">"Đơn vị tổ chức:"</string> - <string name="issued_by" msgid="6959484326943152487">"Cấp bởi:"</string> - <string name="validity_period" msgid="57988851973181309">"Tính hợp lệ:"</string> - <string name="issued_on" msgid="2082890654801808368">"Cấp vào:"</string> - <string name="expires_on" msgid="8061200430557020704">"Hết hạn vào:"</string> <string name="stopping" msgid="4839698519340302982">"Đang dừng…"</string> <string name="stop" msgid="5687251076030630074">"Dừng"</string> <string name="reload" msgid="8585220783228408062">"Làm mới"</string> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index a948af0..4ed87dc 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"网站的名称与证书上的名称不一致。"</string> <string name="ssl_expired" msgid="5739349389499575559">"该证书已过期。"</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"该证书尚未生效。"</string> - <string name="ssl_certificate" msgid="5226747157992111668">"安全证书"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"该证书有效。"</string> - <string name="issued_to" msgid="9032338008819841339">"颁发给："</string> - <string name="common_name" msgid="5745530093500062357">"常用名称："</string> - <string name="org_name" msgid="8868889052889991293">"组织:"</string> - <string name="org_unit" msgid="4489056376307768196">"组织单位："</string> - <string name="issued_by" msgid="6959484326943152487">"颁发者："</string> - <string name="validity_period" msgid="57988851973181309">"有效期："</string> - <string name="issued_on" msgid="2082890654801808368">"颁发时间："</string> - <string name="expires_on" msgid="8061200430557020704">"有效期至："</string> <string name="stopping" msgid="4839698519340302982">"正在停止..."</string> <string name="stop" msgid="5687251076030630074">"停止"</string> <string name="reload" msgid="8585220783228408062">"刷新"</string> diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index bacb4c9..44652b1 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -47,16 +47,6 @@ <string name="ssl_mismatch" msgid="558688832420069896">"網站名稱與憑證不符。"</string> <string name="ssl_expired" msgid="5739349389499575559">"此憑證已過期"</string> <string name="ssl_not_yet_valid" msgid="2893167846212645846">"此憑證無效。"</string> - <string name="ssl_certificate" msgid="5226747157992111668">"安全憑證"</string> - <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"這個憑證沒有問題。"</string> - <string name="issued_to" msgid="9032338008819841339">"發給："</string> - <string name="common_name" msgid="5745530093500062357">"好記的名稱："</string> - <string name="org_name" msgid="8868889052889991293">"組織："</string> - <string name="org_unit" msgid="4489056376307768196">"組織單位："</string> - <string name="issued_by" msgid="6959484326943152487">"發行者："</string> - <string name="validity_period" msgid="57988851973181309">"合法性："</string> - <string name="issued_on" msgid="2082890654801808368">"發給："</string> - <string name="expires_on" msgid="8061200430557020704">"有效日期："</string> <string name="stopping" msgid="4839698519340302982">"停止中…"</string> <string name="stop" msgid="5687251076030630074">"停止"</string> <string name="reload" msgid="8585220783228408062">"重新整理"</string> diff --git a/res/values/integers.xml b/res/values/integers.xml index 5a8c15f..fe92a79 100644 --- a/res/values/integers.xml +++ b/res/values/integers.xml @@ -29,4 +29,6 @@ <integer name="tabFadeDuration">300</integer> <!-- The maximum number of columns in the bookmark grid view --> <integer name="max_bookmark_columns">5</integer> + <!-- The duration of the titlebar animation in millisecs --> + <integer name="titlebar_animation_duration">200</integer> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 34ca824..e1fe0c5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -91,28 +91,6 @@ <!-- Message in an SSL Error dialog --> <string name="ssl_not_yet_valid">This certificate is not valid yet.</string> - <!-- SSL Certificate dialogs --> - <!-- Title for an SSL Certificate dialog --> - <string name="ssl_certificate">Security certificate</string> - <!-- Message on an SSL Certificate dialog --> - <string name="ssl_certificate_is_valid">This certificate is valid.</string> - <!-- Label for an information field on an SSL Certificate Dialog --> - <string name="issued_to">Issued to:</string> - <!-- Label for an information field on an SSL Certificate Dialog --> - <string name="common_name">Common name:</string> - <!-- Label for an information field on an SSL Certificate Dialog --> - <string name="org_name">Organization:</string> - <!-- Label for an information field on an SSL Certificate Dialog --> - <string name="org_unit">Organizational unit:</string> - <!-- Label for an information field on an SSL Certificate Dialog --> - <string name="issued_by">Issued by:</string> - <!-- Label for an information field on an SSL Certificate Dialog --> - <string name="validity_period">Validity:</string> - <!-- Label for an information field on an SSL Certificate Dialog --> - <string name="issued_on">Issued on:</string> - <!-- Label for an information field on an SSL Certificate Dialog --> - <string name="expires_on">Expires on:</string> - <!-- Toast informing the user that loading has stopped for the current page. --> <string name="stopping">Stopping\u2026</string> <!-- Menu item to stop the current page from loading. --> @@ -342,12 +320,25 @@ <string name="pref_content_search_engine_summary">Select a search engine</string> <!-- Settings button label that to pick what to set the homepage to [CHAR LIMIT=40] --> <string name="pref_set_homepage_to">Set to\u2026</string> - <!-- Settings button label to set the homepage to the current page [CHAR LIMIT=40] --> - <string name="pref_use_current">Current page</string> - <!-- Settings button label to set the homepage to a blank page [CHAR LIMIT=40] --> - <string name="pref_use_blank">Blank page</string> - <!-- Settings button label to set the homepage to the default page [CHAR LIMIT=40] --> - <string name="pref_use_default">Default page</string> + <string-array name="pref_homepage_choices"> + <!-- Setting choice to set the homepage to the current page [CHAR LIMIT=40] --> + <item>Current page</item> + <!-- Setting choice to set the homepage to a blank page [CHAR LIMIT=40] --> + <item>Blank page</item> + <!-- Setting choice to set the homepage to the default page [CHAR LIMIT=40] --> + <item>Default page</item> + <!-- Setting choice to set the homepage to the "Most Visited" homepage feature [CHAR LIMIT=40] --> + <item>Most-visited homepage</item> + <!-- Setting choice to set the homepage to a user entered URL [CHAR LIMIT=40] --> + <item>Other\u2026</item> + </string-array> + <string-array name="pref_homepage_values" translatable="false"> + <item>current</item> + <item>blank</item> + <item>default</item> + <item>most_visited</item> + <item>other</item> + </string-array> <!-- Settings label --> <string name="pref_content_autofit">Auto-fit pages</string> <!-- Settings summary --> @@ -643,11 +634,6 @@ <!-- Summary for lab quick controls feature [CHAR LIMIT=80] --> <string name="pref_lab_quick_controls_summary"> Swipe thumb from left or right edge to access quick controls and hide Application and URL bars</string> - <!-- Title for lab "Most Visited" homepage feature [CHAR LIMIT=40] --> - <string name="pref_lab_most_visited_homepage">Most-visited homepage</string> - <!-- Summary for lab "Most Visited" homepage feature [CHAR LIMIT=80] --> - <string name="pref_lab_most_visited_homepage_summary"> - Your homepage displays your most-visited webpages.</string> <!-- Title for the "Instant search" lab feature [CHAR LIMIT=40] --> <string name="pref_use_instant_search">Google Instant</string> <!-- Summary for the "Instant search" lab feature [CHAR LIMIT=120] --> diff --git a/res/xml-sw600dp/lab_preferences.xml b/res/xml-sw600dp/lab_preferences.xml index 705f740..1dbec88 100644 --- a/res/xml-sw600dp/lab_preferences.xml +++ b/res/xml-sw600dp/lab_preferences.xml @@ -24,12 +24,6 @@ android:summary="@string/pref_lab_quick_controls_summary" /> <CheckBoxPreference - android:key="use_most_visited_homepage" - android:defaultValue="false" - android:title="@string/pref_lab_most_visited_homepage" - android:summary="@string/pref_lab_most_visited_homepage_summary" /> - - <CheckBoxPreference android:key="use_instant_search" android:defaultValue="false" android:title="@string/pref_use_instant_search" diff --git a/res/xml/general_preferences.xml b/res/xml/general_preferences.xml index 7b26307..13f09c1 100644 --- a/res/xml/general_preferences.xml +++ b/res/xml/general_preferences.xml @@ -16,11 +16,11 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> - <com.android.browser.BrowserHomepagePreference - android:key="homepage" - android:title="@string/pref_content_homepage" - android:hint="@string/http" - android:inputType="textUri|textMultiLine" /> + <ListPreference + android:key="homepage_picker" + android:entries="@array/pref_homepage_choices" + android:entryValues="@array/pref_homepage_values" + android:title="@string/pref_content_homepage" /> <PreferenceCategory android:title="@string/pref_general_autofill_title"> <CheckBoxPreference android:key="autofill_enabled" diff --git a/res/xml/lab_preferences.xml b/res/xml/lab_preferences.xml index ee00463..3320cee 100644 --- a/res/xml/lab_preferences.xml +++ b/res/xml/lab_preferences.xml @@ -22,11 +22,6 @@ android:title="@string/pref_lab_quick_controls" android:summary="@string/pref_lab_quick_controls_summary" /> <CheckBoxPreference - android:key="use_most_visited_homepage" - android:defaultValue="false" - android:title="@string/pref_lab_most_visited_homepage" - android:summary="@string/pref_lab_most_visited_homepage_summary" /> - <CheckBoxPreference android:key="fullscreen" android:defaultValue="false" android:title="@string/pref_lab_fullscreen" diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java index f7d7a3c..bcb18f1 100644 --- a/src/com/android/browser/BaseUi.java +++ b/src/com/android/browser/BaseUi.java @@ -857,13 +857,14 @@ public abstract class BaseUi implements UI, WebViewFactory, ScrollListener { @Override public void onScroll(int visibleTitleHeight, boolean userInitiated) { WebView view = mActiveTab != null ? mActiveTab.getWebView() : null; - if (view == null || !userInitiated) { + if (view == null) { return; } int scrollY = view.getScrollY(); - if (scrollY < (mLastScrollY - mTitlebarScrollTriggerSlop)) { + if (isTitleBarShowing() + || scrollY < (mLastScrollY - mTitlebarScrollTriggerSlop)) { mLastScrollY = scrollY; - if (visibleTitleHeight == 0) { + if (visibleTitleHeight == 0 && userInitiated) { mHandler.removeMessages(MSG_HIDE_TITLEBAR); showTitleBar(); Message msg = Message.obtain(mHandler, MSG_HIDE_TITLEBAR); @@ -871,7 +872,7 @@ public abstract class BaseUi implements UI, WebViewFactory, ScrollListener { } else if (visibleTitleHeight == getTitleBar().getEmbeddedHeight() && mHandler.hasMessages(MSG_HIDE_TITLEBAR)) { mHandler.removeMessages(MSG_HIDE_TITLEBAR); - hideTitleBar(); + suggestHideTitleBar(); } } else if (scrollY > mLastScrollY) { mLastScrollY = scrollY; diff --git a/src/com/android/browser/BrowserHomepagePreference.java b/src/com/android/browser/BrowserHomepagePreference.java deleted file mode 100644 index cbe5b0d..0000000 --- a/src/com/android/browser/BrowserHomepagePreference.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.browser; - -import android.content.Context; -import android.content.DialogInterface; -import android.os.Bundle; -import android.preference.EditTextPreference; -import android.util.AttributeSet; -import android.view.KeyEvent; -import android.view.LayoutInflater; -import android.view.View; -import android.view.View.OnClickListener; -import android.view.ViewGroup; -import android.view.Window; -import android.view.WindowManager; -import android.view.inputmethod.EditorInfo; -import android.widget.EditText; -import android.widget.TextView; -import android.widget.TextView.OnEditorActionListener; - -public class BrowserHomepagePreference extends EditTextPreference - implements OnEditorActionListener { - private String mCurrentPage; - - public BrowserHomepagePreference(Context context, AttributeSet attrs, - int defStyle) { - super(context, attrs, defStyle); - } - - public BrowserHomepagePreference(Context context, AttributeSet attrs) { - super(context, attrs); - } - - public BrowserHomepagePreference(Context context) { - super(context); - } - - @Override - protected void onAddEditTextToDialogView(View dialogView, - EditText editText) { - super.onAddEditTextToDialogView(dialogView, editText); - editText.setSelectAllOnFocus(true); - editText.setSingleLine(true); - editText.setImeActionLabel(null, EditorInfo.IME_ACTION_DONE); - editText.setOnEditorActionListener(this); - // Now the EditText has a parent. Add a button to set to the current - // page. - createButtons((ViewGroup) editText.getParent()); - } - - @Override - public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { - if (actionId == EditorInfo.IME_ACTION_DONE) { - onClick(getDialog(), DialogInterface.BUTTON_POSITIVE); - getDialog().dismiss(); - return true; - } - return false; - } - - void createButtons(ViewGroup parent) { - LayoutInflater inflater = (LayoutInflater) getContext() - .getSystemService(Context.LAYOUT_INFLATER_SERVICE); - View v = inflater.inflate(R.layout.pref_homepage_buttons, parent); - v.findViewById(R.id.use_current).setOnClickListener(mOnClick); - v.findViewById(R.id.use_default).setOnClickListener(mOnClick); - } - - OnClickListener mOnClick = new OnClickListener() { - @Override - public void onClick(View v) { - switch (v.getId()) { - case R.id.use_current: - getEditText().setText(mCurrentPage); - break; - case R.id.use_default: - getEditText().setText( - BrowserSettings.getFactoryResetHomeUrl(getContext())); - break; - } - } - }; - - @Override - protected void onDialogClosed(boolean positiveResult) { - if (positiveResult) { - String url = getEditText().getText().toString().trim(); - if (url.length() > 0) { - url = UrlUtils.smartUrlFilter(url); - } - getEditText().setText(url); - } - super.onDialogClosed(positiveResult); - } - - /** - * Set the current page of the browser. - * @param currentPage This String will replace the text in the EditText - * when the user clicks the "Use current page" button. - */ - public void setCurrentPage(String currentPage) { - mCurrentPage = currentPage; - } - - @Override - protected void showDialog(Bundle state) { - super.showDialog(state); - // The dialog has its width set to wrap_content. Change it to - // match_parent so there is more room to type in a url. - Window window = getDialog().getWindow(); - View decorView = window.getDecorView(); - WindowManager.LayoutParams params - = (WindowManager.LayoutParams) decorView.getLayoutParams(); - params.width = ViewGroup.LayoutParams.MATCH_PARENT; - window.getWindowManager().updateViewLayout(decorView, params); - } -} diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java index fae59e2..4928e61 100644 --- a/src/com/android/browser/BrowserSettings.java +++ b/src/com/android/browser/BrowserSettings.java @@ -279,7 +279,7 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener, } } - static String getFactoryResetHomeUrl(Context context) { + public static String getFactoryResetHomeUrl(Context context) { String url = context.getResources().getString(R.string.homepage_base); if (url.indexOf("{CID}") != -1) { url = url.replace("{CID}", @@ -545,9 +545,6 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener, // ----------------------------- public String getHomePage() { - if (useMostVisitedHomepage()) { - return HomeProvider.MOST_VISITED; - } return mPrefs.getString(PREF_HOMEPAGE, getFactoryResetHomeUrl(mContext)); } @@ -657,7 +654,7 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener, } public boolean useMostVisitedHomepage() { - return mPrefs.getBoolean(PREF_USE_MOST_VISITED_HOMEPAGE, false); + return HomeProvider.MOST_VISITED.equals(getHomePage()); } public boolean useInstantSearch() { diff --git a/src/com/android/browser/CrashRecoveryHandler.java b/src/com/android/browser/CrashRecoveryHandler.java index 6d8d921..5140952 100644 --- a/src/com/android/browser/CrashRecoveryHandler.java +++ b/src/com/android/browser/CrashRecoveryHandler.java @@ -22,6 +22,7 @@ import android.content.DialogInterface; import android.content.DialogInterface.OnCancelListener; import android.content.DialogInterface.OnClickListener; import android.content.Intent; +import android.content.SharedPreferences; import android.os.Bundle; import android.os.Handler; import android.os.HandlerThread; @@ -38,8 +39,16 @@ public class CrashRecoveryHandler { private static final String LOGTAG = "BrowserCrashRecovery"; private static final String STATE_FILE = "browser_state.parcel"; + private static final String RECOVERY_PREFERENCES = "browser_recovery_prefs"; + private static final String KEY_LAST_RECOVERED = "last_recovered"; private static final int BUFFER_SIZE = 4096; private static final long BACKUP_DELAY = 500; // 500ms between writes + /* This is the duration for which we will prompt to restore + * instead of automatically restoring. The first time the browser crashes, + * we will automatically restore. If we then crash again within XX minutes, + * we will prompt instead of automatically restoring. + */ + private static final long PROMPT_INTERVAL = 30 * 60 * 1000; // 30 minutes private static CrashRecoveryHandler sInstance; @@ -136,6 +145,7 @@ public class CrashRecoveryHandler { .setPositiveButton(R.string.recover_yes, new OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { + updateLastRecovered(); mController.doStart(state, intent); } }) @@ -155,7 +165,30 @@ public class CrashRecoveryHandler { .show(); } + private boolean shouldPrompt() { + Context context = mController.getActivity(); + SharedPreferences prefs = context.getSharedPreferences( + RECOVERY_PREFERENCES, Context.MODE_PRIVATE); + long lastRecovered = prefs.getLong(KEY_LAST_RECOVERED, + System.currentTimeMillis()); + long timeSinceLastRecover = System.currentTimeMillis() - lastRecovered; + if (timeSinceLastRecover > PROMPT_INTERVAL) { + return false; + } + return true; + } + + private void updateLastRecovered() { + Context context = mController.getActivity(); + SharedPreferences prefs = context.getSharedPreferences( + RECOVERY_PREFERENCES, Context.MODE_PRIVATE); + prefs.edit() + .putLong(KEY_LAST_RECOVERED, System.currentTimeMillis()) + .commit(); + } + public void startRecovery(Intent intent) { + Bundle state = null; Parcel parcel = Parcel.obtain(); try { Context context = mController.getActivity(); @@ -169,16 +202,22 @@ public class CrashRecoveryHandler { byte[] data = dataStream.toByteArray(); parcel.unmarshall(data, 0, data.length); parcel.setDataPosition(0); - Bundle state = parcel.readBundle(); - promptToRecover(state, intent); + state = parcel.readBundle(); + if (shouldPrompt()) { + promptToRecover(state, intent); + return; + } else { + updateLastRecovered(); + } } catch (FileNotFoundException e) { // No state to recover - mController.doStart(null, intent); + state = null; } catch (Exception e) { Log.w(LOGTAG, "Failed to recover state!", e); - mController.doStart(null, intent); + state = null; } finally { parcel.recycle(); } + mController.doStart(state, intent); } } diff --git a/src/com/android/browser/PageDialogsHandler.java b/src/com/android/browser/PageDialogsHandler.java index 2dbddf3..c902f65 100644 --- a/src/com/android/browser/PageDialogsHandler.java +++ b/src/com/android/browser/PageDialogsHandler.java @@ -22,7 +22,6 @@ import android.content.DialogInterface; import android.content.res.Configuration; import android.net.http.SslCertificate; import android.net.http.SslError; -import android.text.format.DateFormat; import android.view.LayoutInflater; import android.view.View; import android.webkit.HttpAuthHandler; @@ -31,8 +30,6 @@ import android.webkit.WebView; import android.widget.LinearLayout; import android.widget.TextView; -import java.util.Date; - /** * Displays page info * @@ -234,11 +231,12 @@ public class PageDialogsHandler { * @param tab The tab to show certificate for. */ private void showSSLCertificate(final Tab tab) { - final View certificateView = - inflateCertificateView(tab.getWebView().getCertificate()); - if (certificateView == null) { + + SslCertificate cert = tab.getWebView().getCertificate(); + if (cert == null) { return; } + final View certificateView = cert.inflateCertificateView(mContext); LayoutInflater factory = LayoutInflater.from(mContext); @@ -248,12 +246,12 @@ public class PageDialogsHandler { LinearLayout ll = (LinearLayout) factory.inflate( R.layout.ssl_success, placeholder); ((TextView)ll.findViewById(R.id.success)) - .setText(R.string.ssl_certificate_is_valid); + .setText(com.android.internal.R.string.ssl_certificate_is_valid); mSSLCertificateView = tab; mSSLCertificateDialog = new AlertDialog.Builder(mContext) - .setTitle(R.string.ssl_certificate).setIcon( + .setTitle(com.android.internal.R.string.ssl_certificate).setIcon( R.drawable.ic_dialog_browser_certificate_secure) .setView(certificateView) .setPositiveButton(R.string.ok, @@ -289,11 +287,11 @@ public class PageDialogsHandler { final WebView view, final SslErrorHandler handler, final SslError error) { - final View certificateView = - inflateCertificateView(error.getCertificate()); - if (certificateView == null) { + SslCertificate cert = error.getCertificate(); + if (cert == null) { return; } + final View certificateView = cert.inflateCertificateView(mContext); LayoutInflater factory = LayoutInflater.from(mContext); @@ -333,7 +331,7 @@ public class PageDialogsHandler { mSSLCertificateOnErrorError = error; mSSLCertificateOnErrorDialog = new AlertDialog.Builder(mContext) - .setTitle(R.string.ssl_certificate).setIcon( + .setTitle(com.android.internal.R.string.ssl_certificate).setIcon( R.drawable.ic_dialog_browser_certificate_partially_secure) .setView(certificateView) .setPositiveButton(R.string.ok, @@ -378,76 +376,4 @@ public class PageDialogsHandler { }) .show(); } - - /** - * Inflates the SSL certificate view (helper method). - * @param certificate The SSL certificate. - * @return The resultant certificate view with issued-to, issued-by, - * issued-on, expires-on, and possibly other fields set. - * If the input certificate is null, returns null. - */ - private View inflateCertificateView(SslCertificate certificate) { - if (certificate == null) { - return null; - } - - LayoutInflater factory = LayoutInflater.from(mContext); - - View certificateView = factory.inflate( - R.layout.ssl_certificate, null); - - // issued to: - SslCertificate.DName issuedTo = certificate.getIssuedTo(); - if (issuedTo != null) { - ((TextView) certificateView.findViewById(R.id.to_common)) - .setText(issuedTo.getCName()); - ((TextView) certificateView.findViewById(R.id.to_org)) - .setText(issuedTo.getOName()); - ((TextView) certificateView.findViewById(R.id.to_org_unit)) - .setText(issuedTo.getUName()); - } - - // issued by: - SslCertificate.DName issuedBy = certificate.getIssuedBy(); - if (issuedBy != null) { - ((TextView) certificateView.findViewById(R.id.by_common)) - .setText(issuedBy.getCName()); - ((TextView) certificateView.findViewById(R.id.by_org)) - .setText(issuedBy.getOName()); - ((TextView) certificateView.findViewById(R.id.by_org_unit)) - .setText(issuedBy.getUName()); - } - - // issued on: - String issuedOn = formatCertificateDate( - certificate.getValidNotBeforeDate()); - ((TextView) certificateView.findViewById(R.id.issued_on)) - .setText(issuedOn); - - // expires on: - String expiresOn = formatCertificateDate( - certificate.getValidNotAfterDate()); - ((TextView) certificateView.findViewById(R.id.expires_on)) - .setText(expiresOn); - - return certificateView; - } - - /** - * Formats the certificate date to a properly localized date string. - * @return Properly localized version of the certificate date string and - * the "" if it fails to localize. - */ - private String formatCertificateDate(Date certificateDate) { - if (certificateDate == null) { - return ""; - } - String formattedDate = DateFormat.getDateFormat(mContext) - .format(certificateDate); - if (formattedDate == null) { - return ""; - } - return formattedDate; - } - } diff --git a/src/com/android/browser/PreferenceKeys.java b/src/com/android/browser/PreferenceKeys.java index c90213f..bc8d38f 100644 --- a/src/com/android/browser/PreferenceKeys.java +++ b/src/com/android/browser/PreferenceKeys.java @@ -76,7 +76,6 @@ public interface PreferenceKeys { // Keys for lab_preferences.xml // ---------------------- static final String PREF_ENABLE_QUICK_CONTROLS = "enable_quick_controls"; - static final String PREF_USE_MOST_VISITED_HOMEPAGE = "use_most_visited_homepage"; static final String PREF_USE_INSTANT_SEARCH = "use_instant_search"; static final String PREF_FULLSCREEN = "fullscreen"; diff --git a/src/com/android/browser/SuggestionsAdapter.java b/src/com/android/browser/SuggestionsAdapter.java index 242e170..9a099cb 100644 --- a/src/com/android/browser/SuggestionsAdapter.java +++ b/src/com/android/browser/SuggestionsAdapter.java @@ -16,6 +16,7 @@ package com.android.browser; +import com.android.browser.provider.BrowserProvider2; import com.android.browser.search.SearchEngine; import android.app.SearchManager; @@ -472,6 +473,8 @@ public class SuggestionsAdapter extends BaseAdapter implements Filterable, Uri.Builder ub = BrowserContract.Combined.CONTENT_URI.buildUpon(); ub.appendQueryParameter(BrowserContract.PARAM_LIMIT, Integer.toString(Math.max(mLinesLandscape, mLinesPortrait))); + ub.appendQueryParameter(BrowserProvider2.PARAM_GROUP_BY, + BrowserContract.Combined.URL); mCursor = mContext.getContentResolver().query(ub.build(), COMBINED_PROJECTION, selection, diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java index bc5868f..c78b562 100644 --- a/src/com/android/browser/Tab.java +++ b/src/com/android/browser/Tab.java @@ -799,6 +799,22 @@ class Tab { handler.ignore(); return; } + int colon = host_and_port.lastIndexOf(':'); + String host; + int port; + if (colon == -1) { + host = host_and_port; + port = -1; + } else { + String portString = host_and_port.substring(colon + 1); + try { + port = Integer.parseInt(portString); + host = host_and_port.substring(0, colon); + } catch (NumberFormatException e) { + host = host_and_port; + port = -1; + } + } KeyChain.choosePrivateKeyAlias(mActivity, new KeyChainAliasCallback() { @Override public void alias(String alias) { if (alias == null) { @@ -807,7 +823,7 @@ class Tab { } new KeyChainLookup(mActivity, handler, alias).execute(); } - }, null, null, null, -1); + }, null, null, host, port, null); } /** diff --git a/src/com/android/browser/TabBar.java b/src/com/android/browser/TabBar.java index 1ea6071..8584afa 100644 --- a/src/com/android/browser/TabBar.java +++ b/src/com/android/browser/TabBar.java @@ -276,12 +276,9 @@ public class TabBar extends LinearLayout public void onScroll(int visibleTitleHeight, boolean userInitiated) { if (mUseQuickControls) return; // isLoading is using the current tab, which initially might not be set yet - if (mTabControl.getCurrentTab() != null - && !isLoading()) { - if (visibleTitleHeight == 0) { - if (!showsTitleBarIndicator() - && (!mUi.isEditingUrl() || userInitiated)) { - mUi.hideTitleBar(); + if (mTabControl.getCurrentTab() != null) { + if (visibleTitleHeight == 0 && !mUi.isTitleBarShowing()) { + if (!showsTitleBarIndicator()) { showTitleBarIndicator(true); } } else { diff --git a/src/com/android/browser/TitleBarBase.java b/src/com/android/browser/TitleBarBase.java index e2c3432..c7fb9c6 100644 --- a/src/com/android/browser/TitleBarBase.java +++ b/src/com/android/browser/TitleBarBase.java @@ -16,16 +16,13 @@ package com.android.browser; -import com.android.browser.UI.DropdownChangeListener; -import com.android.browser.UrlInputView.UrlInputListener; -import com.android.browser.autocomplete.SuggestedTextController.TextChangeWatcher; - import android.animation.Animator; import android.animation.Animator.AnimatorListener; import android.animation.ObjectAnimator; import android.app.SearchManager; import android.content.Context; import android.content.Intent; +import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.drawable.Drawable; import android.os.Bundle; @@ -44,6 +41,7 @@ import android.view.ViewGroup; import android.view.animation.Animation; import android.view.animation.Animation.AnimationListener; import android.view.animation.AnimationUtils; +import android.view.animation.DecelerateInterpolator; import android.webkit.WebView; import android.widget.AbsoluteLayout; import android.widget.ArrayAdapter; @@ -57,6 +55,10 @@ import android.widget.RelativeLayout; import android.widget.Spinner; import android.widget.TextView; +import com.android.browser.UI.DropdownChangeListener; +import com.android.browser.UrlInputView.UrlInputListener; +import com.android.browser.autocomplete.SuggestedTextController.TextChangeWatcher; + import java.util.List; /** @@ -68,6 +70,7 @@ public class TitleBarBase extends RelativeLayout OnMenuItemClickListener { protected static final int PROGRESS_MAX = 100; + private static final float ANIM_TITLEBAR_DECELERATE = 2.5f; // These need to be set by the subclass. protected ImageView mFavicon; @@ -149,6 +152,14 @@ public class TitleBarBase extends RelativeLayout mSkipTitleBarAnimations = skip; } + void setupTitleBarAnimator(Animator animator) { + Resources res = mContext.getResources(); + int duration = res.getInteger(R.integer.titlebar_animation_duration); + animator.setInterpolator(new DecelerateInterpolator( + ANIM_TITLEBAR_DECELERATE)); + animator.setDuration(duration); + } + void show() { if (mUseQuickControls) { mParent.addView(this); @@ -163,6 +174,7 @@ public class TitleBarBase extends RelativeLayout mTitleBarAnimator = ObjectAnimator.ofFloat(this, "translationY", startPos, 0); + setupTitleBarAnimator(mTitleBarAnimator); mTitleBarAnimator.start(); } mBaseUi.setTitleGravity(Gravity.TOP); @@ -181,6 +193,7 @@ public class TitleBarBase extends RelativeLayout "translationY", getTranslationY(), (-getEmbeddedHeight() + visibleHeight)); mTitleBarAnimator.addListener(mHideTileBarAnimatorListener); + setupTitleBarAnimator(mTitleBarAnimator); mTitleBarAnimator.start(); } else { mBaseUi.setTitleGravity(Gravity.NO_GRAVITY); @@ -209,7 +222,6 @@ public class TitleBarBase extends RelativeLayout @Override public void onAnimationStart(Animator animation) { mWasCanceled = false; - mUrlInput.setEnabled(false); } @Override @@ -222,7 +234,6 @@ public class TitleBarBase extends RelativeLayout setTranslationY(0); } mBaseUi.setTitleGravity(Gravity.NO_GRAVITY); - mUrlInput.setEnabled(true); } @Override @@ -462,6 +473,7 @@ public class TitleBarBase extends RelativeLayout setFocusState(hasFocus); } if (hasFocus) { + mBaseUi.showTitleBar(); mUrlInput.forceIme(); if (mInVoiceMode) { mUrlInput.forceFilter(); @@ -475,6 +487,7 @@ public class TitleBarBase extends RelativeLayout mUrlInput.setText(currentTab.getUrl(), false); } } + mBaseUi.suggestHideTitleBar(); } mUrlInput.clearNeedsUpdate(); } diff --git a/src/com/android/browser/TitleBarPhone.java b/src/com/android/browser/TitleBarPhone.java index de5fb7f..1fcaf4d 100644 --- a/src/com/android/browser/TitleBarPhone.java +++ b/src/com/android/browser/TitleBarPhone.java @@ -147,9 +147,6 @@ public class TitleBarPhone extends TitleBarBase implements OnFocusChangeListener } } super.onFocusChange(v, hasFocus); - if (!hasFocus) { - mBaseUi.hideTitleBar(); - } } @Override diff --git a/src/com/android/browser/TitleBarXLarge.java b/src/com/android/browser/TitleBarXLarge.java index 69f6949..3d4d2ec 100644 --- a/src/com/android/browser/TitleBarXLarge.java +++ b/src/com/android/browser/TitleBarXLarge.java @@ -123,36 +123,6 @@ public class TitleBarXLarge extends TitleBarBase } @Override - public void onFocusChange(View view, boolean hasFocus) { - // if losing focus and not in touch mode, leave as is - if (hasFocus || view.isInTouchMode() || mUrlInput.needsUpdate()) { - setFocusState(hasFocus); - mUrlContainer.setBackgroundDrawable(hasFocus - ? mFocusDrawable : mUnfocusDrawable); - } - if (hasFocus) { - mUrlInput.forceIme(); - if (mInVoiceMode) { - mUrlInput.forceFilter(); - } - } else if (!mUrlInput.needsUpdate()) { - mUrlInput.dismissDropDown(); - mUrlInput.hideIME(); - if (mUseQuickControls) { - mUi.hideTitleBar(); - } - - if (mUrlInput.getText().length() == 0) { - Tab currentTab = mUiController.getTabControl().getCurrentTab(); - if (currentTab != null) { - mUrlInput.setText(currentTab.getUrl(), false); - } - } - } - mUrlInput.clearNeedsUpdate(); - } - - @Override public void setCurrentUrlIsBookmark(boolean isBookmark) { mStar.setActivated(isBookmark); } @@ -226,6 +196,8 @@ public class TitleBarXLarge extends TitleBarBase } updateUrlIcon(); } + mUrlContainer.setBackgroundDrawable(focus + ? mFocusDrawable : mUnfocusDrawable); } private void stopOrRefresh() { diff --git a/src/com/android/browser/UrlUtils.java b/src/com/android/browser/UrlUtils.java index ccf9710..26f8e0e 100644 --- a/src/com/android/browser/UrlUtils.java +++ b/src/com/android/browser/UrlUtils.java @@ -84,7 +84,7 @@ public class UrlUtils { * @return Original or modified URL * */ - protected static String smartUrlFilter(String url) { + public static String smartUrlFilter(String url) { String inUrl = url.trim(); boolean hasSpace = inUrl.indexOf(' ') != -1; diff --git a/src/com/android/browser/preferences/GeneralPreferencesFragment.java b/src/com/android/browser/preferences/GeneralPreferencesFragment.java index af0fc50..05aa1a7 100644 --- a/src/com/android/browser/preferences/GeneralPreferencesFragment.java +++ b/src/com/android/browser/preferences/GeneralPreferencesFragment.java @@ -16,34 +16,65 @@ package com.android.browser.preferences; +import android.app.AlertDialog; +import android.content.DialogInterface; +import android.content.DialogInterface.OnClickListener; +import android.content.res.Resources; import android.os.Bundle; +import android.preference.ListPreference; import android.preference.Preference; import android.preference.PreferenceFragment; import android.preference.PreferenceScreen; +import android.text.InputType; +import android.text.TextUtils; import android.util.Log; +import android.view.KeyEvent; +import android.view.inputmethod.EditorInfo; +import android.widget.EditText; +import android.widget.TextView; +import android.widget.TextView.OnEditorActionListener; -import com.android.browser.BrowserHomepagePreference; import com.android.browser.BrowserPreferencesPage; +import com.android.browser.BrowserSettings; import com.android.browser.PreferenceKeys; import com.android.browser.R; +import com.android.browser.UrlUtils; +import com.android.browser.homepages.HomeProvider; public class GeneralPreferencesFragment extends PreferenceFragment implements Preference.OnPreferenceChangeListener { + static final String TAG = "PersonalPreferencesFragment"; + static final String BLANK_URL = "about:blank"; + static final String CURRENT = "current"; + static final String BLANK = "blank"; + static final String DEFAULT = "default"; + static final String MOST_VISITED = "most_visited"; + static final String OTHER = "other"; + + static final String PREF_HOMEPAGE_PICKER = "homepage_picker"; + + String[] mChoices, mValues; + String mCurrentPage; + @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Resources res = getActivity().getResources(); + mChoices = res.getStringArray(R.array.pref_homepage_choices); + mValues = res.getStringArray(R.array.pref_homepage_values); + mCurrentPage = getActivity().getIntent() + .getStringExtra(BrowserPreferencesPage.CURRENT_PAGE); // Load the XML preferences file addPreferencesFromResource(R.xml.general_preferences); - Preference e = findPreference(PreferenceKeys.PREF_HOMEPAGE); - e.setOnPreferenceChangeListener(this); - e.setSummary(getPreferenceScreen().getSharedPreferences() - .getString(PreferenceKeys.PREF_HOMEPAGE, null)); - ((BrowserHomepagePreference) e).setCurrentPage( - getActivity().getIntent().getStringExtra(BrowserPreferencesPage.CURRENT_PAGE)); + ListPreference pref = (ListPreference) findPreference(PREF_HOMEPAGE_PICKER); + pref.setSummary(getHomepageSummary()); + pref.setPersistent(false); + pref.setValue(getHomepageValue()); + pref.setOnPreferenceChangeListener(this); } @Override @@ -55,12 +86,114 @@ public class GeneralPreferencesFragment extends PreferenceFragment return false; } - if (pref.getKey().equals(PreferenceKeys.PREF_HOMEPAGE)) { - pref.setSummary((String) objValue); - return true; + if (pref.getKey().equals(PREF_HOMEPAGE_PICKER)) { + BrowserSettings settings = BrowserSettings.getInstance(); + if (CURRENT.equals(objValue)) { + settings.setHomePage(mCurrentPage); + } + if (BLANK.equals(objValue)) { + settings.setHomePage(BLANK_URL); + } + if (DEFAULT.equals(objValue)) { + settings.setHomePage(BrowserSettings.getFactoryResetHomeUrl( + getActivity())); + } + if (MOST_VISITED.equals(objValue)) { + settings.setHomePage(HomeProvider.MOST_VISITED); + } + if (OTHER.equals(objValue)) { + promptForHomepage((ListPreference) pref); + return false; + } + pref.setSummary(getHomepageSummary()); + ((ListPreference)pref).setValue(getHomepageValue()); + return false; + } + + return true; + } + + void promptForHomepage(final ListPreference pref) { + final BrowserSettings settings = BrowserSettings.getInstance(); + final EditText editText = new EditText(getActivity()); + editText.setInputType(InputType.TYPE_CLASS_TEXT + | InputType.TYPE_TEXT_VARIATION_URI); + editText.setText(settings.getHomePage()); + editText.setSelectAllOnFocus(true); + editText.setSingleLine(true); + editText.setImeActionLabel(null, EditorInfo.IME_ACTION_DONE); + final AlertDialog dialog = new AlertDialog.Builder(getActivity()) + .setView(editText) + .setPositiveButton(android.R.string.ok, new OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + String homepage = editText.getText().toString().trim(); + homepage = UrlUtils.smartUrlFilter(homepage); + settings.setHomePage(homepage); + pref.setValue(getHomepageValue()); + pref.setSummary(getHomepageSummary()); + } + }) + .setNegativeButton(android.R.string.cancel, new OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + dialog.cancel(); + } + }) + .setTitle(R.string.pref_set_homepage_to) + .create(); + editText.setOnEditorActionListener(new OnEditorActionListener() { + @Override + public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { + if (actionId == EditorInfo.IME_ACTION_DONE) { + dialog.getButton(AlertDialog.BUTTON_POSITIVE).performClick(); + return true; + } + return false; + } + }); + dialog.show(); + } + + String getHomepageValue() { + BrowserSettings settings = BrowserSettings.getInstance(); + String homepage = settings.getHomePage(); + if (TextUtils.isEmpty(homepage) || BLANK_URL.endsWith(homepage)) { + return BLANK; + } + if (HomeProvider.MOST_VISITED.equals(homepage)) { + return MOST_VISITED; + } + String defaultHomepage = BrowserSettings.getFactoryResetHomeUrl( + getActivity()); + if (TextUtils.equals(defaultHomepage, homepage)) { + return DEFAULT; + } + if (TextUtils.equals(mCurrentPage, homepage)) { + return CURRENT; + } + return OTHER; + } + + String getHomepageSummary() { + BrowserSettings settings = BrowserSettings.getInstance(); + if (settings.useMostVisitedHomepage()) { + return getHomepageLabel(MOST_VISITED); + } + String homepage = settings.getHomePage(); + if (TextUtils.isEmpty(homepage) || BLANK_URL.equals(homepage)) { + return getHomepageLabel(BLANK); } + return homepage; + } - return false; + String getHomepageLabel(String value) { + for (int i = 0; i < mValues.length; i++) { + if (value.equals(mValues[i])) { + return mChoices[i]; + } + } + return null; } @Override diff --git a/src/com/android/browser/provider/BrowserProvider2.java b/src/com/android/browser/provider/BrowserProvider2.java index 284d9bc..06e4e4a 100644 --- a/src/com/android/browser/provider/BrowserProvider2.java +++ b/src/com/android/browser/provider/BrowserProvider2.java @@ -80,6 +80,8 @@ public class BrowserProvider2 extends SQLiteContentProvider { public static final String FAVICON = History.FAVICON; } + public static final String PARAM_GROUP_BY = "groupBy"; + public static final String LEGACY_AUTHORITY = "browser"; static final Uri LEGACY_AUTHORITY_URI = new Uri.Builder() .authority(LEGACY_AUTHORITY).scheme("content").build(); @@ -795,6 +797,7 @@ public class BrowserProvider2 extends SQLiteContentProvider { final int match = URI_MATCHER.match(uri); SQLiteQueryBuilder qb = new SQLiteQueryBuilder(); String limit = uri.getQueryParameter(BrowserContract.PARAM_LIMIT); + String groupBy = uri.getQueryParameter(PARAM_GROUP_BY); switch (match) { case ACCOUNTS: { qb.setTables(VIEW_ACCOUNTS); @@ -1023,8 +1026,8 @@ public class BrowserProvider2 extends SQLiteContentProvider { } } - Cursor cursor = qb.query(db, projection, selection, selectionArgs, null, null, sortOrder, - limit); + Cursor cursor = qb.query(db, projection, selection, selectionArgs, groupBy, + null, sortOrder, limit); cursor.setNotificationUri(getContext().getContentResolver(), BrowserContract.AUTHORITY_URI); return cursor; } @@ -1978,6 +1981,7 @@ public class BrowserProvider2 extends SQLiteContentProvider { case SUGGEST_COLUMN_INTENT_ACTION_ID: return Intent.ACTION_VIEW; case SUGGEST_COLUMN_INTENT_DATA_ID: + return mSource.getString(URL_INDEX); case SUGGEST_COLUMN_TEXT_2_TEXT_ID: case SUGGEST_COLUMN_TEXT_2_URL_ID: return UrlUtils.stripUrl(mSource.getString(URL_INDEX)); |