diff --git a/res/values-be-rBY/strings.xml b/res/values-be-rBY/strings.xml
deleted file mode 100644
index d99aa54..0000000
--- a/res/values-be-rBY/strings.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 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="9095072584761066851">"Усталёўшчык сертыфікатаў"</string>
-    <string name="pick_file_title" msgid="4481949485108233297">"Выбар сертыфіката"</string>
-    <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Выманне сертыфікату"</string>
-    <string name="extracting_pkcs12" msgid="1881267738821799771">"Выманне..."</string>
-    <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Выпіска з %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Дайце назву сертыфікату"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Назва сертыфіката:"</string>
-    <string name="credential_password" msgid="3520176519550993326">"Увядзіце пароль, каб атрымаць сертыфікаты."</string>
-    <string name="credential_info" msgid="2436768402308470397">"Пакет змяшчае:"</string>
-    <string name="p12_description" msgid="4128352087331630024">"Сертыфікаты ў сховішчы ключоў PKCS12."</string>
-    <string name="one_userkey" msgid="3500697912370644881">"адзін ключ карыстальніка"</string>
-    <string name="one_usercrt" msgid="7690798336332403106">"адзін сертыфікат карыстальніка"</string>
-    <string name="one_cacrt" msgid="2667950425420663146">"адзін сертыфікат ЦС"</string>
-    <string name="n_cacrts" msgid="2141498640685639208">"Сертыфікаты ЦС: %d"</string>
-    <string name="password_error" msgid="2042471639556516356">"Увядзіце правільны пароль."</string>
-    <string name="password_empty_error" msgid="591713406761723025">"Увядзіце пароль."</string>
-    <string name="name_empty_error" msgid="3808800768660110354">"Увядзіце назву."</string>
-    <string name="name_char_error" msgid="3176618568784938968">"Увядзіце імя, якое змяшчае толькі літары і лічбы."</string>
-    <string name="unable_to_save_cert" msgid="9178604087335389686">"Немагчыма захаваць сертыфікат. Сховішча ўліковых дадзеных не ўключана або няправільна ініцыялізавана."</string>
-    <string name="cert_not_saved" msgid="4037698479662830270">"Сертыфікат не ўсталяваны."</string>
-    <string name="no_cert_to_saved" msgid="5708884372817309068">"Няма сертыфіката для ўсталявання."</string>
-    <string name="invalid_cert" msgid="7704228670980743590">"Сертыфікат несапраўдны."</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"Усталяваны <xliff:g id="CREDENTIAL">%s</xliff:g>."</string>
-    <string name="cert_too_large_error" msgid="8715414972725646285">"Не атрымлiваецца ўсталяваць, таму што памер сертыфiката занадта вялікі."</string>
-    <string name="cert_missing_error" msgid="7040527352278728220">"Не атрымлiваецца ўсталяваць, таму што немагчыма размясцiць файл сертыфіката."</string>
-    <string name="cert_read_error" msgid="7353463360652419796">"Не атрымлiваецца ўсталяваць, таму што немагчыма прачытаць файл сертыфіката."</string>
-    <string name="no_cert_file_found" product="nosdcard" msgid="3555332946357131929">"Сертыфікат не знойдзены ва USB-назапашвальнiку."</string>
-    <string name="no_cert_file_found" product="default" msgid="1942077544887243999">"На SD-карце не знойдзены файл сертыфіката."</string>
-    <string name="sdcard_not_present" product="nosdcard" msgid="9197143240492611196">"USB-назапашвальнiк адсутнічае."</string>
-    <string name="sdcard_not_present" product="default" msgid="3866952732541932947">"SD-карта не знойдзена."</string>
-    <string name="only_primary_user_allowed" msgid="4005084935023047716">"Сертыфiкаты можа ўсталёўваць толькi ўладальнiк гэтай прылады."</string>
-    <string name="credential_usage_label" msgid="1513892208033156805">"Выкарыстанне ўліковых дадзеных:"</string>
-  <string-array name="credential_usage">
-    <item msgid="375085478373011304">"VPN і праграмы"</item>
-    <item msgid="692322974985472861">"Wi-Fi"</item>
-  </string-array>
-    <string name="wifi_title" msgid="8475811746333426489">"Профіль Wi-Fi"</string>
-    <string name="wifi_detail_title" msgid="3627332137252994395">"Падрабязнасці для %s"</string>
-    <string name="wifi_detail_label" msgid="3032151019356747583">"Падрабязнасці"</string>
-    <string name="wifi_install_label" msgid="1449629407724323233">"Усталяваць"</string>
-    <string name="wifi_installing_label" msgid="8387393993627129025">"Усталёўка"</string>
-    <string name="wifi_cancel_label" msgid="1328748037608392134">"Скасаваць"</string>
-    <string name="wifi_dismiss_label" msgid="1916684434873972698">"Адхіліць"</string>
-    <string name="wifi_no_config" msgid="1835743123288916755">"Няма"</string>
-    <string name="wifi_config_text" msgid="8259587306773310314">"Імя: %1$s\nFQDN: %2$s\nРоўмінг-кансорцыумы: %3$s\nВобласць дзеяння: %4$s\nСпосаб аўтэнтыфікацыі: EAP-%5$s\n"</string>
-    <string name="wifi_ttls_config_text" msgid="2002413183253872168">"Імя карыстальніка: %s\n"</string>
-    <string name="wifi_tls_config_text" msgid="9062328536640168510">"Кліенцкі сертыфікат:\n%1$s\nКлюч: %2$s\n"</string>
-    <string name="wifi_sim_config_text" msgid="1666019954520831840">"SIM-карта: %s\n"</string>
-    <string name="wifi_trust_config_text" msgid="5916047381475747783">"Давераны сертыфікат:\n%s\n"</string>
-    <string name="install_done_title" msgid="4822989918460334497">"Уліковыя даныя ўсталяваны"</string>
-    <string name="install_done" msgid="1522718684172097080">"Уліковыя даныя <xliff:g id="NAME">%1$s</xliff:g> былі дададзены да захаваных сетак Wi-Fi."</string>
-    <string name="done_label" msgid="5597425930652904250">"ГАТОВА"</string>
-    <string name="wifi_installer_detail" msgid="63879632832701669">"Усталюйце ўліковыя даныя Wi-Fi для падлучэння да сеткі, даступнай праз <xliff:g id="NAME">%1$s</xliff:g>."</string>
-    <string name="wifi_installer_download_error" msgid="5429453090956277692">"У спампаванага файла маюцца праблемы, яго нельга ўсталяваць. Пераканайцеся, што вы спампавалі файл з правільнай крыніцы."</string>
-    <string name="wifi_installer_fail" msgid="894483173306576331">"Не ўдаецца ўсталяваць уліковыя даныя Wi-Fi. Паспрабуйце яшчэ раз спампаваць файл."</string>
-    <string name="wifi_installer_fail_no_wifi_title" msgid="8358191074828840533">"Усталёўка скасавана"</string>
-    <string name="wifi_installer_fail_title" msgid="5547079779067835479">"Не ўдаецца ўсталяваць"</string>
-    <string name="wifi_installer_fail_no_wifi" msgid="2044576439984209921">"Уключыце Wi-Fi і паспрабуйце яшчэ раз."</string>
-</resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 2f6d975..98ba539 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -50,9 +50,9 @@
     <string name="credential_usage_label" msgid="1513892208033156805">"প্রমাণপত্রাদির ব্যবহার:"</string>
   <string-array name="credential_usage">
     <item msgid="375085478373011304">"VPN এবং অ্যাপ্লিকেশানগুলি"</item>
-    <item msgid="692322974985472861">"ওয়াই-ফাই"</item>
+    <item msgid="692322974985472861">"Wi-Fi"</item>
   </string-array>
-    <string name="wifi_title" msgid="8475811746333426489">"ওয়াই-ফাই প্রোফাইল"</string>
+    <string name="wifi_title" msgid="8475811746333426489">"Wi-Fi প্রোফাইল"</string>
     <string name="wifi_detail_title" msgid="3627332137252994395">"%s এর বিশদ বিবরণ"</string>
     <string name="wifi_detail_label" msgid="3032151019356747583">"বিশদ বিবরণ"</string>
     <string name="wifi_install_label" msgid="1449629407724323233">"ইনস্টল করুন"</string>
@@ -66,12 +66,12 @@
     <string name="wifi_sim_config_text" msgid="1666019954520831840">"SIM: %s\n"</string>
     <string name="wifi_trust_config_text" msgid="5916047381475747783">"ট্রাস্টের শংসাপত্র:\n%s\n"</string>
     <string name="install_done_title" msgid="4822989918460334497">"শংসাপত্রগুলি ইনস্টল করা হয়েছে"</string>
