Import translations. DO NOT MERGE am: db8c141b5e -s ours am: 166cbf2928 -s ours
am: f05880c695 -s ours
Change-Id: Iad56f26083f698e350ecd2af1d3e94acad5775a3
diff --git a/res/drawable/ic_menu_add.xml b/res/drawable/ic_menu_add.xml
new file mode 100644
index 0000000..3387f29
--- /dev/null
+++ b/res/drawable/ic_menu_add.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2015 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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0"
+ android:tint="?android:attr/colorAccent">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>
diff --git a/res/layout/cert_chooser.xml b/res/layout/cert_chooser.xml
deleted file mode 100644
index f6b73dc..0000000
--- a/res/layout/cert_chooser.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<ListView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:drawSelectorOnTop="false"
- android:textFilterEnabled="true"
- android:choiceMode="singleChoice"
-/>
diff --git a/res/layout/cert_chooser_footer.xml b/res/layout/cert_chooser_footer.xml
deleted file mode 100644
index a3521e3..0000000
--- a/res/layout/cert_chooser_footer.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- >
- <View
- android:layout_width="fill_parent"
- android:layout_height="1dip"
- android:background="@android:drawable/divider_horizontal_dark"
- />
- <TextView
- android:id="@+id/cert_chooser_install_message"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_margin="6dip"
- />
- <LinearLayout
- android:gravity="right"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content">
- <Button
- android:id="@+id/cert_chooser_install_button"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:text="@string/install_new_cert_button_label"
- android:layout_margin="6dip"
- />
- </LinearLayout>
-</LinearLayout>
diff --git a/res/layout/cert_chooser_header.xml b/res/layout/cert_chooser_header.xml
index 63d2c7a..d004ef6 100644
--- a/res/layout/cert_chooser_header.xml
+++ b/res/layout/cert_chooser_header.xml
@@ -16,5 +16,7 @@
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:padding="6dip"
+ android:paddingStart="?android:attr/dialogPreferredPadding"
+ android:paddingEnd="?android:attr/dialogPreferredPadding"
+ android:paddingBottom="20dp"
/>
diff --git a/res/layout/cert_install.xml b/res/layout/cert_install.xml
new file mode 100644
index 0000000..c10b32a
--- /dev/null
+++ b/res/layout/cert_install.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:background="?android:attr/selectableItemBackground"
+ android:minHeight="?android:attr/listPreferredItemHeight"
+ android:paddingStart="?android:attr/dialogPreferredPadding"
+ android:paddingEnd="?android:attr/dialogPreferredPadding"
+ >
+ <ImageView
+ android:id="@+id/add_cert_icon"
+ android:layout_width="42dp"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:paddingEnd="@dimen/radio_label_padding"
+ android:clickable="false"
+ android:focusable="false"
+ android:layout_weight="0"
+ android:src="@drawable/ic_menu_add"
+ android:tint="?android:attr/textColorSecondary"
+ android:tintMode="src_in"
+ />
+ <TextView
+ android:id="@+id/install_certificate"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/install_new_cert_button_label"
+ android:singleLine="true"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:ellipsize="marquee"
+ />
+</LinearLayout>
diff --git a/res/layout/cert_item.xml b/res/layout/cert_item.xml
index b77e9fc..0f07cd5 100644
--- a/res/layout/cert_item.xml
+++ b/res/layout/cert_item.xml
@@ -18,10 +18,21 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
- android:paddingRight="?android:attr/scrollbarSize"
android:background="?android:attr/selectableItemBackground"
- android:padding="15dip"
+ android:minHeight="?android:attr/listPreferredItemHeight"
+ android:paddingStart="?android:attr/dialogPreferredPadding"
+ android:paddingEnd="?android:attr/dialogPreferredPadding"
>
+ <RadioButton
+ android:id="@+id/cert_item_selected"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:clickable="false"
+ android:focusable="false"
+ android:layout_weight="0"
+ android:paddingEnd="@dimen/radio_label_padding"
+ />
<RelativeLayout
android:layout_width="0px"
android:layout_height="wrap_content"
@@ -46,13 +57,4 @@
android:textColor="?android:attr/textColorSecondary"
/>
</RelativeLayout>
- <RadioButton
- android:id="@+id/cert_item_selected"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:clickable="false"
- android:focusable="false"
- android:layout_weight="0"
- />
</LinearLayout>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 701771d..fae8313 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"Die %s-program het \'n sertifikaat versoek. Die kies van \'n sertifikaat sal dat die program hierdie identiteit nou en in die toekoms by bedieners gaan gebruik."</string>
<string name="requesting_server" msgid="5832565605998634370">"Die program het die versoekende bediener as %s geïdentifiseer, maar jy moet slegs vir die program toegang tot die sertifikaat gee as jy die program vertrou."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Jy kan sertifikate installeer van \'n PKCS#12-lêer met \'n %1$s- of \'n %2$s-uitbreiding wat in eksterne berging geleë is."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Installeer"</string>
- <string name="allow_button" msgid="5340501035618157678">"Laat toe"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Installeer sertifikaat"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Kies"</string>
<string name="deny_button" msgid="3766539809121892584">"Weier"</string>
</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index e222bb3..7cb308d 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"የ%s መተግበሪያው የእውቅና ማረጋገጫ ምስክር ወረቀት ጠይቋል። የእውቅና ማረጋገጫ ምስክር ወረቀት መምረጥ መተግበሪያው ይህን መታወቂያ አሁንና ለወደፊቱ ከአገልጋዮች ጋር እንዲጠቀም ያግዘዋል።"</string>
<string name="requesting_server" msgid="5832565605998634370">"መተግበሪያው ጠያቂውን አገልጋይ %s ብሎ ለይቶታል፣ ግን መተግበሪያውን የሚያምኑት ብቻ ከሆነ ነው ለእውቅና ማረጋገጫ ምስክር ወረቀቱን መዳረሻ ሊሰጡት የሚገባው።"</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"የ%1$s ወይም %2$s ቅጥያቸው ውጫዊ ማከማቻ ላይ የሚገኝ የPKCS#12 ፋይል የእውቅና ማረጋገጫ ምስክር ወረቀቶችን መጫን ይችላሉ።"</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"ጫን"</string>
- <string name="allow_button" msgid="5340501035618157678">"ፍቀድ"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"የእውቅና ማረጋገጫን ጫን"</string>
+ <string name="allow_button" msgid="3030990695030371561">"ምረጥ"</string>
<string name="deny_button" msgid="3766539809121892584">"ከልክል"</string>
</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 8bfa25e..ff74bb1 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"طلب التطبيق %s شهادة. وسيتيح اختيار شهادة للتطبيق استخدام هذه الهوية مع الخوادم الآن وفي المستقبل."</string>
<string name="requesting_server" msgid="5832565605998634370">"تعرف التطبيق على الخادم مقدم الطلب كـ %s، ولكن يجب ألا تمنح التطبيق إمكانية الوصول إلى الشهادة إلا إذا كنت تثق فيه."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"يمكنك تثبيت شهادات من ملف PKCS#12 بامتداد %1$s أو %2$s، حيث إن هذا الملف موجود في وحدة التخزين الخارجية."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"تثبيت"</string>
- <string name="allow_button" msgid="5340501035618157678">"سماح"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"تثبيت شهادة"</string>
+ <string name="allow_button" msgid="3030990695030371561">"تحديد"</string>
<string name="deny_button" msgid="3766539809121892584">"رفض"</string>
</resources>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index b442c7e..a33a8ee 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"%s sertifikat tələb edir. Sertifikatın seçilməsi tətbiqə bu identifikasiyanı indi və gələcəkdə serverlərlə istifadə etməyə imkan verəcək."</string>
<string name="requesting_server" msgid="5832565605998634370">"Tətbiq tələb edən serveri %s olaraq tanıdı, lakin siz etibar etdiyiniz tətbiqlərə giriş verməlisiniz."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Siz sertifikatları xarici yaddaşda yerləşən, %1$s və ya %2$s artırması olan PKCS#12 fayldan quraşdıra bilərsiniz."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Quraşdır"</string>
- <string name="allow_button" msgid="5340501035618157678">"Icazə verin"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Sertifikatı quraşdırın"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Seçin"</string>
<string name="deny_button" msgid="3766539809121892584">"İmtina et"</string>
</resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 2a42b51..5d157ad 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"Aplikacija %s je zahtevala sertifikat. Ako odaberete sertifikat, dozvolićete aplikaciji da sada i ubuduće koristi ovaj identitet prilikom komunikacije sa serverima."</string>
<string name="requesting_server" msgid="5832565605998634370">"Aplikacija je identifikovala server koji je uputio zahtev kao %s, ali bi pristup sertifikatu trebalo da joj odobrite samo ako smatrate da je pouzdana."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Možete da instalirate sertifikate iz PKCS#12 datoteke sa ekstenzijom %1$s ili %2$s koji se nalazi u spoljnoj memoriji."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Instaliraj"</string>
- <string name="allow_button" msgid="5340501035618157678">"Dozvoli"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Instaliraj sertifikat"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Izaberi"</string>
<string name="deny_button" msgid="3766539809121892584">"Odbij"</string>
</resources>
diff --git a/res/values-be-rBY/strings.xml b/res/values-be-rBY/strings.xml
new file mode 100644
index 0000000..6e99774
--- /dev/null
+++ b/res/values-be-rBY/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="170210454004696382">"Ключавы ланцужок"</string>
+ <string name="title_no_certs" msgid="8350009443064722873">"Сертыфiкаты не знойдзены"</string>
+ <string name="title_select_cert" msgid="3588447616418041699">"Выберыце сертыфікат"</string>
+ <string name="requesting_application" msgid="1589142627467598421">"Праграма %s запытала сертыфiкат. Выбар сертыфiката дазволiць праграме выкарыстоўваць гэту ідэнтыфікацыю на серверах цяпер i ў будучынi."</string>
+ <string name="requesting_server" msgid="5832565605998634370">"Праграма ідэнтыфікавала запытаны сервер як %s, але, калi вы давяраеце праграме, вам трэба даць ёй доступ да сертыфiката."</string>
+ <string name="install_new_cert_message" msgid="4451971501142085495">"Сертыфікаты можна ўсталяваць з файла PKCS#12 з пашырэннем %1$s або %2$s, якi знаходзіцца на вонкавым сховішчы."</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Усталяваць сертыфікат"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Выбраць"</string>
+ <string name="deny_button" msgid="3766539809121892584">"Адмовіць"</string>
+</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index cfcf71e..3af6780 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"Приложението %s поиска сертификат. Избирането на такъв ще му разреши да използва тази самоличност със сървърите сега и в бъдеще."</string>
<string name="requesting_server" msgid="5832565605998634370">"Приложението идентифицира искащия сървър като %s, но трябва да дадете на приложението достъп до сертификата само ако му имате доверие."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Можете да инсталирате сертификати от файл с формат PKCS#12 с разширение %1$s или %2$s, намиращ се във външното хранилище."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Инсталиране"</string>
- <string name="allow_button" msgid="5340501035618157678">"Разрешаване"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Инсталиране на сертификат"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Избиране"</string>
<string name="deny_button" msgid="3766539809121892584">"Отказ"</string>
</resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index d348297..ae51f98 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"অ্যাপ্লিকেশান %s একটি সার্টিফিকেটের অনুরোধ করেছে। একটি সার্টিফিকেট চয়ন করলে তা অ্যাপ্লিকেশানটিকে এখন এবং ভবিষ্যতে সার্ভারগুলির সঙ্গে এই পরিচয় ব্যবহার করতে দেবে।"</string>
<string name="requesting_server" msgid="5832565605998634370">"অ্যাপ্লিকেশানটি অনুরোধ করা সার্ভারকে %s হিসেবে শনাক্ত করেছে, আপনার কাছে অ্যাপ্লিকেশানটি বিশ্বস্ত হলে তবেই আপনি অ্যাপ্লিকেশানটিকে সার্টিফিকেট অ্যাক্সেস দিতে পারবেন।"</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"বহিরাগত সঞ্চয়স্থানে অবস্থিত %1$s বা %2$s এক্সটেনশান সহ PKCS#12 ফাইল থেকে আপনি আপনার সার্টিফিকেটগুলি ইনস্টল করতে পারেন।"</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"ইনস্টল করুন"</string>
- <string name="allow_button" msgid="5340501035618157678">"অনুমতি দিন"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"শংসাপত্র ইনস্টল করুন"</string>
+ <string name="allow_button" msgid="3030990695030371561">"বেছে নিন"</string>
<string name="deny_button" msgid="3766539809121892584">"আস্বীকার করুন"</string>
</resources>
diff --git a/res/values-bs-rBA/strings.xml b/res/values-bs-rBA/strings.xml
new file mode 100644
index 0000000..4fa2989
--- /dev/null
+++ b/res/values-bs-rBA/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="170210454004696382">"Key Chain"</string>
+ <string name="title_no_certs" msgid="8350009443064722873">"Certifikat nije pronađen."</string>
+ <string name="title_select_cert" msgid="3588447616418041699">"Odaberite certifikat"</string>
+ <string name="requesting_application" msgid="1589142627467598421">"Aplikacija %s je zatražila certifikat. Izbor certifikata će omogućiti aplikaciji korištenje ovog identiteta na serverima, sada i ubuduće."</string>
+ <string name="requesting_server" msgid="5832565605998634370">"Aplikacija je identifikovala server koji traži certifikat kao %s. Dozvolite aplikaciji da pristupi certifikatu samo ako joj vjerujete."</string>
+ <string name="install_new_cert_message" msgid="4451971501142085495">"Možete instalirati certifikate iz PKCS#12 fajla sa ekstenzijom %1$s ili %2$s, koji se nalazi u vanjskoj pohrani."</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Instaliraj certifikat"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Odaberi"</string>
+ <string name="deny_button" msgid="3766539809121892584">"Odbij"</string>
+</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 3425e34..7caf909 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -21,8 +21,8 @@
<string name="title_select_cert" msgid="3588447616418041699">"Tria de certificat"</string>
<string name="requesting_application" msgid="1589142627467598421">"L\'aplicació %s ha sol·licitat un certificat. En triar un certificat, l\'aplicació podrà fer servir aquesta identitat amb els servidors tant ara com en el futur."</string>
<string name="requesting_server" msgid="5832565605998634370">"L\'aplicació ha identificat el servidor sol·licitant com a %s, però només has de permetre que l\'aplicació accedeixi al certificat si hi confies."</string>
- <string name="install_new_cert_message" msgid="4451971501142085495">"Pots instal·lar certificats d\'un fitxer PKCS#12 amb una extensió %1$s o %2$s ubicada en un emmagatzematge extern."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Instal·la"</string>
- <string name="allow_button" msgid="5340501035618157678">"Permet"</string>
+ <string name="install_new_cert_message" msgid="4451971501142085495">"Pots instal·lar certificats des d\'un fitxer PKCS#12 amb una extensió %1$s o %2$s ubicada en un emmagatzematge extern."</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Instal·la el certificat"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Selecciona"</string>
<string name="deny_button" msgid="3766539809121892584">"Denega"</string>
</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index d771d02..f64da4f 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"Aplikace %s vyžaduje certifikát. Výběrem certifikátu aplikaci umožníte, aby nyní i v budoucnosti používala na serverech tuto identitu."</string>
<string name="requesting_server" msgid="5832565605998634370">"Aplikace identifikovala server požadavku: %s. Přístup k certifikátu byste měli povolit, pouze pokud aplikaci důvěřujete."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Certifikáty můžete instalovat ze souboru PKCS#12 s příponou %1$s nebo %2$s, umístěného v externím úložišti."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Instalovat"</string>
- <string name="allow_button" msgid="5340501035618157678">"Povolit"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Instalovat certifikát"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Vybrat"</string>
<string name="deny_button" msgid="3766539809121892584">"Odmítnout"</string>
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 093a01e..417b9f9 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -17,12 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_name" msgid="170210454004696382">"Nøglekæde"</string>
- <string name="title_no_certs" msgid="8350009443064722873">"Der blev ikke fundet nogen medier."</string>
+ <string name="title_no_certs" msgid="8350009443064722873">"Der blev ikke fundet nogen certifikater"</string>
<string name="title_select_cert" msgid="3588447616418041699">"Vælg certifikat"</string>
<string name="requesting_application" msgid="1589142627467598421">"Appen %s har anmodet om et certifikat. Hvis du vælger et certifikat, tillader du, at appen bruger denne identitet på servere både nu og fremover."</string>
<string name="requesting_server" msgid="5832565605998634370">"Appen har identificeret den anmodende server som %s, men du skal kun give appen adgang til certifikatet, hvis du har tillid til den."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Du kan installere certifikater fra en PKCS#12-fil med en %1$s- eller en %2$s-udvidelse, der er placeret på et eksternt lager."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Installer"</string>
- <string name="allow_button" msgid="5340501035618157678">"Tillad"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Installer certifikat"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Vælg"</string>
<string name="deny_button" msgid="3766539809121892584">"Afvis"</string>
</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 6c9c364..eb9a080 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"Die App %s hat ein Zertifikat angefordert. Wenn ein Zertifikat gewählt wird, verwendet die App diese Identität jetzt und zukünftig für Server."</string>
<string name="requesting_server" msgid="5832565605998634370">"Die App hat den anfordernden Server als %s identifiziert, aber du solltest der App nur Zugriff auf das Zertifikat geben, wenn du die App für vertrauenswürdig hältst."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Du kannst Zertifikate aus einer PKCS#12-Datei mit einer %1$s- oder %2$s-Erweiterung installieren, die sich auf externen Speichermedien befinden."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Installieren"</string>
- <string name="allow_button" msgid="5340501035618157678">"Zulassen"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Zertifikat installieren"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Auswählen"</string>
<string name="deny_button" msgid="3766539809121892584">"Ablehnen"</string>
</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index b542a87..63199e2 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"Η εφαρμογή %s έχει ζητήσει πιστοποιητικό. Η επιλογή ενός πιστοποιητικού θα επιτρέψει στην εφαρμογή να χρησιμοποιήσει αυτήν την ταυτότητα στους διακομιστές τώρα και μελλοντικά."</string>
<string name="requesting_server" msgid="5832565605998634370">"Η εφαρμογή έχει εντοπίσει τον ζητούμενο διακομιστή ως %s, αλλά θα πρέπει να παρέχετε στην εφαρμογή πρόσβαση για το πιστοποιητικό μόνο εφόσον την εμπιστεύεστε."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Μπορείτε να εγκαταστήσετε πιστοποιητικά από ένα αρχείο PKCS#12 με επέκταση %1$s ή %2$s που βρίσκονται σε εξωτερική συσκευή αποθήκευσης."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Εγκατάσταση"</string>
- <string name="allow_button" msgid="5340501035618157678">"Αποδοχή"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Εγκατάσταση πιστοποιητικού"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Επιλογή"</string>
<string name="deny_button" msgid="3766539809121892584">"Απόρριψη"</string>
</resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 1c518a6..36b09a7 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -19,10 +19,10 @@
<string name="app_name" msgid="170210454004696382">"Key Chain"</string>
<string name="title_no_certs" msgid="8350009443064722873">"No certificates found"</string>
<string name="title_select_cert" msgid="3588447616418041699">"Choose certificate"</string>
- <string name="requesting_application" msgid="1589142627467598421">"The app %s has requested a certificate. Choosing a certificate will let the app use this identity with servers now and in the future."</string>
+ <string name="requesting_application" msgid="1589142627467598421">"The %s app has requested a certificate. Choosing a certificate will let the app use this identity with servers now and in the future."</string>
<string name="requesting_server" msgid="5832565605998634370">"The app has identified the requesting server as %s, but you should only give the app access to the certificate if you trust the app."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"You can install certificates from a PKCS#12 file with a %1$s or a %2$s extension located in external storage."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Install"</string>
- <string name="allow_button" msgid="5340501035618157678">"Allow"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Install certificate"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Select"</string>
<string name="deny_button" msgid="3766539809121892584">"Deny"</string>
</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 1c518a6..36b09a7 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -19,10 +19,10 @@
<string name="app_name" msgid="170210454004696382">"Key Chain"</string>
<string name="title_no_certs" msgid="8350009443064722873">"No certificates found"</string>
<string name="title_select_cert" msgid="3588447616418041699">"Choose certificate"</string>
- <string name="requesting_application" msgid="1589142627467598421">"The app %s has requested a certificate. Choosing a certificate will let the app use this identity with servers now and in the future."</string>
+ <string name="requesting_application" msgid="1589142627467598421">"The %s app has requested a certificate. Choosing a certificate will let the app use this identity with servers now and in the future."</string>
<string name="requesting_server" msgid="5832565605998634370">"The app has identified the requesting server as %s, but you should only give the app access to the certificate if you trust the app."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"You can install certificates from a PKCS#12 file with a %1$s or a %2$s extension located in external storage."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Install"</string>
- <string name="allow_button" msgid="5340501035618157678">"Allow"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Install certificate"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Select"</string>
<string name="deny_button" msgid="3766539809121892584">"Deny"</string>
</resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 1c518a6..36b09a7 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -19,10 +19,10 @@
<string name="app_name" msgid="170210454004696382">"Key Chain"</string>
<string name="title_no_certs" msgid="8350009443064722873">"No certificates found"</string>
<string name="title_select_cert" msgid="3588447616418041699">"Choose certificate"</string>
- <string name="requesting_application" msgid="1589142627467598421">"The app %s has requested a certificate. Choosing a certificate will let the app use this identity with servers now and in the future."</string>
+ <string name="requesting_application" msgid="1589142627467598421">"The %s app has requested a certificate. Choosing a certificate will let the app use this identity with servers now and in the future."</string>
<string name="requesting_server" msgid="5832565605998634370">"The app has identified the requesting server as %s, but you should only give the app access to the certificate if you trust the app."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"You can install certificates from a PKCS#12 file with a %1$s or a %2$s extension located in external storage."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Install"</string>
- <string name="allow_button" msgid="5340501035618157678">"Allow"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Install certificate"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Select"</string>
<string name="deny_button" msgid="3766539809121892584">"Deny"</string>
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 2200d04..3e54aed 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"La aplicación %s requiere un certificado. La elección de un certificado permitirá que la aplicación use esta identidad para los servidores ahora y en el futuro."</string>
<string name="requesting_server" msgid="5832565605998634370">"La aplicación ha identificado el servidor solicitante %s; no obstante, solo debes permitir que la aplicación acceda al certificado si confías en ella."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Puedes instalar los certificados desde un archivo PKCS#12 con extensión %1$s o %2$s a través de una ubicación de almacenamiento externa."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Instalar"</string>
- <string name="allow_button" msgid="5340501035618157678">"Permitir"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Instalar certificado"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Seleccionar"</string>
<string name="deny_button" msgid="3766539809121892584">"Rechazar"</string>
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 7e202dc..ded53d1 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"La aplicación %s ha solicitado un certificado. Al seleccionar un certificado, la aplicación podrá usar esta identidad con los servidores ahora y en el futuro."</string>
<string name="requesting_server" msgid="5832565605998634370">"La aplicación ha identificado al servidor que solicita el certificado como %s, pero solo debes permitir que la aplicación acceda al certificado si confías en ella."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Puedes instalar certificados desde un archivo PKCS#12 con extensión %1$s o %2$s ubicado en el almacenamiento externo."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Instalar"</string>
- <string name="allow_button" msgid="5340501035618157678">"Permitir"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Instalar certificado"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Seleccionar"</string>
<string name="deny_button" msgid="3766539809121892584">"Denegar"</string>
</resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 34f049a..50b9476 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"Rakendus %s taotleb sertifikaati. Sertifikaadi valimisega saab rakendus kasutada seda identiteeti serveritega nüüd ja tulevikus."</string>
<string name="requesting_server" msgid="5832565605998634370">"Rakendus tuvastas taotluse esitanud serveri kui %s, kuid peaksite rakendusele andma sertifikaadile juurdepääsu ainult siis, kui rakendust usaldate."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Võite installida sertifikaadid failist PKCS#12 laiendiga %1$s või %2$s, mis asub välismäluseadmel."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Installi"</string>
- <string name="allow_button" msgid="5340501035618157678">"Luba"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Sertifikaadi installimine"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Vali"</string>
<string name="deny_button" msgid="3766539809121892584">"Keeldu"</string>
</resources>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 4e39353..71dbd5e 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"%s aplikazioak ziurtagiri bat eskatu du. Ziurtagiri bat aukeratzen baduzu, aplikazioak identitate hori erabiliko du zerbitzarietan hemendik aurrera."</string>
<string name="requesting_server" msgid="5832565605998634370">"Aplikazioak %s gisa identifikatu du zerbitzari eskatzailea, baina ez diozu aplikazioari ziurtagirirako sarbidea eman behar fidagarritzat jotzen ez baduzu."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Ziurtagiriak kanpoko memorian daukazun eta %1$s edo %2$s luzapena duen PKCS#12 fitxategi batetik instala ditzakezu."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Instalatu"</string>
- <string name="allow_button" msgid="5340501035618157678">"Baimendu"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Instalatu ziurtagiria"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Hautatu"</string>
<string name="deny_button" msgid="3766539809121892584">"Ukatu"</string>
</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 7d28eff..bb75080 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"برنامه %s درخواست یک گواهی کرده است. انتخاب یک گواهی به برنامه امکان میدهد از این هویت با سرورها درحال حاضر و در آینده استفاده کند."</string>
<string name="requesting_server" msgid="5832565605998634370">"برنامه سرور درخواستکننده را بهعنوان %s تشخیص داده است اما فقط درصورتیکه به برنامه اطمینان دارید باید به آن اجازه دسترسی به گواهی را بدهید."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"با یک افرونه %2$s یا %1$s واقع در حافظه خارجی میتوانید مجوزهارا از یک فایل PKCS#12 نصب کنید."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"نصب"</string>
- <string name="allow_button" msgid="5340501035618157678">"مجاز است"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"نصب گواهی"</string>
+ <string name="allow_button" msgid="3030990695030371561">"انتخاب"</string>
<string name="deny_button" msgid="3766539809121892584">"اجازه ندارد"</string>
</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 78189ce..1c03cb9 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"Sovellus %s pyysi varmennetta. Jos valitset varmenteen, annat sovellukselle oikeuden käyttää kyseistä identiteettiä palvelimilla nyt ja myöhemmin."</string>
<string name="requesting_server" msgid="5832565605998634370">"Sovellus määritti pyytävän palvelimen olevan %s, mutta suosittelemme antamaan sovellukselle varmenteen käyttöoikeuden vain, jos luotat sovellukseen."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Voit asentaa varmenteita PKCS#12-tiedostosta, jos ulkoisessa tallennustilassa on %1$s tai %2$s-laajennus."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Asenna"</string>
- <string name="allow_button" msgid="5340501035618157678">"Salli"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Asenna varmenne"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Valitse"</string>
<string name="deny_button" msgid="3766539809121892584">"Hylkää"</string>
</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index f5ca147..622150d 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -24,7 +24,7 @@
<!-- String.format failed for translation -->
<!-- no translation found for install_new_cert_message (4451971501142085495) -->
<skip />
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Installer"</string>
- <string name="allow_button" msgid="5340501035618157678">"Autoriser"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Installer le certificat"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Sélectionner"</string>
<string name="deny_button" msgid="3766539809121892584">"Refuser"</string>
</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index e88955e..59fe27b 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"L\'application %s a demandé un certificat. Choisissez un certificat pour permettre à l\'application d\'utiliser cette identité auprès des serveurs à compter d\'aujourd\'hui."</string>
<string name="requesting_server" msgid="5832565605998634370">"L\'application a identifié le serveur demandeur comme %s, mais vous ne devez permettre à l\'application d\'accéder au certificat que si vous faites confiance à celle-ci."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Vous pouvez installer des certificats à partir d\'un fichier PKCS#12 doté d\'une extension %1$s ou %2$s conservée dans la mémoire de stockage externe."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Installer"</string>
- <string name="allow_button" msgid="5340501035618157678">"Autoriser"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Installer le certificat"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Choisir"</string>
<string name="deny_button" msgid="3766539809121892584">"Refuser"</string>
</resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 3a8ba4d..af775a1 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"A aplicación %s solicitou un certificado. Ao escoller un certificado, a aplicación poderá utilizar esta identidade cos servidores agora e no futuro."</string>
<string name="requesting_server" msgid="5832565605998634370">"A aplicación identificou o servidor que realiza a solicitude como %s, pero só debes concederlle acceso á aplicación ao certificado se confías nela."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Podes instalar certificados dun ficheiro PKCS#12 cunha extensión %1$s ou %2$s situado no almacenamento externo."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Instalar"</string>
- <string name="allow_button" msgid="5340501035618157678">"Permitir"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Instalar certificado"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Seleccionar"</string>
<string name="deny_button" msgid="3766539809121892584">"Rexeitar"</string>
</resources>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index c57e423..d2f76bd 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -19,10 +19,10 @@
<string name="app_name" msgid="170210454004696382">"કી ચેઇન"</string>
<string name="title_no_certs" msgid="8350009443064722873">"કોઇ પ્રમાણપત્રો મળ્યાં નથી"</string>
<string name="title_select_cert" msgid="3588447616418041699">"પ્રમાણપત્ર પસંદ કરો"</string>
- <string name="requesting_application" msgid="1589142627467598421">"એપ્લિકેશન %s એ એક પ્રમાણપત્રની વિનંતી કરી છે. પ્રમાણપત્રને પસંદ કરવું એપ્લિકેશનને આ ઓળખાણનો ઉપયોગ સર્વર્સ સાથે હમણાં અને ભવિષ્યમાં કરવા દેશે."</string>
- <string name="requesting_server" msgid="5832565605998634370">"એપ્લિકેશને વિનંતી કરતા સર્વરને %s તરીકે ઓળખ્યું છે, પરંતુ તમારે એપ્લિકેશનને પ્રમાણપત્રની અૅક્સેસ તો જ આપવી જોઈએ જો તમે એપ્લિકેશન પર વિશ્વાસ કરતા હો."</string>
+ <string name="requesting_application" msgid="1589142627467598421">"ઍપ્લિકેશન %s એ એક પ્રમાણપત્રની વિનંતી કરી છે. પ્રમાણપત્રને પસંદ કરવું ઍપ્લિકેશનને આ ઓળખાણનો ઉપયોગ સર્વર્સ સાથે હમણાં અને ભવિષ્યમાં કરવા દેશે."</string>
+ <string name="requesting_server" msgid="5832565605998634370">"ઍપ્લિકેશને વિનંતી કરતા સર્વરને %s તરીકે ઓળખ્યું છે, પરંતુ તમારે ઍપ્લિકેશનને પ્રમાણપત્રની અૅક્સેસ તો જ આપવી જોઈએ જો તમે ઍપ્લિકેશન પર વિશ્વાસ કરતા હો."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"તમે બાહ્ય સંગ્રહ પર સ્થિત %1$s અથવા %2$s એક્સ્ટેન્શન સાથે PKCS#12 ફાઇલમાંથી પ્રમાણપત્રો ઇન્સ્ટોલ કરી શકો છો."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"ઇન્સ્ટોલ કરો"</string>
- <string name="allow_button" msgid="5340501035618157678">"મંજૂરી આપો"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"પ્રમાણપત્ર ઇન્સ્ટૉલ કરો"</string>
+ <string name="allow_button" msgid="3030990695030371561">"પસંદ કરો"</string>
<string name="deny_button" msgid="3766539809121892584">"નકારો"</string>
</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 0034f93..b61cbe7 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"%s ऐप्स ने प्रमाणपत्र का अनुरोध किया है. प्रमाणपत्र चुनने से ऐप्स इस पहचान का उपयोग अभी और भविष्य में सर्वर के साथ कर सकेगा."</string>
<string name="requesting_server" msgid="5832565605998634370">"ऐप्स ने अनुरोध करने वाले सर्वर को %s के रूप में पहचाना है, लेकिन आपको ऐप्स को प्रमाणपत्र पर केवल तब ही पहुंच देना चाहिए जब आप ऐप्स पर विश्वास करते हों."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"आप बाहरी मेमोरी में मौजूद %1$s या %2$s एक्सटेंशन वाली PKCS#12 फ़ाइल से प्रमाणपत्र इंस्टॉल कर सकते हैं."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"इंस्टॉल करें"</string>
- <string name="allow_button" msgid="5340501035618157678">"अनुमति दें"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"प्रमाणपत्र इंस्टॉल करें"</string>
+ <string name="allow_button" msgid="3030990695030371561">"चुनें"</string>
<string name="deny_button" msgid="3766539809121892584">"अस्वीकार करें"</string>
</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 73f4c4d..491bc43 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -17,12 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_name" msgid="170210454004696382">"Key Chain"</string>
- <string name="title_no_certs" msgid="8350009443064722873">"Certifikati nisu pronađeni."</string>
+ <string name="title_no_certs" msgid="8350009443064722873">"Certifikati nisu pronađeni"</string>
<string name="title_select_cert" msgid="3588447616418041699">"Odabir certifikata"</string>
<string name="requesting_application" msgid="1589142627467598421">"Aplikacija %s zatražila je certifikat. Izborom certifikata aplikacija će sad i ubuduće dobiti dopuštenje za upotrebu ovog identiteta na poslužiteljima."</string>
<string name="requesting_server" msgid="5832565605998634370">"Aplikacija je poslužitelj sa zahtjevom identificirala kao %s, ali aplikaciji biste trebali dati pristup do certifikata samo ako je smatrate pouzdanom."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Možete instalirati certifikate iz datoteke PKCS#12 s proširenjem %1$s ili %2$s locirane u vanjskom spremištu."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Instaliraj"</string>
- <string name="allow_button" msgid="5340501035618157678">"Dopusti"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Instaliraj certifikat"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Odaberi"</string>
<string name="deny_button" msgid="3766539809121892584">"Odbij"</string>
</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 2a05a49..c436b8f 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -19,10 +19,10 @@
<string name="app_name" msgid="170210454004696382">"Kulcstartó"</string>
<string name="title_no_certs" msgid="8350009443064722873">"Nincsenek tanúsítványok"</string>
<string name="title_select_cert" msgid="3588447616418041699">"Válassza ki a tanúsítványt"</string>
- <string name="requesting_application" msgid="1589142627467598421">"A(z) %s nevű alkalmazás tanúsítványt kér. Egy tanúsítvány kiválasztása lehetővé teszi, hogy az alkalmazás ezeket az azonosító adatokat használja a szerverekkel összefüggésben most és a jövőben is."</string>
+ <string name="requesting_application" msgid="1589142627467598421">"A(z) %s nevű alkalmazás tanúsítványt kér. A tanúsítvány kiválasztása lehetővé teszi, hogy az alkalmazás ezeket az azonosító adatokat használja a szerverekkel összefüggésben most és a jövőben is."</string>
<string name="requesting_server" msgid="5832565605998634370">"Az alkalmazás %s néven azonosította a kérvényező szervert, de csak akkor biztosítson hozzáférést a tanúsítványhoz az alkalmazás számára, ha megbízik benne."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"PKCS#12 fájlból külső tárolóban található %1$s vagy %2$s bővítmény segítségével telepíthet tanúsítványokat."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Telepítés"</string>
- <string name="allow_button" msgid="5340501035618157678">"Engedélyezés"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Tanúsítvány telepítése"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Választás"</string>
<string name="deny_button" msgid="3766539809121892584">"Elutasítás"</string>
</resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 5294485..dc1670f 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -24,7 +24,7 @@
<!-- String.format failed for translation -->
<!-- no translation found for install_new_cert_message (4451971501142085495) -->
<skip />
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Տեղադրել"</string>
- <string name="allow_button" msgid="5340501035618157678">"Թույլատրել"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Տեղադրել վկայագիրը"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Ընտրել"</string>
<string name="deny_button" msgid="3766539809121892584">"Մերժել"</string>
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index bdd5b79..b57b47f 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"Aplikasi %s telah meminta sertifikat. Memilih sertifikat akan memungkinkan aplikasi menggunakan identitas ini dengan server untuk saat ini dan masa mendatang."</string>
<string name="requesting_server" msgid="5832565605998634370">"Aplikasi telah mengidentifikasi server yang meminta sebagai %s, namun Anda sebaiknya memberikan akses aplikasi ke sertifikat hanya jika Anda memercayai aplikasi tersebut."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Anda dapat memasang sertifikat dari file PKCS#12 dengan ekstensi %1$s atau %2$s yang terletak di penyimpanan eksternal."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Pasang"</string>
- <string name="allow_button" msgid="5340501035618157678">"Izinkan"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Pasang sertifikat"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Pilih"</string>
<string name="deny_button" msgid="3766539809121892584">"Tolak"</string>
</resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index eb43449..8e265a9 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"Forritið %s hefur óskað eftir vottorði. Ef vottorð er valið fær forritið að nota þetta auðkenni til auðkenningar hjá þjónum nú og hér eftir."</string>
<string name="requesting_server" msgid="5832565605998634370">"Forritið hefur greint þjóninn sem sendi beiðnina sem %s en þú ættir aðeins að gefa forritinu aðgang að vottorðinu ef þú treystir því."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Þú getur sett upp vottorð úr PKCS#12-skrá með endinguna %1$s eða %2$s sem finna má í ytri geymslunni."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Setja upp"</string>
- <string name="allow_button" msgid="5340501035618157678">"Leyfa"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Setja upp vottorð"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Velja"</string>
<string name="deny_button" msgid="3766539809121892584">"Hafna"</string>
</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 01b458f..a30dbe6 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -19,10 +19,10 @@
<string name="app_name" msgid="170210454004696382">"Keychain"</string>
<string name="title_no_certs" msgid="8350009443064722873">"Nessun certificato trovato"</string>
<string name="title_select_cert" msgid="3588447616418041699">"Scegli certificato"</string>
- <string name="requesting_application" msgid="1589142627467598421">"L\'applicazione %s ha richiesto un certificato. La scelta di un certificato permetterà all\'applicazione di utilizzare questa identità con i server ora e in futuro."</string>
- <string name="requesting_server" msgid="5832565605998634370">"L\'applicazione ha identificato il server richiedente come %s, ma dovresti consentire all\'applicazione di accedere al certificato solo se la consideri attendibile."</string>
+ <string name="requesting_application" msgid="1589142627467598421">"L\'app %s ha richiesto un certificato. La scelta di un certificato permetterà all\'app di utilizzare questa identità con i server ora e in futuro."</string>
+ <string name="requesting_server" msgid="5832565605998634370">"L\'app ha identificato il server richiedente come %s, ma dovresti consentire all\'app di accedere al certificato solo se la consideri attendibile."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Puoi installare certificati da un file PKCS#12 con un\'estensione %1$s o %2$s che si trova nella memoria esterna."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Installa"</string>
- <string name="allow_button" msgid="5340501035618157678">"Consenti"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Installa certificato"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Seleziona"</string>
<string name="deny_button" msgid="3766539809121892584">"Rifiuta"</string>
</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 2c2f80d..cc8ad2f 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"האפליקציה %s ביקשה אישור. בחירת אישור תאפשר לאפליקציה להשתמש בזהות זו מול שרתים כעת ובעתיד."</string>
<string name="requesting_server" msgid="5832565605998634370">"האפליקציה זיהתה את השרת המבקש כ-%s, אך עליך לתת לאפליקציה גישה לאישור רק אם אתה סומך עליה."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"ניתן להתקין אישורים מקובץ PKCS#12 עם סיומת %1$s או %2$s הממוקם באחסון חיצוני."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"התקן"</string>
- <string name="allow_button" msgid="5340501035618157678">"אפשר"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"התקן אישור"</string>
+ <string name="allow_button" msgid="3030990695030371561">"בחר"</string>
<string name="deny_button" msgid="3766539809121892584">"דחה"</string>
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 44996bc..d7d45ee 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"アプリ%sから証明書がリクエストされました。証明書を選択すると、今後アプリはサーバーに対してこのIDを利用できるようになります。"</string>
<string name="requesting_server" msgid="5832565605998634370">"アプリはリクエストしているサーバーを%sとして識別しましたが、アプリを信頼している場合にのみ、証明書へのアクセス権をアプリに許可してください。"</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"外部ストレージにある、拡張子が%1$sまたは%2$sのPKCS#12ファイルから証明書をインストールできます。"</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"インストール"</string>
- <string name="allow_button" msgid="5340501035618157678">"許可"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"証明書をインストール"</string>
+ <string name="allow_button" msgid="3030990695030371561">"選択"</string>
<string name="deny_button" msgid="3766539809121892584">"拒否"</string>
</resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 2c01370..e9c6f34 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -17,12 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_name" msgid="170210454004696382">"გასაღებების ჯაჭვი"</string>
- <string name="title_no_certs" msgid="8350009443064722873">"სერtიფიკატები ვერ მოიძებნა"</string>
+ <string name="title_no_certs" msgid="8350009443064722873">"სერტიფიკატები ვერ მოიძებნა"</string>
<string name="title_select_cert" msgid="3588447616418041699">"აირჩიეთ სერტიფიკატი"</string>
<string name="requesting_application" msgid="1589142627467598421">"აპლიკაციამ %s მოითხოვა სერტიფიკატი. სერტიფიკატის არჩევა მისცემს აპს შესაძლებლობას, რომ გამოიყენოს ეს იდენტობა სერვერებთან ახლაც და მომავალშიც."</string>
<string name="requesting_server" msgid="5832565605998634370">"აპის მიერ იდენტიფიცირებული მომთხოვნი სერვერი არის %s, მაგრამ სერტიფიკატზე წვდომა უნდა მიანიჭოთ მხოლოდ იმ შემთხვევაში, თუ აპს ენდობით."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"თქვენ შეგიძლიათ დააყენოთ სერტიფიკატი %1$s ან %2$s გაფართოების ფაილიდან - PKCS#12, რომელიც გარე მეხსიერებაში მდებარეობს."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"დაყენება"</string>
- <string name="allow_button" msgid="5340501035618157678">"ნების დართვა"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"სერტიფიკატის ინსტალაცია"</string>
+ <string name="allow_button" msgid="3030990695030371561">"არჩევა"</string>
<string name="deny_button" msgid="3766539809121892584">"უარყოფა"</string>
</resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index d8edf66..1f09836 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -19,10 +19,10 @@
<string name="app_name" msgid="170210454004696382">"Перне тізбектері"</string>
<string name="title_no_certs" msgid="8350009443064722873">"Сертификаттар табылмады."</string>
<string name="title_select_cert" msgid="3588447616418041699">"Сертификатты таңдау"</string>
- <string name="requesting_application" msgid="1589142627467598421">"%s қолданбасы сертификатқа өтініш жасады. Сертификатты таңдау қолданбаға осы анықтағышты қазір және болашақта серверлермен қолдану мүмкіндігін береді."</string>
+ <string name="requesting_application" msgid="1589142627467598421">"%s қолданбасы сертификатқа өтініш жасады. Сертификатты таңдау қолданбаға осы анықтағышты қазір және болашақта серверлермен қолдануға мүмкіндік береді."</string>
<string name="requesting_server" msgid="5832565605998634370">"Бұл қолданба өтінген серверді %s ретінде анықтады, бірақ қолданбаға сенген жағдайда ғана сертификатқа кіруге рұқсат беруге болады."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Сертификаттарды сыртқы жадта орналасқан %1$s немесе %2$s жалғаулы PKCS#12 файлынан орнатуға болады."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Орнату"</string>
- <string name="allow_button" msgid="5340501035618157678">"Рұқсат беру"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Сертификатты орнату"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Таңдау"</string>
<string name="deny_button" msgid="3766539809121892584">"Бас тарту"</string>
</resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 9129422..e59e6de 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"កម្មវិធី %s បានស្នើវិញ្ញាបនបត្រ។ ការជ្រើសវិញ្ញាបនបត្រនឹងឲ្យកម្មវិធីប្រើអត្តសញ្ញាណនេះជាមួយម៉ាស៊ីនមេឥឡូវនេះ និងពេលក្រោយ។"</string>
<string name="requesting_server" msgid="5832565605998634370">"កម្មវិធីបានកំណត់ម៉ាស៊ីនមេស្នើជា %s ប៉ុន្តែអ្នកអ្នកគួរតែផ្ដល់ឲ្យកម្មវិធីចូលប្រើវិញ្ញាបនបត្រតែប៉ុណ្ណោះ បើអ្នកជឿជាក់កម្មវិធី។"</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"អ្នកអាចដំឡើងវិញ្ញាបនបត្រពីឯកសារ PKCS#12 ជាមួយផ្នែកបន្ថែម %1$s ឬ %2$s ដែលស្ថិតក្នុងឧបករណ៍ផ្ទុកខាងក្រៅ។"</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"ដំឡើង"</string>
- <string name="allow_button" msgid="5340501035618157678">"អនុញ្ញាត"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"ដំឡើងវិញ្ញាបនបត្រ"</string>
+ <string name="allow_button" msgid="3030990695030371561">"ជ្រើស"</string>
<string name="deny_button" msgid="3766539809121892584">"បដិសេធ"</string>
</resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 8e1fbf7..ddf555a 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -19,10 +19,10 @@
<string name="app_name" msgid="170210454004696382">"ಕೀ ಚೈನ್"</string>
<string name="title_no_certs" msgid="8350009443064722873">"ಯಾವುದೇ ಪ್ರಮಾಣಪತ್ರಗಳು ಕಂಡುಬಂದಿಲ್ಲ"</string>
<string name="title_select_cert" msgid="3588447616418041699">"ಪ್ರಮಾಣಪತ್ರವನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
- <string name="requesting_application" msgid="1589142627467598421">"ಅಪ್ಲಿಕೇಶನ್ %s ಪ್ರಮಾಣಪತ್ರವೊಂದನ್ನು ವಿನಂತಿಸಿದೆ. ಪ್ರಮಾಣಪತ್ರವನ್ನು ಆಯ್ಕೆ ಮಾಡುವುದರಿಂದ ಸರ್ವರ್ಗಳೊಂದಿಗೆ ಈಗ ಮತ್ತು ಭವಿಷ್ಯದಲ್ಲಿ ಈ ಗುರುತನ್ನು ಬಳಸಲು ಈ ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ."</string>
+ <string name="requesting_application" msgid="1589142627467598421">"%s ಅಪ್ಲಿಕೇಶನ್ ಪ್ರಮಾಣಪತ್ರವೊಂದನ್ನು ವಿನಂತಿಸಿದೆ. ಪ್ರಮಾಣಪತ್ರವನ್ನು ಆಯ್ಕೆ ಮಾಡುವುದರಿಂದ ಸರ್ವರ್ಗಳೊಂದಿಗೆ ಈಗ ಮತ್ತು ಭವಿಷ್ಯದಲ್ಲಿ ಈ ಗುರುತನ್ನು ಬಳಸಲು ಈ ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ."</string>
<string name="requesting_server" msgid="5832565605998634370">"ಅಪ್ಲಿಕೇಶನ್ ವಿನಂತಿಸಿದ ಸರ್ವರ್ ಅನ್ನು %s ರಂತೆ ಗುರುತಿಸಿದೆ, ಆದರೆ ನೀವು ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ನಂಬಿದರೆ ಮಾತ್ರ ಪ್ರಮಾಣಪತ್ರಕ್ಕೆ ಅಪ್ಲಿಕೇಶನ್ ಪ್ರವೇಶವನ್ನು ನೀಡಬೇಕು."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"ಬಾಹ್ಯ ಸಂಗ್ರಹಣೆಯಲ್ಲಿ ಸಂಗ್ರಹವಾಗಿರುವ %1$s ಅಥವಾ %2$s ವಿಸ್ತರಣೆಯೊಂದಿಗೆ PKCS#12 ಫೈಲ್ನಿಂದ ನೀವು ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಸ್ಥಾಪಿಸಬಹುದು."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"ಸ್ಥಾಪಿಸು"</string>
- <string name="allow_button" msgid="5340501035618157678">"ಅನುಮತಿಸು"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"ಪ್ರಮಾಣಪತ್ರವನ್ನು ಸ್ಥಾಪಿಸು"</string>
+ <string name="allow_button" msgid="3030990695030371561">"ಆಯ್ಕೆಮಾಡಿ"</string>
<string name="deny_button" msgid="3766539809121892584">"ನಿರಾಕರಿಸು"</string>
</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 89e71c6..c965cc3 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"%s 앱이 인증서를 요청했습니다. 인증서를 선택하면 앞으로 앱이 이 ID를 서버와 사용합니다."</string>
<string name="requesting_server" msgid="5832565605998634370">"앱이 요청하는 서버를 %s라고 확인했지만 앱을 신뢰하는 경우에만 앱이 인증서에 액세스할 수 있도록 해야 합니다."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"PKCS#12 파일에서 외부 저장소에 있는 확장 프로그램 %1$s 또는 %2$s을(를) 사용하여 인증서를 설치할 수 있습니다."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"설치"</string>
- <string name="allow_button" msgid="5340501035618157678">"허용"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"인증서 설치"</string>
+ <string name="allow_button" msgid="3030990695030371561">"선택"</string>
<string name="deny_button" msgid="3766539809121892584">"거부"</string>
</resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 5b4a55b..32c2b5f 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -17,12 +17,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_name" msgid="170210454004696382">"Ачкычтар топтому"</string>
- <string name="title_no_certs" msgid="8350009443064722873">"Сертификат табылган жок"</string>
+ <string name="title_no_certs" msgid="8350009443064722873">"Тастыктамалар табылган жок"</string>
<string name="title_select_cert" msgid="3588447616418041699">"Сертификат тандоо"</string>
- <string name="requesting_application" msgid="1589142627467598421">"%s колдонмосуна сертификат талап кылынат. Сертификатты тандоо, колдонмого бул тастыктаманы мындан кийин сервер менен колдонууга уруксат берет."</string>
- <string name="requesting_server" msgid="5832565605998634370">"Колдонмо талап кылган серверди %s катары аныктады, бирок сиз колдонмого ишенсеңиз гана ага сертификатка жетки беришиңиз керек."</string>
- <string name="install_new_cert_message" msgid="4451971501142085495">"Сиз сертификаттарды, сырткы сактагычта жайгашкан PKCS#12 файлынан алып, %1$s же %2$s кеңейтмеси менен орното аласыз."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Орнотуу"</string>
- <string name="allow_button" msgid="5340501035618157678">"Уруксат берүү"</string>
+ <string name="requesting_application" msgid="1589142627467598421">"%s колдонмосуна тастыктама талап кылынат. Тастыктаманы тандап, колдонмого бул идентификаторду бүгүн жана кийин да колдоно берүүгө уруксат бериңиз."</string>
+ <string name="requesting_server" msgid="5832565605998634370">"Колдонмо талап кылган серверди %s катары аныктады, бирок тастыктаманы пайдалануу мүмкүнчүлүгүн ишенимдүү колдонмолорго гана берүү керек."</string>
+ <string name="install_new_cert_message" msgid="4451971501142085495">"PKCS#12 файлындагы тастыктамаларды тышкы сактагычта жайгашкан %1$s же %2$s кеңейтмеси менен орнотсоңуз болот."</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Тастыктаманы орнотуу"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Тандоо"</string>
<string name="deny_button" msgid="3766539809121892584">"Баш тартуу"</string>
</resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 21448d6..989ec24 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -19,10 +19,10 @@
<string name="app_name" msgid="170210454004696382">"ພວງກະແຈ"</string>
<string name="title_no_certs" msgid="8350009443064722873">"ບໍ່ພົບໃບຮັບຮອງ"</string>
<string name="title_select_cert" msgid="3588447616418041699">"ເລືອກໃບຮັບຮອງ"</string>
- <string name="requesting_application" msgid="1589142627467598421">"ແອັບຯ %s ໄດ້ຮ້ອງຂໍໃບຮັບຮອງ. ການເລືອກໃບຮັບຮອງໃດນຶ່ງ ຈະເຮັດໃຫ້ແອັບຯດັ່ງກ່າວ ໃຊ້ການລະບຸໂຕຕົນນີ້ກັບເຊີບເວີໃນຕອນນີ້ ແລະໃນອະນາຄົດ."</string>
+ <string name="requesting_application" msgid="1589142627467598421">"ແອັບ %s ໄດ້ຮ້ອງຂໍໃບຮັບຮອງ. ການເລືອກໃບຮັບຮອງໃດໜຶ່ງຈະເຮັດໃຫ້ແອັບດັ່ງກ່າວໃຊ້ການລະບຸຕົວຕົນນີ້ກັບເຊີບເວີໃນຕອນນີ້ ແລະໃນອະນາຄົດ."</string>
<string name="requesting_server" msgid="5832565605998634370">"ແອັບຯດັ່ງກ່າວ ໄດ້ຢືນຢັນໂຕຕົນເຊີບເວີທີ່ຮ້ອງຂໍເປັນ %s ແຕ່ທ່ານຄວນອະນຸມັດການເຂົ້າເຖິງ ແອັບຯໃຫ້ໃບຮັບຮອງ ສະເພາະໃນກໍລະນີທີ່ທ່ານເຊື່ອແອັບຯດັ່ງກ່າວເທົ່ານັ້ນ."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"ທ່ານສາມາດຕິດຕັ້ງໃບຮັບຮອງຈາກໄຟລ໌ PKCS#12 ທີ່ມີນາມສະກຸນ %1$s ຫຼື %2$s ຢູ່ໃນພື້ນທີ່ຈັດເກັບຂໍ້ມູນພາຍນອກໄດ້."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"ຕິດຕັ້ງ"</string>
- <string name="allow_button" msgid="5340501035618157678">"ອະນຸຍາດ"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"ຕິດຕັ້ງໃບຮັບຮອງ"</string>
+ <string name="allow_button" msgid="3030990695030371561">"ເລືອກ"</string>
<string name="deny_button" msgid="3766539809121892584">"ປະຕິເສດ"</string>
</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index ab0a5a2..c50dbd5 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"Programa „%s“ prašo pateikti sertifikatą. Pasirinkus sertifikatą, programa galės dabar ir ateityje jį naudoti serveriuose."</string>
<string name="requesting_server" msgid="5832565605998634370">"Programa užklausą teikiantį serverį identifikavo kaip %s, bet programai suteikite prieigą prie sertifikato, tik jei pasitikite ja."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Galite įdiegti sertifikatus iš failo PKCS#12 naudodami išorinėje saugykloje esantį plėtinį %1$s arba %2$s."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Įdiegti"</string>
- <string name="allow_button" msgid="5340501035618157678">"Leisti"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Įdiegti sertifikatą"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Pasirinkti"</string>
<string name="deny_button" msgid="3766539809121892584">"Atmesti"</string>
</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index e4521f4..bc2e3ab 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"Lietotnē %s tika pieprasīts sertifikāts. Ja izvēlēsieties sertifikātu, lietotne varēs izmantot šo identitāti serveros tagad un turpmāk."</string>
<string name="requesting_server" msgid="5832565605998634370">"Lietotne ir identificējusi pieprasošo serveri kā %s, bet lietotnei piekļuvi sertifikātam varat piešķirt tikai tad, ja tai uzticaties."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Jūs varat instalēt sertifikātus no PKCS#12 faila ar %1$s vai %2$s paplašinājumu, kas atrodas ārējā atmiņā."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Instalēt"</string>
- <string name="allow_button" msgid="5340501035618157678">"Atļaut"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Instalēt sertifikātu"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Atlasīt"</string>
<string name="deny_button" msgid="3766539809121892584">"Noraidīt"</string>
</resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 18d8557..f1e5566 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"Апликацијата %s побара сертификат. Ако изберете сертификат, апликацијата ќе може да го користи овој идентитет со сервери сега и во иднина."</string>
<string name="requesting_server" msgid="5832565605998634370">"Апликацијата го идентификуваше серверот барател како %s, но вие треба да ѝ дадете пристап на апликацијата до серификатот само ако ѝ верувате на апликацијата."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Може да инсталирате сертификати од датотеката PKCS#12 со наставка %1$s или %2$s што се наоѓа на надворешната меморија."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Инсталирај"</string>
- <string name="allow_button" msgid="5340501035618157678">"Дозволи"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Инсталирај сертификат"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Избери"</string>
<string name="deny_button" msgid="3766539809121892584">"Одбиј"</string>
</resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 63f239f..724e482 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"%s അപ്ലിക്കേഷൻ ഒരു സർട്ടിഫിക്കറ്റ് അഭ്യർത്ഥിച്ചു. ഒരു സർട്ടിഫിക്കറ്റ് തിരഞ്ഞെടുക്കുന്നത്, സെർവറുകളിൽ ഇപ്പോഴും പിന്നീടും അപ്ലിക്കേഷൻ ഈ ഐഡന്റിറ്റി ഉപയോഗിക്കാൻ അനുവദിക്കുന്നതിനിടയാക്കും."</string>
<string name="requesting_server" msgid="5832565605998634370">"അഭ്യർത്ഥിച്ച സെർവറായി %s എന്നതിനെ അപ്ലിക്കേഷൻ തിരിച്ചറിഞ്ഞു, പക്ഷേ നിങ്ങൾ അപ്ലിക്കേഷനെ വിശ്വസിക്കുന്നുവെങ്കിൽ മാത്രമേ സർട്ടിഫിക്കറ്റിലേക്ക് അപ്ലിക്കേഷന് ആക്സസ്സ് നൽകാവൂ."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"ബാഹ്യസംഭരണത്തിലുള്ള %1$s അല്ലെങ്കിൽ %2$s എക്സ്റ്റൻഷൻ ഉപയോഗിച്ച് നിങ്ങൾക്ക് ഒരു PKCS#12 ഫയലിൽ സർട്ടിഫിക്കറ്റുകൾ ഇൻസ്റ്റാളുചെയ്യാനാകും."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"ഇൻസ്റ്റാളുചെയ്യുക"</string>
- <string name="allow_button" msgid="5340501035618157678">"അനുവദിക്കുക"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"സർട്ടിഫിക്കറ്റ് ഇൻസ്റ്റാൾ ചെയ്യുക"</string>
+ <string name="allow_button" msgid="3030990695030371561">"തിരഞ്ഞെടുക്കുക"</string>
<string name="deny_button" msgid="3766539809121892584">"നിരസിക്കുക"</string>
</resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index fb26747..76dfd97 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"%s апп сертификат шаардаж байна. Сертификатыг сонгосноор тус апп одоо болон цаашид сервертэй харьцахдаа үүнийг ашиглах боломжтой болно."</string>
<string name="requesting_server" msgid="5832565605998634370">"Апп хүсэлт гаргасан серверийг %s гэж таниулсан гэхдээ та энэ апп-д зөвхөн итгэж байгаа тохиолдолд л сертификатад хандалт хийх эрхийг өгөөрэй."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Та %1$s эсхүл %2$s өргөтгэлтэй гадаад хадгалах санд байрласан PKCS#12 файлаас сертификатуудыг суулгаж болно."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Суулгах"</string>
- <string name="allow_button" msgid="5340501035618157678">"Зөвшөөрөх"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Сертификат суулгах"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Сонгох"</string>
<string name="deny_button" msgid="3766539809121892584">"Татгалзах"</string>
</resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 2d6bfad..27de709 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"%s अॅप एका प्रमाणपत्राची विनंती करत आहे. एक प्रमाणपत्र निवडणे या अॅपला या सर्व्हरसह आता आणि भविष्यात ही ओळख वापरू देईल."</string>
<string name="requesting_server" msgid="5832565605998634370">"अॅपने विनंती केलेल्या सर्व्हरला %s म्हणून ओळखले आहे, परंतु आपला अॅपवर विश्वास असल्यास आपण अॅपला केवळ प्रमाणपत्रामध्ये प्रवेश द्यावा."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"आपण अतिरिक्त संचयनामध्ये स्थित %1$s किंवा %2$s विस्तारासह एका PKCS#12 फाईलवरुन प्रमाणपत्र स्थापित करु शकता."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"स्थापित करा"</string>
- <string name="allow_button" msgid="5340501035618157678">"अनुमती द्या"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"प्रमाणपत्र स्थापित करा"</string>
+ <string name="allow_button" msgid="3030990695030371561">"निवडा"</string>
<string name="deny_button" msgid="3766539809121892584">"नकार द्या"</string>
</resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 5fd5cf8..48ef504 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"Apl %s telah meminta sijil. Memilih sijil akan membenarkan apl menggunakan identiti ini dengan pelayan sekarang dan pada masa hadapan."</string>
<string name="requesting_server" msgid="5832565605998634370">"Apl ini telah mengenal pasti pelayan yang meminta sebagai %s, tapi anda hanya patut memberi apl akses kepada sijil hanya jika anda mempercayai apl itu."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Anda boleh memasang sijil daripada fail PKCS#12 dengan sambungan %1$s atau %2$s yang terletak dalam storan luaran."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Pasang"</string>
- <string name="allow_button" msgid="5340501035618157678">"Benarkan"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Pasang sijil"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Pilih"</string>
<string name="deny_button" msgid="3766539809121892584">"Nafikan"</string>
</resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 59d2dd4..a05cd3a 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -19,10 +19,10 @@
<string name="app_name" msgid="170210454004696382">"သော့တွဲ"</string>
<string name="title_no_certs" msgid="8350009443064722873">"အသိအမှတ်ပြုလက်မှတ်မတွေ့ပါ"</string>
<string name="title_select_cert" msgid="3588447616418041699">"အသိအမှတ်ပြုလက်မှတ် ရွေးချယ်ရန်"</string>
- <string name="requesting_application" msgid="1589142627467598421">"အပလီကေးရှင်း %s သည် အသိအမှတ်ပြုလက်မှတ် တောင်းခံနေပါသည်။ အသိအမှတ်ပြုလက်မှတ် ရွေးချယ်လိုက်ခြင်းအားဖြင့် ယခုနှင့် နောင်အနာဂတ်တွင် အပလီကေးရှင်းကို ဆာဗာများနှင့် ချိတ်ဆက်ရာတွင် အထောက်အထားဖြင့် သုံးစွဲနိုင်သည်။"</string>
+ <string name="requesting_application" msgid="1589142627467598421">"အက်ပ်%s သည် အသိအမှတ်ပြုလက်မှတ် တောင်းခံနေပါသည်။ အသိအမှတ်ပြုလက်မှတ် ရွေးချယ်လိုက်ခြင်းအားဖြင့် ယခုနှင့် နောင်အနာဂတ်တွင် အက်ပ်ကို ဆာဗာများနှင့် ချိတ်ဆက်ရာတွင် အထောက်အထားဖြင့် သုံးစွဲနိုင်သည်။"</string>
<string name="requesting_server" msgid="5832565605998634370">"အပလီကေးရှင်းသည် တောင်းဆိုလာသောဆာဗာကို %sအနေဖြင့် ဖော်ပြသည်။ သို့သော် သင်သည် အပလီကေးရှင်းကို ယုံကြည်မှသာ သုံးစွဲရန် ခွင့်ပြုသင့်သည်။"</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"အသိအမှတ်ပြုလက်မှတ်များကို ပြင်ပ သိုလှောင်ရာများမှာရှိသော %1$s သို့မဟုတ် %2$s ဖိုင်နောက်ဆက်တွဲပါသော PKCS#12 ဖိုင် များမှ ထည့်သွင်းနိုင်သည်။"</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"ထည့်သွင်းရန်"</string>
- <string name="allow_button" msgid="5340501035618157678">"ခွင့်ပြုသည်"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"အသိအမှတ်ပြုလက်မှတ်ကို ထည့်သွင်းရန်"</string>
+ <string name="allow_button" msgid="3030990695030371561">"ရွေးရန်"</string>
<string name="deny_button" msgid="3766539809121892584">"ငြင်းပယ်ရန်"</string>
</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 41e9ec9..520407b 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"Appen %s etterspør sertifikat. Når du velger et sertifikat, kommer appen til å bruke denne identiteten overfor tjenere nå og i fremtiden."</string>
<string name="requesting_server" msgid="5832565605998634370">"Appen har identifisert tjeneren som etterspør informasjon, som %s, men du må bare gi appen adgang til sertifikatet dersom du anser den som pålitelig."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Du kan installere sertifikater fra en PKCS#12-fil med %1$s eller %2$s-utvidelse lagret på ekstern lagring."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Installer"</string>
- <string name="allow_button" msgid="5340501035618157678">"Tillat"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Installer sertifikat"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Velg"</string>
<string name="deny_button" msgid="3766539809121892584">"Avslå"</string>
</resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 40f4311..6aff71b 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"अनुप्रयोग %s ले एक प्रमाणपत्र अनुरोध गरेको छ। प्रमाणपत्र रोज्नाले अनुप्रयोगलाई यस पहिचान सर्भरका साथ अहिले र भविष्यमा प्रयोग गर्न मद्दत पुर्याउँछ।"</string>
<string name="requesting_server" msgid="5832565605998634370">"अनुप्रयोगले %s को अनुरोध सर्भरलाई चिन्यो तर यदि तपाईँ अनुप्रयोगलाई विश्वास गर्नुहुन्छ भने तपाईँ प्रमाणपत्रलाई मात्र अनुप्रयोग पहुँच दिन सक्नु हुन्छ।"</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"तपाइँले प्रमाणपत्रहरू बाह्य भण्डारणमा अवस्थित %1$s वा एक %2$s विस्तारका साथ PKCS#12 फाइलबाट स्थापना गर्न सक्नुहुन्छ।"</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"स्थापना गर्नुहोस्"</string>
- <string name="allow_button" msgid="5340501035618157678">"अनुमति दिनुहोस्"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"प्रमाणपत्र स्थापना गर्नुहोस्"</string>
+ <string name="allow_button" msgid="3030990695030371561">"चयन गर्नुहोस्"</string>
<string name="deny_button" msgid="3766539809121892584">"अस्वीकार गर्नुहोस्"</string>
</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 036a53c..1c6f9cb 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"De app %s heeft een certificaat aangevraagd. Door een certificaat te kiezen, kan de app deze identiteit nu en in de toekomst gebruiken voor servers."</string>
<string name="requesting_server" msgid="5832565605998634370">"De app heeft de aanvragende server geïdentificeerd als %s, maar je moet de app alleen toegang tot het certificaat geven als je de app vertrouwt."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Je kunt certificaten installeren uit een PKCS#12-bestand met de extensie %1$s of %2$s dat zich bevindt in de externe opslag."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Installeren"</string>
- <string name="allow_button" msgid="5340501035618157678">"Toestaan"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Certificaat installeren"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Selecteren"</string>
<string name="deny_button" msgid="3766539809121892584">"Weigeren"</string>
</resources>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index 13a5de9..ca2309f 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"ਐਪ %s ਨੇ ਇੱਕ ਸਰਟੀਫਿਕੇਟ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਹੈ। ਇੱਕ ਸਰਟੀਫਿਕੇਟ ਚੁਣਨ ਨਾਲ ਇਹ ਐਪ ਨੂੰ ਹੁਣ ਅਤੇ ਭਵਿੱਖ ਵਿੱਚ ਸਰਵਰਾਂ ਨਾਲ ਇਹ ਪਛਾਣ ਵਰਤਣ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।"</string>
<string name="requesting_server" msgid="5832565605998634370">"ਐਪ ਨੇ ਬੇਨਤੀ ਕਰਨ ਵਾਲੇ ਸਰਵਰ ਦੀ ਪਛਾਣ %s ਦੇ ਤੌਰ ਤੇ ਕੀਤੀ ਹੈ, ਪਰੰਤੂ ਤੁਹਾਨੂੰ ਐਪ ਨੂੰ ਸਰਟੀਫਿਕੇਟ ਤੱਕ ਕੇਵਲ ਤਾਂ ਹੀ ਪਹੁੰਚ ਦੇਣੀ ਚਾਹੀਦੀ ਹੈ ਜੇਕਰ ਤੁਸੀਂ ਐਪ ਤੇ ਭਰੋਸਾ ਕਰਦੇ ਹੋ।"</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"ਤੁਸੀਂ ਬਾਹਰੀ ਸਟੋਰੇਜ ਵਿੱਚ ਸਥਿਤ ਇੱਕ %1$s ਜਾਂ ਇੱਕ %2$s ਐਕਸਟੈਂਸ਼ਨ ਨਾਲ ਇੱਕ PKCS#12 ਫਾਈਲ ਵਿੱਚੋਂ ਸਰਟੀਫਿਕੇਟ ਇੰਸੌਟਲ ਕਰ ਸਕਦੇ ਹੋ।"</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"ਇੰਸਟੌਲ ਕਰੋ"</string>
- <string name="allow_button" msgid="5340501035618157678">"ਆਗਿਆ ਦਿਓ"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"ਪ੍ਰਮਾਣ-ਪੱਤਰ ਸਥਾਪਤ ਕਰੋ"</string>
+ <string name="allow_button" msgid="3030990695030371561">"ਚੁਣੋ"</string>
<string name="deny_button" msgid="3766539809121892584">"ਅਸਵੀਕਾਰ ਕਰੋ"</string>
</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index e002f57..a790f99 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"Aplikacja %s prosi o certyfikat. Wybranie certyfikatu umożliwi aplikacji używanie tej tożsamości na serwerach zarówno teraz, jak i w przyszłości."</string>
<string name="requesting_server" msgid="5832565605998634370">"Aplikacja zidentyfikowała serwer żądający jako %s, ale dostęp do certyfikatu należy przyznać tylko zaufanej aplikacji."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Możesz zainstalować certyfikaty z pliku PKCS#12 z rozszerzeniem %1$s lub %2$s, który znajduje się w pamięci zewnętrznej."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Zainstaluj"</string>
- <string name="allow_button" msgid="5340501035618157678">"Zezwól"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Zainstaluj certyfikat"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Wybierz"</string>
<string name="deny_button" msgid="3766539809121892584">"Odmów"</string>
</resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 4db4d20..9eb1c83 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"O app %s solicitou um certificado. A escolha de um certificado permitirá que o app use esta identidade com os servidores de agora em diante."</string>
<string name="requesting_server" msgid="5832565605998634370">"O app identificou o servidor da solicitação como %s, mas você só deve permitir o acesso ao certificado caso confie no app."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Você pode instalar certificados a partir de um arquivo PKCS#12 com a extensão %1$s ou %2$s armazenado externamente."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Instalar"</string>
- <string name="allow_button" msgid="5340501035618157678">"Permitir"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Instalar certificado"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Selecionar"</string>
<string name="deny_button" msgid="3766539809121892584">"Negar"</string>
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 445a0f7..4bf30d4 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"A aplicação %s solicitou um certificado. Selecionar um certificado irá permitir que a aplicação utilize esta identidade, agora e no futuro, junto dos servidores."</string>
<string name="requesting_server" msgid="5832565605998634370">"A aplicação identificou o servidor solicitador como %s, mas apenas deve permitir que a aplicação aceda ao certificado se confiar na mesma."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Pode instalar certificados a partir de um ficheiro PKCS#12 com uma extensão %1$s ou %2$s localizada no armazenamento externo."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Instalar"</string>
- <string name="allow_button" msgid="5340501035618157678">"Permitir"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Instalar certificado"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Selecionar"</string>
<string name="deny_button" msgid="3766539809121892584">"Recusar"</string>
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 4db4d20..9eb1c83 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"O app %s solicitou um certificado. A escolha de um certificado permitirá que o app use esta identidade com os servidores de agora em diante."</string>
<string name="requesting_server" msgid="5832565605998634370">"O app identificou o servidor da solicitação como %s, mas você só deve permitir o acesso ao certificado caso confie no app."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Você pode instalar certificados a partir de um arquivo PKCS#12 com a extensão %1$s ou %2$s armazenado externamente."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Instalar"</string>
- <string name="allow_button" msgid="5340501035618157678">"Permitir"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Instalar certificado"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Selecionar"</string>
<string name="deny_button" msgid="3766539809121892584">"Negar"</string>
</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index cc9c3b4..5b6fc44 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -19,10 +19,10 @@
<string name="app_name" msgid="170210454004696382">"Key Chain"</string>
<string name="title_no_certs" msgid="8350009443064722873">"Nu au fost găsite certificate"</string>
<string name="title_select_cert" msgid="3588447616418041699">"Alegeți un certificat"</string>
- <string name="requesting_application" msgid="1589142627467598421">"Aplicaţia %s a solicitat un certificat. Alegerea unui certificat va permite aplicației să utilizeze această identitate în relația sa cu serverele, acum și în viitor."</string>
- <string name="requesting_server" msgid="5832565605998634370">"Aplicaţia a identificat serverul solicitant drept %s, dar ar trebui să acordați aplicației acces la certificat numai dacă aveți încredere în aceasta."</string>
+ <string name="requesting_application" msgid="1589142627467598421">"Aplicația %s a solicitat un certificat. Alegerea unui certificat va permite aplicației să utilizeze această identitate în relația sa cu serverele, acum și în viitor."</string>
+ <string name="requesting_server" msgid="5832565605998634370">"Aplicația a identificat serverul solicitant drept %s, dar ar trebui să acordați aplicației acces la certificat numai dacă aveți încredere în aceasta."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Puteți instala certificate dintr-un fișier PKCS#12 cu o extensie %1$s sau %2$s care se află pe stocarea externă."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Instalaţi"</string>
- <string name="allow_button" msgid="5340501035618157678">"Permiteți"</string>
- <string name="deny_button" msgid="3766539809121892584">"Refuzaţi"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Instalați certificatul"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Selectați"</string>
+ <string name="deny_button" msgid="3766539809121892584">"Refuzați"</string>
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index e4c1000..ab090cf 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"Приложение %s запросило сертификат. Выберите сертификат, чтобы разрешить приложению использовать это удостоверение для серверов сейчас и в будущем."</string>
<string name="requesting_server" msgid="5832565605998634370">"Приложение идентифицировало запрашивающий сервер как %s, но вы должны предоставлять доступ к сертификату только доверенным приложениям."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Можно установить сертификаты из файла PKCS#12 с расширением %1$s или %2$s, который находится во внешнем хранилище."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Установить"</string>
- <string name="allow_button" msgid="5340501035618157678">"Разрешить"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Установить сертификат"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Выбрать"</string>
<string name="deny_button" msgid="3766539809121892584">"Отклонить"</string>
</resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index d2638c2..6ee4dbe 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"%s යෙදුම සහතිකයක් අයැදුම් කර ඇත. සහතික පත්රයක් තෝරාගැනීමෙන් යෙදුමට එම අනන්යයතාවය සේවාදායක සමඟ දැන් සහ අනාගතයේ භාවිතා කිරීමට ඉඩ දෙනු ඇත."</string>
<string name="requesting_server" msgid="5832565605998634370">"යෙදුම ඉල්ලීම් කරන සේවාදායකය %s ලෙස හඳුනාගෙන ඇත, එහෙත් ඔබ යෙදුමට සහතිකය සඳහා ප්රවේශය ලබා දිය යුත්තේ ඔබ යෙදුම විශ්වාස කරන්නේ නම් පමණි."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"ඔබට බාහිර ආචයනයේ පිහිටුවා ඇති %1$s හෝ %2$s දිගුවක් සහිත PKCS#12 ගොනුවකින් සහතික ස්ථාපනය කළ හැක."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"ස්ථාපනය"</string>
- <string name="allow_button" msgid="5340501035618157678">"අවසර දෙන්න"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"සහතිකය ස්ථාපනය කරන්න"</string>
+ <string name="allow_button" msgid="3030990695030371561">"තෝරන්න"</string>
<string name="deny_button" msgid="3766539809121892584">"තහනම්"</string>
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 8653e73..0c72df8 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"Aplikácia %s vyžaduje certifikát. Výberom certifikátu umožníte aplikácii používať príslušnú identitu na serveroch teraz aj v budúcnosti."</string>
<string name="requesting_server" msgid="5832565605998634370">"Aplikácia rozpoznala, že požiadavka bola odoslaná zo servera %s. Prístup k certifikátu by ste jej však mali poskytnúť iba v prípade, že jej dôverujete."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Certifikáty môžete inštalovať zo súboru PKCS#12 s príponou %1$s alebo %2$s, umiestneného v externom úložisku."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Inštalovať"</string>
- <string name="allow_button" msgid="5340501035618157678">"Povoliť"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Inštalovať certifikát"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Vybrať"</string>
<string name="deny_button" msgid="3766539809121892584">"Zamietnuť"</string>
</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index be18ddf..d388d20 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -19,10 +19,10 @@
<string name="app_name" msgid="170210454004696382">"Shramba poverilnic"</string>
<string name="title_no_certs" msgid="8350009443064722873">"Potrdil ni mogoče najti"</string>
<string name="title_select_cert" msgid="3588447616418041699">"Izberite potrdilo"</string>
- <string name="requesting_application" msgid="1589142627467598421">"Aplikacija %s je zahtevala potrdilo. Če izberete potrdilo, boste aplikaciji omogočili uporabo te identitete s strežniki zdaj in v prihodnosti."</string>
- <string name="requesting_server" msgid="5832565605998634370">"Aplikacija je zahtevajoči strežnik prepoznala kot %s, vendar ji dostop do potrdila dovolite le, če ji zaupate."</string>
- <string name="install_new_cert_message" msgid="4451971501142085495">"Namestite lahko potrdila iz datoteke PKCS#12 z razširitvijo %1$s ali %2$s, ki je v zunanjem pomnilniku."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Namesti"</string>
- <string name="allow_button" msgid="5340501035618157678">"Dovoli"</string>
+ <string name="requesting_application" msgid="1589142627467598421">"Aplikacija %s je zahtevala potrdilo. Če izberete potrdilo, boste aplikaciji omogočili uporabo te identitete v strežnikih zdaj in v prihodnje."</string>
+ <string name="requesting_server" msgid="5832565605998634370">"Aplikacija je strežnik, ki je poslal zahtevo, prepoznala kot %s, vendar ji dostop do potrdila dovolite le, če ji zaupate."</string>
+ <string name="install_new_cert_message" msgid="4451971501142085495">"Namestite lahko potrdila iz datoteke PKCS#12 s pripono %1$s ali %2$s, ki je v zunanji shrambi."</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Namestitev potrdila"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Izberi"</string>
<string name="deny_button" msgid="3766539809121892584">"Zavrni"</string>
</resources>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index c214919..224bbc5 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"Aplikacioni \"%s\" ka kërkuar një certifikatë, pajisja me të cilën i mundëson atij lejekalimin me serverët, tani dhe në të ardhmen."</string>
<string name="requesting_server" msgid="5832565605998634370">"Aplikacioni ka identifikuar serverin kërkues %s, por qasja e tij në certifikatë varet vetëm nga ti: nëse i beson apo jo këtij aplikacioni."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Mund të instalosh certifikata nga skedari PKCS#12 që gjendet në hapësirën e jashtme ruajtëse, vetëm nëse ato bartin prapashtesat %1$s ose %2$s."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Instalo"</string>
- <string name="allow_button" msgid="5340501035618157678">"Lejo"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Instalo certifikatën"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Zgjidh"</string>
<string name="deny_button" msgid="3766539809121892584">"Refuzo"</string>
</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 5402cb4..8f7a26c 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"Апликација %s је захтевала сертификат. Ако одаберете сертификат, дозволићете апликацији да сада и убудуће користи овај идентитет приликом комуникације са серверима."</string>
<string name="requesting_server" msgid="5832565605998634370">"Апликација је идентификовала сервер који је упутио захтев као %s, али би приступ сертификату требало да јој одобрите само ако сматрате да је поуздана."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Можете да инсталирате сертификате из PKCS#12 датотеке са екстензијом %1$s или %2$s који се налази у спољној меморији."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Инсталирај"</string>
- <string name="allow_button" msgid="5340501035618157678">"Дозволи"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Инсталирај сертификат"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Изабери"</string>
<string name="deny_button" msgid="3766539809121892584">"Одбиј"</string>
</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index b9a9508..90fdea4 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"Appen %s har begärt ett certifikat. Om du väljer ett certifikat används detta som identitet gentemot servrar nu och framgent."</string>
<string name="requesting_server" msgid="5832565605998634370">"Servern för förfrågan har identifierats som %s, men ge bara appen åtkomst till certifikatet om du litar på appen."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Du kan installera certifikat från en PKCS#12-fil med filändelsen %1$s eller %2$s på en extern lagringsenhet."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Installera"</string>
- <string name="allow_button" msgid="5340501035618157678">"Tillåt"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Installera certifikat"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Välj"</string>
<string name="deny_button" msgid="3766539809121892584">"Neka"</string>
</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index fa08917..87cbba2 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -26,7 +26,7 @@
<!-- no translation found for requesting_server (5832565605998634370) -->
<skip />
<string name="install_new_cert_message" msgid="4451971501142085495">"Unaweza kusakinisha vyeti kutoka katika faili PKCS#12 kwa kirefusho %1$s au %2$s kilicho katika hifadhi ya nje."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Weka"</string>
- <string name="allow_button" msgid="5340501035618157678">"Ruhusu"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Sakinisha cheti"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Chagua"</string>
<string name="deny_button" msgid="3766539809121892584">"Kana"</string>
</resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index f0f70eb..566323c 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"%s பயன்பாடானது சான்றிதழைக் கோரியுள்ளது. சான்றிதழைத் தேர்வுசெய்வது, பயன்பாடு இந்த அடையாளத்தைச் சேவையகங்களுடன் இப்போதும், எதிர்காலத்திலும் பயன்படுத்த அனுமதிக்கும்."</string>
<string name="requesting_server" msgid="5832565605998634370">"பயன்பாடானது, கோரப்படும் சேவையகத்தை %s ஆக அடையாளம் கண்டுள்ளது, நீங்கள் பயன்பாட்டை நம்பினால் மட்டுமே, பயன்பாட்டிற்குச் சான்றிதழ் அணுகலை வழங்கவும்."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"வெளிப்புறச் சேமிப்பிடத்தில் உள்ள %1$s அல்லது %2$s நீட்டிப்புடன் PKCS#12 கோப்பிலிருந்து நீங்கள் சான்றிதழ்களை நிறுவலாம்."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"நிறுவு"</string>
- <string name="allow_button" msgid="5340501035618157678">"அனுமதி"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"சான்றிதழை நிறுவு"</string>
+ <string name="allow_button" msgid="3030990695030371561">"தேர்ந்தெடு"</string>
<string name="deny_button" msgid="3766539809121892584">"நிராகரி"</string>
</resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 4c26b32..aadaa04 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"అనువర్తనం %s ప్రమాణపత్రాన్ని అభ్యర్థించింది. ప్రమాణపత్రాన్ని ఎంచుకోవడం వలన ఇప్పుడు మరియు భవిష్యత్తులో సర్వర్లతో ఈ గుర్తింపును ఉపయోగించడానికి అనువర్తనం అనుమతించబడుతుంది."</string>
<string name="requesting_server" msgid="5832565605998634370">"అనువర్తనం అభ్యర్థిస్తున్న సర్వర్ను %sగా గుర్తించింది, కానీ మీరు అనువర్తనాన్ని విశ్వసిస్తే మాత్రమే ప్రమాణపత్రం కోసం అనువర్తనానికి ప్రాప్యతను అందించాలి."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"మీరు బాహ్య నిల్వలో ఉండే %1$s లేదా %2$s పొడిగింపుతో PKCS#12 ఫైల్ నుండి ప్రమాణపత్రాలను ఇన్స్టాల్ చేయవచ్చు."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"ఇన్స్టాల్ చేయి"</string>
- <string name="allow_button" msgid="5340501035618157678">"అనుమతించు"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"ప్రమాణపత్రాన్ని ఇన్స్టాల్ చేయి"</string>
+ <string name="allow_button" msgid="3030990695030371561">"ఎంచుకోండి"</string>
<string name="deny_button" msgid="3766539809121892584">"తిరస్కరించు"</string>
</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index e77f19f..2be27c8 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"แอปพลิเคชัน %s ได้ขอใบรับรอง การเลือกใบรับรองจะช่วยให้แอปพลิเคชันสามารถ ใช้ข้อมูลระบุตัวตนนี้กับเซิร์ฟเวอร์ทั้งในขณะนี้ และในอนาคตได้"</string>
<string name="requesting_server" msgid="5832565605998634370">"แอปพลิเคชันได้ระบุชี้เซิร์ฟเวอร์ที่ร้องขอว่าเป็น %s แต่คุณควรจะให้สิทธิ์แก่แอปพลิเคชันในการเข้าถึงใบรับรองต่อเมื่อคุณเชื่อถือแอปพลิเคชันนั้นเท่านั้น"</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"คุณสามารถติดตั้งใบรับรองจากไฟล์ PKCS#12 ที่มีนามสกุล %1$s หรือ %2$s ที่อยู่ในที่จัดเก็บข้อมูลภายนอก"</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"ติดตั้ง"</string>
- <string name="allow_button" msgid="5340501035618157678">"อนุญาต"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"ติดตั้งใบรับรอง"</string>
+ <string name="allow_button" msgid="3030990695030371561">"เลือก"</string>
<string name="deny_button" msgid="3766539809121892584">"ปฏิเสธ"</string>
</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 955681b..92caf1b 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -21,8 +21,8 @@
<string name="title_select_cert" msgid="3588447616418041699">"Pumili ng certificate"</string>
<string name="requesting_application" msgid="1589142627467598421">"Humiling ng certificate ang app na %s. Bibigyang-daan ng pagpili ng certificate ang app na magamit ang pagkakakilanlang ito sa mga server ngayon at sa hinaharap."</string>
<string name="requesting_server" msgid="5832565605998634370">"Natukoy ng app ang humihiling na server bilang %s, ngunit dapat mo lang bigyan ng access sa certificate ang app kung pinagkakatiwalaan mo ang app."</string>
- <string name="install_new_cert_message" msgid="4451971501142085495">"Maaari kang mag-install ng mga certificate mula sa isang PKCS#12 file na may %1$s o %2$s na extension na matatagpuan sa panlabas na storage."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"I-install"</string>
- <string name="allow_button" msgid="5340501035618157678">"Payagan"</string>
+ <string name="install_new_cert_message" msgid="4451971501142085495">"Maaari kang mag-install ng mga certificate mula sa isang PKCS#12 file na may %1$s o %2$s na extension na matatagpuan sa external storage."</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Mag-install ng certificate"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Piliin"</string>
<string name="deny_button" msgid="3766539809121892584">"Tanggihan"</string>
</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 75e0b1c..3460324 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"%s uygulaması sertifika isteğinde bulundu. Sertifika seçmek, uygulamanın şimdi ve gelecekte sunucularla iletişiminde bu kimliği kullanmasını sağlar."</string>
<string name="requesting_server" msgid="5832565605998634370">"Uygulama, istekte bulunan sunucuyu %s olarak tanımladı, ancak sertifikaya erişim iznini sadece uygulamaya güveniyorsanız vermelisiniz."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Sertifikaları harici depolama biriminde bulunan %1$s veya %2$s uzantılı bir PKCS#12 dosyasından yükleyebilirsiniz."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Yükle"</string>
- <string name="allow_button" msgid="5340501035618157678">"İzin ver"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Sertifika yükle"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Seç"</string>
<string name="deny_button" msgid="3766539809121892584">"Reddet"</string>
</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index c635acd..3f19c18 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"Додаток %s надіслав запит на сертифікат. Вибір сертифіката дозволить цьому додатку використовувати цю ідентифікацію на серверах зараз і в майбутньому."</string>
<string name="requesting_server" msgid="5832565605998634370">"Ця програма визначила сервер надсилання запиту як %s, однак надавайте програмі доступ до сертифіката, лише якщо довіряєте цій програмі."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Можна встановлювати сертифікати з файлу PKCS#12 із розширенням %1$s або %2$s, розміщеного в зовнішній пам’яті."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Установити"</string>
- <string name="allow_button" msgid="5340501035618157678">"Дозволити"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Установити сертифікат"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Вибрати"</string>
<string name="deny_button" msgid="3766539809121892584">"Заборонити"</string>
</resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 8c08fd9..5746276 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"ایپ %s نے ایک سرٹیفکیٹ کی درخواست کی ہے۔ ایک سرٹیفکیٹ منتخب کرنے سے ایپ ابھی اور مستقبل میں سرورز کے ساتھ اس شناخت کا استعمال کر سکے گی۔"</string>
<string name="requesting_server" msgid="5832565605998634370">"ایپ نے درخواست کرنے والے سرور کی %s کے بطور شناخت کی ہے، لیکن آپ کو سرٹیفکیٹ تک ایپ کو رسائی صرف تبھی دینی چاہیے جب آپ ایپ پر بھروسہ کرتے ہوں۔"</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"آپ بیرونی اسٹوریج میں موجود ایک %1$s یا %2$s ایکسٹنشن کے ساتھ ایک PKCS#12 فائل سے سرٹیفکیٹس انسٹال کر سکتے ہیں۔"</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"انسٹال کریں"</string>
- <string name="allow_button" msgid="5340501035618157678">"اجازت دیں"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"سرٹیفکیٹ انسٹال کریں"</string>
+ <string name="allow_button" msgid="3030990695030371561">"منتخب کریں"</string>
<string name="deny_button" msgid="3766539809121892584">"رد کریں"</string>
</resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index e9485ab..b26a1e6 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"%s ilovasi sertifikat so‘radi. Sertifikatni tanlash ilovaga sertifikat guvohnomasi bilan serverlarga hozir va keyinchalik kirishiga ruxsat beradi."</string>
<string name="requesting_server" msgid="5832565605998634370">"Ilova so‘ralayotgan serverni %s sifatida aniqladi. Lekin ilovaga sertifikatga ruxsat faqatgina ushbu ilovaga ishonganda berilishi lozim."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Sertifikatlarni tashqi xotirada joylashgan %1$s yoki %2$s kengaytmali PKCS#12 faylidan o‘rnatishingiz mumkin."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"O‘rnatish"</string>
- <string name="allow_button" msgid="5340501035618157678">"Ruxsat berish"</string>
- <string name="deny_button" msgid="3766539809121892584">"Rad qilish"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Sertifikat o‘rnatish"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Tanlash"</string>
+ <string name="deny_button" msgid="3766539809121892584">"Rad etish"</string>
</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 23152be..72d455f 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"Ứng dụng %s đã yêu cầu chứng chỉ. Việc chọn chứng chỉ sẽ cho phép ứng dụng sử dụng danh tính này với máy chủ tại lúc này và trong tương lai."</string>
<string name="requesting_server" msgid="5832565605998634370">"Ứng dụng đã xác định máy chủ yêu cầu là %s nhưng bạn chỉ nên cho phép ứng dụng truy cập vào chứng chỉ nếu bạn tin tưởng ứng dụng."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Bạn có thể cài đặt chứng chỉ từ tệp PKCS#12 với tiện ích mở rộng %1$s hoặc %2$s nằm trong bộ nhớ ngoài."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Cài đặt"</string>
- <string name="allow_button" msgid="5340501035618157678">"Cho phép"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Cài đặt chứng chỉ"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Chọn"</string>
<string name="deny_button" msgid="3766539809121892584">"Từ chối"</string>
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index a6a8b0a..56ec1e9 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"应用“%s”请求使用证书。选择一个证书可让该应用现在和将来对服务器使用此身份凭证。"</string>
<string name="requesting_server" msgid="5832565605998634370">"该应用已将请求服务器标识为“%s”，您只应向信任的应用授予使用证书的权限。"</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"您可以安装PKCS#12文件（位于外部存储设备中且扩展名为%1$s或%2$s）中的证书。"</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"安装"</string>
- <string name="allow_button" msgid="5340501035618157678">"允许"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"安装证书"</string>
+ <string name="allow_button" msgid="3030990695030371561">"选择"</string>
<string name="deny_button" msgid="3766539809121892584">"拒绝"</string>
</resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index d509f48..25cd038 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"應用程式「%s」已提出憑證要求。選擇憑證即可讓應用程式今後在伺服器上使用這個身分。"</string>
<string name="requesting_server" msgid="5832565605998634370">"應用程式已識別提出要求的伺服器為「%s」。除非您信任應用程式，否則請勿允許應用程式存取憑證。"</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"您可以從外部儲存裝置中副檔名為 %1$s 或 %2$s 的 PKCS#12 檔案安裝憑證。"</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"安裝"</string>
- <string name="allow_button" msgid="5340501035618157678">"允許"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"安裝憑證"</string>
+ <string name="allow_button" msgid="3030990695030371561">"選取"</string>
<string name="deny_button" msgid="3766539809121892584">"拒絕"</string>
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 2f0813f..610b804 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"應用程式「%s」已提出憑證要求。選擇憑證即可讓應用程式今後在伺服器上使用這個身分。"</string>
<string name="requesting_server" msgid="5832565605998634370">"應用程式已將提出要求的伺服器視為「%s」。除非您信任應用程式，否則請勿允許應用程式存取憑證。"</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"您可以從外部儲存裝置中含有 %1$s 或 %2$s 擴充功能的 PKCS#12 檔案安裝憑證。"</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"安裝"</string>
- <string name="allow_button" msgid="5340501035618157678">"允許"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"安裝憑證"</string>
+ <string name="allow_button" msgid="3030990695030371561">"選取"</string>
<string name="deny_button" msgid="3766539809121892584">"拒絕"</string>
</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 42486c8..2c11c29 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -22,7 +22,7 @@
<string name="requesting_application" msgid="1589142627467598421">"Lolu hlelo lokusebenza %s licele isitifiketi. Ukukhetha isitifiketi kuzovumela uhlelo lokusebenza ukusebenzisa ubunikazi namaseva manje nangokuzayo."</string>
<string name="requesting_server" msgid="5832565605998634370">"Uhlelo lokusebenza libone iseva ecelayo njenge-%s, kepha kufanele unike uhlelo ukufinyelela esitifiketini uma uthemba uhlelo lokusebenza."</string>
<string name="install_new_cert_message" msgid="4451971501142085495">"Ungafaka izitifiketi kusuka efayeleni le-PKCS#12 ngesandiso se-%1$s noma se-%2$s esibekwe esilondolozini sangaphandle."</string>
- <string name="install_new_cert_button_label" msgid="510732745267546907">"Faka"</string>
- <string name="allow_button" msgid="5340501035618157678">"Vumela"</string>
+ <string name="install_new_cert_button_label" msgid="903474285774077171">"Faka isitifiketi"</string>
+ <string name="allow_button" msgid="3030990695030371561">"Khetha"</string>
<string name="deny_button" msgid="3766539809121892584">"Nqaba"</string>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
new file mode 100644
index 0000000..6a11f35
--- /dev/null
+++ b/res/values/dimens.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+* Copyright (C) 2016 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.
+*/
+-->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+ <!-- Distance between a radio button and the label referring to it. -->
+ <dimen name="radio_label_padding">10dp</dimen>
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 166555c..b1a8df6 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -32,10 +32,10 @@
<string name="install_new_cert_message">You can install certificates from a PKCS#12 file with a %1$s or a %2$s extension located in external storage.</string>
<!-- Label of button to send the user to the CertInstaller to install a certificate -->
- <string name="install_new_cert_button_label">Install</string>
+ <string name="install_new_cert_button_label">Install certificate</string>
- <!-- Label of button to send the allow the application certificate request -->
- <string name="allow_button">Allow</string>
+ <!-- Label of button to select the certificate and allow the application certificate request -->
+ <string name="allow_button">Select</string>
<!-- Label of button to send the deny the application certificate request -->
<string name="deny_button">Deny</string>
diff --git a/src/com/android/keychain/KeyChainActivity.java b/src/com/android/keychain/KeyChainActivity.java
index b5058b2..3fd4a13 100644
--- a/src/com/android/keychain/KeyChainActivity.java
+++ b/src/com/android/keychain/KeyChainActivity.java
@@ -17,7 +17,6 @@
package com.android.keychain;
import android.app.Activity;
-import android.app.ActivityManagerNative;
import android.app.admin.IDevicePolicyManager;
import android.app.AlertDialog;
import android.app.Dialog;
@@ -207,24 +206,6 @@
private void displayCertChooserDialog(final CertificateAdapter adapter) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
- TextView contextView = (TextView) View.inflate(this, R.layout.cert_chooser_header, null);
- View footer = View.inflate(this, R.layout.cert_chooser_footer, null);
-
- final ListView lv = (ListView) View.inflate(this, R.layout.cert_chooser, null);
- lv.addHeaderView(contextView, null, false);
- lv.addFooterView(footer, null, false);
- lv.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
- lv.setAdapter(adapter);
- builder.setView(lv);
-
- lv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-
- public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
- lv.setItemChecked(position, true);
- adapter.notifyDataSetChanged();
- }
- });
-
boolean empty = adapter.mAliases.isEmpty();
int negativeLabel = empty ? android.R.string.cancel : R.string.deny_button;
builder.setNegativeButton(negativeLabel, new DialogInterface.OnClickListener() {
@@ -234,40 +215,71 @@
});
String title;
+ int selectedItem = -1;
Resources res = getResources();
if (empty) {
title = res.getString(R.string.title_no_certs);
} else {
title = res.getString(R.string.title_select_cert);
String alias = getIntent().getStringExtra(KeyChain.EXTRA_ALIAS);
+
if (alias != null) {
// if alias was requested, set it if found
int adapterPosition = adapter.mAliases.indexOf(alias);
if (adapterPosition != -1) {
- int listViewPosition = adapterPosition+1;
- lv.setItemChecked(listViewPosition, true);
+ // increase by 1 to account for item 0 being the header.
+ selectedItem = adapterPosition + 1;
}
} else if (adapter.mAliases.size() == 1) {
// if only one choice, preselect it
- int adapterPosition = 0;
- int listViewPosition = adapterPosition+1;
- lv.setItemChecked(listViewPosition, true);
+ selectedItem = 1;
}
builder.setPositiveButton(R.string.allow_button, new DialogInterface.OnClickListener() {
@Override public void onClick(DialogInterface dialog, int id) {
- int listViewPosition = lv.getCheckedItemPosition();
- int adapterPosition = listViewPosition-1;
- String alias = ((adapterPosition >= 0)
- ? adapter.getItem(adapterPosition)
- : null);
- finish(alias);
+ if (dialog instanceof AlertDialog) {
+ ListView lv = ((AlertDialog) dialog).getListView();
+ int listViewPosition = lv.getCheckedItemPosition();
+ int adapterPosition = listViewPosition-1;
+ String alias = ((adapterPosition >= 0)
+ ? adapter.getItem(adapterPosition)
+ : null);
+ finish(alias);
+ } else {
+ Log.wtf(TAG, "Expected AlertDialog, got " + dialog, new Exception());
+ finish(null);
+ }
}
});
}
builder.setTitle(title);
- final Dialog dialog = builder.create();
+ builder.setSingleChoiceItems(adapter, selectedItem, null);
+ final AlertDialog dialog = builder.create();
+ // Show text above and below the list to explain what the certificate will be used for,
+ // and how to install another one, respectively.
+ TextView contextView = (TextView) View.inflate(this, R.layout.cert_chooser_header, null);
+
+ final ListView lv = dialog.getListView();
+ lv.addHeaderView(contextView, null, false);
+ lv.addFooterView(View.inflate(this, R.layout.cert_install, null));
+ lv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+ public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+ if (position == 0) {
+ // Header. Just text; ignore clicks.
+ return;
+ } else if (position == adapter.getCount() + 1) {
+ // Footer. Remove dialog so that we will recreate with possibly new content
+ // after install returns.
+ dialog.dismiss();
+ Credentials.getInstance().install(KeyChainActivity.this);
+ } else {
+ dialog.getButton(DialogInterface.BUTTON_POSITIVE).setEnabled(true);
+ lv.setItemChecked(position, true);
+ adapter.notifyDataSetChanged();
+ }
+ }
+ });
// getTargetPackage guarantees that the returned string is
// supplied by the system, so that an application can not
@@ -295,21 +307,14 @@
}
contextView.setText(contextMessage);
- String installMessage = String.format(res.getString(R.string.install_new_cert_message),
- Credentials.EXTENSION_PFX, Credentials.EXTENSION_P12);
- TextView installText = (TextView) footer.findViewById(R.id.cert_chooser_install_message);
- installText.setText(installMessage);
-
- Button installButton = (Button) footer.findViewById(R.id.cert_chooser_install_button);
- installButton.setOnClickListener(new View.OnClickListener() {
- @Override public void onClick(View v) {
- // remove dialog so that we will recreate with
- // possibly new content after install returns
- dialog.dismiss();
- Credentials.getInstance().install(KeyChainActivity.this);
- }
- });
-
+ if (selectedItem == -1) {
+ dialog.setOnShowListener(new DialogInterface.OnShowListener() {
+ @Override
+ public void onShow(DialogInterface dialogInterface) {
+ dialog.getButton(DialogInterface.BUTTON_POSITIVE).setEnabled(false);
+ }
+ });
+ }
dialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
@Override public void onCancel(DialogInterface dialog) {
finish(null);
diff --git a/src/com/android/keychain/KeyChainService.java b/src/com/android/keychain/KeyChainService.java
index 1d21fe5..d312d27 100644
--- a/src/com/android/keychain/KeyChainService.java
+++ b/src/com/android/keychain/KeyChainService.java
@@ -16,6 +16,7 @@
package com.android.keychain;
+import android.app.BroadcastOptions;
import android.app.IntentService;
import android.content.ContentValues;
import android.content.Context;
@@ -27,6 +28,7 @@
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
import android.os.Binder;
+import android.os.Build;
import android.os.IBinder;
import android.os.Process;
import android.os.UserHandle;
@@ -151,7 +153,8 @@
} catch (CertificateException e) {
throw new IllegalStateException(e);
}
- broadcastStorageChange();
+ broadcastLegacyStorageChange();
+ broadcastTrustStoreChange();
}
/**
@@ -198,7 +201,8 @@
return false;
}
}
- broadcastStorageChange();
+ broadcastKeychainChange();
+ broadcastLegacyStorageChange();
return true;
}
@@ -208,7 +212,8 @@
return false;
}
removeGrantsForAlias(alias);
- broadcastStorageChange();
+ broadcastKeychainChange();
+ broadcastLegacyStorageChange();
return true;
}
@@ -232,7 +237,8 @@
}
}
}
- broadcastStorageChange();
+ broadcastTrustStoreChange();
+ broadcastLegacyStorageChange();
return ok;
}
@@ -243,7 +249,8 @@
synchronized (mTrustedCertificateStore) {
ok = deleteCertificateEntry(alias);
}
- broadcastStorageChange();
+ broadcastTrustStoreChange();
+ broadcastLegacyStorageChange();
return ok;
}
@@ -289,7 +296,8 @@
@Override public void setGrant(int uid, String alias, boolean value) {
checkSystemCaller();
setGrantInternal(mDatabaseHelper.getWritableDatabase(), uid, alias, value);
- broadcastStorageChange();
+ broadcastPermissionChange(uid, alias, value);
+ broadcastLegacyStorageChange();
}
private ParceledListSlice<ParcelableString> makeAliasesParcelableSynchronised(
@@ -465,9 +473,36 @@
}
}
- private void broadcastStorageChange() {
+ private void broadcastLegacyStorageChange() {
Intent intent = new Intent(KeyChain.ACTION_STORAGE_CHANGED);
- sendBroadcastAsUser(intent, new UserHandle(UserHandle.myUserId()));
+ BroadcastOptions opts = BroadcastOptions.makeBasic();
+ opts.setMaxManifestReceiverApiLevel(Build.VERSION_CODES.N_MR1);
+ sendBroadcastAsUser(intent, UserHandle.of(UserHandle.myUserId()), null, opts.toBundle());
}
+ private void broadcastKeychainChange() {
+ Intent intent = new Intent(KeyChain.ACTION_KEYCHAIN_CHANGED);
+ sendBroadcastAsUser(intent, UserHandle.of(UserHandle.myUserId()));
+ }
+
+ private void broadcastTrustStoreChange() {
+ Intent intent = new Intent(KeyChain.ACTION_TRUST_STORE_CHANGED);
+ sendBroadcastAsUser(intent, UserHandle.of(UserHandle.myUserId()));
+ }
+
+ private void broadcastPermissionChange(int uid, String alias, boolean access) {
+ // Since the permission change only impacts one uid only send to that uid's packages.
+ final PackageManager packageManager = getPackageManager();
+ String[] packages = packageManager.getPackagesForUid(uid);
+ if (packages == null) {
+ return;
+ }
+ for (String pckg : packages) {
+ Intent intent = new Intent(KeyChain.ACTION_KEY_ACCESS_CHANGED);
+ intent.putExtra(KeyChain.EXTRA_KEY_ALIAS, alias);
+ intent.putExtra(KeyChain.EXTRA_KEY_ACCESSIBLE, access);
+ intent.setPackage(pckg);
+ sendBroadcastAsUser(intent, UserHandle.of(UserHandle.myUserId()));
+ }
+ }
}