Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/KeyChain into cm-13.0staging/cm-13.0+r22

Android 6.0.1 release 22

14 files changed, 22 insertions, 104 deletions

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 3425e34..058b305 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -19,8 +19,8 @@
     <string name="app_name" msgid="170210454004696382">"Clauer"</string>
     <string name="title_no_certs" msgid="8350009443064722873">"No s\'ha trobat cap certificat"</string>
     <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="requesting_application" msgid="1589142627467598421">"L\'aplicació %s ha sol·licitat un certificat. Si es tria un certificat es permetrà que l\'aplicació pugui 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 hauries de donar-li accés 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>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index b542a87..fc479e9 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -19,7 +19,7 @@
     <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>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 7d28eff..0163c98 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/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">"‏با یک افرونه %2$s یا %1$s واقع در حافظه خارجی می‌توانید مجوزهارا از یک فایل PKCS#12 نصب کنید."</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 یا a %2$s واقع در حافظه خارجی نصب کنید."</string>
     <string name="install_new_cert_button_label" msgid="510732745267546907">"نصب"</string>
     <string name="allow_button" msgid="5340501035618157678">"مجاز است"</string>
-    <string name="deny_button" msgid="3766539809121892584">"اجازه ندارد"</string>
+    <string name="deny_button" msgid="3766539809121892584">"رد کردن"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index e88955e..f5ca147 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -21,7 +21,9 @@
     <string name="title_select_cert" msgid="3588447616418041699">"Choisir un certificat"</string>
     <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.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="deny_button" msgid="3766539809121892584">"Refuser"</string>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
deleted file mode 100644
index c57e423..0000000
--- a/res/values-gu-rIN/strings.xml
+++ /dev/null
@@ -1,28 +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.
- -->
-
-<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_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="deny_button" msgid="3766539809121892584">"નકારો"</string>
-</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 2a05a49..d766846 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -19,7 +19,7 @@
     <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 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_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>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 2c2f80d..8cf5847 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -19,8 +19,8 @@
     <string name="app_name" msgid="170210454004696382">"Key Chain"</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">"‏ניתן להתקין אישורים מקובץ PKCS#12 עם סיומת %1$s או %2$s הממוקם באחסון חיצוני."</string>
     <string name="install_new_cert_button_label" msgid="510732745267546907">"התקן"</string>
     <string name="allow_button" msgid="5340501035618157678">"אפשר"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 5fd5cf8..ece5d02 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -19,9 +19,9 @@
     <string name="app_name" msgid="170210454004696382">"Rantaian Utama"</string>
     <string name="title_no_certs" msgid="8350009443064722873">"Tiada sijil dijumpai"</string>
     <string name="title_select_cert" msgid="3588447616418041699">"Pilih sijil"</string>
-    <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_application" msgid="1589142627467598421">"Apl %s telah meminta sijil. Memilih sijil akan membenarkan apl menggunakan identiti ini dengan pelayan sekarang dan di 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_message" msgid="4451971501142085495">"Anda boleh memasang sijil dari 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="deny_button" msgid="3766539809121892584">"Nafikan"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 036a53c..128b052 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -20,8 +20,8 @@
     <string name="title_no_certs" msgid="8350009443064722873">"Geen certificaten gevonden"</string>
     <string name="title_select_cert" msgid="3588447616418041699">"Certificaat kiezen"</string>
     <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="requesting_server" msgid="5832565605998634370">"De app heeft de aanvragende server geïdentificeerd als %s, maar u moet de app alleen toegang tot het certificaat geven als u de app vertrouwt."</string>
+    <string name="install_new_cert_message" msgid="4451971501142085495">"U 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="deny_button" msgid="3766539809121892584">"Weigeren"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
deleted file mode 100644
index 4db4d20..0000000
--- a/res/values-pt-rBR/strings.xml
+++ /dev/null
@@ -1,28 +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.
- -->
-
-<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">"Chaveiro"</string>
-    <string name="title_no_certs" msgid="8350009443064722873">"Nenhum certificado encontrado"</string>
-    <string name="title_select_cert" msgid="3588447616418041699">"Escolher certificado"</string>
-    <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="deny_button" msgid="3766539809121892584">"Negar"</string>
-</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 1cf30cb..636d1f7 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -19,8 +19,8 @@
     <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>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index e4c1000..c1d14b1 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -20,7 +20,7 @@
     <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_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>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
deleted file mode 100644
index c214919..0000000
--- a/res/values-sq-rAL/strings.xml
+++ /dev/null
@@ -1,28 +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.
- -->
-
-<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">"Zinxhiri kyç"</string>
-    <string name="title_no_certs" msgid="8350009443064722873">"Nuk u gjet asnjë certifikatë"</string>
-    <string name="title_select_cert" msgid="3588447616418041699">"Zgjidh certifikatën"</string>
-    <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="deny_button" msgid="3766539809121892584">"Refuzo"</string>
-</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index c635acd..ded6c07 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -19,7 +19,7 @@
     <string name="app_name" msgid="170210454004696382">"Key Chain"</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>