-    <string name="install_done" msgid="1522718684172097080">"ওয়াই-ফাই এর সংরক্ষিত নেটওয়ার্কগুলিতে <xliff:g id="NAME">%1$s</xliff:g> শংসাপত্রগুলি সংরক্ষণ করা হয়েছে৷"</string>
+    <string name="install_done" msgid="1522718684172097080">"Wi-Fi এর সংরক্ষিত নেটওয়ার্কগুলিতে <xliff:g id="NAME">%1$s</xliff:g> শংসাপত্রগুলি সংরক্ষণ করা হয়েছে৷"</string>
     <string name="done_label" msgid="5597425930652904250">"সম্পন্ন"</string>
-    <string name="wifi_installer_detail" msgid="63879632832701669">"<xliff:g id="NAME">%1$s</xliff:g> এর মাধ্যমে উপলব্ধ নেটওয়ার্কেগুলিতে সংযুক্ত করতে ওয়াই-ফাই শংসাপত্রগুলি ইনস্টল করুন৷"</string>
+    <string name="wifi_installer_detail" msgid="63879632832701669">"<xliff:g id="NAME">%1$s</xliff:g> এর মাধ্যমে উপলব্ধ নেটওয়ার্কেগুলিতে সংযুক্ত করতে Wi-Fi শংসাপত্রগুলি ইনস্টল করুন৷"</string>
     <string name="wifi_installer_download_error" msgid="5429453090956277692">"ডাউনলোড করা ফাইলে কিছু সমস্যা রয়েছে এবং ইনস্টল করা যাবে না৷ আপনি সঠিক উৎস থেকে ফাইলটি ডাউনলোড করেছেন কিনা নিশ্চিত করুন৷"</string>
-    <string name="wifi_installer_fail" msgid="894483173306576331">"ওয়াই-ফাই শংসাপত্রগুলি ইনস্টল করা যাবে না৷ ফাইলটি পুনরায় ডাউনলোড করার চেষ্টা করুন৷"</string>
+    <string name="wifi_installer_fail" msgid="894483173306576331">"Wi-Fi শংসাপত্রগুলি ইনস্টল করা যাবে না৷ ফাইলটি পুনরায় ডাউনলোড করার চেষ্টা করুন৷"</string>
     <string name="wifi_installer_fail_no_wifi_title" msgid="8358191074828840533">"ইনস্টলেশন বাতিল হয়েছে"</string>
     <string name="wifi_installer_fail_title" msgid="5547079779067835479">"ইনস্টল করতে পারবেন না"</string>
-    <string name="wifi_installer_fail_no_wifi" msgid="2044576439984209921">"ওয়াই-ফাই চালু করুন এবং আবার চেষ্টা করুন।"</string>
+    <string name="wifi_installer_fail_no_wifi" msgid="2044576439984209921">"Wi-Fi চালু করুন এবং আবার চেষ্টা করুন।"</string>
 </resources>
diff --git a/res/values-bs-rBA/strings.xml b/res/values-bs-rBA/strings.xml
deleted file mode 100644
index c8e5dbc..0000000
--- a/res/values-bs-rBA/strings.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 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="9095072584761066851">"Alat za instaliranje certifikata"</string>
-    <string name="pick_file_title" msgid="4481949485108233297">"Odaberite certifikat"</string>
-    <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Izdvoji certifikat"</string>
-    <string name="extracting_pkcs12" msgid="1881267738821799771">"Izdvajanje..."</string>
-    <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Izdvoji iz %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Unesite naziv certifikata"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Naziv certifikata:"</string>
-    <string name="credential_password" msgid="3520176519550993326">"Unesite lozinku za izdvajanje certifikata."</string>
-    <string name="credential_info" msgid="2436768402308470397">"Paket sadrži:"</string>
-    <string name="p12_description" msgid="4128352087331630024">"Certifikati u bazi ključeva PKCS12."</string>
-    <string name="one_userkey" msgid="3500697912370644881">"jedan korisnički ključ"</string>
-    <string name="one_usercrt" msgid="7690798336332403106">"jedan certifikat korisnika"</string>
-    <string name="one_cacrt" msgid="2667950425420663146">"jedan CA certifikat"</string>
-    <string name="n_cacrts" msgid="2141498640685639208">"%d CA certifikati"</string>
-    <string name="password_error" msgid="2042471639556516356">"Unesite ispravnu lozinku."</string>
-    <string name="password_empty_error" msgid="591713406761723025">"Unesite lozinku."</string>
-    <string name="name_empty_error" msgid="3808800768660110354">"Unesite ime."</string>
-    <string name="name_char_error" msgid="3176618568784938968">"Unesite ime koje sadrži samo slova i brojeve."</string>
-    <string name="unable_to_save_cert" msgid="9178604087335389686">"Certifikat nije spremljen. Pohranjivanje akreditiva nije omogućeno niti ispravno pokrenuto."</string>
-    <string name="cert_not_saved" msgid="4037698479662830270">"Certifikat nije instaliran."</string>
-    <string name="no_cert_to_saved" msgid="5708884372817309068">"Nema certifikata za instalaciju."</string>
-    <string name="invalid_cert" msgid="7704228670980743590">"Certifikat je nevažeći."</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"Certifikat <xliff:g id="CREDENTIAL">%s</xliff:g> je instaliran."</string>
-    <string name="cert_too_large_error" msgid="8715414972725646285">"Instalacija je prekinuta jer je certifikat prevelik."</string>
-    <string name="cert_missing_error" msgid="7040527352278728220">"Instalacija je prekinuta jer fajl u kojem je pohranjen certifikat nije pronađen."</string>
-    <string name="cert_read_error" msgid="7353463360652419796">"Instalacija je prekinuta jer fajl u kojem je pohranjen certifikat nije očitan."</string>
-    <string name="no_cert_file_found" product="nosdcard" msgid="3555332946357131929">"Fajl u kojem je pohranjen certifikat nije pronađen na USB pohrani."</string>
-    <string name="no_cert_file_found" product="default" msgid="1942077544887243999">"Fajl u kojem je pohranjen certifikat nije pronađen na SD kartici."</string>
-    <string name="sdcard_not_present" product="nosdcard" msgid="9197143240492611196">"USB pohrana nije dostupna."</string>
-    <string name="sdcard_not_present" product="default" msgid="3866952732541932947">"SD kartica nije pronađena."</string>
-    <string name="only_primary_user_allowed" msgid="4005084935023047716">"Samo vlasnik ovog uređaja može instalirati certifikate."</string>
-    <string name="credential_usage_label" msgid="1513892208033156805">"Upotreba akreditiva:"</string>
-  <string-array name="credential_usage">
-    <item msgid="375085478373011304">"VPN i aplikacije"</item>
-    <item msgid="692322974985472861">"Wi-Fi"</item>
-  </string-array>
-    <string name="wifi_title" msgid="8475811746333426489">"Wi-Fi profil"</string>
-    <string name="wifi_detail_title" msgid="3627332137252994395">"Detalji za mrežu %s"</string>
-    <string name="wifi_detail_label" msgid="3032151019356747583">"Detalji"</string>
-    <string name="wifi_install_label" msgid="1449629407724323233">"Instaliraj"</string>
-    <string name="wifi_installing_label" msgid="8387393993627129025">"Instalira se"</string>
-    <string name="wifi_cancel_label" msgid="1328748037608392134">"Otkaži"</string>
-    <string name="wifi_dismiss_label" msgid="1916684434873972698">"Odbaci"</string>
-    <string name="wifi_no_config" msgid="1835743123288916755">"Ništa"</string>
-    <string name="wifi_config_text" msgid="8259587306773310314">"Naziv: %1$s\nPuno ime domene: %2$s\nKonzorcijumi za roming: %3$s\nImenovana oblast: %4$s\nMetoda provjere vjerodostojnosti: EAP-%5$s\n"</string>
-    <string name="wifi_ttls_config_text" msgid="2002413183253872168">"Korisničko ime: %s\n"</string>
-    <string name="wifi_tls_config_text" msgid="9062328536640168510">"Certifikat klijenta:\n%1$s\nKljuč: %2$s\n"</string>
-    <string name="wifi_sim_config_text" msgid="1666019954520831840">"SIM: %s\n"</string>
-    <string name="wifi_trust_config_text" msgid="5916047381475747783">"Pouzdani certifikat:\n%s\n"</string>
-    <string name="install_done_title" msgid="4822989918460334497">"Akreditivi su instalirani"</string>
-    <string name="install_done" msgid="1522718684172097080">"Akreditivi za <xliff:g id="NAME">%1$s</xliff:g> su dodani na sačuvane Wi-Fi mreže."</string>
-    <string name="done_label" msgid="5597425930652904250">"GOTOVO"</string>
-    <string name="wifi_installer_detail" msgid="63879632832701669">"Instalirajte akreditive za Wi-Fi da se povežete sa mrežama dostupnim preko <xliff:g id="NAME">%1$s</xliff:g>."</string>
-    <string name="wifi_installer_download_error" msgid="5429453090956277692">"Postoje problemi u preuzetom fajlu i ne može se instalirati. Provjerite da li ste preuzeli fajl iz ispravnog izvora."</string>
-    <string name="wifi_installer_fail" msgid="894483173306576331">"Nije uspjelo instaliranje Wi-Fi akreditiva. Pokušajte ponovo preuzeti fajl."</string>
-    <string name="wifi_installer_fail_no_wifi_title" msgid="8358191074828840533">"Instalacija je otkazana"</string>
-    <string name="wifi_installer_fail_title" msgid="5547079779067835479">"Instaliranje nije uspjelo"</string>
-    <string name="wifi_installer_fail_no_wifi" msgid="2044576439984209921">"Uključite Wi-Fi i pokušajte ponovo."</string>
-</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 35f053b..efbb1eb 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -34,7 +34,7 @@
     <string name="password_empty_error" msgid="591713406761723025">"Πληκτρολογήστε τον κωδικό πρόσβασης."</string>
     <string name="name_empty_error" msgid="3808800768660110354">"Πληκτρολογήστε ένα όνομα."</string>
     <string name="name_char_error" msgid="3176618568784938968">"Πληκτρολογήστε ένα όνομα που περιέχει μόνο γράμματα και αριθμούς."</string>
-    <string name="unable_to_save_cert" msgid="9178604087335389686">"Δεν ήταν δυνατή η αποθήκευση του πιστοποιητικού. Ο αποθηκευτικός χώρος διαπιστευτηρίων δεν είναι ενεργοποιημένος ή δεν έχει προετοιμαστεί σωστά."</string>
+    <string name="unable_to_save_cert" msgid="9178604087335389686">"Δεν ήταν δυνατή η αποθήκευση του πιστοποιητικού. Ο χώρος αποθήκευσης διαπιστευτηρίων δεν είναι ενεργοποιημένος ή δεν έχει προετοιμαστεί σωστά."</string>
     <string name="cert_not_saved" msgid="4037698479662830270">"Το πιστοποιητικό δεν έχει εγκατασταθεί."</string>
     <string name="no_cert_to_saved" msgid="5708884372817309068">"Δεν υπάρχει πιστοποιητικό προς εγκατάσταση."</string>
     <string name="invalid_cert" msgid="7704228670980743590">"Το πιστοποιητικό δεν είναι έγκυρο."</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 2a08c73..43e8cac 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -35,7 +35,7 @@
     <string name="name_empty_error" msgid="3808800768660110354">"Type a name."</string>
     <string name="name_char_error" msgid="3176618568784938968">"Type a name that contains only letters and numbers."</string>
     <string name="unable_to_save_cert" msgid="9178604087335389686">"Couldn\'t save the certificate. The credential storage isn\'t enabled or properly initialised."</string>
-    <string name="cert_not_saved" msgid="4037698479662830270">"Failed to install certificate."</string>
+    <string name="cert_not_saved" msgid="4037698479662830270">"The certificate is not installed."</string>
     <string name="no_cert_to_saved" msgid="5708884372817309068">"No certificate to install."</string>
     <string name="invalid_cert" msgid="7704228670980743590">"The certificate is invalid."</string>
     <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> is installed."</string>
@@ -67,7 +67,7 @@
     <string name="wifi_trust_config_text" msgid="5916047381475747783">"Trust certificate:\n%s\n"</string>
     <string name="install_done_title" msgid="4822989918460334497">"Credentials installed"</string>
     <string name="install_done" msgid="1522718684172097080">"<xliff:g id="NAME">%1$s</xliff:g> credentials have been added to Wi-Fi saved networks."</string>
-    <string name="done_label" msgid="5597425930652904250">"DONE"</string>
+    <string name="done_label" msgid="5597425930652904250">"FINISHED"</string>
     <string name="wifi_installer_detail" msgid="63879632832701669">"Install Wi-Fi credentials to connect to networks available via <xliff:g id="NAME">%1$s</xliff:g>."</string>
     <string name="wifi_installer_download_error" msgid="5429453090956277692">"Downloaded file has problems and can\'t be installed. Make sure that you have downloaded the file from the correct source."</string>
     <string name="wifi_installer_fail" msgid="894483173306576331">"Can\'t install Wi-Fi credentials. Try downloading the file again."</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 2a08c73..43e8cac 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -35,7 +35,7 @@
     <string name="name_empty_error" msgid="3808800768660110354">"Type a name."</string>
     <string name="name_char_error" msgid="3176618568784938968">"Type a name that contains only letters and numbers."</string>
     <string name="unable_to_save_cert" msgid="9178604087335389686">"Couldn\'t save the certificate. The credential storage isn\'t enabled or properly initialised."</string>
-    <string name="cert_not_saved" msgid="4037698479662830270">"Failed to install certificate."</string>
+    <string name="cert_not_saved" msgid="4037698479662830270">"The certificate is not installed."</string>
     <string name="no_cert_to_saved" msgid="5708884372817309068">"No certificate to install."</string>
     <string name="invalid_cert" msgid="7704228670980743590">"The certificate is invalid."</string>
     <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> is installed."</string>
@@ -67,7 +67,7 @@
     <string name="wifi_trust_config_text" msgid="5916047381475747783">"Trust certificate:\n%s\n"</string>
     <string name="install_done_title" msgid="4822989918460334497">"Credentials installed"</string>
     <string name="install_done" msgid="1522718684172097080">"<xliff:g id="NAME">%1$s</xliff:g> credentials have been added to Wi-Fi saved networks."</string>
-    <string name="done_label" msgid="5597425930652904250">"DONE"</string>
+    <string name="done_label" msgid="5597425930652904250">"FINISHED"</string>
     <string name="wifi_installer_detail" msgid="63879632832701669">"Install Wi-Fi credentials to connect to networks available via <xliff:g id="NAME">%1$s</xliff:g>."</string>
     <string name="wifi_installer_download_error" msgid="5429453090956277692">"Downloaded file has problems and can\'t be installed. Make sure that you have downloaded the file from the correct source."</string>
     <string name="wifi_installer_fail" msgid="894483173306576331">"Can\'t install Wi-Fi credentials. Try downloading the file again."</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 2a08c73..43e8cac 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -35,7 +35,7 @@
     <string name="name_empty_error" msgid="3808800768660110354">"Type a name."</string>
     <string name="name_char_error" msgid="3176618568784938968">"Type a name that contains only letters and numbers."</string>
     <string name="unable_to_save_cert" msgid="9178604087335389686">"Couldn\'t save the certificate. The credential storage isn\'t enabled or properly initialised."</string>
-    <string name="cert_not_saved" msgid="4037698479662830270">"Failed to install certificate."</string>
+    <string name="cert_not_saved" msgid="4037698479662830270">"The certificate is not installed."</string>
     <string name="no_cert_to_saved" msgid="5708884372817309068">"No certificate to install."</string>
     <string name="invalid_cert" msgid="7704228670980743590">"The certificate is invalid."</string>
     <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> is installed."</string>
@@ -67,7 +67,7 @@
     <string name="wifi_trust_config_text" msgid="5916047381475747783">"Trust certificate:\n%s\n"</string>
     <string name="install_done_title" msgid="4822989918460334497">"Credentials installed"</string>
     <string name="install_done" msgid="1522718684172097080">"<xliff:g id="NAME">%1$s</xliff:g> credentials have been added to Wi-Fi saved networks."</string>
-    <string name="done_label" msgid="5597425930652904250">"DONE"</string>
+    <string name="done_label" msgid="5597425930652904250">"FINISHED"</string>
     <string name="wifi_installer_detail" msgid="63879632832701669">"Install Wi-Fi credentials to connect to networks available via <xliff:g id="NAME">%1$s</xliff:g>."</string>
     <string name="wifi_installer_download_error" msgid="5429453090956277692">"Downloaded file has problems and can\'t be installed. Make sure that you have downloaded the file from the correct source."</string>
     <string name="wifi_installer_fail" msgid="894483173306576331">"Can\'t install Wi-Fi credentials. Try downloading the file again."</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 3880fb3..4a669dc 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -28,7 +28,7 @@
     <string name="p12_description" msgid="4128352087331630024">"Certificados del almacén de claves PKCS12"</string>
     <string name="one_userkey" msgid="3500697912370644881">"una clave de usuario"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"un certificado de usuario"</string>
-    <string name="one_cacrt" msgid="2667950425420663146">"un certificado de CA"</string>
+    <string name="one_cacrt" msgid="2667950425420663146">"un certificado CA"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d certificados de CA"</string>
     <string name="password_error" msgid="2042471639556516356">"Escribe la contraseña correcta."</string>
     <string name="password_empty_error" msgid="591713406761723025">"Escribe la contraseña."</string>
@@ -58,7 +58,7 @@
     <string name="wifi_install_label" msgid="1449629407724323233">"Instalar"</string>
     <string name="wifi_installing_label" msgid="8387393993627129025">"Instalando"</string>
     <string name="wifi_cancel_label" msgid="1328748037608392134">"Cancelar"</string>
-    <string name="wifi_dismiss_label" msgid="1916684434873972698">"Descartar"</string>
+    <string name="wifi_dismiss_label" msgid="1916684434873972698">"Aceptar"</string>
     <string name="wifi_no_config" msgid="1835743123288916755">"Ninguna"</string>
     <string name="wifi_config_text" msgid="8259587306773310314">"Nombre: %1$s\nFQDN: %2$s\nConsorcios de itinerancia: %3$s\nDominio: %4$s\nMétodo de autenticación: EAP-%5$s\n"</string>
     <string name="wifi_ttls_config_text" msgid="2002413183253872168">"Nombre de usuario: %s\n"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 9df336a..1494525 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -28,7 +28,7 @@
     <string name="p12_description" msgid="4128352087331630024">"Sertifikaadid PKCS12 võtmete andmebaasis."</string>
     <string name="one_userkey" msgid="3500697912370644881">"üks kasutajavõti"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"üks kasutaja sertifikaat"</string>
-    <string name="one_cacrt" msgid="2667950425420663146">"üks CA-sertifikaat"</string>
+    <string name="one_cacrt" msgid="2667950425420663146">"üks CA sertifikaat"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA sertifikaadid"</string>
     <string name="password_error" msgid="2042471639556516356">"Sisestage õige parool."</string>
     <string name="password_empty_error" msgid="591713406761723025">"Sisestage parool."</string>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 444fb8d..8f0b282 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -35,7 +35,7 @@
     <string name="name_empty_error" msgid="3808800768660110354">"Idatzi izena."</string>
     <string name="name_char_error" msgid="3176618568784938968">"Idatzi hizkiak eta zenbakiak soilik dituen izena."</string>
     <string name="unable_to_save_cert" msgid="9178604087335389686">"Ezin izan da ziurtagiria gorde. Kredentzialen biltegia ez dago gaituta edo ez da behar bezala abiarazi."</string>
-    <string name="cert_not_saved" msgid="4037698479662830270">"Ziurtagiria ez da instalatu."</string>
+    <string name="cert_not_saved" msgid="4037698479662830270">"Ziurtagiria ez dago instalatuta."</string>
     <string name="no_cert_to_saved" msgid="5708884372817309068">"Ez dago ziurtagiririk instalatzeko."</string>
     <string name="invalid_cert" msgid="7704228670980743590">"Ziurtagiriak ez du balio."</string>
     <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> instalatu da."</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index a7bc1a8..ccdd799 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -34,7 +34,7 @@
     <string name="password_empty_error" msgid="591713406761723025">"گذرواژه را تایپ کنید."</string>
     <string name="name_empty_error" msgid="3808800768660110354">"نامی تایپ کنید."</string>
     <string name="name_char_error" msgid="3176618568784938968">"نامی را که فقط شامل عدد و نویسه باشد تایپ کنید."</string>
-    <string name="unable_to_save_cert" msgid="9178604087335389686">"گواهی‌نامه ذخیره نشد. حافظه اطلاعات کاربری فعال نیست یا به‌درستی راه‌اندازی نشده است."</string>
+    <string name="unable_to_save_cert" msgid="9178604087335389686">"گواهی‌نامه ذخیره نشد. محل ذخیره اطلاعات کاربری فعال نیست یا به درستی راه‌اندازی نشده است."</string>
     <string name="cert_not_saved" msgid="4037698479662830270">"گواهی نصب نشده است."</string>
     <string name="no_cert_to_saved" msgid="5708884372817309068">"هیچ گواهی برای نصب موجود نیست."</string>
     <string name="invalid_cert" msgid="7704228670980743590">"مجوز نامعتبر است."</string>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index 193bfe8..9e8f428 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -49,7 +49,7 @@
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"માત્ર આ ઉપકરણના માલિક પ્રમાણપત્રો ઇન્સ્ટોલ કરી શકે છે."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"ઓળખપત્ર ઉપયોગ:"</string>
   <string-array name="credential_usage">
-    <item msgid="375085478373011304">"VPN અને ઍપ્લિકેશનો"</item>
+    <item msgid="375085478373011304">"VPN અને એપ્લિકેશનો"</item>
     <item msgid="692322974985472861">"Wi-Fi"</item>
   </string-array>
     <string name="wifi_title" msgid="8475811746333426489">"Wi-Fi પ્રોફાઇલ"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 0b55e24..8e3fe4c 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -25,7 +25,7 @@
     <skip />
     <string name="name_credential_dialog_title" msgid="277729846491554437">"Անվանեք վկայագիրը"</string>
     <string name="credential_name" msgid="1974979771369744378">"Վկայագրի անունը`"</string>
-    <string name="credential_password" msgid="3520176519550993326">"Մուտքագրեք գաղտնաբառը` հավաստագրերն արտածելու համար:"</string>
+    <string name="credential_password" msgid="3520176519550993326">"Մուտքագրեք գաղտնաբառը` վկայագրերն արտածելու համար:"</string>
     <string name="credential_info" msgid="2436768402308470397">"Փաթեթը պարունակում է`"</string>
     <string name="p12_description" msgid="4128352087331630024">"Վկայականներ PKCS12 բանալիների պահոցում:"</string>
     <string name="one_userkey" msgid="3500697912370644881">"մեկ օգտվողի բանալի"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index ca6b440..a86eacc 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -69,8 +69,8 @@
     <string name="install_done" msgid="1522718684172097080">"Kredensial <xliff:g id="NAME">%1$s</xliff:g> telah ditambahkan ke jaringan Wi-Fi yang tersimpan."</string>
     <string name="done_label" msgid="5597425930652904250">"SELESAI"</string>
     <string name="wifi_installer_detail" msgid="63879632832701669">"Pasang kredensial Wi-Fi untuk menyambungkan ke jaringan yang tersedia melalui <xliff:g id="NAME">%1$s</xliff:g>."</string>
-    <string name="wifi_installer_download_error" msgid="5429453090956277692">"File yang didownload bermasalah dan tidak dapat dipasang. Pastkan Anda mendownload file dari sumber yang benar."</string>
-    <string name="wifi_installer_fail" msgid="894483173306576331">"Tidak dapat memasang kredensial Wi-Fi. Coba download file lagi."</string>
+    <string name="wifi_installer_download_error" msgid="5429453090956277692">"File yang diunduh bermasalah dan tidak dapat dipasang. Pastkan Anda mengunduh file dari sumber yang benar."</string>
+    <string name="wifi_installer_fail" msgid="894483173306576331">"Tidak dapat memasang kredensial Wi-Fi. Coba unduh file lagi."</string>
     <string name="wifi_installer_fail_no_wifi_title" msgid="8358191074828840533">"Pemasangan dibatalkan"</string>
     <string name="wifi_installer_fail_title" msgid="5547079779067835479">"Tidak dapat memasang"</string>
     <string name="wifi_installer_fail_no_wifi" msgid="2044576439984209921">"Aktifkan Wi-Fi dan coba lagi."</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 132493b..32e165b 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -24,26 +24,26 @@
     <string name="name_credential_dialog_title" msgid="277729846491554437">"სერტიფიკატის დასახელება"</string>
     <string name="credential_name" msgid="1974979771369744378">"სერტიფიკატის სახელი:"</string>
     <string name="credential_password" msgid="3520176519550993326">"სერტიფიკატების ამოსაღებად აკრიფეთ პაროლი."</string>
-    <string name="credential_info" msgid="2436768402308470397">"პაკეტში შედის:"</string>
+    <string name="credential_info" msgid="2436768402308470397">"პაკეტი შეიცავს:"</string>
     <string name="p12_description" msgid="4128352087331630024">"სერთიფიკატები გასაღების საცავში PKCS12."</string>
     <string name="one_userkey" msgid="3500697912370644881">"მომხმარებლის ერთი გასაღები"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"გამოიყენეთ მომხმარებლის სერტიფიკატი"</string>
-    <string name="one_cacrt" msgid="2667950425420663146">"ერთი CA სერტიფიკატი"</string>
+    <string name="one_cacrt" msgid="2667950425420663146">"ერთი CA სერთიფიკატი"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA სერტიფიკატები"</string>
     <string name="password_error" msgid="2042471639556516356">"აკრიფეთ სწორი პაროლი."</string>
     <string name="password_empty_error" msgid="591713406761723025">"პაროლის აკრეფა."</string>
     <string name="name_empty_error" msgid="3808800768660110354">"შეიყვანეთ სახელი."</string>
     <string name="name_char_error" msgid="3176618568784938968">"დაბეჭდეთ  სახელი, რომელიც შეიცავს მხოლოდ ასოებსა და ციფრებს."</string>
     <string name="unable_to_save_cert" msgid="9178604087335389686">"სერთიფიკატის შენახვა ვერ მოხერხდა. ავტორიზაციის მონაცემთა საცავი არ არის გააქტიურებული ან სათანადოდ ინიცირებული."</string>
-    <string name="cert_not_saved" msgid="4037698479662830270">"სერტიფიკატი არ არის დაინსტალირებული."</string>
-    <string name="no_cert_to_saved" msgid="5708884372817309068">"არ არის დასაყენებელი სერტიფიკატი."</string>
+    <string name="cert_not_saved" msgid="4037698479662830270">"სერთიფიკატი არ არის დაინსტალირებული."</string>
+    <string name="no_cert_to_saved" msgid="5708884372817309068">"არ არის დასაყენებელი სერთიფიკატი."</string>
     <string name="invalid_cert" msgid="7704228670980743590">"სერტიფიკატი არასწორია."</string>
     <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> დაყენებულია."</string>
-    <string name="cert_too_large_error" msgid="8715414972725646285">"დაყენება ვერ მოხერხდა, რადგან სერტიფიკატი ზედმეტად დიდია."</string>
+    <string name="cert_too_large_error" msgid="8715414972725646285">"დაყენება ვერ მოხერხდა, რადგან სერთიფიკატი ზედმეტად დიდია."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"ვერ დაინსტალირდა, რადგანაც სერთიფიკატის ფაილის პოვნა ვერ მოხერხდა."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"ინსლატაცია ვერ განხორციელდა, რადგან სერტიფიკატის ფაილის წაკითხვა ვერ მოხერხდა."</string>
     <string name="no_cert_file_found" product="nosdcard" msgid="3555332946357131929">"USB მეხსიერებაში სერთიფიკატის ფაილი ვერ მოიძებნა."</string>
-    <string name="no_cert_file_found" product="default" msgid="1942077544887243999">"SD ბარათზე სერტიფიკატი ვერ მოიძებნა."</string>
+    <string name="no_cert_file_found" product="default" msgid="1942077544887243999">"SD ბარათზე სერთიფიკატი ვერ მოიძებნა."</string>
     <string name="sdcard_not_present" product="nosdcard" msgid="9197143240492611196">"USB მეხსიერება მიუწვდომელია."</string>
     <string name="sdcard_not_present" product="default" msgid="3866952732541932947">"SD ბარათი არ არის."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"მხოლოდ მოწყობილობის მფლობელს შეუძლია სერტიფიკატების ინსტალაცია."</string>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 2db4d41..57eddd8 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -47,9 +47,9 @@
     <string name="sdcard_not_present" product="nosdcard" msgid="9197143240492611196">"USB жады қол жетімсіз"</string>
     <string name="sdcard_not_present" product="default" msgid="3866952732541932947">"SD карта жоқ."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Осы құрылғының иесі ғана сертификаттарды орната алады."</string>
-    <string name="credential_usage_label" msgid="1513892208033156805">"Растау деректерін қолдану:"</string>
+    <string name="credential_usage_label" msgid="1513892208033156805">"Анықтамалық деректерді қолдану:"</string>
   <string-array name="credential_usage">
-    <item msgid="375085478373011304">"VPN және қолданбалар"</item>
+    <item msgid="375085478373011304">"Виртуалды жеке желі және қолданбалар"</item>
     <item msgid="692322974985472861">"Wi-Fi"</item>
   </string-array>
     <string name="wifi_title" msgid="8475811746333426489">"Wi-Fi профилі"</string>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 65e73c2..6073e2c 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -50,14 +50,14 @@
     <string name="credential_usage_label" msgid="1513892208033156805">"ರುಜುವಾತು ಬಳಕೆ:"</string>
   <string-array name="credential_usage">
     <item msgid="375085478373011304">"VPN ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</item>
-    <item msgid="692322974985472861">"ವೈ-ಫೈ"</item>
+    <item msgid="692322974985472861">"Wi-Fi"</item>
   </string-array>
     <string name="wifi_title" msgid="8475811746333426489">"ವೈ-ಫೈ ಪ್ರೊಫೈಲ್‌"</string>
     <string name="wifi_detail_title" msgid="3627332137252994395">"%s ಗೆ ವಿವರಗಳು"</string>
     <string name="wifi_detail_label" msgid="3032151019356747583">"ವಿವರಗಳು"</string>
     <string name="wifi_install_label" msgid="1449629407724323233">"ಸ್ಥಾಪಿಸು"</string>
     <string name="wifi_installing_label" msgid="8387393993627129025">"ಸ್ಥಾಪಿಸಲಾಗುತ್ತಿದೆ"</string>
-    <string name="wifi_cancel_label" msgid="1328748037608392134">"ರದ್ದುಮಾಡಿ"</string>
+    <string name="wifi_cancel_label" msgid="1328748037608392134">"ರದ್ದುಮಾಡು"</string>
     <string name="wifi_dismiss_label" msgid="1916684434873972698">"ವಜಾಗೊಳಿಸು"</string>
     <string name="wifi_no_config" msgid="1835743123288916755">"ಯಾವುದೂ ಇಲ್ಲ"</string>
     <string name="wifi_config_text" msgid="8259587306773310314">"ಹೆಸರು: %1$s\nFQDN: %2$s\nರೋಮಿಂಗ್‌ ಕನ್ಸೋರ್ಟಿಯಂಗಳು: %3$s\nಕ್ಷೇತ್ರ: %4$s\nದೃಢೀಕರಣ ವಿಧಾನ: EAP-%5$s\n"</string>
@@ -66,11 +66,11 @@
     <string name="wifi_sim_config_text" msgid="1666019954520831840">"ಸಿಮ್: %s\n"</string>
     <string name="wifi_trust_config_text" msgid="5916047381475747783">"ಟ್ರಸ್ಟ್ ಪ್ರಮಾಣಪತ್ರ:\n%s\n"</string>
     <string name="install_done_title" msgid="4822989918460334497">"ರುಜುವಾತುಗಳನ್ನು ಸ್ಥಾಪಿಸಲಾಗಿದೆ"</string>
-    <string name="install_done" msgid="1522718684172097080">"ವೈ-ಫೈ ಉಳಿಸಲಾದ ನೆಟ್‌ವರ್ಕ್‌ಗಳಿಗೆ <xliff:g id="NAME">%1$s</xliff:g> ರುಜುವಾತುಗಳನ್ನು ಸೇರಿಸಲಾಗಿದೆ."</string>
+    <string name="install_done" msgid="1522718684172097080">"Wi-Fi ಉಳಿಸಲಾದ ನೆಟ್‌ವರ್ಕ್‌ಗಳಿಗೆ <xliff:g id="NAME">%1$s</xliff:g> ರುಜುವಾತುಗಳನ್ನು ಸೇರಿಸಲಾಗಿದೆ."</string>
     <string name="done_label" msgid="5597425930652904250">"ಮುಗಿದಿದೆ"</string>
-    <string name="wifi_installer_detail" msgid="63879632832701669">"<xliff:g id="NAME">%1$s</xliff:g> ಮೂಲಕ ಲಭ್ಯವಿರುವ ನೆಟ್‌ವರ್ಕ್‌ಗಳಿಗೆ ಸಂಪರ್ಕಪಡಿಸಲು ವೈ-ಫೈ ರುಜುವಾತುಗಳನ್ನು ಸ್ಥಾಪಿಸಿ."</string>
+    <string name="wifi_installer_detail" msgid="63879632832701669">"<xliff:g id="NAME">%1$s</xliff:g> ಮೂಲಕ ಲಭ್ಯವಿರುವ ನೆಟ್‌ವರ್ಕ್‌ಗಳಿಗೆ ಸಂಪರ್ಕಪಡಿಸಲು Wi-Fi ರುಜುವಾತುಗಳನ್ನು ಸ್ಥಾಪಿಸಿ."</string>
     <string name="wifi_installer_download_error" msgid="5429453090956277692">"ಡೌನ್‌ಲೋಡ್ ಮಾಡಲಾದ ಫೈಲ್ ಸಮಸ್ಯೆಗಳನ್ನು ಹೊಂದಿವೆ ಹಾಗೂ ಸ್ಥಾಪಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ನೀವು ಸರಿಯಾದ ಮೂಲದಿಂದ ಫೈಲ್ ಡೌನ್‌ಲೋಡ್ ಮಾಡಿರುವಿರಾ ಎಂಬುದನ್ನು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
-    <string name="wifi_installer_fail" msgid="894483173306576331">"ವೈ-ಫೈ ರುಜುವಾತುಗಳನ್ನು ಸ್ಥಾಪಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ಮತ್ತೆ ಫೈಲ್ ಡೌನ್‌ಲೋಡ್ ಮಾಡಲು ಪ್ರಯತ್ನಿಸಿ."</string>
+    <string name="wifi_installer_fail" msgid="894483173306576331">"Wi-Fi ರುಜುವಾತುಗಳನ್ನು ಸ್ಥಾಪಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ಮತ್ತೆ ಫೈಲ್ ಡೌನ್‌ಲೋಡ್ ಮಾಡಲು ಪ್ರಯತ್ನಿಸಿ."</string>
     <string name="wifi_installer_fail_no_wifi_title" msgid="8358191074828840533">"ಸ್ಥಾಪಿಸುವಿಕೆ ರದ್ದು ಮಾಡಲಾಗಿದೆ"</string>
     <string name="wifi_installer_fail_title" msgid="5547079779067835479">"ಸ್ಥಾಪಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="wifi_installer_fail_no_wifi" msgid="2044576439984209921">"ವೈ-ಫೈ ಆನ್ ಮಾಡಿ ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 7f963df..b9c1d8c 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -47,7 +47,7 @@
     <string name="sdcard_not_present" product="nosdcard" msgid="9197143240492611196">"USB сактагыч жеткиликтүү эмес."</string>
     <string name="sdcard_not_present" product="default" msgid="3866952732541932947">"SD-карта табылган жок."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Сертификаттарды бул түзмөктүн ээси гана орното алат."</string>
-    <string name="credential_usage_label" msgid="1513892208033156805">"Тастыктама төмөнкү менен колдонулат:"</string>
+    <string name="credential_usage_label" msgid="1513892208033156805">"Сертификат кийинки менен колдонулат:"</string>
   <string-array name="credential_usage">
     <item msgid="375085478373011304">"VPN жана колдонмолор"</item>
     <item msgid="692322974985472861">"Wi-Fi"</item>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index bf30de3..134c446 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -28,7 +28,7 @@
     <string name="p12_description" msgid="4128352087331630024">"ໃບຮັບຮອງໃນແຫລ່ງເກັບກະແຈ PKCS12."</string>
     <string name="one_userkey" msgid="3500697912370644881">"ນຶ່ງກະແຈຜູ່ໃຊ້"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"ນຶ່ງໃບຮັບຮອງຜູ່ໃຊ້"</string>
-    <string name="one_cacrt" msgid="2667950425420663146">"ໃບຢັ້ງຢືນ CA ໜຶ່ງໃບ"</string>
+    <string name="one_cacrt" msgid="2667950425420663146">"ນຶ່ງໃບຮັບຮອງ CA"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d ໃບຮັບຮອງ CA"</string>
     <string name="password_error" msgid="2042471639556516356">"ພິມລະຫັດຜ່ານທີ່ຖືກຕ້ອງ."</string>
     <string name="password_empty_error" msgid="591713406761723025">"ພິມລະຫັດຜ່ານ."</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 8e4331c..e7ae930 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -34,7 +34,7 @@
     <string name="password_empty_error" msgid="591713406761723025">"Įveskite slaptažodį."</string>
     <string name="name_empty_error" msgid="3808800768660110354">"Įveskite pavadinimą."</string>
     <string name="name_char_error" msgid="3176618568784938968">"Įveskite pavadinimą, sudarytą tik iš raidžių ir skaičių."</string>
-    <string name="unable_to_save_cert" msgid="9178604087335389686">"Nepavyko išsaugoti sertifikato. Prisijungimo duomenų saugykla neįgalinta arba netinkamai inicijuota."</string>
+    <string name="unable_to_save_cert" msgid="9178604087335389686">"Nepavyko išsaugoti sertifikato. Kredencialų atmintinė neįgalinta arba netinkamai inicijuota."</string>
     <string name="cert_not_saved" msgid="4037698479662830270">"Sertifikatas neįdiegtas."</string>
     <string name="no_cert_to_saved" msgid="5708884372817309068">"Nėra diegiamo sertifikato."</string>
     <string name="invalid_cert" msgid="7704228670980743590">"Sertifikatas negalioja."</string>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 49789cc..188a9da 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -54,7 +54,7 @@
   </string-array>
     <string name="wifi_title" msgid="8475811746333426489">"വൈഫൈ പ്രൊഫൈൽ"</string>
     <string name="wifi_detail_title" msgid="3627332137252994395">"%s എന്നതിനായുള്ള വിശദാംശങ്ങൾ"</string>
-    <string name="wifi_detail_label" msgid="3032151019356747583">"വിശദാംശങ്ങൾ‌"</string>
+    <string name="wifi_detail_label" msgid="3032151019356747583">"വിശദാംശങ്ങള്‍‌"</string>
     <string name="wifi_install_label" msgid="1449629407724323233">"ഇന്‍സ്റ്റാള്‍ ചെയ്യുക"</string>
     <string name="wifi_installing_label" msgid="8387393993627129025">"ഇൻസ്‌റ്റാൾ ചെയ്യുന്നു"</string>
     <string name="wifi_cancel_label" msgid="1328748037608392134">"റദ്ദാക്കുക"</string>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index c215c55..bf493df 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -49,15 +49,15 @@
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"ဤစက်ပိုင်ရှင်မှသာ အသိအမှတ်ပြုလက်မှတ် များ ထည့်သွင်းနိုင်ပါလိမ့်မည်"</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Credential အသုံးပြုပုံ:"</string>
   <string-array name="credential_usage">
-    <item msgid="375085478373011304">"VPN နဲ့ အက်ပ်များ"</item>
-    <item msgid="692322974985472861">"Wi-Fi"</item>
+    <item msgid="375085478373011304">"VPN နဲ့ apps"</item>
+    <item msgid="692322974985472861">"ဝိုင်ဖိုင်"</item>
   </string-array>
-    <string name="wifi_title" msgid="8475811746333426489">"Wi-Fi  ပရိုဖိုင်"</string>
+    <string name="wifi_title" msgid="8475811746333426489">"ဝိုင်ဖိုင် ပရိုဖိုင်"</string>
     <string name="wifi_detail_title" msgid="3627332137252994395">"%s အတွက်သေးစိတ်"</string>
     <string name="wifi_detail_label" msgid="3032151019356747583">"အသေးစိတ်"</string>
     <string name="wifi_install_label" msgid="1449629407724323233">"တပ်ဆင်ရန်"</string>
     <string name="wifi_installing_label" msgid="8387393993627129025">"တပ်ဆင်နေ"</string>
-    <string name="wifi_cancel_label" msgid="1328748037608392134">"မလုပ်တော့"</string>
+    <string name="wifi_cancel_label" msgid="1328748037608392134">"ဖျက်သိမ်းရန်"</string>
     <string name="wifi_dismiss_label" msgid="1916684434873972698">"ပယ်ရန်"</string>
     <string name="wifi_no_config" msgid="1835743123288916755">"မရှိ"</string>
     <string name="wifi_config_text" msgid="8259587306773310314">"အမည်: %1$s\nFQDN: %2$s\nRoaming Consortiums: %3$s\nRealm: %4$s\nAuth method: EAP-%5$s\n"</string>
@@ -70,7 +70,7 @@
     <string name="done_label" msgid="5597425930652904250">"လုပ်ပြီး"</string>
     <string name="wifi_installer_detail" msgid="63879632832701669">"<xliff:g id="NAME">%1$s</xliff:g> မှတဆင့် ရနိုင်သော ကွန်ယက်များအား ချိတ်ဆက်ရန် ဝိုင်ဖိုင်အထောက်အထားများ သွင်းယူပါ"</string>
     <string name="wifi_installer_download_error" msgid="5429453090956277692">"ဒေါင်းလုပ်ရယူထားသော ဖိုင်များတွင် ပြဿနာရှိပြီး သွင်းယူမရနိုင်ပါ။ ဖိုင်အား မှန်ကန်သောနေရာမှ ဒေါင်းလုပ်ရယူထားကြောင်း သေချာပါစေ။"</string>
-    <string name="wifi_installer_fail" msgid="894483173306576331">"Wi-Fi  အထောက်အထားများအား သွင်းယွင်းနိုင်ခြင်းမရှိပါ။ ဖိုင်အား ထပ်မံ၍ ဒေါင်းလုပ်ရယူပါ။"</string>
+    <string name="wifi_installer_fail" msgid="894483173306576331">"ဝိုင်ဖိုင် အထောက်အထားများအား သွင်းယွင်းနိုင်ခြင်းမရှိပါ။ ဖိုင်အား ထပ်မံ၍ ဒေါင်းလုပ်ရယူပါ။"</string>
     <string name="wifi_installer_fail_no_wifi_title" msgid="8358191074828840533">"ထည့်သွင်းခြင်း ပယ်ဖျက်လိုက်ပါပြီ"</string>
     <string name="wifi_installer_fail_title" msgid="5547079779067835479">"မထည့်သွင်းနိုင်ပါ"</string>
     <string name="wifi_installer_fail_no_wifi" msgid="2044576439984209921">"ဝိုင်ဖိုင်ကို ဖွင့်ကာ ထပ်မံကြိုးစားပါ။"</string>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index c37dba1..a8711a2 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -50,7 +50,7 @@
     <string name="credential_usage_label" msgid="1513892208033156805">"प्रमाणपत्रको प्रयोग:"</string>
   <string-array name="credential_usage">
     <item msgid="375085478373011304">"VPN र अनुप्रयोगहरू"</item>
-    <item msgid="692322974985472861">"Wi-Fi"</item>
+    <item msgid="692322974985472861">"वाइफाइ"</item>
   </string-array>
     <string name="wifi_title" msgid="8475811746333426489">"Wi-Fi प्रोफाइल"</string>
     <string name="wifi_detail_title" msgid="3627332137252994395">"%s को लागि विवरणहरू"</string>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index a5191d0..65a3a1b 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -46,7 +46,7 @@
     <string name="no_cert_file_found" product="default" msgid="1942077544887243999">"SD ਕਾਰਡ ਵਿੱਚ ਕੋਈ ਸਰਟੀਫਿਕੇਟ ਫਾਈਲ ਨਹੀਂ ਮਿਲੀ।"</string>
     <string name="sdcard_not_present" product="nosdcard" msgid="9197143240492611196">"USB ਸਟੋਰੇਜ ਉਪਲਬਧ ਨਹੀਂ ਹੈ।"</string>
     <string name="sdcard_not_present" product="default" msgid="3866952732541932947">"SD ਕਾਰਡ ਮੌਜੂਦ ਨਹੀਂ ਹੈ।"</string>
-    <string name="only_primary_user_allowed" msgid="4005084935023047716">"ਕੇਵਲ ਇਸ ਡੀਵਾਈਸ ਦਾ ਮਾਲਕ ਸਰਟੀਫਿਕੇਟ ਇੰਸਟੌਲ ਕਰ ਸਕਦਾ ਹੈ।"</string>
+    <string name="only_primary_user_allowed" msgid="4005084935023047716">"ਕੇਵਲ ਇਸ ਡਿਵਾਈਸ ਦਾ ਮਾਲਕ ਸਰਟੀਫਿਕੇਟ ਇੰਸਟੌਲ ਕਰ ਸਕਦਾ ਹੈ।"</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"ਕ੍ਰੈਡੈਂਸ਼ੀਅਲ ਵਰਤੋਂ:"</string>
   <string-array name="credential_usage">
     <item msgid="375085478373011304">"VPN ਅਤੇ ਐਪਸ"</item>
@@ -58,7 +58,7 @@
     <string name="wifi_install_label" msgid="1449629407724323233">"ਸਥਾਪਿਤ ਕਰੋ"</string>
     <string name="wifi_installing_label" msgid="8387393993627129025">"ਇੰਸਟੌਲ ਕਰ ਰਿਹਾ ਹੈ"</string>
     <string name="wifi_cancel_label" msgid="1328748037608392134">"ਰੱਦ ਕਰੋ"</string>
-    <string name="wifi_dismiss_label" msgid="1916684434873972698">"ਖਾਰਜ ਕਰੋ"</string>
+    <string name="wifi_dismiss_label" msgid="1916684434873972698">"ਬਰਖਾਸਤ ਕਰੋ"</string>
     <string name="wifi_no_config" msgid="1835743123288916755">"ਕੋਈ ਨਹੀਂ"</string>
     <string name="wifi_config_text" msgid="8259587306773310314">"ਨਾਂ: %1$s\nFQDN: %2$s\nਰੋਮਿੰਗ ਕੰਸੋਰਟੀਅਮਸ: %3$s\nਖੇਤਰ: %4$s\nਪ੍ਰਮਾਣਿਤ ਵਿਧੀ: EAP-%5$s\n"</string>
     <string name="wifi_ttls_config_text" msgid="2002413183253872168">"ਉਪਭੋਗਤਾ ਨਾਂ: %s\n"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 4a49601..b9ddeb7 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -23,25 +23,25 @@
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Extrageți din %s"</string>
     <string name="name_credential_dialog_title" msgid="277729846491554437">"Denumiți certificatul"</string>
     <string name="credential_name" msgid="1974979771369744378">"Nume certificat:"</string>
-    <string name="credential_password" msgid="3520176519550993326">"Introduceți parola pentru a extrage certificatele."</string>
-    <string name="credential_info" msgid="2436768402308470397">"Pachetul conține:"</string>
+    <string name="credential_password" msgid="3520176519550993326">"Introduceţi parola pentru a extrage certificatele."</string>
+    <string name="credential_info" msgid="2436768402308470397">"Pachetul conţine:"</string>
     <string name="p12_description" msgid="4128352087331630024">"Certificate în depozitul de chei PKCS12."</string>
     <string name="one_userkey" msgid="3500697912370644881">"o cheie pentru utilizator"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"un certificat pentru utilizator"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"un certificat CA"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d certificate CA"</string>
-    <string name="password_error" msgid="2042471639556516356">"Introduceți parola corectă."</string>
-    <string name="password_empty_error" msgid="591713406761723025">"Introduceți parola."</string>
-    <string name="name_empty_error" msgid="3808800768660110354">"Introduceți un nume."</string>
-    <string name="name_char_error" msgid="3176618568784938968">"Introduceți un nume care conține doar litere și numere."</string>
-    <string name="unable_to_save_cert" msgid="9178604087335389686">"Nu se poate salva certificatul. Spațiul de stocare a certificatelor nu este activat sau nu este corect inițializat."</string>
+    <string name="password_error" msgid="2042471639556516356">"Introduceţi parola corectă."</string>
+    <string name="password_empty_error" msgid="591713406761723025">"Introduceţi parola."</string>
+    <string name="name_empty_error" msgid="3808800768660110354">"Introduceţi un nume."</string>
+    <string name="name_char_error" msgid="3176618568784938968">"Introduceţi un nume care conţine doar litere și numere."</string>
+    <string name="unable_to_save_cert" msgid="9178604087335389686">"Nu se poate salva certificatul. Spaţiul de stocare a certificatelor nu este activat sau nu este corect iniţializat."</string>
     <string name="cert_not_saved" msgid="4037698479662830270">"Certificatul nu este instalat."</string>
     <string name="no_cert_to_saved" msgid="5708884372817309068">"Niciun certificat de instalat."</string>
     <string name="invalid_cert" msgid="7704228670980743590">"Certificatul este nevalid."</string>
     <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> este instalat."</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Nu se poate instala, deoarece dimensiunea certificatului este prea mare."</string>
-    <string name="cert_missing_error" msgid="7040527352278728220">"Nu se poate instala, deoarece fișierul certificat nu a putut fi găsit."</string>
-    <string name="cert_read_error" msgid="7353463360652419796">"Nu se poate instala, deoarece fișierul certificat nu a putut fi citit."</string>
+    <string name="cert_missing_error" msgid="7040527352278728220">"Nu se poate instala, deoarece fişierul certificat nu a putut fi găsit."</string>
+    <string name="cert_read_error" msgid="7353463360652419796">"Nu se poate instala, deoarece fişierul certificat nu a putut fi citit."</string>
     <string name="no_cert_file_found" product="nosdcard" msgid="3555332946357131929">"Nu a fost găsit niciun fișier certificat în stocarea USB."</string>
     <string name="no_cert_file_found" product="default" msgid="1942077544887243999">"Nu s-a găsit niciun fișier certificat pe cardul SD."</string>
     <string name="sdcard_not_present" product="nosdcard" msgid="9197143240492611196">"Stocarea USB nedisponibilă."</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 0b0664b..5f00450 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -21,7 +21,7 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Chopoa cheti"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Inadondoa..."</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Chopoa kutoka kwa %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Jina lililo kwenye cheti"</string>
+    <string name="name_credential_dialog_title" msgid="277729846491554437">"Jina kwenye cheti"</string>
     <string name="credential_name" msgid="1974979771369744378">"Jina la cheti:"</string>
     <string name="credential_password" msgid="3520176519550993326">"Chapisha nenosiri ili kudondoa vyeti."</string>
     <string name="credential_info" msgid="2436768402308470397">"Furushi lina:"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 44276a5..aca4b08 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -49,7 +49,7 @@
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Ang may-ari lang ng device na ito ang maaaring mag-install ng mga certificate."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Paggamit ng kredensyal:"</string>
   <string-array name="credential_usage">
-    <item msgid="375085478373011304">"VPN at mga app"</item>
+    <item msgid="375085478373011304">"VPN at apps"</item>
     <item msgid="692322974985472861">"Wi-Fi"</item>
   </string-array>
     <string name="wifi_title" msgid="8475811746333426489">"Profile ng Wi-Fi"</string>
diff --git a/src/com/android/certinstaller/WiFiInstaller.java b/src/com/android/certinstaller/WiFiInstaller.java
index 728c8ec..1e36715 100644
--- a/src/com/android/certinstaller/WiFiInstaller.java
+++ b/src/com/android/certinstaller/WiFiInstaller.java
@@ -2,33 +2,25 @@
 
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.net.Uri;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiEnterpriseConfig;
 import android.net.wifi.WifiManager;
+import android.net.wifi.hotspot2.ConfigBuilder;
+import android.net.wifi.hotspot2.PasspointConfiguration;
+import android.os.AsyncTask;
 import android.os.Bundle;
-import android.security.Credentials;
-import android.security.KeyStore;
+import android.provider.DocumentsContract;
 import android.util.Log;
 import android.view.View;
-import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
-import android.os.AsyncTask;
-import android.provider.DocumentsContract;
 
-import java.security.PrivateKey;
-import java.security.interfaces.RSAPrivateKey;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
+/**
+ * An Activity for provisioning a Hotspot 2.0 Release 1 configuration.
+ */
 public class WiFiInstaller extends Activity {
 
     private static final String TAG = "WifiInstaller";
@@ -37,7 +29,7 @@
     public static final int INSTALL_SUCCESS = 2;
     public static final int INSTALL_FAIL = 1;
     public static final int INSTALL_FAIL_NO_WIFI = 0;
-    WifiConfiguration mWifiConfiguration;
+    PasspointConfiguration mPasspointConfig;
     WifiManager mWifiManager;
     boolean doNotInstall;
 
@@ -54,16 +46,14 @@
                 mimeType + " is " + (data != null ? data.length : "-"));
 
         mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
-        mWifiConfiguration = mWifiManager.buildWifiConfig(uriString, mimeType, data);
+        mPasspointConfig = ConfigBuilder.buildPasspointConfig(mimeType, data);
         dropFile(Uri.parse(uriString), getApplicationContext());
 
-        if (mWifiConfiguration != null) {
-            WifiEnterpriseConfig enterpriseConfig = mWifiConfiguration.enterpriseConfig;
-            doNotInstall = (enterpriseConfig.getEapMethod() == WifiEnterpriseConfig.Eap.TTLS
-                    || enterpriseConfig.getEapMethod() == WifiEnterpriseConfig.Eap.TLS)
-                    && enterpriseConfig.getCaCertificate() == null;
-        } else {
-            Log.w(TAG, "failed to build wifi configuration");
+        if (mPasspointConfig == null) {
+            Log.w(TAG, "failed to build passpoint configuration");
+            doNotInstall = true;
+        } else if (mPasspointConfig.homeSp == null) {
+            Log.w(TAG, "Passpoint profile missing HomeSP information");
             doNotInstall = true;
         }
     }
@@ -74,40 +64,10 @@
         createMainDialog();
     }
 
-    public static List<String> splitDomain(String domain) {
-        if (domain.endsWith(".")) {
-            domain = domain.substring(0, domain.length() - 1);
-        }
-
-        String[] labels = domain.toLowerCase().split("\\.");
-        LinkedList<String> labelList = new LinkedList<>();
-        for (String label : labels) {
-            labelList.addFirst(label);
-        }
-
-        return labelList;
-    }
-
-    public static boolean sameBaseDomain(List<String> arg1, String domain) {
-        if (domain == null) {
-            return false;
-        }
-
-        List<String> arg2 = splitDomain(domain);
-        if (arg2.isEmpty()) {
-            return false;
-        }
-        Iterator<String> l1 = arg1.iterator();
-        Iterator<String> l2 = arg2.iterator();
-
-        while(l1.hasNext() && l2.hasNext()) {
-            if (!l1.next().equals(l2.next())) {
-                return false;
-            }
-        }
-        return true;
-    }
-
+    /**
+     * Create a dialog that guides the user through Hotspot 2.0 Release 1 configuration file
+     * installation.
+     */
     private void createMainDialog() {
         Resources res = getResources();
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
@@ -117,58 +77,40 @@
         TextView text = (TextView) layout.findViewById(R.id.wifi_info);
         if (!doNotInstall) {
             text.setText(String.format(getResources().getString(R.string.wifi_installer_detail),
-                    mWifiConfiguration.providerFriendlyName));
+                    mPasspointConfig.homeSp.friendlyName));
 
-            builder.setTitle(mWifiConfiguration.providerFriendlyName);
+            builder.setTitle(mPasspointConfig.homeSp.friendlyName);
             builder.setIcon(res.getDrawable(R.drawable.signal_wifi_4_bar_lock_black_24dp));
 
             builder.setPositiveButton(R.string.wifi_install_label,
                     new DialogInterface.OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
-                    final boolean wifiEnabled = mWifiManager.isWifiEnabled();
-                    if (wifiEnabled) {
-                        Toast.makeText(WiFiInstaller.this, getString(R.string.wifi_installing_label),
-                                Toast.LENGTH_LONG).show();
-                    }
+                    Toast.makeText(WiFiInstaller.this, getString(R.string.wifi_installing_label),
+                            Toast.LENGTH_LONG).show();
                     AsyncTask.execute(new Runnable() {
                         @Override
                         public void run() {
                             boolean success = false;
-                            if (wifiEnabled) {
-                                List<String> newDomain = splitDomain(mWifiConfiguration.FQDN);
-                                for (WifiConfiguration config :
-                                        mWifiManager.getConfiguredNetworks()) {
-                                    if (sameBaseDomain(newDomain, config.FQDN)) {
-                                        mWifiManager.removeNetwork(config.networkId);
-                                        break;
-                                    }
-                                }
-                                try {
-                                    success = mWifiManager.addNetwork(mWifiConfiguration) != -1
-                                            && mWifiManager.saveConfiguration();
-                                }
-                                catch (RuntimeException rte) {
-                                    Log.w(TAG, "Caught exception while installing wifi config: " +
-                                            rte, rte);
-                                    success = false;
-                                }
+                            try {
+                                success = mWifiManager.addOrUpdatePasspointConfiguration(
+                                        mPasspointConfig);
+                            } catch (RuntimeException rte) {
+                                Log.w(TAG, "Caught exception while installing wifi config: " +
+                                           rte, rte);
+                                success = false;
                             }
                             if (success) {
                                 Intent intent = new Intent(getApplicationContext(),
                                         CredentialsInstallDialog.class);
                                 intent.putExtra(NETWORK_NAME,
-                                        mWifiConfiguration.providerFriendlyName);
+                                        mPasspointConfig.homeSp.friendlyName);
                                 intent.putExtra(INSTALL_STATE, INSTALL_SUCCESS);
                                 startActivity(intent);
                             } else {
                                 Intent intent = new Intent(getApplicationContext(),
                                         CredentialsInstallDialog.class);
-                                if (!wifiEnabled) {
-                                    intent.putExtra(INSTALL_STATE, INSTALL_FAIL_NO_WIFI);
-                                } else {
-                                    intent.putExtra(INSTALL_STATE, INSTALL_FAIL);
-                                }
+                                intent.putExtra(INSTALL_STATE, INSTALL_FAIL);
                                 startActivity(intent);
                             }
                             finish();