Merge "Merge Android10 QPR1 into AOSP master" am: df26c4042e am: c4f0d395a1

Change-Id: I01a838ac04d0c714972477f2fd346303539c6d9b
diff --git a/OWNERS b/OWNERS
index 72f853d..13bb3b6 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,5 +1,4 @@
 eranm@google.com
-irinaid@google.com
 pgrafov@google.com
 rubinxu@google.com
 sandness@google.com
diff --git a/res/layout/name_certificate_dialog.xml b/res/layout/name_certificate_dialog.xml
new file mode 100644
index 0000000..c838ba8
--- /dev/null
+++ b/res/layout/name_certificate_dialog.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+    <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="16dp">
+
+        <TextView android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:text="@string/name_credential_dialog_title"
+                  style="@style/dialog_title"/>
+
+        <TextView android:id="@+id/error"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:textColor="@color/red"
+                  android:textStyle="bold"
+                  android:visibility="gone" />
+
+        <TextView android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:text="@string/certificate_name"
+                  android:textAppearance="?android:attr/textAppearanceSmall"
+                  android:textColor="?android:attr/colorAccent"/>
+
+        <EditText android:id="@+id/certificate_name"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  style="@style/dialog_edit_text"/>
+
+    </LinearLayout>
+</ScrollView>
diff --git a/res/layout/name_credential_dialog.xml b/res/layout/name_credential_dialog.xml
deleted file mode 100644
index 6dd46ff..0000000
--- a/res/layout/name_credential_dialog.xml
+++ /dev/null
@@ -1,85 +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.
--->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-    <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="15dip">
-
-        <TextView android:id="@+id/error"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textColor="@color/red"
-                android:textStyle="bold"
-                android:visibility="gone" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/credential_name"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <EditText android:id="@+id/credential_name"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:singleLine="True"/>
-
-        <LinearLayout
-            android:id="@+id/credential_usage_group"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" >
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingTop="12dp"
-                android:text="@string/credential_usage_label"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
-
-            <Spinner
-                android:id="@+id/credential_usage"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:entries="@array/credential_usage" />
-
-            <TextView
-                android:id="@+id/credential_capabilities_warning"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingTop="12dp"
-                android:text="@string/certificate_capabilities_warning"
-                android:textColor="@color/red" />
-
-        </LinearLayout>
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="12dp"
-            android:text="@string/credential_info" />
-
-        <TextView android:id="@+id/credential_info"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-    </LinearLayout>
-</ScrollView>
diff --git a/res/layout/select_certificate_usage_dialog.xml b/res/layout/select_certificate_usage_dialog.xml
new file mode 100644
index 0000000..6a053a4
--- /dev/null
+++ b/res/layout/select_certificate_usage_dialog.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="16dp">
+
+        <LinearLayout
+            android:id="@+id/certificate_usage_group"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/select_certificate_usage_title"
+                style="@style/dialog_title"/>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dip"
+                android:background="?android:attr/dividerHorizontal"/>
+
+            <RadioGroup
+                android:id="@+id/certificate_usage"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp">
+
+                <RadioButton
+                    android:id="@+id/user_certificate"
+                    style="@style/dialog_button"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/user_certificate"
+                    android:checked="true"/>
+
+                <RadioButton
+                    android:id="@+id/wifi_certificate"
+                    style="@style/dialog_button"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/wifi_certificate"/>
+
+            </RadioGroup>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dip"
+                android:background="?android:attr/dividerHorizontal"/>
+
+        </LinearLayout>
+
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 9f3865f..cd28bbf 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -21,12 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Ekstraheer sertifikaat"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Onttrek tans..."</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Uittreksel uit %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Benoem die sertifikaat"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Sertifikaatnaam:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Gee hierdie sertifikaat \'n naam"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Sertifikaatnaam"</string>
     <string name="credential_password" msgid="3520176519550993326">"Tik die wagwoord in om die sertifikate te onttrek."</string>
     <string name="credential_info" msgid="2436768402308470397">"Die pakket bevat:"</string>
     <string name="p12_description" msgid="4128352087331630024">"Sertifikate in PKCS12-sleutelware."</string>
     <string name="one_userkey" msgid="3500697912370644881">"een gebruikersleutel"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"Algoritme:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"een gebruikersertifikaat"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"een CA-sertifikaat"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA-sertifikate"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Die sertifikaat is ongeldig."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Private sleutel word vereis om \'n sertifikaat te installeer"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Sertifikaat word vereis om \'n private sleutel te installeer"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> is geïnstalleer."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Kies \'n sertifikaattipe"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Kan nie CA-sertifikate installeer nie"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA-sertifikate kan jou privaatheid bedreig en moet in Instellings geïnstalleer word"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Maak toe"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Kan nie sertifikate installeer nie"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Maak toe"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Hierdie lêer kan nie as \'n <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g> gebruik word nie"</string>
+    <string name="certificate" msgid="8790577925509962529">"Sertifikaat"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA-sertifikaat"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN- en programgebruikersertifikaat"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Wi‑Fi-sertifikaat"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA-sertifikaat is geïnstalleer"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Gebruikersertifikaat is geïnstalleer"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Wi‑Fi-sertifikaat is geïnstalleer"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Kon nie installeer nie omdat die sertifikaat te groot is."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Kon nie installeer nie omdat die sertifikaatlêer nie gevind kon word nie."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Kon nie installeer nie omdat die sertifikaatlêer nie gelees kon word nie."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Tydelike mislukking. Probeer later weer."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Slegs die eienaar van hierdie toestel kan sertifikate installeer."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Eiebewysgebruik:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 705bec3..a9136a7 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -21,12 +21,13 @@
     <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="name_credential_dialog_title" msgid="1481964824549786927">"ይህን የእውቅና ማረጋገጫ ስም ይስጡት"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"የእውቅና ማረጋገጫ ስም"</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="userkey_type" msgid="6214833257030657106">"ስልተ ቀመር፦"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"የአንድ ተጠቃሚ ምስክር"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"አንድCA ምስክር"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA ምስክሮች"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"ምስክሩ ትክክል አይደለም።"</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"የእውቅና ማረጋገጫን ለመጫን የግል ቁልፍ ያስፈልጋል"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"የግል ቁልፍን ለመጫን የእውቅና ማረጋገጫ ያስፈልጋል"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> ተጭኗል።"</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"የየእውቅና ማረጋገጫ ዓይነት ይምረጡ"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"የ CA የእውቅና ማረጋገጫዎችን መጫን አልተቻለም"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA የእውቅና ማረጋገጫዎች የእርስዎን ግላዊነት ስጋት ውስጥ ሊጨምሩት ይችላሉ እና በቅንብሮች ውስጥ መጫን አለባቸው"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"ዝጋ"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"የእውቅና ማረጋገጫዎችን መጫን አልተቻለም"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"ዝጋ"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"ይህ ፋይል እንደ <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g> ጥቅም ላይ ሊውል አይችልም"</string>
+    <string name="certificate" msgid="8790577925509962529">"የእውቅና ማረጋገጫ"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA የእውቅና ማረጋገጫ"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN &amp; መተግበሪያ የተጠቃሚ የእውቅና ማረጋገጫ"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Wi‑Fi የእውቅና ማረጋገጫ"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA የእውቅና ማረጋገጫ ተጭኗል"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"የተጠቃሚ የእውቅና ማረጋገጫ ተጭኗል"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Wi‑Fi የእውቅና ማረጋገጫ ተጭኗል"</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="cert_temp_error" msgid="617276803992714550">"ጊዜያዊ ብልሽት። እባክዎ ቆይተው እንደገና ይሞክሩ።"</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"የዚህ መሣሪያ ብቻ ነው የዕውቅና ማረጋገጫዎችን ሊጭን የሚችለው።"</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"የምስክርነት አጠቃቀም፦"</string>
   <string-array name="credential_usage">
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index e8657c0..d8114ce 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -21,14 +21,13 @@
     <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="name_credential_dialog_title" msgid="1481964824549786927">"تسمية هذه الشهادة"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"اسم الشهادة"</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>
-    <!-- no translation found for userkey_type (6214833257030657106) -->
-    <skip />
+    <string name="userkey_type" msgid="6214833257030657106">"الخوارزمية:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"شهادة مستخدم واحد"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"‏شهادة CA واحدة"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"‏%d شهادات CA"</string>
@@ -42,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"الشهادة غير صالحة."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"يلزَم توفّر مفتاح خاص لتثبيت شهادة."</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"يلزَم توفّر شهادة لتثبيت مفتاح خاص."</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> مثبت."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"اختَر نوع شهادة"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"‏يتعذّر تثبيت شهادات CA"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"‏يمكن أن تعرّض شهادات CA خصوصيتك للخطر ويجب تثبيتها في \"الإعدادات\"."</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"إغلاق"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"يتعذّر تثبيت الشهادات"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"إغلاق"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"لا يمكن استخدام هذا الملف كـ <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>."</string>
+    <string name="certificate" msgid="8790577925509962529">"شهادة"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"‏شهادة CA"</string>
+    <string name="user_certificate" msgid="514888069820553128">"‏شهادة مستخدم التطبيق وVPN"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"‏شهادة شبكة Wi‑Fi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"‏تم تثبيت شهادة CA."</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"تم تثبيت شهادة المستخدم."</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"‏تم تثبيت شهادة شبكة Wi‑Fi."</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="cert_temp_error" msgid="617276803992714550">"تعذّر تنفيذ الإجراء مؤقتًا. يُرجى إعادة المحاولة لاحقًا."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"يُسمح لمالك هذا الجهاز فقط تثبيت الشهادات."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"استخدام بيانات الاعتماد:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 106ad48..f24a66a 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -21,12 +21,13 @@
     <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="name_credential_dialog_title" msgid="1481964824549786927">"এই প্ৰমাণপত্ৰখনৰ এটা নাম দিয়ক"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"প্ৰমাণপত্ৰৰ নাম"</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="userkey_type" msgid="6214833257030657106">"কলনবিধি:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"এজন ব্যৱহাৰকাৰী থকা প্ৰমাণপত্ৰ"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"এখন চিএ প্ৰমাণপত্ৰ"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d চিএ প্ৰমাণপত্ৰবোৰ"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"এই প্ৰমাণপত্ৰখন মান্য নহয়।"</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"প্ৰমাণপত্ৰ ইনষ্টল কৰিবলৈ নিজা চাবি আৱশ্য়ক"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"নিজা চাবি ইনষ্টল কৰিবলৈ প্ৰমাণপত্ৰ আৱশ্য়ক"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> ইনষ্টল কৰা হৈছে।"</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"এটা প্ৰমাণপত্ৰৰ প্ৰকাৰ বাছনি কৰক"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"চিএ প্ৰমাণপত্ৰসমূহ ইনষ্টল কৰিব নোৱাৰি"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"চিএ প্ৰমাণপত্ৰসমূহে আপোনাৰ গোপনীয়তা অসুৰক্ষিত কৰিব পাৰে আৰু এইবোৰ ছেটিংসমূহতে ইনষ্টল কৰিব লাগিব"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"বন্ধ কৰক"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"প্ৰমাণপত্ৰসমূহ ইনষ্টল কৰিব নোৱাৰি"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"বন্ধ কৰক"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"এই ফাইলটো <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g> হিচাপে ব্যৱহাৰ কৰিব নোৱাৰি"</string>
+    <string name="certificate" msgid="8790577925509962529">"প্ৰমাণপত্ৰ"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"চিএ প্ৰমাণপত্ৰ"</string>
+    <string name="user_certificate" msgid="514888069820553128">"ভিপিএন আৰু এপ্‌ ব্যৱহাৰকাৰীৰ প্ৰমাণপত্ৰ"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"ৱাই-ফাই প্ৰমাণপত্ৰ"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA প্ৰমাণপত্ৰ ইনষ্টল কৰা হৈছে"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"ব্যৱহাৰকাৰীৰ প্ৰমাণপত্ৰ ইনষ্টল কৰা হৈছে"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"ৱাই-ফাই প্ৰমাণপত্ৰ ইনষ্টল কৰা হৈছে"</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="cert_temp_error" msgid="617276803992714550">"সাময়িক বিফলতা। অনুগ্ৰহ কৰি পাছত আকৌ চেষ্টা কৰক।"</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"এই ডিভাইচৰ গৰাকীয়েহে প্ৰমাণপত্ৰসমূহ ইনষ্টল কৰিব পাৰে৷"</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"প্ৰমাণপত্ৰৰ ব্যৱহাৰ:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 6639bf7..de5ac12 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -21,12 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Sertifikat çıxarışı"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Əldə edilir..."</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"%s fayldan çıxarış"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Sertifikatı adlandırın"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Sertifikat adı:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Bu sertifikatı adlandırın"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Sertifikat adı"</string>
     <string name="credential_password" msgid="3520176519550993326">"Sertifikatları çıxarmaq üçün parolu yazın."</string>
     <string name="credential_info" msgid="2436768402308470397">"Bu paketdə olanlar:"</string>
     <string name="p12_description" msgid="4128352087331630024">"PKCS12 açar deposu sertifikatları."</string>
     <string name="one_userkey" msgid="3500697912370644881">"tək istifadəçi açarı"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"Alqorithm:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"tək istifadəçi sertifikatı"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"bir CA sertifikatı"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA sertifikatlar"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Sertifikat yanlışdır."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Sertifikatı quraşdırmaq üçün şəxsi açar tələb olunur"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Şəxsi açarı quraşdırmaq üçün sertifikat tələb olunur"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> quraşdırılıb."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Sertifikat növü seçin"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"CA sertifikatlarını quraşdırmaq olmur"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA sertifikatları məxfiliyinizi təhlükəyə ata bilər və Ayarlarda quraşdırılmalıdır"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Bağlayın"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Sertifikatları quraşdırmaq mümkün deyil"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Bağlayın"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Bu fayl <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g> kimi istifadə edilə bilməz"</string>
+    <string name="certificate" msgid="8790577925509962529">"Sertifikat"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA sertifikatı"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN, tətbiq istifadəçi sertifikatı"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Wi‑Fi sertifikatı"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA sertifikatı quraşdırıldı"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"İstifadəçi sertifikatı quraşdırıldı"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Wi‑Fi sertifikatı quraşdırıldı"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Sertifikat ölçüsü çox böyük olduğu üçün yüklənə bilmədi."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Quraşdırmaq mümkün olmadı, çünki sertifikat faylını tapmaq mümkün deyil."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Quraşdırmaq mümkün olmadı, çünki sertifikat faylını oxumaq mümkün deyil."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Müvəqqəti xəta. Sonra cəhd edin."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Yalnız bu cihazın sahibi sertifikatları quraşdıra bilər."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"İstifadə hesabı:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index bb7957c..c7cfb4a 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -21,12 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Izdvajanje sertifikata"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Izdvajanje..."</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Izdvajanje iz datoteke %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Imenovanje sertifikata"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Naziv sertifikata:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Dajte naziv ovom sertifikatu"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Naziv sertifikata"</string>
     <string name="credential_password" msgid="3520176519550993326">"Unesite lozinku da biste izdvojili sertifikate."</string>
     <string name="credential_info" msgid="2436768402308470397">"Paket obuhvata:"</string>
     <string name="p12_description" msgid="4128352087331630024">"Sertifikati u PKCS12 skladištu za ključ."</string>
     <string name="one_userkey" msgid="3500697912370644881">"ključ za jednog korisnika"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"Algoritam:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"sertifikat za jednog korisnika"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"jedan CA sertifikat"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA sertifikati"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Sertifikat je nevažeći."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Privatni ključ je obavezan za instaliranje sertifikata"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Sertifikat je obavezan za instaliranje privatnog ključa"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> je instaliran."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Odaberite tip sertifikata"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Instaliranje CA sertifikata nije uspelo"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA sertifikati mogu da ugroze privatnost i moraju da se instaliraju u podešavanjima"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Zatvori"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Instaliranje sertifikata nije uspelo"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Zatvori"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Ova datoteka ne može da se koristi kao <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Sertifikat"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA sertifikat"</string>
+    <string name="user_certificate" msgid="514888069820553128">"Korisnički sertifikat za VPN i aplikaciju"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Sertifikat za Wi‑Fi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA sertifikat je instaliran"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Korisnički sertifikat je instaliran"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Sertifikat za Wi‑Fi je instaliran"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Instalacija nije moguća jer je sertifikat prevelik."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Instalacija nije moguća jer nije moguće pronaći datoteku sertifikata."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Instalacija nije moguća jer nije moguće čitati datoteku sertifikata."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Privremena greška. Probajte ponovo kasnije."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Samo vlasnik ovog uređaja može da instalira sertifikate."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Korišćenje akreditiva:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 6d4876d..3cd5ead 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -21,12 +21,13 @@
     <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="name_credential_dialog_title" msgid="1481964824549786927">"Дайце назву гэтаму сертыфікату"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Назва сертыфіката"</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="userkey_type" msgid="6214833257030657106">"Алгарытм:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"адзін сертыфікат карыстальніка"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"адзін сертыфікат ЦС"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"Сертыфікаты ЦС: %d"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Сертыфікат несапраўдны."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Каб усталяваць сертыфікат, патрэбны закрыты ключ"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Каб усталяваць закрыты ключ, патрэбны сертыфікат"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"Усталяваны <xliff:g id="CREDENTIAL">%s</xliff:g>."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Выберыце тып сертыфіката"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Не ўдалося ўсталяваць сертыфікаты ЦС"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"Сертыфікаты ЦС могуць паставіць вашу прыватнасць пад пагрозу. Іх трэба ўсталёўваць у Наладах"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Закрыць"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Не ўдалося ўсталяваць сертыфікаты"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Закрыць"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Гэты файл нельга выкарыстоўваць як <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Сертыфікат"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"Сертыфікат ЦС"</string>
+    <string name="user_certificate" msgid="514888069820553128">"Сертыфікат карыстальніка VPN і праграм"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Сертыфікат Wi‑Fi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"Сертыфікат ЦС усталяваны"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Сертыфікат карыстальніка ўсталяваны"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Сертыфікат Wi‑Fi усталяваны"</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="cert_temp_error" msgid="617276803992714550">"Часовая памылка. Паўтарыце спробу пазней."</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">
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 5666c51..567d578 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -21,12 +21,13 @@
     <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="name_credential_dialog_title" msgid="1481964824549786927">"Дайте име на този сертификат"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Име на сертификата"</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="userkey_type" msgid="6214833257030657106">"Алгоритъм:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"един потребителски сертификат"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"един сертификат от сертифициращ орган"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d сертификата от сертифициращи органи"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Сертификатът е невалиден."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"За инсталирането на сертификат се изисква частен ключ"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"За инсталирането на частен ключ се изисква сертификат"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> е инсталиран."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Изберете тип сертификат"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Сертификатите от сертифициращ орган не могат да се инсталират"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"Сертификатите от сертифициращ орган могат да изложат поверителността ви на риск и трябва да се инсталират от настройките."</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Затваряне"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Сертификатите не могат да се инсталират"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Затваряне"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Този файл не може да се използва като <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Сертификат"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"Сертификат от сертифициращ орган"</string>
+    <string name="user_certificate" msgid="514888069820553128">"Виртуална частна мрежа (VPN) и потребителски сертификат за приложението"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Сертификат за Wi‑Fi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"Сертификатът от сертифициращ орган е инсталиран"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Потребителският сертификат е инсталиран"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Сертификатът за Wi‑Fi е инсталиран"</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="cert_temp_error" msgid="617276803992714550">"Временен неуспех. Моля, опитайте отново по-късно."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Само собственикът на това устройство може да инсталира сертификати."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Използв. на идент. данни"</string>
   <string-array name="credential_usage">
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 7e5f249..fe0ba9c 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -21,12 +21,13 @@
     <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="name_credential_dialog_title" msgid="1481964824549786927">"এই সার্টিফিকেটের নাম লিখুন"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"সার্টিফিকেটের নাম"</string>
     <string name="credential_password" msgid="3520176519550993326">"শংসাপত্রগুলিকে দেখার উপযোগী করার জন্য পাসওয়ার্ডটি টাইপ করুন৷"</string>
     <string name="credential_info" msgid="2436768402308470397">"প্যাকেজটিতে যা রয়েছে:"</string>
     <string name="p12_description" msgid="4128352087331630024">"PKCS১২ কীস্টোর-এ থাকা শংসাপত্রগুলি"</string>
     <string name="one_userkey" msgid="3500697912370644881">"একটি ব্যবহারকারী কী"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"অ্যালগরিদম:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"একটি ব্যবহারকারী সার্টিফিকেট"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"এইটি CA সার্টিফিকেট"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA সার্টিফিকেট"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"শংসাপত্রটি বৈধ নয়৷"</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"সার্টিফিকেট ইনস্টল করার জন্য ব্যক্তিগত কী প্রয়োজন"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"ব্যক্তিগত কী ইনস্টল করার জন্য সার্টিফিকেট প্রয়োজন"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> ইনস্টল হয়েছে৷"</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"সার্টিফিকেটের একটি ধরন বেছে নিন"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"CA সার্টিফিকেট ইনস্টল করা যাবে না"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA সার্টিফিকেট আপনার গোপনীয়তাকে বিপদে ফেলতে পারে, তাই আপনাকে সেটিংসে গিয়ে সেটি ইনস্টল করতে হবে"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"বন্ধ করুন"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"সার্টিফিকেট ইনস্টল করা যাচ্ছে না"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"বন্ধ করুন"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"এই ফাইলটি <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g> হিসেবে ব্যবহার করা যাবে না"</string>
+    <string name="certificate" msgid="8790577925509962529">"সার্টিফিকেট"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA সার্টিফিকেট"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN ও অ্যাপ ব্যবহারকারীর সার্টিফিকেট"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"ওয়াই-ফাই সার্টিফিকেট"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA সার্টিফিকেট ইনস্টল করা হয়েছে"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"ব্যবহারকারীর সার্টিফিকেট ইনস্টল করা হয়েছে"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"ওয়াই-ফাই সার্টিফিকেট ইনস্টল করা হয়েছে"</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="cert_temp_error" msgid="617276803992714550">"সাময়িক সমস্যা। পরে আবার চেষ্টা করুন।"</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"শুধুমাত্র এই ডিভাইসটির মালিকই শংসাপত্রগুলি ইনস্টল করতে পারবেন৷"</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"প্রমাণপত্রাদির ব্যবহার:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 55d31d9..7594c68 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -21,12 +21,13 @@
     <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">"Imenovanje certifikata"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Ime certifikata:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Dajte naziv ovoj potvrdi"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Naziv potvrde:"</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="userkey_type" msgid="6214833257030657106">"Algoritam:"</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>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Certifikat je nevažeći."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Za instalaciju potvrde potreban je privatni ključ"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Za instalaciju privatnog ključa potrebna je potvrda"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"Certifikat <xliff:g id="CREDENTIAL">%s</xliff:g> je instaliran."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Odaberite vrstu potvrde"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Nije moguće instalirati CA certifikate"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA certifikat može vašu privatnost dovesti u opasnost i mora biti instaliran u Postavkama"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Zatvori"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Nije moguće instalirati potvrde"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Zatvori"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Ovaj fajl se ne može koristiti kao <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Potvrda"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA certifikat"</string>
+    <string name="user_certificate" msgid="514888069820553128">"Potvrda za VPN i korisnika aplikacije"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Potvrda za WiFi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA certifikat je instaliran"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Potvrda korisnika je instalirana"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Potvrda za WiFi je instalirana"</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="cert_temp_error" msgid="617276803992714550">"Privremena greška. Pokušajte kasnije."</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">
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 5072dff..a411eeb 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -21,14 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Extreu el certificat"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"S\'està extraient..."</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Extracció de %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Nom del certificat"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Nom del certificat:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Posa nom a aquest certificat"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Nom del certificat"</string>
     <string name="credential_password" msgid="3520176519550993326">"Introdueix la contrasenya per extreure els certificats."</string>
     <string name="credential_info" msgid="2436768402308470397">"El paquet conté:"</string>
     <string name="p12_description" msgid="4128352087331630024">"Certificats al magatzem de claus PKCS12."</string>
     <string name="one_userkey" msgid="3500697912370644881">"una clau d\'usuari"</string>
-    <!-- no translation found for userkey_type (6214833257030657106) -->
-    <skip />
+    <string name="userkey_type" msgid="6214833257030657106">"Algoritme:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"un certificat d\'usuari"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"un certificat de CA"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d certificats de CA"</string>
@@ -42,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"El certificat no és vàlid."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Per instal·lar un certificat es requereix una clau privada"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Per instal·lar una clau privada es requereix un certificat"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"S\'ha instal·lat <xliff:g id="CREDENTIAL">%s</xliff:g>."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Tria un tipus de certificat"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"No es poden instal·lar els certificats de CA"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"Els certificats de CA poden posar en risc la teva privadesa i s\'han d\'instal·lar des de Configuració"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Tanca"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"No es poden instal·lar els certificats"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Tanca"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Aquest fitxer no es pot utilitzar com a <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"certificat"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"certificat de CA"</string>
+    <string name="user_certificate" msgid="514888069820553128">"certificat d\'usuari d\'app i VPN"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"certificat de Wi‑Fi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"S\'ha instal·lat el certificat de CA"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"S\'ha instal·lat el certificat d\'usuari"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"S\'ha instal·lat el certificat de Wi‑Fi"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"No s\'ha pogut instal·lar perquè la mida del certificat és massa gran."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"No s\'ha pogut instal·lar perquè el fitxer de certificat no s\'ha pogut ubicar."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"No s\'ha pogut instal·lar perquè el fitxer de certificat no s\'ha pogut llegir."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Error temporal. Prova-ho més tard."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Només el propietari d\'aquest dispositiu pot instal·lar certificats."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Ús de credencials:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 9f2de1f..bff965a 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -21,12 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Extrahovat certifikát"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Extrahování..."</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Extrahovat z %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Zadejte název certifikátu"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Název certifikátu:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Zadání názvu certifikátu"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Název certifikátu"</string>
     <string name="credential_password" msgid="3520176519550993326">"Chcete-li extrahovat certifikáty, zadejte heslo."</string>
     <string name="credential_info" msgid="2436768402308470397">"Balíček obsahuje:"</string>
     <string name="p12_description" msgid="4128352087331630024">"Certifikáty v repozitáři klíčů PKCS12."</string>
     <string name="one_userkey" msgid="3500697912370644881">"klíč pro jednoho uživatele"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"Algoritmus:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"certifikát pro jednoho uživatele"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"jeden certifikát CA"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d certifikátů CA"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Certifikát je neplatný."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"K instalaci certifikátu je vyžadován soukromý klíč"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"K instalaci soukromého klíče je vyžadován certifikát"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"Pověření <xliff:g id="CREDENTIAL">%s</xliff:g> bylo nainstalováno."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Vyberte typ certifikátu"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Certifikáty CA nelze nainstalovat"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"Certifikáty CA mohou ohrozit vaše soukromí a musí být nainstalovány v Nastavení"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Zavřít"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Certifikáty nelze nainstalovat"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Zavřít"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Tento soubor nelze použít jako <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Certifikát"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"Certifikát CA"</string>
+    <string name="user_certificate" msgid="514888069820553128">"Certifikát pro VPN a aplikaci"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Certifikát Wi‑Fi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"Certifikát CA byl nainstalován"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Uživatelský certifikát byl nainstalován"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Certifikát Wi-Fi byl nainstalován"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Instalace se nezdařila, protože je soubor certifikátu příliš velký."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Instalace se nezdařila, protože se soubor certifikátu nepodařilo najít."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Instalace se nezdařila, protože se soubor certifikátu nepodařilo přečíst."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Dočasné selhání. Zkuste to později."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Certifikáty může instalovat pouze majitel tohoto zařízení."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Použití pověření:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 9f5e87b..c4d8cb7 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -21,12 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Udpak certifikat"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Udtrækker..."</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Udtræk fra %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Giv certifikatet et navn"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Certifikatnavn:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Navngiv dette certifikat"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Certifikatnavn"</string>
     <string name="credential_password" msgid="3520176519550993326">"Angiv adgangskoden for at udtrække certifikaterne."</string>
     <string name="credential_info" msgid="2436768402308470397">"Pakken indeholder:"</string>
     <string name="p12_description" msgid="4128352087331630024">"Certifikater i PKCS12-nøgler."</string>
     <string name="one_userkey" msgid="3500697912370644881">"en brugernøgle"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"Algoritme:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"et brugercertifikat"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"et CA-certifikat"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA-certifikater"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Certifikatet er ugyldigt."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Et certifikat kan ikke installeres uden en privat nøgle"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"En privat nøgle kan ikke installeres uden et certifikat"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> er installeret."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Vælg en certifikattype"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"CA-certifikater kan ikke installeres"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA-certifikater kan udgøre en risiko for dit privatliv, og de skal installeres under Indstillinger"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Luk"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Certifikaterne kan ikke installeres"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Luk"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Denne fil kan ikke bruges som <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Certifikat"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA-certifikat"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN- og appbrugercertifikat"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Wi‑Fi-certifikat"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA-certifikatet er installeret"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Brugercertifikatet er installeret"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Wi‑Fi-certifikatet er installeret"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Kunne ikke installere, fordi certifikatstørrelsen er for stor."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Der kunne ikke installeres, fordi certifikatfilen ikke blev fundet."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Der kunne ikke installeres, fordi certifikatfilen ikke kunne læses."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Midlertidig fejl. Prøv igen senere."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Kun ejeren af denne enhed kan installere certifikater."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Brug af loginoplysninger:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index cd028a5..7492fa0 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -21,14 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Zertifikat extrahieren"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Zertifikate werden extrahiert..."</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Zertifikate aus %s extrahieren"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Zertifikat benennen"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Zertifikatname:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Name für Zertifikat eingeben"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Zertifikatname"</string>
     <string name="credential_password" msgid="3520176519550993326">"Gib das Passwort zum Extrahieren der Zertifikate ein."</string>
     <string name="credential_info" msgid="2436768402308470397">"Das Paket enthält Folgendes:"</string>
     <string name="p12_description" msgid="4128352087331630024">"Zertifikate im PKCS12-Keystore"</string>
     <string name="one_userkey" msgid="3500697912370644881">"ein Nutzerschlüssel"</string>
-    <!-- no translation found for userkey_type (6214833257030657106) -->
-    <skip />
+    <string name="userkey_type" msgid="6214833257030657106">"Algorithmus:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"ein Nutzerzertifikat"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"ein CA-Zertifikat"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA-Zertifikate"</string>
@@ -42,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Das Zertifikat ist ungültig."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Für die Installation von Zertifikaten ist ein privater Schlüssel erforderlich"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Für die Installation von privaten Schlüsseln ist ein Zertifikat erforderlich"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> ist installiert."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Zertifikat-Typ auswählen"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"CA-Zertifikate können nicht installiert werden"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA-Zertifikate können ein Datenschutz-Risiko darstellen und müssen über die Einstellungen installiert werden"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Schließen"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Die Zertifikate können nicht installiert werden"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Schließen"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Diese Datei kann nicht als <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g> verwendet werden"</string>
+    <string name="certificate" msgid="8790577925509962529">"Zertifikat"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA-Zertifikat"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN- &amp; App-Nutzerzertifikat"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"WLAN-Zertifikat"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA-Zertifikat installiert"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Nutzerzertifikat installiert"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"WLAN-Zertifikat installiert"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Installation nicht möglich, weil das Zertifikat zu groß ist"</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Installation nicht möglich, weil die Zertifikatdatei nicht gefunden wurde"</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Installation nicht möglich, weil die Zertifikatdatei nicht gelesen werden konnte"</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Temporärer Fehler. Versuch es bitte später noch einmal."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Nur der Eigentümer dieses Geräts kann Zertifikate installieren."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Verwendung der Anmeldedaten:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 54271cb..fe02e38 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -21,12 +21,13 @@
     <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="name_credential_dialog_title" msgid="1481964824549786927">"Ονομάστε αυτό το πιστοποιητικό"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Όνομα πιστοποιητικού"</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="userkey_type" msgid="6214833257030657106">"Αλγόριθμος:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"πιστοποιητικό για ένα χρήστη"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"πιστοποιητικό μίας αρχής πιστοποίησης"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"Πιστοποιητικά αρχών πιστοποίησης %d"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Το πιστοποιητικό δεν είναι έγκυρο."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Απαιτείται ιδιωτικό κλειδί για την εγκατάσταση κάποιου πιστοποιητικού"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Απαιτείται πιστοποιητικό για την εγκατάσταση κάποιου ιδιωτικού κλειδιού"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"Το <xliff:g id="CREDENTIAL">%s</xliff:g> είναι εγκατεστημένο."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Επιλογή τύπου πιστοποιητικών"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Δεν είναι δυνατή η εγκατάσταση πιστοποιητικών CA"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"Τα πιστοποιητικά CA μπορούν να θέσουν σε κίνδυνο το απόρρητο και πρέπει να εγκαθίστανται στις Ρυθμίσεις"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Κλείσιμο"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Δεν είναι δυνατή η εγκατάσταση πιστοποιητικών"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Κλείσιμο"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Αυτό το αρχείο δεν μπορεί να χρησιμοποιηθεί ως <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Πιστοποιητικό"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"Πιστοποιητικό CA"</string>
+    <string name="user_certificate" msgid="514888069820553128">"Πιστοποιητικό χρήστη VPN και εφαρμογής"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Πιστοποιητικό Wi‑Fi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"Εγκαταστάθηκε πιστοποιητικό CA"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Εγκαταστάθηκε πιστοποιητικό χρήστη"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Εγκαταστάθηκε πιστοποιητικό Wi‑Fi"</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="cert_temp_error" msgid="617276803992714550">"Προσωρινή αποτυχία. Δοκιμάστε ξανά αργότερα."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Μόνο ο κάτοχος αυτής της συσκευής μπορεί να εγκαταστήσει πιστοποιητικά."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Χρήση διαπιστευτηρίων:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 0950fc8..7768352 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -21,12 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Extract certificate"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Extracting..."</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Extract from %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Name the certificate"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Certificate name:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Name this certificate"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Certificate name"</string>
     <string name="credential_password" msgid="3520176519550993326">"Enter the password to extract the certificates."</string>
     <string name="credential_info" msgid="2436768402308470397">"The package contains:"</string>
     <string name="p12_description" msgid="4128352087331630024">"Certificates in PKCS12 keystore."</string>
     <string name="one_userkey" msgid="3500697912370644881">"one user key"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"Algorithm:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"one user certificate"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"one CA certificate"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA certificates"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"The certificate is invalid."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Private key required to install a certificate"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Certificate required to install a private key"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> is installed."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Choose a certificate type"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Can\'t install CA certificates"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA certificates can put your privacy at risk and must be installed in Settings"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Close"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Can\'t install certificates"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Close"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"This file can\'t be used as a <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Certificate"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA certificate"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN and app user certificate"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Wi‑Fi certificate"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA certificate installed"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"User certificate installed"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Wi‑Fi certificate installed"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Couldn\'t install because the certificate size is too large."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Couldn\'t install because the certificate file couldn\'t be located."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Couldn\'t install because the certificate file couldn\'t be read."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Temporary failure. Please try again later."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Only the owner of this device may install certificates."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Credential use:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 0950fc8..7768352 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -21,12 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Extract certificate"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Extracting..."</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Extract from %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Name the certificate"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Certificate name:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Name this certificate"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Certificate name"</string>
     <string name="credential_password" msgid="3520176519550993326">"Enter the password to extract the certificates."</string>
     <string name="credential_info" msgid="2436768402308470397">"The package contains:"</string>
     <string name="p12_description" msgid="4128352087331630024">"Certificates in PKCS12 keystore."</string>
     <string name="one_userkey" msgid="3500697912370644881">"one user key"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"Algorithm:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"one user certificate"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"one CA certificate"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA certificates"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"The certificate is invalid."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Private key required to install a certificate"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Certificate required to install a private key"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> is installed."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Choose a certificate type"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Can\'t install CA certificates"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA certificates can put your privacy at risk and must be installed in Settings"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Close"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Can\'t install certificates"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Close"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"This file can\'t be used as a <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Certificate"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA certificate"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN and app user certificate"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Wi‑Fi certificate"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA certificate installed"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"User certificate installed"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Wi‑Fi certificate installed"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Couldn\'t install because the certificate size is too large."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Couldn\'t install because the certificate file couldn\'t be located."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Couldn\'t install because the certificate file couldn\'t be read."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Temporary failure. Please try again later."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Only the owner of this device may install certificates."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Credential use:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 0950fc8..7768352 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -21,12 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Extract certificate"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Extracting..."</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Extract from %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Name the certificate"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Certificate name:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Name this certificate"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Certificate name"</string>
     <string name="credential_password" msgid="3520176519550993326">"Enter the password to extract the certificates."</string>
     <string name="credential_info" msgid="2436768402308470397">"The package contains:"</string>
     <string name="p12_description" msgid="4128352087331630024">"Certificates in PKCS12 keystore."</string>
     <string name="one_userkey" msgid="3500697912370644881">"one user key"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"Algorithm:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"one user certificate"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"one CA certificate"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA certificates"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"The certificate is invalid."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Private key required to install a certificate"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Certificate required to install a private key"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> is installed."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Choose a certificate type"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Can\'t install CA certificates"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA certificates can put your privacy at risk and must be installed in Settings"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Close"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Can\'t install certificates"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Close"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"This file can\'t be used as a <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Certificate"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA certificate"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN and app user certificate"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Wi‑Fi certificate"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA certificate installed"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"User certificate installed"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Wi‑Fi certificate installed"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Couldn\'t install because the certificate size is too large."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Couldn\'t install because the certificate file couldn\'t be located."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Couldn\'t install because the certificate file couldn\'t be read."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Temporary failure. Please try again later."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Only the owner of this device may install certificates."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Credential use:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 0950fc8..7768352 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -21,12 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Extract certificate"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Extracting..."</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Extract from %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Name the certificate"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Certificate name:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Name this certificate"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Certificate name"</string>
     <string name="credential_password" msgid="3520176519550993326">"Enter the password to extract the certificates."</string>
     <string name="credential_info" msgid="2436768402308470397">"The package contains:"</string>
     <string name="p12_description" msgid="4128352087331630024">"Certificates in PKCS12 keystore."</string>
     <string name="one_userkey" msgid="3500697912370644881">"one user key"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"Algorithm:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"one user certificate"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"one CA certificate"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA certificates"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"The certificate is invalid."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Private key required to install a certificate"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Certificate required to install a private key"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> is installed."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Choose a certificate type"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Can\'t install CA certificates"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA certificates can put your privacy at risk and must be installed in Settings"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Close"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Can\'t install certificates"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Close"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"This file can\'t be used as a <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Certificate"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA certificate"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN and app user certificate"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Wi‑Fi certificate"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA certificate installed"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"User certificate installed"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Wi‑Fi certificate installed"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Couldn\'t install because the certificate size is too large."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Couldn\'t install because the certificate file couldn\'t be located."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Couldn\'t install because the certificate file couldn\'t be read."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Temporary failure. Please try again later."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Only the owner of this device may install certificates."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Credential use:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index f9694a1..1b39cd1 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -21,12 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‏‏‎‏‏‏‏‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‏‎‎‏‏‎‏‏‎‏‏‏‏‎‎‎‏‎‎‎‎‏‎‏‏‎‎‏‎Extract certificate‎‏‎‎‏‎"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‏‏‎‏‏‏‎‎‏‏‎‏‏‎‎‎‎‏‎‏‎‏‎‎‎‎‎‏‏‏‏‏‎‎‎‎‎‎‎‏‎‏‏‏‏‎‏‎‏‏‎‏‏‎Extracting…‎‏‎‎‏‎"</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‎‎‏‎‏‎‏‎‎‏‏‎‎‎‏‎‏‎‏‏‎‏‎‏‏‏‎‏‎‎‎‎‎‎‏‏‏‎‏‎‏‎‏‎‏‎‎‎‎‏‏‎‎Extract from %s‎‏‎‎‏‎"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‏‎‎‎‏‏‏‎‏‎‎‏‎‏‏‏‎‏‎‏‏‏‎‏‎‎‏‏‏‎‎‏‎‎‎‏‎‏‎‎‎‎‏‎‏‎Name the certificate‎‏‎‎‏‎"</string>
-    <string name="credential_name" msgid="1974979771369744378">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‎‏‎‎‎‏‎‎‎‏‎‎‏‏‎‏‎‎‎‏‏‎‏‎‏‏‏‏‏‎‎‎‏‎‎‏‏‎‏‏‎‎‏‏‏‏‏‏‏‏‎‏‎‎Certificate name:‎‏‎‎‏‎"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‏‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‏‎‎‎‎‎‎‏‎‏‎‎‏‎‏‏‏‏‎Name this certificate‎‏‎‎‏‎"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‎‏‏‎‏‎‎‎‎‏‎‎‏‏‏‎‏‎‏‏‎‎‏‎‎‎‎‎‎‏‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎Certificate name‎‏‎‎‏‎"</string>
     <string name="credential_password" msgid="3520176519550993326">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‎‎‏‏‎‏‏‎‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‎‎‏‏‎‏‎‎‏‎‏‎‎‎‎‎‏‎‎‎‎‎‎‎‏‏‏‎‏‎‏‏‏‎‎Type the password to extract the certificates.‎‏‎‎‏‎"</string>
     <string name="credential_info" msgid="2436768402308470397">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‎‎‏‏‏‎‏‎‎‎‏‎‎‏‎‎‎‏‏‏‏‏‏‎‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‏‏‎‎‎‎‏‎‏‏‎‎‏‏‏‏‏‎‏‎The package contains:‎‏‎‎‏‎"</string>
     <string name="p12_description" msgid="4128352087331630024">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‎‎‏‎‏‎‏‏‎‏‏‎‏‎‎‏‎‏‏‎‎‏‏‎‏‏‏‎‎‏‎‎‏‎‎‏‎‎‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‎‎Certificates in PKCS12 keystore.‎‏‎‎‏‎"</string>
     <string name="one_userkey" msgid="3500697912370644881">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‎‏‎‎‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‎‎‎‏‎‏‏‎‎‏‏‎‎‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‏‎‎‎‏‎one user key‎‏‎‎‏‎"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‏‎‏‎‏‏‎‏‏‎‏‏‏‏‏‎‎‏‏‎‎‎‏‎‏‎‎‏‎‎‎‏‎‏‎‎‏‎‎Algorithm:‎‏‎‎‏‎"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‏‎‏‏‎‎‏‏‎‏‎‎‎‏‎‏‎‏‏‎‏‏‎‏‏‏‎‎‎‏‎‎‎‎‏‎‎‎‎‏‎‎‎‏‏‎‏‎‎‎‏‎‎one user certificate‎‏‎‎‏‎"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‎‎‏‏‎‎‏‏‏‎‏‏‎‏‏‎‎‎‏‏‎‏‏‎‎‏‎‎‏‏‎‎‎‏‏‎‏‎‎‎‎‏‎‎‏‎‏‏‎‏‎‏‎‎one CA certificate‎‏‎‎‏‎"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‏‏‎‏‎‏‎‏‎‏‏‏‎‎‏‎‏‎‎‎‎‏‏‎‎‏‎‏‎‎‏‏‎‎‎‏‎‏‎‎‎‎%d CA certificates‎‏‎‎‏‎"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‏‎‏‎‏‏‏‎‏‎‏‏‎‎‏‎‏‎‎‎‎‏‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‎‎‏‏‎‎The certificate is invalid.‎‏‎‎‏‎"</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‏‏‏‏‎‎‏‎‏‎‎‎‎‎‏‏‎‎‏‏‎‏‎‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‎‎‏‏‏‏‎‏‎‏‎‎Private key required to install a certificate‎‏‎‎‏‎"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‏‏‏‎‏‎‎‏‏‎‏‏‎‏‎‎‏‏‏‎‎‎‎‏‎‎‏‏‏‎‎‏‎‏‎‏‎‏‎‏‎‎‏‏‏‏‏‏‏‎‎‎‏‏‎Certificate required to install a private key‎‏‎‎‏‎"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‏‏‎‎‎‏‏‎‎‎‏‎‎‎‎‎‏‎‎‎‎‏‏‏‏‎‎‎‏‎‏‎‎‏‏‎‏‏‏‏‎‎‏‎‏‏‎‏‏‎‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="CREDENTIAL">%s</xliff:g>‎‏‎‎‏‏‏‎ is installed.‎‏‎‎‏‎"</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎Choose a certificate type‎‏‎‎‏‎"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‎‎‏‎‏‎‎‎‎‎‎‎‏‏‎‎‎‏‏‏‏‏‎‏‎‎‎‏‎‎‎‎‏‏‎‎‏‎‎‎‎‎‏‎‏‎‎‏‎‏‎‎‎Can\'t install CA certificates‎‏‎‎‏‎"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‏‏‎‏‎‎‏‎‏‎‎‎‎‎‎‎‎‏‏‎‎‎‏‎‏‏‏‏‏‏‎‎‎‏‎‎‎‎‎‏‎‎‏‎‎‏‏‏‏‎CA certificates can put your privacy at risk and must be installed in Settings‎‏‎‎‏‎"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‎‏‏‏‎‎‎‏‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‏‏‏‏‎‎‎‏‏‎‏‎‏‎‎‎‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‎‎‎‎‎Close‎‏‎‎‏‎"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‏‎‏‏‏‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‎‎‏‏‎‎‎‏‏‎‏‏‏‏‎‎‎‎‎‏‎‎‎‏‏‏‎‏‎‎‎‏‏‎Can\'t install certificates‎‏‎‎‏‎"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‏‏‎‎‏‏‎‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‎‏‏‏‎‎‏‎‏‏‏‎‏‏‎‎‏‎‏‎‏‎‎‎‏‎‎‎‎‎‎‏‏‎‏‏‏‎‎Close‎‏‎‎‏‎"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‎‏‏‏‏‎‎‏‎‎‏‏‏‎‎‎‎‎‏‏‏‎‎‎‏‎‎‏‏‎‎‎‏‎‎‏‏‎‎‏‎‏‎‎‎‏‎‎‎‏‏‎‏‎This file can\'t be used as a ‎‏‎‎‏‏‎<xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="certificate" msgid="8790577925509962529">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‎‎‎‎‏‏‎‎‎‏‏‏‏‏‎‎‎‏‏‎‏‎‎‏‎‏‎‏‏‎‏‏‎‎‏‎‎‎‎‏‎Certificate‎‏‎‎‏‎"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‏‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‎‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‎‎‏‏‎‏‎‎‎‎‎‎‎‎‎‎‎‎‏‎CA certificate‎‏‎‎‏‎"</string>
+    <string name="user_certificate" msgid="514888069820553128">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‏‏‏‏‎‎‏‎‎‏‎‏‎‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‏‏‏‎‏‎‏‎‎‎‎VPN &amp; app user certificate‎‏‎‎‏‎"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‎‏‎‏‏‎‎‏‏‏‎‎‏‏‏‎‎‎‎‏‏‏‎‏‏‏‎‎‎‏‎‎‏‎‏‎‏‎‎‎‎‎‎‎‎‎‏‎‏‏‏‏‎‏‎Wi‑Fi certificate‎‏‎‎‏‎"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‎‎‎‏‎‏‏‎‏‏‏‎‏‏‏‎‏‏‎‏‎‎‎‏‏‎‏‏‏‏‎‎‎‏‏‏‎‏‏‎‏‎‏‏‎‏‏‎‏‏‎‏‎‎CA certificate installed‎‏‎‎‏‎"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‏‏‏‎‏‏‎‎‏‏‎‏‎‎‏‎‏‎‏‏‎‏‎‏‏‎‎‎‎‎‎‏‏‏‏‎‎‎‎‏‏‏‏‎‎‎‎‏‎‎‏‏‏‎User certificate installed‎‏‎‎‏‎"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‏‏‎‎‏‎‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‎‎‎‏‏‏‏‏‎‏‎‎‏‏‎‎‎‎‎‎‏‎‎‏‏‎‎‎‎‏‎‎‏‏‎‎‎Wi‑Fi certificate installed‎‏‎‎‏‎"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‎‏‏‎‏‎‏‏‏‏‏‏‎‏‏‏‏‎‏‏‏‎‎‏‏‏‏‎‏‏‎‏‏‏‎‏‏‎‏‎‎‏‏‏‏‎‎‏‏‎‏‎Couldn\'t install because the certificate size is too large.‎‏‎‎‏‎"</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‏‎‏‎‎‏‏‏‏‏‎‏‎‎‏‎‏‎‎‏‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‎‎‎‏‏‏‎‎‎Couldn\'t install because the certificate file couldn\'t be located.‎‏‎‎‏‎"</string>
     <string name="cert_read_error" msgid="7353463360652419796">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‏‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‎‎‏‎‎‎‏‎‎‏‏‎‏‎‎‎‏‎‏‏‎‏‎‏‎‎‎Couldn\'t install because the certificate file couldn\'t be read.‎‏‎‎‏‎"</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‎‎‎‏‎‎‎‎‎‎‎‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‏‎‎‎‎‏‎‎‏‎‏‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‎Temporary failure. Please try again later.‎‏‎‎‏‎"</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‎‏‎‏‎‎‏‏‏‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‎‎‏‏‏‏‎‏‎‏‎‎‎‏‎‎‏‏‎‏‎‎‎‎‏‎‎‏‎‎‎Only the owner of this device may install certificates.‎‏‎‎‏‎"</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‎‎‏‎‎‏‏‎‏‏‎‎‏‏‏‏‎‎‎‏‎‎‏‏‏‎‎‎‎‎‎‎‏‏‎‎‎‏‎‎‏‏‏‎‏‏‎‎‎‏‎‏‎Credential use:‎‏‎‎‏‎"</string>
   <string-array name="credential_usage">
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index e12d7f6..a60b5e0 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -21,12 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Extraer el certificado"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Extrayendo…"</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Extraer desde %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Nombre del certificado"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Nombre del certificado:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Asígnale un nombre a este certificado"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Nombre del certificado"</string>
     <string name="credential_password" msgid="3520176519550993326">"Escribe la contraseña para extraer los certificados."</string>
     <string name="credential_info" msgid="2436768402308470397">"El paquete contiene:"</string>
     <string name="p12_description" msgid="4128352087331630024">"Certificados en el keystore PKCS12."</string>
     <string name="one_userkey" msgid="3500697912370644881">"una clave de usuario"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"Algoritmo:"</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="n_cacrts" msgid="2141498640685639208">"%d Certificados de CA"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"El certificado no es válido."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Se requiere una clave privada para instalar un certificado"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Se requiere un certificado para instalar una clave privada"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> está instalado."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Elige un tipo de certificado diferente"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"No es posible instalar Certificados de CA"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"Los Certificados de CA pueden poner tu privacidad en riesgo y deben instalarse en Configuración"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Cerrar"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"No es posible instalar certificados"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Cerrar"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"No se puede usar este archivo como <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Certificado"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"Certificado de CA"</string>
+    <string name="user_certificate" msgid="514888069820553128">"Certificado de usuario de app y VPN"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Certificado de Wi‑Fi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"Se instaló el Certificado de CA"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Se instaló el certificado de usuario"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Se instaló el certificado de Wi‑Fi"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"No fue posible realizar la instalación porque el certificado es demasiado grande."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"No fue posible realizar la instalación porque no se pudo ubicar el archivo del certificado."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"No fue posible realizar la instalación porque no se pudo leer el archivo del certificado."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Ocurrió un error temporal. Vuelve a intentarlo."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Solo el propietario de este dispositivo puede instalar certificados."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Uso de credenciales:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 1b91b6a..17b6a17 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -21,14 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Extraer certificado"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Extrayendo..."</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Extraer de %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Nombre del certificado"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Nombre del certificado:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Da un nombre al certificado"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Nombre del certificado"</string>
     <string name="credential_password" msgid="3520176519550993326">"Escribe la contraseña para extraer los certificados"</string>
     <string name="credential_info" msgid="2436768402308470397">"El paquete contiene:"</string>
     <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>
-    <!-- no translation found for userkey_type (6214833257030657106) -->
-    <skip />
+    <string name="userkey_type" msgid="6214833257030657106">"Algoritmo:"</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="n_cacrts" msgid="2141498640685639208">"%d certificados de CA"</string>
@@ -42,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"El certificado no es válido."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Se necesita una clave privada para instalar un certificado"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Se necesita un certificado para instalar una clave privada"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> se ha instalado."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Elige un tipo de certificado"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"No se pueden instalar certificados de CA"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"Los certificados de CA pueden poner en riesgo tu seguridad y deben instalarse desde Ajustes"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Cerrar"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"No se pueden instalar certificados"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Cerrar"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Este archivo no puede utilizarse como <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"certificado"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"certificado de CA"</string>
+    <string name="user_certificate" msgid="514888069820553128">"Certificado de usuario de VPN y aplicaciones"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"certificado de Wi‑Fi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"Se ha instalado el certificado de CA"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Se ha instalado el certificado de usuario"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Se ha instalado el certificado de Wi‑Fi"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"No se ha podido instalar porque el tamaño del certificado es demasiado grande."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"No se ha podido instalar porque no se ha encontrado el archivo de certificado."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"No se ha podido instalar porque no se puede leer el archivo de certificado."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Se ha producido un error temporal. Inténtalo de nuevo más tarde."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Solo el propietario de este dispositivo puede instalar certificados."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Uso de credenciales:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index ee96724..f930dab 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -21,12 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Sertifikaadi ekstraktimine"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Ekstraktimine ..."</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Ekstraktimine %s-st"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Lisage sertifikaadile nimi"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Sertifikaadi nimi:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Pange sellele sertifikaadile nimi"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Sertifikaadi nimi"</string>
     <string name="credential_password" msgid="3520176519550993326">"Sertifikaatide ekstraktimiseks sisestage parool."</string>
     <string name="credential_info" msgid="2436768402308470397">"Pakett sisaldab:"</string>
     <string name="p12_description" msgid="4128352087331630024">"Sertifikaadid PKCS12 võtmete andmebaasis."</string>
     <string name="one_userkey" msgid="3500697912370644881">"üks kasutajavõti"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"Algoritm:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"üks kasutaja sertifikaat"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"üks CA-sertifikaat"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA sertifikaadid"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Sertifikaat on kehtetu."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Sertifikaadi installimiseks on vaja privaatvõtit"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Privaatvõtme installimiseks on vaja sertifikaati"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> on installitud."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Valige sertifikaadi tüüp"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"CA-sertifikaate ei saa installida"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA-sertifikaadid võivad teie privaatsuse ohtu seada ja need tuleb installida menüüs Seaded"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Sule"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Sertifikaate ei saa installida"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Sule"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Seda faili ei saa kasutada sertifikaadina <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Sertifikaat"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA-sertifikaat"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN-i ja rakenduse kasutaja sertifikaat"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"WiFi-sertifikaat"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA-sertifikaat on installitud"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Kasutajasertifikaat on installitud"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"WiFi-sertifikaat on installitud"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Ei saanud installida, sest sertifikaadi maht on liiga suur."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Ei saanud installida, sest sertifikaadi faili ei leitud."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Ei saanud installida, sest sertifikaadi fail pole loetav."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Ajutine viga. Proovige hiljem uuesti."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Ainult seadme omanik võib installida sertifikaate."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Mandaadi kasutus:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 0d4d511..9489d23 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -21,14 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Atera ziurtagiria"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Ateratzen…"</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Atera %s fitxategitik"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Jarri izena ziurtagiriari"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Ziurtagiriaren izena:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Eman izen bat ziurtagiriari"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Ziurtagiriaren izena"</string>
     <string name="credential_password" msgid="3520176519550993326">"Idatzi ziurtagiriak ateratzeko pasahitza."</string>
     <string name="credential_info" msgid="2436768402308470397">"Paketearen edukia:"</string>
     <string name="p12_description" msgid="4128352087331630024">"PKCS12 gako-biltegian dauden ziurtagiriak."</string>
     <string name="one_userkey" msgid="3500697912370644881">"erabiltzaile-gako bat"</string>
-    <!-- no translation found for userkey_type (6214833257030657106) -->
-    <skip />
+    <string name="userkey_type" msgid="6214833257030657106">"Algoritmoa:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"erabiltzaile-ziurtagiri bat"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"CA ziurtagiri bat"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA ziurtagiriak"</string>
@@ -42,15 +41,29 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Ziurtagiriak ez du balio."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Gako pribatua behar da ziurtagiri bat instalatzeko"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Ziurtagiria behar da gako pribatu bat instalatzeko"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> instalatu da."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Aukeratu ziurtagiri mota bat"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Ezin dira instalatu CA ziurtagiriak"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA ziurtagiriek arriskuan ezar dezakete zure pribatutasuna. Ezarpenak atalean instalatu behar dira."</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Itxi"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Ezin dira instalatu ziurtagiriak"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Itxi"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Fitxategi horri ezin zaio eman erabilera hau: <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Ziurtagiria"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA ziurtagiria"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN eta aplikazioetarako erabiltzaile-ziurtagiria"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Wifi-ziurtagiria"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"Instalatu da CA ziurtagiria"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Instalatu da erabiltzaile-ziurtagiria"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Instalatu da wifi-ziurtagiria"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Ezin izan da instalatu ziurtagiria handiegia delako."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Ezin izan da instalatu ezin izan delako ziurtagiri-fitxategia aurkitu."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Ezin izan da instalatu ezin izan delako ziurtagiri-fitxategia irakurri."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Aldi baterako hutsegitea. Saiatu berriro geroago."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Gailuaren jabeak soilik instala ditzake ziurtagiriak."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Kredentzialen erabilera:"</string>
   <string-array name="credential_usage">
     <item msgid="375085478373011304">"VPN konexioa eta aplikazioak"</item>
-    <item msgid="692322974985472861">"Wi-Fi konexioa"</item>
+    <item msgid="692322974985472861">"Wifia"</item>
   </string-array>
     <string name="certificate_capabilities_warning" msgid="4158609401937799110">"Oharra: ziurtagiri honen jaulkitzaileak gailura edo gailutik bidalitako trafiko guztia ikuska dezake."</string>
     <string name="wifi_title" msgid="8475811746333426489">"Wi-Fi profila"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 1bc12c8..556cf57 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -19,14 +19,15 @@
     <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="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="name_credential_dialog_title" msgid="1481964824549786927">"نام‌گذاری این گواهینامه"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"نام گواهینامه"</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="userkey_type" msgid="6214833257030657106">"الگوریتم:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"یک گواهی کاربری"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"‏یک گواهی CA"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"‏%d گواهی CA"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"مجوز نامعتبر است."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"برای نصب گواهی به کلید خصوصی نیاز است"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"برای نصب کلید خصوصی، به گواهی نیاز است"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> نصب شده است."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"یک نوع گواهینامه انتخاب کنید"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"گواهینامه‌های مرکز صدور گواهی نمی‌توانند نصب شوند"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"گواهینامه‌های مرکز صدور گواهی می‌توانند حریم‌خصوصی شما را درمعرض خطر قرار دهند و باید در «تنظیمات» نصب شوند."</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"بستن"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"گواهینامه‌ها نمی‌توانند نصب شوند"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"بستن"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"از این فایل نمی‌توانید به‌عنوان <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g> استفاده کنید"</string>
+    <string name="certificate" msgid="8790577925509962529">"گواهی"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"گواهینامه مرکز صدور گواهی"</string>
+    <string name="user_certificate" msgid="514888069820553128">"‏گواهینامه کاربر برنامه و VPN"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"‏گواهینامه Wi-Fi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"گواهینامه مرکز صدور گواهی نصب شد"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"گواهینامه کاربر نصب شد"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"‏گواهینامه Wi-Fi نصب شد"</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="cert_temp_error" msgid="617276803992714550">"خطای موقت. لطفاً بعداً دوباره امتحان کنید."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"فقط مالک این دستگاه می‌تواند مجوزها را نصب کند."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"استفاده از اطلاعات کاربری:"</string>
   <string-array name="credential_usage">
@@ -59,17 +74,17 @@
     <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_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">"‏سیم‌کارت: %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="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_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" 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>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index e88ec05..4805043 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -21,12 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Pura varmenne"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Haetaan..."</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Hae tallenteesta %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Nimeä varmenne"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Varmenteen nimi:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Nimeä tämä varmenne"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Varmenteen nimi"</string>
     <string name="credential_password" msgid="3520176519550993326">"Hae varmenteet kirjoittamalla salasana."</string>
     <string name="credential_info" msgid="2436768402308470397">"Paketti sisältää:"</string>
     <string name="p12_description" msgid="4128352087331630024">"Varmenteet PKCS12-avaintallenteessa."</string>
     <string name="one_userkey" msgid="3500697912370644881">"yhden käyttäjän näppäin"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"Algoritmi:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"yhden käyttäjän varmenne"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"yksi CA-varmenne"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA-varmennetta"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Varmenne on virheellinen."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Varmenteen asennus edellyttää yksityistä avainta."</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Yksityisen avaimen asennus edellyttää varmennetta."</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> on asennettu."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Valitse varmenteen tyyppi"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"CA-varmenteita ei voi asentaa"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA-varmenteet voivat vaarantaa tietosuojasi. Ne on asennettava asetusten kautta."</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Sulje"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Varmenteita ei voi asentaa"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Sulje"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Tiedosto ei sovi tähän tarkoitukseen: <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Varmenne"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA-varmenne"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN- ja sovelluskäytön varmenne"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Wi‑Fi-varmenne"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA-varmenne asennettu"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Käyttäjävarmenne asennettu"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Wi‑Fi-varmenne asennettu"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Asennus epäonnistui, koska varmenne on liian suuri."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Asennus epäonnistui, koska varmennetiedostoa ei löydy."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Asennus epäonnistui, koska varmennetiedostoa ei voitu lukea."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Väliaikainen vika. Yritä myöhemmin uudelleen."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Vain tämän laitteen omistaja voi asentaa varmenteita."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Käyttöoikeustietojen käyttö:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 3381300..0b5629c 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -21,14 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Extraire le certificat"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Extraction en cours…"</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Extraire de %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Attribuer un nom au certificat"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Nom du certificat :"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Nommez ce certificat"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Nom du certificat"</string>
     <string name="credential_password" msgid="3520176519550993326">"Saisir le mot de passe pour extraire les certificats"</string>
     <string name="credential_info" msgid="2436768402308470397">"Le paquet contient :"</string>
     <string name="p12_description" msgid="4128352087331630024">"Certificats du keystore PKCS12"</string>
     <string name="one_userkey" msgid="3500697912370644881">"une clé utilisateur"</string>
-    <!-- no translation found for userkey_type (6214833257030657106) -->
-    <skip />
+    <string name="userkey_type" msgid="6214833257030657106">"Algorithme :"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"un certificat utilisateur"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"un certificat de l\'autorité de certification"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d certificats de l\'autorité de certification"</string>
@@ -42,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Le certificat est incorrect."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Clé privée requise pour installer un certificat"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Certificat requis pour installer une clé privée"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> est installé."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Choisissez un type de certificat"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Impossible d\'installer les certificats CA"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"Les certificats CA peuvent présenter un risque pour votre confidentialité et doivent être installés dans le menu Paramètres"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Fermer"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Impossible d\'installer les certificats"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Fermer"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Ce fichier ne peut pas être utilisé comme <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Certificat"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"Certificat CA"</string>
+    <string name="user_certificate" msgid="514888069820553128">"Certificat RPV et d\'application de l\'utilisateur"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Certificat Wi‑Fi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"Certificat CA installé"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Certificat utilisateur installé"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Certificat Wi‑Fi installé"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Impossible de procéder à l\'installation, car le certificat est trop volumineux."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Impossible de procéder à l\'installation, car le fichier de certificat est introuvable."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Impossible de procéder à l\'installation, car le fichier de certificat ne peut être lu."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Échec temporaire. Veuillez réessayer plus tard."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Seul le propriétaire de cet appareil peut installer des certificats."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Utilisation du certificat :"</string>
   <string-array name="credential_usage">
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index a02c8c0..8692e48 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -21,14 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Extraire le certificat"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Extraction en cours…"</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Extraire de %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Attribuer un nom au certificat"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Nom du certificat :"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Donner un nom à ce certificat"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Nom du certificat"</string>
     <string name="credential_password" msgid="3520176519550993326">"Saisir le mot de passe pour extraire les certificats"</string>
     <string name="credential_info" msgid="2436768402308470397">"Le package contient :"</string>
     <string name="p12_description" msgid="4128352087331630024">"Certificats dans le keystore PKCS12"</string>
     <string name="one_userkey" msgid="3500697912370644881">"une clé utilisateur"</string>
-    <!-- no translation found for userkey_type (6214833257030657106) -->
-    <skip />
+    <string name="userkey_type" msgid="6214833257030657106">"Algorithme :"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"un certificat utilisateur"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"un certificat de l\'autorité de certification"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d certificats de l\'autorité de certification"</string>
@@ -42,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Le certificat est incorrect."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Clé privée requise pour installer un certificat"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Certificat requis pour installer une clé privée"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> est installé."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Sélectionner un type de certificat"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Impossible d\'installer les certificats CA"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"Les certificats CA peuvent présenter un risque pour votre confidentialité et doivent être installés via les paramètres"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Fermer"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Impossible d\'installer les certificats"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Fermer"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Impossible d\'utiliser ce fichier comme <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"certificat"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"certificat CA"</string>
+    <string name="user_certificate" msgid="514888069820553128">"Certificat utilisateur pour le VPN et les applications"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"certificat Wi‑Fi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"Certificat CA installé"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Certificat utilisateur installé"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Certificat Wi‑Fi installé"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Impossible de procéder à l\'installation, car le certificat est trop volumineux."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Impossible de procéder à l\'installation, car le fichier de certificat est introuvable."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Impossible de procéder à l\'installation, car le fichier de certificat ne peut être lu."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Échec provisoire. Veuillez réessayer plus tard."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Seul le propriétaire de cet appareil peut installer des certificats."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Utilisation du certificat :"</string>
   <string-array name="credential_usage">
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 3730cfe..4b9b9d1 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -21,12 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Extraer certificado"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Extraendo..."</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Extraer de %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Escolle un nome para o certificado"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Nome do certificado:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Introduce un nome para este certificado"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Nome do certificado"</string>
     <string name="credential_password" msgid="3520176519550993326">"Escribe o contrasinal para extraer os certificados."</string>
     <string name="credential_info" msgid="2436768402308470397">"O paquete contén:"</string>
     <string name="p12_description" msgid="4128352087331630024">"Certificados en almacenamento de clave PKCS12."</string>
     <string name="one_userkey" msgid="3500697912370644881">"unha clave de usuario"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"Algoritmo:"</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="n_cacrts" msgid="2141498640685639208">"%d certificados de CA"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"O certificado non é válido."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Necesítase unha clave privada para instalar un certificado"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Necesítase un certificado para instalar unha clave privada"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> está instalado."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Escolle un tipo de certificado"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Non se puideron instalar os certificados de CA"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"Os certificados de CA poden pór en risco a túa privacidade e deben instalarse en Configuración"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Pechar"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Non se puideron instalar os certificados"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Pechar"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Este ficheiro non se pode usar como <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"certificado"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"certificado de CA"</string>
+    <string name="user_certificate" msgid="514888069820553128">"Certificado de usuario de aplicacións e VPN"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"certificado de wifi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"Instalouse o certificado de CA"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Instalouse o certificado de usuario"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Instalouse o certificado de wifi"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Non se puido instalar porque o tamaño do certificado é demasiado grande."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Non se puido instalar porque non se puido localizar o ficheiro de certificado."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Non se puido instalar porque non se puido ler o ficheiro de certificado."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Produciuse un erro temporal. Téntao de novo máis tarde."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Só o propietario deste dispositivo pode instalar certificados."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Uso da credencial:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 31bef27..001141d 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -21,12 +21,13 @@
     <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="name_credential_dialog_title" msgid="1481964824549786927">"આ પ્રમાણપત્રને નામ આપો"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"પ્રમાણપત્રનું નામ"</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="userkey_type" msgid="6214833257030657106">"ઍલ્ગોરિધમ:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"એક વપરાશકર્તા પ્રમાણપત્ર"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"એક CA પ્રમાણપત્ર"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA પ્રમાણપત્રો"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"પ્રમાણપત્ર અમાન્ય છે."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"પ્રમાણપત્ર ઇન્સ્ટૉલ કરવા માટે ખાનગી કી જરૂરી છે"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"ખાનગી કી ઇન્સ્ટૉલ કરવા માટે પ્રમાણપત્ર જરૂરી છે"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> ઇન્સ્ટોલ થયેલ છે."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"પ્રમાણપત્રનો પ્રકાર પસંદ કરો"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"CA પ્રમાણપત્રો ઇન્સ્ટૉલ કરી શકાતા નથી"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA પ્રમાણપત્રો તમારી પ્રાઇવસીને જોખમમાં મૂકી શકે છે અને તેમને સેટિંગમાં ઇન્સ્ટૉલ કરવા જરૂરી છે"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"બંધ કરો"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"પ્રમાણપત્રો ઇન્સ્ટૉલ કરી શકાતા નથી"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"બંધ કરો"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"<xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g> તરીકે આ ફાઇલનો ઉપયોગ કરી શકાશે નહીં"</string>
+    <string name="certificate" msgid="8790577925509962529">"પ્રમાણપત્ર"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA પ્રમાણપત્ર"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN અને ઍપ વપરાશકર્તા પ્રમાણપત્ર"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"વાઇ-ફાઇ પ્રમાણપત્ર"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA પ્રમાણપત્ર ઇન્સ્ટૉલ કર્યું"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"વપરાશકર્તા પ્રમાણપત્ર ઇન્સ્ટૉલ કર્યું"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"વાઇફાઇ પ્રમાણપત્ર ઇન્સ્ટૉલ કર્યું"</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="cert_temp_error" msgid="617276803992714550">"હંગામી રૂપે નિષ્ફળતા. કૃપા કરીને થોડા સમય પછી ફરી પ્રયાસ કરો."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"માત્ર આ ઉપકરણના માલિક પ્રમાણપત્રો ઇન્સ્ટોલ કરી શકે છે."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"ઓળખપત્ર ઉપયોગ:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 66b192f..1f77747 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -21,12 +21,13 @@
     <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="name_credential_dialog_title" msgid="1481964824549786927">"इस प्रमाणपत्र को एक नाम दें"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"प्रमाणपत्र का नाम"</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="userkey_type" msgid="6214833257030657106">"एल्गोरिदम:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"एक उपयोगकर्ता प्रमाणपत्र"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"एक CA प्रमाणपत्र"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA प्रमाणपत्र"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"प्रमाणपत्र अमान्य है."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"प्रमाणपत्र इंस्टॉल करने के लिए निजी कुंजी ज़रूरी है"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"निजी कुंजी इंस्टॉल करने के लिए प्रमाणपत्र ज़रूरी है"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> इंस्‍टॉल किया हुआ है."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"चुनें कि प्रमाणपत्र किस तरह का है"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"CA प्रमाणपत्र इंस्टॉल नहीं किए जा सकते"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA प्रमाणपत्र से आपकी निजता खतरे में पड़ सकती है. इसे \'सेटिंग\' में ही इंस्टॉल किया जाना चाहिए"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"बंद करें"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"प्रमाणपत्र इंस्टॉल नहीं किए जा सकते"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"बंद करें"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"इस फ़ाइल का इस्तेमाल <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g> के तौर पर नहीं किया जा सकता"</string>
+    <string name="certificate" msgid="8790577925509962529">"प्रमाणपत्र"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA प्रमाणपत्र"</string>
+    <string name="user_certificate" msgid="514888069820553128">"वीपीएन और ऐप्लिकेशन उपयोगकर्ता प्रमाणपत्र"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"वाई-फ़ाई प्रमाणपत्र"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA प्रमाणपत्र इंस्टॉल किया गया"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"उपयोगकर्ता प्रमाणपत्र इंस्टॉल किया गया"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"वाई-फ़ाई प्रमाणपत्र इंस्टॉल किया गया"</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="cert_temp_error" msgid="617276803992714550">"कुछ समय के लिए गड़बड़ी हुई. कृपया बाद में कोशिश करें."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"केवल इस डिवाइस का स्वामी ही प्रमाणपत्रों को इंस्टॉल कर सकता है."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"प्रमाणिकता उपयोग:"</string>
   <string-array name="credential_usage">
@@ -51,7 +66,7 @@
     <item msgid="692322974985472861">"वाई-फ़ाई"</item>
   </string-array>
     <string name="certificate_capabilities_warning" msgid="4158609401937799110">"ध्यान दें: यह प्रमाणपत्र देने वाली कंपनी, आपके डिवाइस पर आ रहे और आपके डिवाइस से भेजे जा रहे नेटवर्क से जुड़े सभी ट्रैफ़िक की जाँच कर सकती है."</string>
-    <string name="wifi_title" msgid="8475811746333426489">"वाई-फ़ार्इ प्रोफ़ाइल"</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>
@@ -68,7 +83,7 @@
     <string name="install_done" msgid="1522718684172097080">"<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_download_error" msgid="5429453090956277692">"डाउनलोड की गई फ़ाइल में समस्या है और उसे इंस्टॉल नहीं किया जा सकता. सुनिश्चित करें कि आपने सही स्रोत से फ़ाइल डाउनलोड की है."</string>
+    <string name="wifi_installer_download_error" msgid="5429453090956277692">"डाउनलोड की गई फ़ाइल में समस्या है और उसे इंस्टॉल नहीं किया जा सकता. पक्का करें कि आपने सही स्रोत से फ़ाइल डाउनलोड की है."</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>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 075aa12..8fcfa7b 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -21,12 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Izdvajanje certifikata"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Izdvajanje..."</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Izdvojeno iz značajke %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Naziv certifikata"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Naziv certifikata:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Dodijelite naziv ovom certifikatu"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Naziv certifikata"</string>
     <string name="credential_password" msgid="3520176519550993326">"Unesite zaporku za izdvajanje certifikata."</string>
     <string name="credential_info" msgid="2436768402308470397">"Paket sadrži:"</string>
     <string name="p12_description" msgid="4128352087331630024">"Certifikat za bazu ključeva PKCS12."</string>
     <string name="one_userkey" msgid="3500697912370644881">"tipka jednog korisnika"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"Algoritam:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"certifikat jednog korisnika"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"jedan CA certifikat"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA certifikati"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Certifikat je nevažeći."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Za instaliranje certifikata potreban je privatni ključ"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Za instaliranje privatnog ključa potreban je certifikat"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> je instaliran."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Odaberite vrstu certifikata"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Instaliranje CA certifikata nije uspjelo"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA certifikati mogu ugroziti vašu privatnost i potrebno ih je instalirati u Postavkama"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Zatvori"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Instaliranje certifikata nije uspjelo"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Zatvori"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Ova se datoteke ne može koristiti kao <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Certifikat"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA certifikat"</string>
+    <string name="user_certificate" msgid="514888069820553128">"Korisnički certifikat za VPN i aplikacije"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Certifikat za Wi‑Fi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA certifikat je instaliran"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Korisnički certifikat je instaliran"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Certifikat za Wi‑Fi je instaliran"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Nije moguće instalirati jer je certifikat prevelik."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Nije moguće instalirati jer nije bilo moguće locirati datoteku certifikata."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Nije moguće instalirati jer nije bilo moguće pročitati datoteku certifikata."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Privremeni neuspjeh. Pokušajte kasnije."</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 vjerodajnice:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 0e138b9..b55bee1 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -21,12 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Tanúsítvány kibontása"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Kibontás..."</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Kiolvasás innen: %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"A tanúsítvány neve"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Tanúsítvány neve:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Tanúsítvány elnevezése"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Tanúsítvány neve"</string>
     <string name="credential_password" msgid="3520176519550993326">"Adja meg a jelszót a tanúsítványok kibontásához."</string>
     <string name="credential_info" msgid="2436768402308470397">"A csomag tartalma:"</string>
     <string name="p12_description" msgid="4128352087331630024">"Tanúsítványok a PKCS12 kulcstárban."</string>
     <string name="one_userkey" msgid="3500697912370644881">"egy felhasználói kulcs"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"Algoritmus:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"egy felhasználói tanúsítvány"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"egy CA tanúsítvány"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA tanúsítvány"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Ez a tanúsítvány érvénytelen."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Tanúsítvány telepítéséhez privát kulcs szükséges"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Privát kulcs telepítéséhez tanúsítvány szükséges"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"A(z) <xliff:g id="CREDENTIAL">%s</xliff:g> tanúsítvány telepítve van."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Válasszon tanúsítványtípust"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Nem sikerült telepíteni a CA-tanúsítványokat"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"A CA-tanúsítványok veszélyeztethetik adatait, és a Beállításokban kell telepíteni őket"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Bezárás"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Nem sikerült telepíteni a tanúsítványokat"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Bezárás"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Ez a fájl nem használható a következőképp: <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Tanúsítvány"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA-tanúsítvány"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN- és appfelhasználói tanúsítvány"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Wi‑Fi-tanúsítvány"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA-tanúsítvány telepítve"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Felhasználói tanúsítvány telepítve"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Wi‑Fi-tanúsítvány telepítve"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Nem lehet telepíteni, mert a tanúsítvány mérete túl nagy."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Nem lehet telepíteni, mert a tanúsítványfájl nem található."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Nem lehet telepíteni, mert a tanúsítványfájl nem olvasható."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Ideiglenes hiba. Próbálja újra."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Csak az eszköz tulajdonosa telepíthet tanúsítványokat."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Hitelesítési adatok használata:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index c131f21..0063353 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -23,14 +23,13 @@
     <!-- String.format failed for translation -->
     <!-- no translation found for pkcs12_file_password_dialog_title (8102721384767269510) -->
     <skip />
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Անվանեք վկայագիրը"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Վկայագրի անունը`"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Անուն տվեք այս հավաստագրին"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Հավաստագրի անունը"</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>
-    <!-- no translation found for userkey_type (6214833257030657106) -->
-    <skip />
+    <string name="userkey_type" msgid="6214833257030657106">"Ալգորիթմ՝"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"մեկ օգտատիրոջ վկայական"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"մեկ CA վկայագիր"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA վկայականներ"</string>
@@ -44,10 +43,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Վկայագիրը անվավեր է:"</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Հավաստագիրը տեղադրելու համար գաղտնի բանալի է անհրաժեշտ"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Գաղտնի բանալի տեղադրելու համար հավաստագիր է անհրաժեշտ"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g>-ը տեղադրված է:"</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Ընտրեք հավաստագրի տեսակը"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Չհաջողվեց տեղադրել ՎԿ հավաստագիրը"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"ՎԿ հավաստագրերը կարող են վտանգել ձեր գաղտնիությունը և պետք է տեղադրվեն կարգավորումներում:"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Փակել"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Չհաջողվեց տեղադրել հավաստագրերը"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Փակել"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Այս ֆայլը չի կարող օգտագործվել որպես <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Հավաստագիր"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"ՎԿ հավաստագիր"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN-ի և հավելվածների օգտատիրոջ հավաստագիր"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Wi‑Fi հավաստագիր"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"ՎԿ հավաստագիրը տեղադրվեց"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Օգտատիրոջ հավաստագիրը տեղադրվեց"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Wi‑Fi հավաստագիրը տեղադրվեց"</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="cert_temp_error" msgid="617276803992714550">"Ժամանակավոր խափանում: Նորից փորձեք:"</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Միայն այս սարքի սեփականատերը կարող է վկայագրեր տեղադրել:"</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Վկայականի օգտագործումը`"</string>
   <string-array name="credential_usage">
@@ -62,7 +75,7 @@
     <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_no_config" msgid="1835743123288916755">"Չկա"</string>
     <string name="wifi_config_text" msgid="8259587306773310314">"Անուն՝ %1$s\nFQDN՝ %2$s\nRoaming Consortiums՝ %3$s\nRealm՝ %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>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index d23f171..0e71644 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -21,12 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Ekstrak sertifikat"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Mengekstrak..."</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Ekstrak dari %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Beri nama sertifikat"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Nama sertifikat:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Beri nama sertifikat ini"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Nama sertifikat"</string>
     <string name="credential_password" msgid="3520176519550993326">"Ketikkan sandi untuk mengekstrak sertifikat."</string>
     <string name="credential_info" msgid="2436768402308470397">"Paket terdiri dari:"</string>
     <string name="p12_description" msgid="4128352087331630024">"Sertifikat dalam PKCS12 keystore."</string>
     <string name="one_userkey" msgid="3500697912370644881">"satu kunci pengguna"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"Algoritme:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"satu sertifikat pengguna"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"satu Sertifikat CA"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"Sertifikat CA %d"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Sertifiakt tidak valid."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Kunci pribadi diperlukan untuk menginstal sertifikat"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Sertifikat diperlukan untuk menginstal kunci pribadi"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> telah dipasang."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Pilih jenis sertifikat"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Tidak dapat menginstal sertifikat"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"Sertifikat CA dapat membuat privasi berisiko dan harus diinstal di Setelan"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Tutup"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Tidak dapat menginstal sertifikat"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Tutup"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"File ini tidak dapat digunakan sebagai <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Sertifikat"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"Sertifikat CA"</string>
+    <string name="user_certificate" msgid="514888069820553128">"Sertifikat pengguna aplikasi &amp; VPN"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Sertifikat Wi‑Fi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"Sertifikat CA diinstal"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Sertifikat pengguna diinstal"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Sertifikat Wi‑Fi diinstal"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Tidak dapat memasang karena ukuran sertifikat terlalu besar."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Tidak dapat memasang karena file sertifikat tidak dapat ditemukan."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Tidak dapat memasang karena file sertifikat tidak dapat dibaca."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Kegagalan sementara. Coba lagi nanti."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Hanya pemilik perangkat ini yang dapat memasang sertifikat."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Penggunaan kredensial:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 8c664b7..2fb4155 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -21,12 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Draga út vottorð"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Dregur út…"</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Draga út úr %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Gefa vottorði heiti"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Heiti vottorðs:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Gefðu þessu vottorði heiti"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Heiti vottorðs"</string>
     <string name="credential_password" msgid="3520176519550993326">"Sláðu inn aðgangsorðið til að sækja vottorðin."</string>
     <string name="credential_info" msgid="2436768402308470397">"Pakkinn inniheldur:"</string>
     <string name="p12_description" msgid="4128352087331630024">"Vottorð í PKCS12-lyklageymslu."</string>
     <string name="one_userkey" msgid="3500697912370644881">"einn notandalykill"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"Reiknirit:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"eitt notandavottorð"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"eitt CA-vottorð"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA-vottorð"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Vottorðið er ógilt."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Einkalykill er nauðysnlegur til að setja upp vottorð"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Vottorð er nauðsynlegt til að setja upp einkalykil"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> er uppsett."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Veldu tegund vottorðs"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Ekki er hægt að setja upp CA-vottorð"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA-vottorð geta stefnt persónuvernd þinni í hættu og setja verður þau upp í stillingunum"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Loka"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Ekki er hægt að setja upp vottorð"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Loka"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Ekki er hægt að nota þessa skrá sem <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Vottorð"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA-vottorð"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN- og forritsnotandavottorð"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Wi‑Fi vottorð"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA-vottorð er uppsett"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Notandavottorð er uppsett"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Wi‑Fi vottorð er uppsett"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Uppsetning mistókst því að vottorðsskráin er of stór."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Uppsetning mistókst því að vottorðsskráin fannst ekki."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Uppsetning mistókst því að ekki tókst að lesa vottorðsskrána."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Tímabundin villa. Reyndu aftur síðar."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Aðeins eigandi þessa tækis má setja upp vottorð."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Notkun skilríkja:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 1894b20..f48adf1 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -21,12 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Estrai certificato"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Estrazione..."</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Estrazione da %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Specifica un nome per il certificato"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Nome certificato:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Assegna un nome al certificato"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Nome certificato"</string>
     <string name="credential_password" msgid="3520176519550993326">"Digita la password per l\'estrazione dei certificati."</string>
     <string name="credential_info" msgid="2436768402308470397">"Il pacchetto contiene:"</string>
     <string name="p12_description" msgid="4128352087331630024">"Certificati in keystore PKCS12."</string>
     <string name="one_userkey" msgid="3500697912370644881">"una chiave utente"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"Algoritmo:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"un certificato utente"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"un certificato CA"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"Certificati CA %d"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Il certificato non è valido."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"L\'installazione di un certificato richiede la chiave privata"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"L\'installazione di una chiave privata richiede il certificato"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> installato."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Scegli un tipo di certificato"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Impossibile installare i certificati CA"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"I certificati CA può mettere a rischio la tua privacy e devono essere installati nelle Impostazioni"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Chiudi"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Impossibile installare i certificati"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Chiudi"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Questo file non può essere usato come <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Certificazione"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"Certificato CA"</string>
+    <string name="user_certificate" msgid="514888069820553128">"Certificato utente per app e VPN"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Certificato Wi‑Fi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"Certificato CA installato"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Certificato utente installato"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Certificato Wi‑Fi installato"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Installazione impossibile: dimensioni del certificato troppo grandi."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Installazione impossibile: file del certificato non trovato."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Installazione impossibile: file del certificato non leggibile."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Errore temporaneo. Riprova più tardi."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Solo il proprietario di questo dispositivo può installare certificati."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Utilizzo della credenziale:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 804694e..580cfdc 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -21,12 +21,13 @@
     <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="name_credential_dialog_title" msgid="1481964824549786927">"מה שם האישור הזה?"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"שם אישור"</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="userkey_type" msgid="6214833257030657106">"אלגוריתם:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"אישור למשתמש אחד"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"אישור אחד מרשות אישורים"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"‏אישורים של רשות האישורים %d"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"האישור אינו חוקי."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"מפתח פרטי נדרש כדי להתקין אישור"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"אישור נדרש כדי להתקין מפתח פרטי"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> הותקן."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"יש לבחור את סוג האישור"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"‏לא ניתן להתקין אישורי CA"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"‏אישורי CA עלולים לסכן את הפרטיות שלך, וחובה להתקין אותם בהגדרות"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"סגירה"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"לא ניתן להתקין את האישורים"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"סגירה"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"לא ניתן להשתמש בקובץ הזה בתור <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"אישור"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"‏אישור CA"</string>
+    <string name="user_certificate" msgid="514888069820553128">"‏אישור משתמש לאפליקציה ול-VPN"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"‏אישור Wi-Fi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"‏הותקן אישור CA"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"הותקן אישור משתמש"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"‏הותקן אישור Wi-Fi"</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="cert_temp_error" msgid="617276803992714550">"שגיאה זמנית. יש לנסות מאוחר יותר."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"רק הבעלים של מכשיר זה יכול להתקין אישורים."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"השימוש בפרטי הכניסה:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index f836bac..c05a49c 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -21,12 +21,13 @@
     <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="name_credential_dialog_title" msgid="1481964824549786927">"この証明書の名前を指定してください"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"証明書名"</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">"ユーザーキー1個"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"アルゴリズム:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"ユーザー証明書1件"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"CA証明書1件"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"CA証明書%d件"</string>
@@ -40,17 +41,31 @@
     <string name="invalid_cert" msgid="7704228670980743590">"証明書が無効です。"</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"証明書をインストールするには、秘密鍵が必要です"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"秘密鍵をインストールするには、証明書が必要です"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g>がインストールされています。"</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"証明書の種類の選択"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"CA 証明書をインストールできません"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA 証明書はユーザーのプライバシーを危険にさらす可能性があるため、[設定] でインストールしてください"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"閉じる"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"証明書をインストールできません"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"閉じる"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"このファイルは <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>として利用できません"</string>
+    <string name="certificate" msgid="8790577925509962529">"証明書"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA 証明書"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN とアプリユーザー証明書"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Wi‑Fi 証明書"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA 証明書をインストールしました"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"ユーザー証明書をインストールしました"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Wi‑Fi 証明書をインストールしました"</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="only_primary_user_allowed" msgid="4005084935023047716">"証明書をインストールできるのはこの端末の所有者だけです。"</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"一時的なエラーが発生しました。しばらくしてからもう一度お試しください。"</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>
     <item msgid="692322974985472861">"Wi-Fi"</item>
   </string-array>
-    <string name="certificate_capabilities_warning" msgid="4158609401937799110">"注: この証明書の発行者が端末のすべてのトラフィックを検証する場合があります。"</string>
+    <string name="certificate_capabilities_warning" msgid="4158609401937799110">"注: この証明書の発行者がデバイスのすべてのトラフィックを検証する場合があります。"</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>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index f826da7..a5e9e75 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -21,12 +21,13 @@
     <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="name_credential_dialog_title" msgid="1481964824549786927">"დაარქვით სახელი ამ სერტიფიკატს"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"სერტიფიკატის სახელი"</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="userkey_type" msgid="6214833257030657106">"ალგორითმი:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"გამოიყენეთ მომხმარებლის სერტიფიკატი"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"ერთი CA სერტიფიკატი"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA სერტიფიკატები"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"სერტიფიკატი არასწორია."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"სერტიფიკატის ინსტალაციისთვის საჭიროა პირადი გასაღები"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"პირადი გასაღების ინსტალაციისთვის საჭიროა სერტიფიკატი"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> დაყენებულია."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"აირჩიეთ სერტიფიკატის ტიპი"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"CA სერტიფიკატების ინსტალაცია ვერ მოხერხდა"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA სერტიფიკატები შეიძლება თქვენი კონფიდენციალურობისთვის საფრთხეს წარმოადგენდეს და უნდა დაყენდეს პარამეტრებში"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"დახურვა"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"სერტიფიკატების ინსტალაცია ვერ მოხერხდა"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"დახურვა"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"ეს ფაილი არ შეიძლება გამოყენებულ იქნას, როგორც <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"სერტიფიკატი"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA სერტიფიკატი"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN და აპის მომხმარებლის სერტიფიკატი"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Wi‑Fi სერტიფიკატი"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA სერტიფიკატი დაინსტალირდა"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"მომხმარებლის სერტიფიკატი დაინსტალირდა"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Wi‑Fi სერტიფიკატი დაინსტალირდა"</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="cert_temp_error" msgid="617276803992714550">"დროებითი შეფერხება. ცადეთ მოგვიანებით."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"მხოლოდ მოწყობილობის მფლობელს შეუძლია სერტიფიკატების ინსტალაცია."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"ავტორიზაციის მონაცემების გამოყენება:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index dbfd4be..42f6ece 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -21,14 +21,13 @@
     <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="name_credential_dialog_title" msgid="1481964824549786927">"Бұл сертификатқа ат қойыңыз"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Сертификат атауы"</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>
-    <!-- no translation found for userkey_type (6214833257030657106) -->
-    <skip />
+    <string name="userkey_type" msgid="6214833257030657106">"Алгоритм:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"бір пайдаланушы сертификаты"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"бір CA сертификаты"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d растау агенттігінің сертификаттары"</string>
@@ -42,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Сертификат жарамсыз."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Сертификатты орнату үшін жеке кілт қажет"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Жеке кілтті орнату үшін сертификат қажет"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> орнатылған."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Сертификат түрін таңдаңыз"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"CA сертификаттарын орнату мүмкін емес"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA сертификаттары құпиялылығыңызға қауіп төндіруі мүмкін болғандықтан, оларды \"Параметрлер\" бөлімінен орнату керек."</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Жабу"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Сертификаттарды орнату мүмкін емес."</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Жабу"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Бұл файлды <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g> ретінде пайдалану мүмкін емес."</string>
+    <string name="certificate" msgid="8790577925509962529">"Сертификат"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA сертификаты"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN және қолданба пайдаланушысы сертификаты"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Wi‑Fi сертификаты"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA сертификаты орнатылды"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Пайдаланушы сертификаты орнатылды"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Wi‑Fi сертификаты орнатылды"</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="cert_temp_error" msgid="617276803992714550">"Уақытша қате шықты. Қайталап көріңіз."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Осы құрылғының иесі ғана сертификаттарды орната алады."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Растау деректерін қолдану:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 32a7811..ca22b12 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -21,12 +21,13 @@
     <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="name_credential_dialog_title" msgid="1481964824549786927">"ដាក់ឈ្មោះ​ឱ្យវិញ្ញាបនបត្រ​នេះ"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"ឈ្មោះ​វិញ្ញាបនបត្រ"</string>
     <string name="credential_password" msgid="3520176519550993326">"បញ្ចូល​ពាក្យ​សម្ងាត់​ដើម្បី​ស្រង់​វិញ្ញាបនបត្រ​ចេញ។"</string>
     <string name="credential_info" msgid="2436768402308470397">"កញ្ចប់​មាន​៖"</string>
     <string name="p12_description" msgid="4128352087331630024">"វិញ្ញាបនបត្រ​នៅ​ក្នុង PKCS12 keystore ។"</string>
     <string name="one_userkey" msgid="3500697912370644881">"សោ​អ្នក​ប្រើ​ម្នាក់"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"ក្បួន៖"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"វិញ្ញាបនបត្រ​អ្នក​ប្រើ​ម្នាក់"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"វិញ្ញាបនបត្រ CA មួយ"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"វិញ្ញាបនបត្រ CA %d"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"វិញ្ញាបនបត្រ​មិន​ត្រឹមត្រូវ។"</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"តម្រូវឱ្យមានសោឯកជន ដើម្បី​ដំឡើង​វិញ្ញាបនបត្រ"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"តម្រូវឱ្យមានវិញ្ញាបនបត្រ ដើម្បី​ដំឡើង​សោឯកជន"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"បាន​ដំឡើង <xliff:g id="CREDENTIAL">%s</xliff:g> ។"</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"ជ្រើសរើស​ប្រភេទ​វិញ្ញាបនបត្រ"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"មិនអាច​ដំឡើង​វិញ្ញាបនបត្រ CA បានទេ"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"វិញ្ញាបនបត្រ CA អាច​ធ្វើឱ្យ​ឯកជនភាព​របស់អ្នក​ប្រឈមនឹង​ហានិភ័យ ហើយ​ត្រូវតែ​ដំឡើង​នៅក្នុង​ការកំណត់"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"បិទ"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"មិនអាច​ដំឡើង​វិញ្ញាបនបត្រ​បានទេ"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"បិទ"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"មិនអាច​ប្រើ​ឯកសារ​នេះ​ជា <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g> បានទេ"</string>
+    <string name="certificate" msgid="8790577925509962529">"វិញ្ញាបនបត្រ"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"វិញ្ញាបនបត្រ CA"</string>
+    <string name="user_certificate" msgid="514888069820553128">"វិញ្ញាបនបត្រអ្នកប្រើប្រាស់កម្មវិធី និង VPN"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"វិញ្ញាបនបត្រ Wi‑Fi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"បានដំឡើង​វិញ្ញាបនបត្រ CA ហើយ"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"បានដំឡើង​វិញ្ញាបនបត្រ​អ្នកប្រើប្រាស់​ហើយ"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"បានដំឡើង​វិញ្ញាបនបត្រ Wi‑Fi ហើយ"</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="cert_temp_error" msgid="617276803992714550">"ការមិន​ដំណើរការ​ជា​បណ្ដោះអាសន្ន​។ សូម​ព្យាយាម​ម្ដងទៀត​នៅពេលក្រោយ​។"</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"មាន​តែ​ម្ចាស់​ឧបករណ៍​នេះ​ប៉ុណ្ណោះ​អាច​ដំឡើង​វិញ្ញាបនបត្រ។"</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"ការ​ប្រើ​ព័ត៌មាន​សម្ងាត់៖"</string>
   <string-array name="credential_usage">
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index ce742f3..8e082c9 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -21,14 +21,13 @@
     <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="name_credential_dialog_title" msgid="1481964824549786927">"ಈ ಪ್ರಮಾಣಪತ್ರಕ್ಕೆ ಹೆಸರನ್ನು ನೀಡಿ"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"ಪ್ರಮಾಣಪತ್ರದ ಹೆಸರು"</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>
-    <!-- no translation found for userkey_type (6214833257030657106) -->
-    <skip />
+    <string name="userkey_type" msgid="6214833257030657106">"ಅಲ್ಗಾರಿದಮ್:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"ಒಂದು ಬಳಕೆದಾರರ ಪ್ರಮಾಣಪತ್ರವಿದೆ"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"ಒಂದು CA ಪ್ರಮಾಣಪತ್ರವಿದೆ"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA ಪ್ರಮಾಣಪತ್ರಗಳು"</string>
@@ -42,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"ಪ್ರಮಾಣಪತ್ರ ಅಮಾನ್ಯವಾಗಿದೆ."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"ಪ್ರಮಾಣಪತ್ರವನ್ನು ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಲು ಅಗತ್ಯವಿರುವ ಖಾಸಗಿ ಕೀಲಿ"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"ಖಾಸಗಿ ಕೀಲಿ ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಲು ಅಗತ್ಯವಿರುವ ಪ್ರಮಾಣಪತ್ರ"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> ಸ್ಥಾಪಿಸಲಾಗಿದೆ."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"ಪ್ರಮಾಣಪತ್ರದ ಪ್ರಕಾರವನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"CA ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA ಪ್ರಮಾಣಪತ್ರಗಳು ನಿಮ್ಮ ಗೌಪ್ಯತೆಗೆ ಅಪಾಯವನ್ನುಂಟು ಮಾಡುವ ಕಾರಣ, ಅವುಗಳನ್ನು ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಿ"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"ಮುಚ್ಚಿರಿ"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"ಮುಚ್ಚಿರಿ"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"ಈ ಫೈಲ್ ಅನ್ನು <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g> ಆಗಿ ಬಳಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+    <string name="certificate" msgid="8790577925509962529">"ಪ್ರಮಾಣಪತ್ರ"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA ಪ್ರಮಾಣಪತ್ರ"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN ಮತ್ತು ಆ್ಯಪ್ ಬಳಕೆದಾರರ ಪ್ರಮಾಣಪತ್ರ"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"ವೈ-ಫೈ ಪ್ರಮಾಣಪತ್ರ"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA ಪ್ರಮಾಣಪತ್ರವನ್ನು ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಲಾಗಿದೆ"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"ಬಳಕೆದಾರರ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಲಾಗಿದೆ"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"ವೈ-ಫೈ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಲಾಗಿದೆ"</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="cert_temp_error" msgid="617276803992714550">"ತಾತ್ಕಾಲಿಕ ವೈಫಲ್ಯ. ನಂತರ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"ಈ ಸಾಧನದ ಮಾಲೀಕರು ಮಾತ್ರ ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಸ್ಥಾಪಿಸಬಹುದು."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"ರುಜುವಾತು ಬಳಕೆ:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index ef7b0f2..1520ad0 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -21,12 +21,13 @@
     <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="name_credential_dialog_title" msgid="1481964824549786927">"인증서 이름 지정"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"인증서 이름"</string>
     <string name="credential_password" msgid="3520176519550993326">"인증서를 추출하기 위한 비밀번호를 입력하세요."</string>
     <string name="credential_info" msgid="2436768402308470397">"패키지 포함 내용:"</string>
     <string name="p12_description" msgid="4128352087331630024">"PKCS12 keystore의 인증서입니다."</string>
     <string name="one_userkey" msgid="3500697912370644881">"사용자 키 1개"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"알고리즘:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"사용자 인증서 1개"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"CA 인증서 1개"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA 인증서"</string>
@@ -34,16 +35,30 @@
     <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>
     <string name="action_missing_private_key" msgid="7543470057312920042">"인증서 설치에 필요한 개인 키"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"개인 키 설치에 필요한 인증서"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g>이(가) 설치되었습니다."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"인증서 유형 선택"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"CA 인증서를 설치할 수 없음"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA 인증서는 개인정보 유출 위험이 있으며 반드시 설정에서 설치해야 합니다."</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"닫기"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"인증서를 설치할 수 없음"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"닫기"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"이 파일은 <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>(으)로 사용할 수 없습니다."</string>
+    <string name="certificate" msgid="8790577925509962529">"인증서"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA 인증서"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN 및 앱 사용자 인증서"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Wi‑Fi 인증서"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA 인증서 설치됨"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"사용자 인증서 설치됨"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Wi‑Fi 인증서 설치됨"</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="cert_temp_error" msgid="617276803992714550">"일시적인 오류입니다. 나중에 다시 시도해 보세요."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"이 기기의 소유자만 인증서를 설치할 수 있습니다."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"자격증명 사용:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 796db49..340f435 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -21,12 +21,13 @@
     <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="name_credential_dialog_title" msgid="1481964824549786927">"Тастыктаманы атаңыз"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Тастыктаманын аталышы"</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="userkey_type" msgid="6214833257030657106">"Алгоритм:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"бир колдонуучу тастыктамасы"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"бир CA тастыктамасы"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA тастыктамасы"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Тастыктама жараксыз."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Тастыктаманы орнотуу үчүн купуя ачкыч талап кылынат"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Купуя ачкыкты орнотуу үчүн тастыктама талап кылынат"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> орнотулду."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Тастыктаманын түрүн тандоо"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Тастыктоочу борбордун (ТБ) тастыктамалары орнотулбай жатат"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"Тастыктоочу борбордун (ТБ) тастыктамалары купуялыгыңыз үчүн коркунуч туудурушу мүмкүн. Аларды Жөндөөлөрдөн орнотуп алуу керек"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Жабуу"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Тастыктамалар орнотулбай жатат"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Жабуу"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Бул файлды <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g> катары колдонууга болбойт"</string>
+    <string name="certificate" msgid="8790577925509962529">"Тастыктама"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"Тастыктоочу борбордун (ТБ) тастыктамасы"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN жана колдонуучунун тастыктамасы"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Wi‑Fi тастыктамасы"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"Тастыктоочу борбордун (ТБ) тастыктамасы орнотулду"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Колдонуучунун тастыктамасы орнотулду"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Wi‑Fi тастыктамасы орнотулду"</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="cert_temp_error" msgid="617276803992714550">"Убактылуу бузулуу. Кийинчерээк кайталаңыз."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Сертификаттарды бул түзмөктүн ээси гана орното алат."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Тастыктама төмөнкү менен колдонулат:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 349f421..6baa425 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -21,12 +21,13 @@
     <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="name_credential_dialog_title" msgid="1481964824549786927">"ຕັ້ງຊື່ໃບຮັງຮອງນີ້"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"ຊື່ໃບຮັບຮອງ"</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="userkey_type" msgid="6214833257030657106">"ອະກໍຣິທຶມ:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"ນຶ່ງໃບຮັບຮອງຜູ່ໃຊ້"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"ໃບຢັ້ງຢືນ CA ໜຶ່ງໃບ"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d ໃບຮັບຮອງ CA"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"ໃບຮັບຮອງບໍ່ຖືກຕ້ອງ."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"ຕ້ອງໃຊ້ກະແຈສ່ວນຕົວເພື່ອຕິດຕັ້ງໃບຮັບຮອງ"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"ຕ້ອງໃຊ້ໃບຮັບຮອງເພື່ອຕິດຕັ້ງກະແຈສ່ວນຕົວ"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> ຖືກຕິດຕັ້ງແລ້ວ."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"ເລືອກປະເພດໃບຮັບຮອງ"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"ບໍ່ສາມາດຕິດຕັ້ງໃບຢັ້ງຢືນ CA ໄດ້"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"ໃບຢັ້ງຢືນ CA ອາດເຮັດໃຫ້ທ່ານມີຄວາມສ່ຽງດ້ານຄວາມເປັນສ່ວນຕົວໄດ້ ແລະ ຈະຕ້ອງຕິດຕັ້ງໃນການຕັ້ງຄ່າ"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"ປິດ"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"ບໍ່ສາມາດຕິດຕັ້ງໃບຮັບຮອງໄດ້"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"ປິດ"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"ບໍ່ສາມາດໃຊ້ໄຟລ໌ນີ້ເປັນ <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g> ໄດ້"</string>
+    <string name="certificate" msgid="8790577925509962529">"ໃບຮັບຮອງ"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"ໃບ​ຢັ້ງ​ຢືນ​ CA"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN ແລະ ໃບຮັບຮອງຜູ້ໃຊ້ແອັບ"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"ໃບຮັບຮອງ Wi‑Fi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"ຕິດຕັ້ງໃບຮັບຮອງ CA ແລ້ວ"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"ຕິດຕັ້ງໃບຮັບຮອງຜູ້ໃຊ້ແລ້ວ"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"ຕິດຕັ້ງໃບຮັບຮອງ Wi‑Fi ແລ້ວ"</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="cert_temp_error" msgid="617276803992714550">"ເກີດຄວາມລົ້ມເຫລວຊົ່ວຄາວ. ກະລຸນາລອງໃໝ່ພາຍຫຼັງ."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"ສະເພາະເຈົ້າຂອງອຸປະກອນນີ້ເທົ່ານັ້ນ ທີ່ສາມາດຕິດຕັ້ງໃບຮັບຮອງໄດ້."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"ການໃຊ້ຂໍ້ມູນຮັບຮອງ:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 7524372..35b2ced 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -21,12 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Išskleisti sertifikatą"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Išarchyvuojama..."</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Ištrauka iš %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Sukurti sertifikato pavadinimą"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Sertifikato pavadinimas:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Suteikite šiam sertifikatui pavadinimą"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Sertifikato pavadinimas"</string>
     <string name="credential_password" msgid="3520176519550993326">"Įveskite slaptažodį, kad išarchyvuotumėte sertifikatus."</string>
     <string name="credential_info" msgid="2436768402308470397">"Pakete yra:"</string>
     <string name="p12_description" msgid="4128352087331630024">"Sertifikatai PKCS12 raktų saugykloje."</string>
     <string name="one_userkey" msgid="3500697912370644881">"vieno naudotojo raktas"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"Algoritmas:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"vieno naudotojo sertifikatas"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"vienas CA sertifikatas"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA sertifikatai"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Sertifikatas negalioja."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Norint įdiegti sertifikatą būtinas privatus raktas"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Norint įdiegti privatų raktą būtinas sertifikatas"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> įdiegtas."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Pasirinkite sertifikato tipą"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Nepavyko įdiegti CA sertifikatų"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"Dėl CA sertifikatų gali kilti pavojus privatumui. Juos būtina įdiegti skiltyje „Nustatymai“"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Uždaryti"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Nepavyko įdiegti sertifikatų"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Uždaryti"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Šio failo negalima naudoti kaip: <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Sertifikatas"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA sertifikatas"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN ir programos naudotojo sertifikatas"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"„Wi‑Fi“ sertifikatas"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA sertifikatas įdiegtas"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Naudotojo sertifikatas įdiegtas"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"„Wi‑Fi“ sertifikatas įdiegtas"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Nepavyko įdiegti, nes sertifikatas per didelis."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Nepavyko įdiegti, nes nepavyko rasti sertifikato failo."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Nepavyko įdiegti, nes nepavyko nuskaityti sertifikato failo."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Laikina klaida. Vėliau bandykite dar kartą."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Tik įrenginio savininkas gali įdiegti sertifikatus."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Kredencialų naudojimas:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 23baf67..5fbad7a 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -21,12 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Sertifikāta izgūšana"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Notiek izvilkšana..."</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Izvilkšana no: %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Sertifikāta nosaukšana"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Sertifikāta nosaukums:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Nosaukuma piešķiršana šim sertifikātam"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Sertifikāta nosaukums"</string>
     <string name="credential_password" msgid="3520176519550993326">"Ierakstiet paroli, lai izvilktu sertifikātus."</string>
     <string name="credential_info" msgid="2436768402308470397">"Pakotnē ir ietverts:"</string>
     <string name="p12_description" msgid="4128352087331630024">"Sertifikāti PKCS12 atslēgu krātuvē."</string>
     <string name="one_userkey" msgid="3500697912370644881">"viens lietotāja taustiņš"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"Algoritms:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"viena lietotāja sertifikāts"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"viens CA sertifikāts"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA sertifikāti"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Sertifikāts nav derīgs."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Lai instalētu sertifikātu, nepieciešama privāta atslēga"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Lai instalētu privāto atslēgu, nepieciešams sertifikāts"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> ir instalēts."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Izvēlieties sertifikāta veidu"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Nevar instalēt CA sertifikātus"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA sertifikāti var apdraudēt jūsu konfidencialitāti, tādēļ tie jāinstalē sadaļā Iestatījumi."</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Aizvērt"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Nevar instalēt sertifikātus"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Aizvērt"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Šo failu nevar izmantot kā: <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Sertifikāts"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA sertifikāts"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN un lietotnes lietotāja sertifikāts"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Wi‑Fi sertifikāts"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA sertifikāts ir instalēts"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Lietotāja sertifikāts ir instalēts"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Wi‑Fi sertifikāts ir instalēts"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Nevarēja instalēt, jo sertifikāta izmērs ir pārāk liels."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Neizdevās instalēt, jo nevarēja atrast sertifikāta failu."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Neizdevās instalēt, jo nevarēja nolasīt sertifikāta failu."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Radās īslaicīga kļūme. Lūdzu, vēlāk mēģiniet vēlreiz."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Tikai šīs ierīces īpašnieks var instalēt sertifikātus."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Akredit. datu lietojums:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index e32f35d..8489263 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -21,12 +21,13 @@
     <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="name_credential_dialog_title" msgid="1481964824549786927">"Именувајте го сертификатов"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Име на сертификатот"</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="userkey_type" msgid="6214833257030657106">"Алгоритам:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"еден сертификат на корисник"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"еден CA сертификат"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA сертификати"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Сертификатот е неважечки."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Потребен е приватен клуч за инсталирање сертификат"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Потребен е сертификат за инсталирање приватен клуч"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> е инсталиран."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Изберете тип сертификат"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Не може да се инсталираат CA-сертификатите"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA-сертификатите може да ја загрозат вашата приватност и мора да се инсталираат во „Поставки“"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Затвори"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Не може да се инсталираат сертификатите"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Затвори"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Датотекава не може да се користи како <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Сертификат"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"Сертификат CA"</string>
+    <string name="user_certificate" msgid="514888069820553128">"Кориснички сертификат за VPN и апликации"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Сертификат за Wi‑Fi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"Сертификат CA е инсталиран"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Корисничкиот сертификат е инсталиран"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Сертификатот за Wi‑Fi е инсталиран"</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="cert_temp_error" msgid="617276803992714550">"Привремен проблем. Обидете се подоцна."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Само сопственикот на овој уред може да инсталира сертификати."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Употреба на акредитив:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 8bd67e7..ad387e3 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -21,12 +21,13 @@
     <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="name_credential_dialog_title" msgid="1481964824549786927">"ഈ സർട്ടിഫിക്കറ്റിന് പേര് നൽകുക"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"സർട്ടിഫിക്കറ്റിന്റെ പേര്"</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="userkey_type" msgid="6214833257030657106">"അൽഗരിതം:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"ഒരു ഉപയോക്തൃ സർട്ടിഫിക്കറ്റ്"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"ഒരു CA സർട്ടിഫിക്കറ്റ്"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA സർട്ടിഫിക്കറ്റുകൾ"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"സർട്ടിഫിക്കറ്റ് അസാധുവാണ്."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"ഒരു സർട്ടിഫിക്കറ്റ് ഇൻസ്റ്റാൾ ചെയ്യുന്നതിന് സ്വകാര്യ കീ ആവശ്യമാണ്"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"ഒരു സ്വകാര്യ കീ ഇൻസ്റ്റാൾ ചെയ്യുന്നതിന് സർട്ടിഫിക്കറ്റ് ആവശ്യമാണ്"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> ഇൻസ്‌റ്റാൾ ചെയ്‌തു."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"സർട്ടിഫിക്കറ്റ് തരം തിരഞ്ഞെടുക്കുക"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"CA സർട്ടിഫിക്കറ്റുകൾ ഇൻസ്‌റ്റാൾ ചെയ്യാനാവുന്നില്ല"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA സർട്ടിഫിക്കറ്റുകൾ ഇൻസ്റ്റാൾ ചെയ്തില്ലെങ്കിൽ നിങ്ങളുടെ സ്വകാര്യത അപകടത്തിലാകും, അതിനാൽ ക്രമീകരണത്തിൽ അവ ഇൻസ്റ്റാൾ ചെയ്യേണ്ടതുണ്ട്."</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"അടയ്ക്കുക"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"സർട്ടിഫിക്കറ്റുകൾ ഇൻസ്‌റ്റാൾ ചെയ്യാനാവില്ല"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"അടയ്ക്കുക"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"ഈ ഫയൽ <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g> ആയി ഉപയോഗിക്കാനാവില്ല"</string>
+    <string name="certificate" msgid="8790577925509962529">"സർട്ടിഫിക്കറ്റ്"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA സർട്ടിഫിക്കറ്റ്"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN ആപ്പ് യൂസർ സർട്ടിഫിക്കറ്റ്"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"വെെഫെെ സർട്ടിഫിക്കറ്റ്"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA സർട്ടിഫിക്കറ്റ് ഇൻസ്റ്റാൾ ചെയ്തു"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"ഉപയോക്തൃ സർട്ടിഫിക്കറ്റ് ഇൻസ്റ്റാൾ ചെയ്തു"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"വെെഫെെ സർട്ടിഫിക്കറ്റ് ഇൻസ്റ്റാൾ ചെയ്തു"</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="cert_temp_error" msgid="617276803992714550">"താൽക്കാലിക പിശക്. പിന്നീട് വീണ്ടും ശ്രമിക്കുക."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"ഈ ഉപകരണത്തിന്റെ ഉടമയ്‌ക്കുമാത്രമേ സർട്ടിഫിക്കറ്റുകൾ ഇൻസ്റ്റാളുചെയ്യാനാകൂ."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"ക്രെഡൻഷ്യൽ ഉപയോഗം:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index e7a1547..f192714 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -21,12 +21,13 @@
     <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="name_credential_dialog_title" msgid="1481964824549786927">"Энэ сертификатыг нэрлэх"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Сертификатын нэр"</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="userkey_type" msgid="6214833257030657106">"Алгоритм:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"Нэг хэрэглэгчийн сертификат"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"нэг CA сертификат"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA сертификат"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Сертификат буруу."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Сертификат суулгахад хувийн түлхүүр шаардлагатай"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Нууцлалын түлхүүр суулгахад сертификат шаардлагатай"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> суулгагдав."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Сертификатын төрлийг сонгоно уу"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"CA сертификатыг суулгах боломжгүй байна"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA сертификат нь таны нууцлалыг эрсдэлд оруулж болох бөгөөд түүнийг Тохиргоо хэсгээс суулгах ёстой"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Хаах"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Сертификатыг суулгах боломжгүй байна"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Хаах"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Энэ файлыг <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>-р ашиглах боломжгүй"</string>
+    <string name="certificate" msgid="8790577925509962529">"Сертификат"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA сертификат"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN; апликейшн хэрэглэгчийн сертификат"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Wi‑Fi сертификат"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA сертификатыг суулгалаа"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Хэрэглэгчийн сертификатыг суулгалаа"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Wi‑Fi сертификатыг суулгалаа"</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="cert_temp_error" msgid="617276803992714550">"Түр зуурын алдаа гарлаа. Дараа дахин оролдоно уу."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Зөвхөн энэ төхөөрөмжийн эзэмшигч л сертификатыг суулгах боломжтой."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Нууцлал ашиглах:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index de716d2..498c7db 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -21,14 +21,13 @@
     <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="name_credential_dialog_title" msgid="1481964824549786927">"या प्रमाणपत्राला नाव द्या"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"प्रमाणपत्राचे नाव:"</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>
-    <!-- no translation found for userkey_type (6214833257030657106) -->
-    <skip />
+    <string name="userkey_type" msgid="6214833257030657106">"अल्गोरिदम:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"एक वापरकर्ता प्रमाणपत्र"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"एक CA प्रमाणपत्र"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA प्रमाणपत्रे"</string>
@@ -42,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"प्रमाणपत्र अवैध आहे."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"प्रमाणपत्र इंस्टॉल करण्यासाठी खाजगी की ची आवश्यकता आहे"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"खाजगी की इंस्टॉल करण्यासाठी प्रमाणपत्राची आवश्यकता आहे"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> स्‍थापित केले."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"प्रमाणपत्राचा प्रकार निवडा"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"CA प्रमाणपत्रे इंस्टॉल करू शकत नाही"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA प्रमाणपत्रे तुमची गोपनीयता धोक्यात आणू शकतात आणि ती सेटिंग्ज मध्ये इंस्टॉल केलेली असणे आवश्यक आहेत"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"बंद करा"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"प्रमाणपत्रे इंस्टॉल करू शकत नाही"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"बंद करा"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"ही फाइल <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g> म्हणून वापरता येत नाही"</string>
+    <string name="certificate" msgid="8790577925509962529">"प्रमाणपत्र"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA प्रमाणपत्र"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN व ॲप वापरकर्ता प्रमाणपत्र"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"वाय-फाय प्रमाणपत्र"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA प्रमाणपत्र इंस्टॉल केले आहे"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"वापरकर्ता प्रमाणपत्र इंस्टॉल केले आहे"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"वाय-फाय प्रमाणपत्र इंस्टॉल केले आहे"</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="cert_temp_error" msgid="617276803992714550">"तात्पुरता बिघाड. नंतर पुन्हा प्रयत्न करा."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"फक्त या डिव्हाइसचा मालक प्रमाणपत्रे इंस्टॉल करू शकतो."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"क्रिडेन्शियलचा वापर:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index faf8d19..a734950 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -21,12 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Dapatkan sijil"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Mengekstrak..."</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Ekstrak daripada %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Namakan sijil"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Nama sijil:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Namakan sijil ini"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Nama sijil"</string>
     <string name="credential_password" msgid="3520176519550993326">"Taip kata laluan untuk mengekstrak sijil."</string>
     <string name="credential_info" msgid="2436768402308470397">"Pakej mengandungi:"</string>
     <string name="p12_description" msgid="4128352087331630024">"Sijil dalam stor kunci PKCS12."</string>
     <string name="one_userkey" msgid="3500697912370644881">"kunci satu pengguna"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"Algoritma:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"sijil satu pengguna"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"satu sijil CA"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d sijil CA"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Sijil tidak sah."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Kunci peribadi diperlukan untuk memasang sijil"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Sijil diperlukan untuk memasang kunci peribadi"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> dipasangkan."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Pilih jenis sijil"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Tidak dapat memasang sijil CA"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"Sijil CA boleh meletakkan privasi anda dalam risiko dan mestilah dipasang dalam Tetapan"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Tutup"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Tidak dapat memasang sijil"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Tutup"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Fail ini tidak boleh digunakan sebagai <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Sijil"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"Sijil CA"</string>
+    <string name="user_certificate" msgid="514888069820553128">"Sijil pengguna VPN &amp; apl"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Sijil Wi‑Fi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"Sijil CA dipasang"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Sijil pengguna dipasang"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Sijil Wi-Fi dipasang"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Tidak dapat memasang kerana saiz sijil adalah terlalu besar."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Tidak dapat memasang kerana fail sijil tidak dapat dikesan."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Tidak dapat memasang kerana fail sijil tidak dapat dibaca."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Kegagalan sementara. Sila cuba lagi nanti."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Hanya pemilik peranti ini boleh memasang sijil."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Penggunaan bukti kelayakan:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 67bc7ec..fcdfba8 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -21,12 +21,13 @@
     <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="name_credential_dialog_title" msgid="1481964824549786927">"ဤအသိအမှတ်ပြုလက်မှတ်ကို အမည်ပေးပါ"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"အသိအမှတ်ပြုလက်မှတ်အမည်"</string>
     <string name="credential_password" msgid="3520176519550993326">"အသိအမှတ်ပြုလက်မှတ် များ ထုတ်ယူရန် စကားဝှက်ရိုက်ထည့်ပါ"</string>
     <string name="credential_info" msgid="2436768402308470397">"packageထဲတွင် ပါဝင်သည်မှာ:"</string>
     <string name="p12_description" msgid="4128352087331630024">"PKCS12ကီးစတိုးထဲမှ အသိအမှတ်ပြုလက်မှတ်များ"</string>
     <string name="one_userkey" msgid="3500697912370644881">"အသုံးပြုသူတစ်ဦး၏ကီးတစ်ခု"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"လုပ်နည်းစနစ်−"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"အသုံးပြုသူတစ်ဦး၏အသိအမှတ်ပြုလက်မှတ်တစ်ခု"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"CAအသိအမှတ်ပြုလက်မှတ်တစ်ခု"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA အသိအမှတ်ပြုလက်မှတ်များ"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"အသိအမှတ်ပြုလက်မှတ်မှာ အသုံးပြုမရပါ"</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"အသိအမှတ်ပြုလက်မှတ် ထည့်သွင်းရန် သီးသန့်ကီး လိုအပ်သည်"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"သီးသန့်ကီး ထည့်သွင်းရန် အသိအမှတ်ပြုလက်မှတ် လိုအပ်သည်"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g>အားထည့်သွင်းထားသည်"</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"အသိအမှတ်ပြုလက်မှတ် အမျိုးအစားကို ရွေးပါ"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"CA လက်မှတ်များကို ထည့်သွင်း၍ မရပါ"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA လက်မှတ်သည် သင်၏ကန့်သတ်ဆက်တင်ကို အန္တရာယ်ရှိစေနိုင်ပြီး ဆက်တင်များတွင် ထည့်သွင်းရမည်"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"ပိတ်ရန်"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"လက်မှတ်များကို ထည့်သွင်း၍ မရပါ"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"ပိတ်ထားသည်"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"ဤဖိုင်ကို <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>အဖြစ် သုံး၍မရပါ"</string>
+    <string name="certificate" msgid="8790577925509962529">"အသိအမှတ်ပြုလက်မှတ်"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA လက်မှတ်"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN အက်ပ် သုံးစွဲသူ လက်မှတ်"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Wi‑Fi လက်မှတ်"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA လက်မှတ် ထည့်သွင်းပြီးပါပြီ"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"အသုံးပြုသူ အသိအမှတ်ပြုလက်မှတ် ထည့်သွင်းပြီးပါပြီ"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Wi‑Fi အသိအမှတ်ပြုလက်မှတ် ထည့်သွင်းပြီးပါပြီ"</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="cert_temp_error" msgid="617276803992714550">"ယာယီပြတ်တောက်မှု။ နောက်မှ ထပ်စမ်းကြည့်ပါ။"</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"ဤစက်ပိုင်ရှင်မှသာ အသိအမှတ်ပြုလက်မှတ် များ ထည့်သွင်းနိုင်ပါလိမ့်မည်"</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Credential အသုံးပြုပုံ:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 74d41f2..7c12168 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -21,12 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Pakk ut sertifikatet"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Henter …"</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Hent fra %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Gi sertifikatet et navn"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Sertifikatnavn:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Gi dette sertifikatet et navn"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Sertifikatnavn"</string>
     <string name="credential_password" msgid="3520176519550993326">"Skriv inn passordet for å hente ut sertifikatene."</string>
     <string name="credential_info" msgid="2436768402308470397">"Pakken inneholder:"</string>
     <string name="p12_description" msgid="4128352087331630024">"Sertifikater i PKCS12-keystore."</string>
     <string name="one_userkey" msgid="3500697912370644881">"én brukernøkkel"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"Algoritme:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"ett brukersertifikat"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"ett CA-sertifikat"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d instanssertifikater"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Sertifikatet er ugyldig."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Privat nøkkel er nødvendig for å installere et sertifikat"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Sertifikat er nødvendig for å installere en privat nøkkel"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> er installert."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Velg en sertifikattype"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Kan ikke installere CA-sertifikater"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA-sertifikater kan være en risiko for personvernet ditt og må installeres i innstillingene"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Lukk"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Kan ikke installere sertifikater"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Lukk"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Denne filen kan ikke brukes som <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Sertifikat"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA-sertifikat"</string>
+    <string name="user_certificate" msgid="514888069820553128">"Brukersertifikat for VPN &amp; app"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Wi‑Fi-sertifikat"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA-sertifikatet er installert"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Brukersertifikatet er installert"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Wi‑Fi-sertifikatet er installert"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Kunne ikke installere fordi sertifikatet er for stort."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Kunne ikke installere fordi sertifikatfilen ikke ble funnet."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Kunne ikke installere fordi sertifikatfilen ikke kunne leses."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Midlertidig feil. Prøv igjen senere."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Bare eieren av denne enheten kan installere sertifikater."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Bruk av legitimasjon:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index b72eaa0..7b6178f 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -21,12 +21,13 @@
     <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="name_credential_dialog_title" msgid="1481964824549786927">"यो प्रमाणपत्रको नाम राख्नुहोस्"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"प्रमाणपत्रको नाम"</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="userkey_type" msgid="6214833257030657106">"एल्गोरिदम:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"एउटा उपयोगकर्ता प्रमाणपत्र"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"एउटा CA प्रमाणपत्र"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA प्रमाणपत्रहरू"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"प्रमाणपत्र अमान्य छ।"</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"प्रमाणपत्र स्थापना गर्न निजी साँचो आवश्यक पर्छ"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"निजी साँचो स्थापना गर्न प्रमाणपत्र आवश्यक पर्छ"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> स्थापित छ।"</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"प्रमाणपत्रको प्रकार छनौट गर्नुहोस्"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"CA का प्रमाणपत्रहरू स्थापना गर्न सकिँदैन"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA का प्रमाणपत्रहरूले तपाईंको गोपनीयतालाई जोखिममा पार्न सक्ने हुनाले अनिवार्य रूपमा सेटिङमा गएर यसको स्थापना गर्नु पर्छ"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"बन्द गर्नुहोस्"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"प्रमाणपत्रहरू स्थापना गर्न सकिएन"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"बन्द गर्नुहोस्"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"यो फाइल कुनै <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g> को रूपमा प्रयोग गर्न सकिँदैन"</string>
+    <string name="certificate" msgid="8790577925509962529">"प्रमाणपत्र"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA को प्रमाणपत्र"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN र अनुप्रयोगको प्रयोगकर्तासम्बन्धी प्रमाणपत्र"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Wi‑Fi को प्रमाणपत्र"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA प्रमाणपत्र स्थापना गरियो"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"प्रयोगकर्ताको प्रमाणपत्र स्थापना गरियो"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Wi‑Fi को प्रमाणपत्र स्थापना गरियो"</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="cert_temp_error" msgid="617276803992714550">"अस्थायी विफलता। कृपया पछि फेरि प्रयास गर्नुहोस्।"</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"यो उपकरणको मालिकले मात्र प्रमाणपत्रहरू स्थापना गर्न सक्छ।"</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"प्रमाणपत्रको प्रयोग:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index d38fbc0..73b4f50 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -21,12 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Certificaat uitpakken"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Uitpakken..."</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Uitpakken vanuit %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Geef een naam op voor het certificaat"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Certificaatnaam:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Dit certificaat een naam geven"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Certificaatnaam"</string>
     <string name="credential_password" msgid="3520176519550993326">"Typ het wachtwoord om de certificaten uit te pakken."</string>
     <string name="credential_info" msgid="2436768402308470397">"Het pakket bevat:"</string>
     <string name="p12_description" msgid="4128352087331630024">"Certificaten in PKCS12-opslagruimte voor sleutels."</string>
     <string name="one_userkey" msgid="3500697912370644881">"één gebruikerssleutel"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"Algoritme:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"één gebruikerscertificaat"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"één CA-certificaat"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA-certificaten"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Het certificaat is ongeldig."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Privésleutel vereist om een certificaat te installeren"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Certificaat vereist om een privésleutel te installeren"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> is geïnstalleerd."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Een certificaattype kiezen"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Kan CA-certificaten niet installeren"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA-certificaten kunnen je privacy in gevaar brengen en moeten worden geïnstalleerd via Instellingen"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Sluiten"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Kan certificaten niet installeren"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Sluiten"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Dit bestand kan niet worden gebruikt als <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Certificaat"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA-certificaat"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN- en app-gebruikerscertificaat"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Wifi-certificaat"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA-certificaat geïnstalleerd"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Gebruikerscertificaat geïnstalleerd"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Wifi-certificaat geïnstalleerd"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Kan niet installeren omdat het certificaat te groot is."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Kan niet installeren omdat het certificaatbestand niet kan worden gevonden."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Kan niet installeren omdat het certificaatbestand niet kan worden gelezen."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Tijdelijke fout. Probeer het later opnieuw."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Alleen de eigenaar van dit apparaat kan certificaten installeren."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Gebruik van certificaatgegevens:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index bb91ca7..f121c38 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -21,12 +21,13 @@
     <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="name_credential_dialog_title" msgid="1481964824549786927">"ଏହି ସାର୍ଟିଫିକେଟ୍‌ର ନାମ ଦିଅନ୍ତୁ"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"ସାର୍ଟିଫିକେଟ୍ ନାମ"</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="userkey_type" msgid="6214833257030657106">"ଆଲଗୋରିଦମ୍:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"ଜଣେ ୟୁଜରଙ୍କ ସର୍ଟିଫିକେଟ୍‍"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"ଏକ CA ସର୍ଟିଫିକେଟ୍‍"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA ସର୍ଟିଫିକେଟ୍‍"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"ଏହି ସର୍ଟିଫିକେଟ୍‍ ବୈଧ ନୁହେଁ।"</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"ଗୋଟିଏ ସର୍ଟିଫିକେଟ୍‍କୁ ଇନଷ୍ଟଲ୍ କରିବା ପାଇଁ ବ୍ୟକ୍ତିଗତ କୀ\' ଆବଶ୍ୟକ"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"ଗୋଟିଏ ବ୍ୟକ୍ତିଗତ କୀ’କୁ ଇନଷ୍ଟଲ୍ କରିବା ପାଇଁ ସର୍ଟିଫିକେଟ୍ ଆବଶ୍ୟକ"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> ଇନଷ୍ଟଲ୍‌ ହୋଇଛି।"</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"ଏକ ସାର୍ଟିଫିକେଟ୍‌ର ପ୍ରକାର ବାଛନ୍ତୁ"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"CA ସାର୍ଟିଫିକେଟ୍‌ଗୁଡ଼ିକୁ ଇନ୍‌ଷ୍ଟଲ୍ କରାଯାଇପାରିବ ନାହିଁ"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA ସାର୍ଟିଫିକେଟ୍‌ଗୁଡ଼ିକ ଆପଣଙ୍କର ଗୋପନୀୟତାକୁ ବିପଦରେ ପକାଇ ପାରେ ଏବଂ ଏଗୁଡ଼ିକୁ ସେଟିଂସ୍‌ରେ ଇନ୍‌ଷ୍ଟଲ୍ କରାଯିବା ଦରକାର"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"ବନ୍ଦ କରନ୍ତୁ"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"ସାର୍ଟିଫିକେଟ୍‌ଗୁଡ଼ିକୁ ଇନ୍‌ଷ୍ଟଲ୍ କରାଯାଇପାରିବ ନାହିଁ"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"ବନ୍ଦ କରନ୍ତୁ"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"ଏହି ଫାଇଲ୍ <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g> ଭାବରେ ବ୍ୟବହାର କରାଯାଇପାରିବ ନାହିଁ"</string>
+    <string name="certificate" msgid="8790577925509962529">"ସାର୍ଟିଫିକେଟ୍"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA ସାର୍ଟିଫିକେଟ୍"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN ଓ ଆପ୍ ଉପଯୋଗକର୍ତ୍ତା ସାର୍ଟିଫିକେଟ୍"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"ୱାଇ-ଫାଇ ସାର୍ଟିଫିକେଟ୍"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA ସାର୍ଟିଫିକେଟ୍ ଇନ୍‌ଷ୍ଟଲ୍ କରାଯାଇଛି"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"ଉପଯୋଗକର୍ତ୍ତା ସାର୍ଟିଫିକେଟ୍ ଇନ୍‌ଷ୍ଟଲ୍ କରାଯାଇଛି"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Wi‑Fi ସାର୍ଟିଫିକେଟ୍ ଇନ୍‌ଷ୍ଟଲ୍ କରାଯାଇଛି"</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="cert_temp_error" msgid="617276803992714550">"ଅସ୍ଥାୟୀ ବିଫଳତା। ଦୟାକରି ପରେ ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"କେବଳ ଏହି ଡିଭାଇସ୍‌‍ର ମାଲିକ ହିଁ ସର୍ଟିଫିକେଟ୍‌ ଇନଷ୍ଟଲ୍‍ କରିପାରିବେ।"</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"ତଥ୍ୟର ବ୍ୟବହାର:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 4930503..fa28646 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -21,12 +21,13 @@
     <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="name_credential_dialog_title" msgid="1481964824549786927">"ਇਸ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਦਾ ਨਾਮ ਰੱਖੋ"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"ਪ੍ਰਮਾਣ-ਪੱਤਰ ਦਾ ਨਾਮ"</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="userkey_type" msgid="6214833257030657106">"ਐਲਗੋਰਿਦਮ:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"ਇੱਕ ਵਰਤੋਂਕਾਰ ਪ੍ਰਮਾਣ-ਪੱਤਰ"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"ਇੱਕ CA ਪ੍ਰਮਾਣ-ਪੱਤਰ"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA ਸਰਟੀਫਿਕੇਟ"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"ਪ੍ਰਮਾਣ-ਪੱਤਰ ਅਵੈਧ ਹੈ।"</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"ਕੋਈ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਸਥਾਪਤ ਕਰਨ ਲਈ ਨਿੱਜੀ ਕੁੰਜੀ ਦੀ ਲੋੜ ਹੈ"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"ਕੋਈ ਨਿੱਜੀ ਕੁੰਜੀ ਸਥਾਪਤ ਕਰਨ ਲਈ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਦੀ ਲੋੜ ਹੈ"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> ਇੰਸਟੌਲ ਕੀਤਾ ਹੈ।"</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"ਪ੍ਰਮਾਣ-ਪੱਤਰ ਦੀ ਕਿਸਮ ਚੁਣੋ"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"CA ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ ਨੂੰ ਸਥਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA ਪ੍ਰਮਾਣ-ਪੱਤਰ ਤੁਹਾਡੀ ਪਰਦੇਦਾਰੀ ਨੂੰ ਜੋਖਮ ਵਿੱਚ ਪਾ ਸਕਦਾ ਹੈ ਅਤੇ ਇਸਦਾ \'ਸੈਟਿੰਗਾਂ\' ਵਿੱਚ ਸਥਾਪਤ ਕੀਤਾ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"ਬੰਦ ਕਰੋ"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ ਨੂੰ ਸਥਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"ਬੰਦ ਕਰੋ"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"ਇਸ ਫ਼ਾਈਲ ਨੂੰ <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g> ਵਜੋਂ ਵਰਤਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"</string>
+    <string name="certificate" msgid="8790577925509962529">"ਪ੍ਰਮਾਣ-ਪੱਤਰ"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA ਪ੍ਰਮਾਣ-ਪੱਤਰ"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN ਅਤੇ ਐਪ ਵਰਤੋਂਕਾਰ ਪ੍ਰਮਾਣ-ਪੱਤਰ"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"ਵਾਈ-ਫਾਈ ਪ੍ਰਮਾਣ-ਪੱਤਰ"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA ਪ੍ਰਮਾਣ-ਪੱਤਰ ਸਥਾਪਤ ਕੀਤਾ ਗਿਆ"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"ਵਰਤੋਂਕਾਰ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਸਥਾਪਤ ਕੀਤਾ ਗਿਆ"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"ਵਾਈ-ਫਾਈ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਸਥਾਪਤ ਕੀਤਾ ਗਿਆ"</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="cert_temp_error" msgid="617276803992714550">"ਅਸਥਾਈ ਅਸਫਲਤਾ। ਕਿਰਪਾ ਕਰਕੇ ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"ਸਿਰਫ਼ ਇਸ ਡੀਵਾਈਸ ਦਾ ਮਾਲਕ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਸਥਾਪਤ ਕਰ ਸਕਦਾ ਹੈ।"</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"ਕ੍ਰੈਡੈਂਸ਼ੀਅਲ ਵਰਤੋਂ:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 1bc4e72..98c9357 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -21,12 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Wyodrębnij certyfikat"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Wyodrębnianie..."</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Wyodrębnij z %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Nadaj certyfikatowi nazwę"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Nazwa certyfikatu:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Nazwij ten certyfikat"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Nazwa certyfikatu"</string>
     <string name="credential_password" msgid="3520176519550993326">"Wprowadź hasło, aby wyodrębnić certyfikaty."</string>
     <string name="credential_info" msgid="2436768402308470397">"Pakiet zawiera:"</string>
     <string name="p12_description" msgid="4128352087331630024">"Certyfikaty w magazynie kluczy PKCS12."</string>
     <string name="one_userkey" msgid="3500697912370644881">"jeden klucz użytkownika"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"Algorytm:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"jeden certyfikat użytkownika"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"jeden certyfikat urzędu certyfikacji"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"Certyfikaty urzędu certyfikacji %d"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Certyfikat jest nieprawidłowy."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Do zainstalowania certyfikatu wymagany jest klucz prywatny"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Do zainstalowania klucza prywatnego wymagany jest certyfikat"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> jest zainstalowany."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Wybierz typ certyfikatu"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Nie można zainstalować certyfikatów CA"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"Certyfikaty CA mogą stanowić zagrożenie dla prywatności i trzeba je instalować w Ustawieniach"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Zamknij"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Nie można zainstalować certyfikatów"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Zamknij"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Ten plik nie może zostać użyty jako: <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Certyfikat"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"Certyfikat CA"</string>
+    <string name="user_certificate" msgid="514888069820553128">"Certyfikat użytkownika VPN i aplikacji"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Certyfikat Wi‑Fi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"Zainstalowano certyfikat CA"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Zainstalowano certyfikat użytkownika"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Zainstalowano certyfikat Wi‑Fi"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Nie można zainstalować, ponieważ rozmiar certyfikatu jest zbyt duży."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Nie można zainstalować, ponieważ nie można znaleźć pliku certyfikatu."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Nie można zainstalować, ponieważ nie można odczytać pliku certyfikatu."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Tymczasowa awaria. Spróbuj ponownie później."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Certyfikaty może instalować tylko właściciel tego urządzenia."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Przeznaczenie tych danych logowania:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index e8b3a59..1cebabe 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -21,12 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Extrair certificado"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Extraindo..."</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Extrair de %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Nomear o certificado"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Nome do certificado:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Nomeie este certificado"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Nome do certificado"</string>
     <string name="credential_password" msgid="3520176519550993326">"Digite a senha para extrair os certificados."</string>
     <string name="credential_info" msgid="2436768402308470397">"O pacote contém:"</string>
     <string name="p12_description" msgid="4128352087331630024">"Certificados no armazenamento de chaves PKCS12."</string>
     <string name="one_userkey" msgid="3500697912370644881">"uma chave de usuário"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"Algoritmo:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"um certificado de usuário"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"um certificado CA"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d certificados CA"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"O certificado é inválido."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"A chave privada é obrigatória para instalar um certificado"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"O certificado é obrigatório para instalar uma chave privada"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"A <xliff:g id="CREDENTIAL">%s</xliff:g> está instalada"</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Escolher um tipo de certificado"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Não foi possível instalar os certificados de CA."</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"Os certificados de CA podem gerar riscos à sua privacidade e precisam ser instalados nas configurações"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Fechar"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Não foi possível instalar os certificados"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Fechar"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Não é possível usar esse arquivo como <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Certificado"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"Certificado de CA"</string>
+    <string name="user_certificate" msgid="514888069820553128">"Certificado do usuário do app e VPN"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Certificado de Wi-Fi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"Certificado de CA instalado"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Certificado do usuário instalado"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Certificado de Wi‑Fi instalado"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Não foi possível concluir a instalação, pois o tamanho do certificado é muito grande."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"A instalação não pôde ser concluída, pois não foi possível localizar o arquivo do certificado."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"A instalação não pôde ser concluída, pois não foi possível ler o arquivo do certificado."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Falha temporária. Tente novamente mais tarde."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Somente o dono do dispositivo pode instalar certificados."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Uso da credencial:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 430d71d..2f0000e 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -21,14 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Extrair certificado"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"A extrair..."</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Extrair de %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Atribua um nome ao certificado"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Nome do certificado:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Atribua um nome a este certificado"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Nome do certificado"</string>
     <string name="credential_password" msgid="3520176519550993326">"Introduza a palavra-passe para extrair os certificados."</string>
     <string name="credential_info" msgid="2436768402308470397">"O pacote contém:"</string>
     <string name="p12_description" msgid="4128352087331630024">"Certificados no KeyStore PKCS12."</string>
     <string name="one_userkey" msgid="3500697912370644881">"sem chave de utilizador"</string>
-    <!-- no translation found for userkey_type (6214833257030657106) -->
-    <skip />
+    <string name="userkey_type" msgid="6214833257030657106">"Algoritmo:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"certificado para um utilizador"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"um certificado da AC"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d certificados da AC"</string>
@@ -42,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"O certificado não é válido."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"É necessária uma chave privada para instalar um certificado."</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"É necessário um certificado para instalar uma chave privada."</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"O <xliff:g id="CREDENTIAL">%s</xliff:g> está instalado."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Escolha um tipo de certificado"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Não é possível instalar os certificados da AC (Autoridade de certificação)"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"Os certificados da AC (Autoridade de certificação) podem representar um risco para a sua privacidade e têm de ser instalados nas Definições."</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Fechar"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Não é possível instalar certificados"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Fechar"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Não é possível utilizar este ficheiro como um <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"certificado"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"certificado da AC (Autoridade de certificação)"</string>
+    <string name="user_certificate" msgid="514888069820553128">"certificado VPN e de utilizador da aplicação"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"certificado de Wi‑Fi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"Certificado da AC (Autoridade de certificação) instalado."</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Certificado do utilizador instalado."</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Certificado de Wi‑Fi instalado."</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Não foi possível instalar porque o tamanho do certificado é demasiado grande."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Não foi possível instalar, porque não foi possível localizar o ficheiro do certificado."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Não foi possível instalar, porque não foi possível ler o ficheiro do certificado."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Falha temporária. Tente novamente mais tarde."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Apenas o proprietário deste dispositivo pode instalar certificados."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Utilização de credenciais:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index e8b3a59..1cebabe 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -21,12 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Extrair certificado"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Extraindo..."</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Extrair de %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Nomear o certificado"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Nome do certificado:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Nomeie este certificado"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Nome do certificado"</string>
     <string name="credential_password" msgid="3520176519550993326">"Digite a senha para extrair os certificados."</string>
     <string name="credential_info" msgid="2436768402308470397">"O pacote contém:"</string>
     <string name="p12_description" msgid="4128352087331630024">"Certificados no armazenamento de chaves PKCS12."</string>
     <string name="one_userkey" msgid="3500697912370644881">"uma chave de usuário"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"Algoritmo:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"um certificado de usuário"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"um certificado CA"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d certificados CA"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"O certificado é inválido."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"A chave privada é obrigatória para instalar um certificado"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"O certificado é obrigatório para instalar uma chave privada"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"A <xliff:g id="CREDENTIAL">%s</xliff:g> está instalada"</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Escolher um tipo de certificado"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Não foi possível instalar os certificados de CA."</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"Os certificados de CA podem gerar riscos à sua privacidade e precisam ser instalados nas configurações"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Fechar"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Não foi possível instalar os certificados"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Fechar"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Não é possível usar esse arquivo como <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Certificado"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"Certificado de CA"</string>
+    <string name="user_certificate" msgid="514888069820553128">"Certificado do usuário do app e VPN"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Certificado de Wi-Fi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"Certificado de CA instalado"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Certificado do usuário instalado"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Certificado de Wi‑Fi instalado"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Não foi possível concluir a instalação, pois o tamanho do certificado é muito grande."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"A instalação não pôde ser concluída, pois não foi possível localizar o arquivo do certificado."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"A instalação não pôde ser concluída, pois não foi possível ler o arquivo do certificado."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Falha temporária. Tente novamente mais tarde."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Somente o dono do dispositivo pode instalar certificados."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Uso da credencial:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 7058f1b..5cdb67e 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -21,12 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Extrageți certificatul"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Se extrage..."</string>
     <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="name_credential_dialog_title" msgid="1481964824549786927">"Denumiți acest certificat"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Numele certificatului"</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="userkey_type" msgid="6214833257030657106">"Algoritm:"</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>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Certificatul este nevalid."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Pentru a instala un certificat este necesară o cheie privată"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Pentru a instala o cheie privată este necesar un certificat"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> este instalat."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Alegeți un tip de certificat"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Nu se pot instala certificatele CA"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"Certificatele CA vă pot periclita confidențialitatea și trebuie instalate în Setări"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Închideți"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Nu se pot instala certificatele"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Închideți"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Fișierul nu poate fi folosit ca <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Certificat"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"Certificat CA"</string>
+    <string name="user_certificate" msgid="514888069820553128">"Certificatul de utilizator de aplicații și VPN"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Certificat pentru Wi‑Fi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"Certificatul CA a fost instalat"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Certificatul pentru utilizator a fost instalat"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Certificatul pentru Wi‑Fi a fost 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_temp_error" msgid="617276803992714550">"Eroare temporară. Încercați din nou mai târziu."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Numai proprietarul acestui dispozitiv poate instala certificate."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Utilizarea datelor de conectare:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 41f0b77..bf53acf 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -21,12 +21,13 @@
     <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="name_credential_dialog_title" msgid="1481964824549786927">"Укажите название сертификата"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Название сертификата"</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="userkey_type" msgid="6214833257030657106">"Алгоритм:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"один пользовательский сертификат"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"один сертификат центра сертификации"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"Сертификатов центра сертификации: %d"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Сертификат недействителен."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Для установки сертификата требуется закрытый ключ."</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Для установки закрытого ключа требуется сертификат."</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> установлен"</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Выберите тип сертификата"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Невозможно установить сертификаты центра сертификации"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"Сертификаты центра сертификации должны устанавливаться в настройках. В противном случае конфиденциальность ваших данных может быть нарушена."</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Закрыть"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Невозможно установить сертификаты"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Закрыть"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Этот файл нельзя использовать в качестве <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>."</string>
+    <string name="certificate" msgid="8790577925509962529">"сертификата"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"сертификата центра сертификации"</string>
+    <string name="user_certificate" msgid="514888069820553128">"сертификата пользователя приложений и VPN"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"сертификата Wi-Fi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"Сертификат ЦС установлен."</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Сертификат пользователя установлен."</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Сертификат Wi‑Fi установлен."</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="cert_temp_error" msgid="617276803992714550">"Временный сбой. Повторите попытку позже."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Сертификаты может устанавливать только владелец устройства."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Использование:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index a4705f6..491fd57 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -23,12 +23,13 @@
     <!-- String.format failed for translation -->
     <!-- no translation found for pkcs12_file_password_dialog_title (8102721384767269510) -->
     <skip />
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"සහතිකය නම් කරන්න"</string>
-    <string name="credential_name" msgid="1974979771369744378">"සහතිකයේ නම:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"මෙම සහතිකය නම් කරන්න"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"සහතිකයේ නම"</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="userkey_type" msgid="6214833257030657106">"ඇල්ගොරිතමය:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"එක් පරිශීලක සහතිකය"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"CA සහතික එකක්"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA සහතික"</string>
@@ -42,10 +43,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"සහතිකය අවලංගුයි."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"සහතිකයක් ස්ථාපනය කිරීම සඳහා පුද්ගලික යතුරක් අවශ්‍යයි"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"පුද්ගලික යතුරක් ස්ථාපනය කිරීම සඳහා සහතිකයක් අවශ්‍යයි"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> ස්ථාපනය කරන ලදි."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"සහතික වර්ගයක් තෝරන්න"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"CA සහතික ස්ථාපනය කළ නොහැකිය"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA සහතිකවලට ඔබේ රහස්‍යතාව අවදානමකට හෙළිය හැකි අතර සැකසීම් තුළ ස්ථාපනය කළ යුතුය"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"වසන්න"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"සහතික ස්ථාපනය කළ නොහැකිය"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"වසන්න"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"මෙම ගොනුව <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g> එකක් ලෙස භාවිත කළ නොහැකිය"</string>
+    <string name="certificate" msgid="8790577925509962529">"සහතිකය"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA සහතිකය"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN &amp; යෙදුම් පරිශීලක සහතිකය"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Wi‑Fi සහතිකය"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA සහතිකය ස්ථාපනය කරන ලදී"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"පරිශීලක සහතිකය ස්ථාපනය කරන ලදී"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Wi‑Fi සහතිකය ස්ථාපනය කරන ලදී"</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="cert_temp_error" msgid="617276803992714550">"තාවකාලික දෝෂයකි. කරුණාකර පසුව නැවත උත්සාහ කරන්න."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"මෙම උපාංගයේ හිමිකරුට පමණක් සහතිකය ස්ථාපනය කළ හැක."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"අක්තපත්‍ර භාවිතය:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 6e71c9d..460df54 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -21,14 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Extrahovať certifikát"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Prebieha extrahovanie..."</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Extrahovať z %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Nazvite certifikát"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Názov certifikátu:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Pomenujte tento certifikát"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Názov certifikátu"</string>
     <string name="credential_password" msgid="3520176519550993326">"Ak chcete extrahovať certifikáty, zadajte heslo."</string>
     <string name="credential_info" msgid="2436768402308470397">"Balíček obsahuje:"</string>
     <string name="p12_description" msgid="4128352087331630024">"Certifikáty v úložisku kľúčov PKCS12."</string>
     <string name="one_userkey" msgid="3500697912370644881">"kľúč pre jedného používateľa"</string>
-    <!-- no translation found for userkey_type (6214833257030657106) -->
-    <skip />
+    <string name="userkey_type" msgid="6214833257030657106">"Algoritmus:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"certifikát pre jedného používateľa"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"jeden certifikát CA"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d certifikátov CA"</string>
@@ -42,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Certifikát je neplatný."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Na inštaláciu certifikátu sa vyžaduje súkromný kľúč"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Na inštaláciu súkromného kľúča sa vyžaduje certifikát"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> bol nainštalovaný"</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Vyberte typ certifikátu"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Certifikáty CA nie je možné nainštalovať"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"Certifikáty CA môžu ohroziť vaše súkromie a ich inštaláciu je nutné vykonať v Nastaveniach"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Zavrieť"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Certifikáty nie je možné nainštalovať"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Zavrieť"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Tento súbor nemôžete použiť ako <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"certifikát"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"certifikát CA"</string>
+    <string name="user_certificate" msgid="514888069820553128">"certifikát používateľa VPN a aplikácie"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"certifikát Wi‑Fi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"Certifikát CA bol nainštalovaný"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Certifikát používateľa bol nainštalovaný"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Certifikát Wi‑Fi bol nainštalovaný"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Inštalácia zlyhala, pretože súbor certifikátu je príliš veľký."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Inštalácia zlyhala, pretože sa nepodarilo nájsť súbor s certifikátom."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Inštalácia zlyhala, pretože sa nepodarilo prečítať súbor s certifikátom."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Dočasná chyba. Skúste to znova neskôr."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Certifikáty môže inštalovať iba vlastník tohto zariadenia."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Použitie poverení:"</string>
   <string-array name="credential_usage">
@@ -59,7 +72,7 @@
     <string name="wifi_install_label" msgid="1449629407724323233">"Inštalovať"</string>
     <string name="wifi_installing_label" msgid="8387393993627129025">"Inštalácia"</string>
     <string name="wifi_cancel_label" msgid="1328748037608392134">"Zrušiť"</string>
-    <string name="wifi_dismiss_label" msgid="1916684434873972698">"Odmietnuť"</string>
+    <string name="wifi_dismiss_label" msgid="1916684434873972698">"Zavrieť"</string>
     <string name="wifi_no_config" msgid="1835743123288916755">"Žiadne"</string>
     <string name="wifi_config_text" msgid="8259587306773310314">"Názov: %1$s\nPresne stanovený názov domény (FQDN): %2$s\nRoamingové konzorciá: %3$s\nOblasť: %4$s\nMetóda overenia totožnosti: EAP-%5$s\n"</string>
     <string name="wifi_ttls_config_text" msgid="2002413183253872168">"Používateľské meno: %s\n"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 1f772b9..d673b33 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -21,12 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Izvozi potrdilo"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Ekstrahiranje ..."</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Ekstrahiraj iz %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Poimenovanje potrdila"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Ime potrdila:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Poimenujte to potrdilo"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Ime potrdila"</string>
     <string name="credential_password" msgid="3520176519550993326">"Za ekstrahiranje potrdil vnesite geslo."</string>
     <string name="credential_info" msgid="2436768402308470397">"V tem paketu je:"</string>
     <string name="p12_description" msgid="4128352087331630024">"Potrdila v shrambi ključev PKCS12"</string>
     <string name="one_userkey" msgid="3500697912370644881">"en uporabniški ključ"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"Algoritem:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"potrdilo enega uporabnika"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"eno overjeno potrdilo"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d overjenih potrdil"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Potrdilo ni veljavno."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Za namestitev potrdila potrebujete zasebni ključ"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Za namestitev zasebnega ključa potrebujete potrdilo"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> je nameščen."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Izberite vrsto potrdila"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Potrdil overiteljev potrdil ni mogoče namestiti"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"Potrdila overiteljev potrdil lahko ogrozijo vašo zasebnost, zato jih je treba namestiti v nastavitvah"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Zapri"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Potrdil ni mogoče namestiti"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Zapri"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Te datoteke ni mogoče uporabiti kot <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"potrdilo"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"potrdilo overitelja potrdil"</string>
+    <string name="user_certificate" msgid="514888069820553128">"Uporabniško potrdilo za VPN in aplikacije"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"potrdilo za Wi‑Fi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"Potrdilo overitelja potrdil je nameščeno"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Uporabniško potrdilo je nameščeno"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Potrdilo za Wi‑Fi je nameščeno"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Namestitev ni uspela, ker je potrdilo preveliko."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Namestitev ni uspela, ker ni bilo mogoče najti datoteke s potrdilom."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Namestitev ni uspela, ker ni bilo mogoče prebrati datoteke s potrdilom."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Začasna napaka. Poskusite znova pozneje."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Samo lastnik sme namestiti potrdila."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Uporaba poverilnice:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 841da36..72ccc11 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -21,12 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Nxirr certifikatën"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Po nxjerr…"</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Nxirr nga %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Emërto certifikatën"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Emri i certifikatës:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Emërtoje këtë certifikatë"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Emri i certifikatës"</string>
     <string name="credential_password" msgid="3520176519550993326">"Shkruaj fjalëkalimin për të nxjerrë certifikatat."</string>
     <string name="credential_info" msgid="2436768402308470397">"Paketa përmban:"</string>
     <string name="p12_description" msgid="4128352087331630024">"Certifikatat në depon e çelësave PKCS12."</string>
     <string name="one_userkey" msgid="3500697912370644881">"çelës për një përdorues"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"Algoritmi:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"certifikatë për një përdorues"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"një certifikatë CA"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d certifikata CA"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Certifikata është e pavlefshme."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Kërkohet çelësi privat për të instaluar një certifikatë"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Kërkohet certifikata për të instaluar një çelës privat"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> është instaluar."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Zgjidh një lloj certifikate"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Certifikatat CA nuk mund të instalohen"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"Certifikatat CA mund ta vendosin privatësinë tënde në rrezik dhe duhet të instalohen te \"Cilësimet\""</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Mbyll"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Certifikatat nuk mund të instalohen"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Mbyll"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Ky skedar nuk mund të përdoret si <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Certifikata"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"Certifikata CA"</string>
+    <string name="user_certificate" msgid="514888069820553128">"Certifikata e përdoruesit për VPN-në dhe aplikacionin"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Certifikata e Wi‑Fi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"Certifikata CA u instalua"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Certifikata e përdoruesit u instalua"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Certifikata Wi‑Fi u instalua"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Nuk mundi të instalohej sepse madhësia e certifikatës është shumë e madhe."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Nuk mundi të instalohej sepse skedari i certifikatës nuk u gjet."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Nuk mund të instalohej sepse skedari i certifikatës nuk mund të lexohej."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Dështim i përkohshëm. Provo përsëri më vonë."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Vetëm zotëruesi i kësaj pajisjeje mund të instalojë certifikatat."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Përdorimi i kredencialeve:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 70da148..779e5e4 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -21,12 +21,13 @@
     <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="name_credential_dialog_title" msgid="1481964824549786927">"Дајте назив овом сертификату"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Назив сертификата"</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="userkey_type" msgid="6214833257030657106">"Алгоритам:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"сертификат за једног корисника"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"један CA сертификат"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA сертификати"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Сертификат је неважећи."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Приватни кључ је обавезан за инсталирање сертификата"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Сертификат је обавезан за инсталирање приватног кључа"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> је инсталиран."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Одаберите тип сертификата"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Инсталирање CA сертификата није успело"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA сертификати могу да угрозе приватност и морају да се инсталирају у подешавањима"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Затвори"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Инсталирање сертификата није успело"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Затвори"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Ова датотека не може да се користи као <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Сертификат"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA сертификат"</string>
+    <string name="user_certificate" msgid="514888069820553128">"Кориснички сертификат за VPN и апликацију"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Сертификат за Wi‑Fi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA сертификат је инсталиран"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Кориснички сертификат је инсталиран"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Сертификат за Wi‑Fi је инсталиран"</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="cert_temp_error" msgid="617276803992714550">"Привремена грешка. Пробајте поново касније."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Само власник овог уређаја може да инсталира сертификате."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Коришћење акредитива:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index c82b354..016e6c9 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -21,12 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Extrahera certifikat"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Extraheras ..."</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Extrahera från %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Ange ett namn på certifikatet"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Certifikatnamn:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Ange ett namn på certifikatet"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Certifikatnamn"</string>
     <string name="credential_password" msgid="3520176519550993326">"Ange lösenordet om du vill extrahera certifikaten."</string>
     <string name="credential_info" msgid="2436768402308470397">"Paketet innehåller:"</string>
     <string name="p12_description" msgid="4128352087331630024">"Certifikat i PKCS12-nyckellager."</string>
     <string name="one_userkey" msgid="3500697912370644881">"en användarnyckel"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"Algoritm:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"ett användarcertifikat"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"ett CA-certifikat"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA-certifikat"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Certifikatet är ogiltigt."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"En privat nyckel krävs för att installera certifikat"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Certifikat krävs för att installera en privat nyckel"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> har installerats."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Välj typ av certifikat"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Det går inte att installera CA-certifikat"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA-certifikat kan äventyra din integritet och måste installeras i inställningarna"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Stäng"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Det gick inte att installera certifikat"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Stäng"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Den här filen går inte att använda som <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Certifikat"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA-certifikat"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN- och appanvändarcertifikat"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Wi‑Fi-certifikat"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA-certifikatet har installerats"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Användarcertifikatet har installerats"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Wi-Fi-certifikatet har installerats"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Det gick inte att installera eftersom certifikatet är för stort."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Det gick inte att installera eftersom certifikatfilen inte hittades."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Det gick inte att installera eftersom certifikatfilen inte kunde läsas."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Tillfälligt fel. Försök igen senare."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Endast ägaren av den här enheten kan installera certifikat."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Användning av användaruppgifter:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 856679a..6e2c8f7 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -21,12 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Chopoa cheti"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Zinatolewa..."</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="credential_name" msgid="1974979771369744378">"Jina la cheti:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Kipe cheti hiki jina"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"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>
     <string name="p12_description" msgid="4128352087331630024">"Vyeti katika hifadhi-vitufe ya PKCS12."</string>
     <string name="one_userkey" msgid="3500697912370644881">"ufunguo wa mtumiaji mmoja"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"Algoriti:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"cheti cha mtumiaji mmoja"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"Cheti kimoja cha CA"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"Vyeti vya %d CA"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Cheti ni batili."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Unatakiwa uwe na ufunguo wa faragha ili usakinishe cheti"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Unatakiwa uwe na cheti ili usakinishe ufunguo wa faragha"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> imesakinishwa."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Chagua aina ya cheti"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Imeshindwa kusakinisha vyeti vya CA"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"Vyeti vya CA vinaweza kuhatarisha faragha yako na lazima visakinishwe katika Mipangilio"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Funga"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Imeshindwa kusakinisha vyeti"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Funga"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Faili hii haiwezi kutumika kama <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Cheti"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"Cheti cha CA"</string>
+    <string name="user_certificate" msgid="514888069820553128">"Cheti cha mtumiaji wa programu na VPN"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Cheti cha Wi-Fi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"Cheti cha CA kimesakinishwa"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Cheti cha mtumiaji kimesakinishwa"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Cheti cha Wi-Fi kimesakinishwa"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Haikuweza kusakinisha kwa sababu cheti ni kikubwa mno."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Haikuweza kusakinisha kwa sababu faili ya cheti haikupatikana."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Haikuweza kusakinisha kwa sababu faili ya cheti haikuweza kusomwa."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Hitilafu ya muda. Tafadhali jaribu tena baadaye."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Mmiliki wa kifaa hiki tu ndiye awezaye kusakinisha vyeti."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Matumizi ya kitambulisho:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 751a033..b99e8ea 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -21,14 +21,13 @@
     <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="name_credential_dialog_title" msgid="1481964824549786927">"இந்தச் சான்றிதழுக்குப் பெயரிடுக"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"சான்றிதழின் பெயர்"</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>
-    <!-- no translation found for userkey_type (6214833257030657106) -->
-    <skip />
+    <string name="userkey_type" msgid="6214833257030657106">"அல்காரிதம்:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"ஒரு பயனர் சான்றிதழ்"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"ஒரு CA சான்றிதழ்"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA சான்றிதழ்கள்"</string>
@@ -42,14 +41,28 @@
     <string name="invalid_cert" msgid="7704228670980743590">"சான்றிதழ் தவறானது."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"சான்றிதழை நிறுவ, தனிப்பட்ட குறியீடு தேவை"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"தனிப்பட்ட குறியீட்டை நிறுவ, சான்றிதழ் தேவை"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> நிறுவப்பட்டது."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"சான்றிதழின் வகை ஒன்றைத் தேர்ந்தெடுங்கள்"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"CA சான்றிதழ்களை நிறுவ இயலவில்லை"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA சான்றிதழ்களால் உங்கள் தனியுரிமைக்கு ஆபத்து நேரலாம், எனவே அவற்றை அமைப்புகளில் நிறுவ வேண்டும்"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"மூடுக"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"சான்றிதழ்களை நிறுவ இயலவில்லை"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"மூடுக"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"இந்தக் கோப்பை <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g> ஆகப் பயன்படுத்த முடியாது"</string>
+    <string name="certificate" msgid="8790577925509962529">"சான்றிதழ்"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA சான்றிதழ்"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN &amp; ஆப்ஸ் பயனர் சான்றிதழ்"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"வைஃபை சான்றிதழ்"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA சான்றிதழ் நிறுவப்பட்டது"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"பயனர் சான்றிதழ் நிறுவப்பட்டது"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"வைஃபை சான்றிதழ் நிறுவப்பட்டது"</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="cert_temp_error" msgid="617276803992714550">"தற்காலிகத் தோல்வி . பிறகு முயலவும்."</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>
+    <item msgid="375085478373011304">"VPN மற்றும் ஆப்ஸ்"</item>
     <item msgid="692322974985472861">"வைஃபை"</item>
   </string-array>
     <string name="certificate_capabilities_warning" msgid="4158609401937799110">"கவனத்திற்கு: இந்தச் சான்றிதழை வழங்குபவர், சாதனத்தைப் பயன்படுத்துவதன் மூலம் கிடைக்கும் ட்ராஃபிக் அனைத்தையும் ஆய்வுசெய்யக்கூடும்."</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 3f06685..049f998 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -21,12 +21,13 @@
     <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="name_credential_dialog_title" msgid="1481964824549786927">"ఈ సర్టిఫికెట్‌కు పేరు పెట్టండి"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"సర్టిఫికెట్ పేరు"</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="userkey_type" msgid="6214833257030657106">"అల్గారిథమ్:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"ఒక వినియోగదారు సర్టిఫికెట్"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"ఒక CA సర్టిఫికెట్"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA ప్రమాణపత్రాలు"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"సర్టిఫికెట్ చెల్లదు."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"సర్టిఫికెట్‌ను ఇన్‌స్టాల్ చేయడానికి ప్రైవేట్ కీ అవసరం"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"ప్రైవేట్ కీని ఇన్‌స్టాల్ చేయడానికి సర్టిఫికెట్‌ అవసరం"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> ఇన్‌స్టాల్ చేయబడింది."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"సర్టిఫికెట్ రకాన్ని ఎంచుకోండి"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"CA సర్టిఫికెట్‌లను ఇన్‌స్టాల్ చేయడం సాధ్యపడదు"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA సర్టిఫికెట్‌ల వలన మీ గోప్యతకు ప్రమాదం ఏర్పడవచ్చు, కనుక వాటిని సెట్టింగ్‌లలో తప్పక ఇన్‌స్టాల్ చేయవలసి ఉంటుంది"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"మూసివేయి"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"సర్టిఫికెట్‌లను ఇన్‌స్టాల్ చేయడం సాధ్యపడదు"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"మూసివేయి"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"ఈ ఫైల్‌ను <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>గా ఉపయోగించడం సాధ్యం కాదు"</string>
+    <string name="certificate" msgid="8790577925509962529">"సర్టిఫికెట్"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA సర్టిఫికెట్"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN &amp; యాప్ వినియోగదారు సర్టిఫికెట్"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Wi‑Fi సర్టిఫికెట్"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA సర్టిఫికెట్ ఇన్‌స్టాల్ చేయబడింది"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"యూజర్ సర్టిఫికెట్ ఇన్‌స్టాల్ చేయబడింది"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Wi‑Fi సర్టిఫికెట్ ఇన్‌స్టాల్ చేయబడింది"</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="cert_temp_error" msgid="617276803992714550">"తాత్కాలిక వైఫల్యం. దయచేసి కాసేపటి తర్వాత మళ్లీ ప్రయత్నించండి."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"ఈ పరికర యజమాని మాత్రమే ప్రమాణపత్రాలను ఇన్‌స్టాల్ చేయవచ్చు."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"ఆధారాల వినియోగం:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 00f7c7a..5be769f 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -21,12 +21,13 @@
     <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="name_credential_dialog_title" msgid="1481964824549786927">"ตั้งชื่อใบรับรองนี้"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"ชื่อใบรับรอง"</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="userkey_type" msgid="6214833257030657106">"อัลกอริทึม:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"ใบรับรองสำหรับผู้ใช้หนึ่งราย"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"หนึ่งใบรับรอง CA"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d ใบรับรอง CA"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"ใบรับรองไม่ถูกต้อง"</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"ต้องใช้คีย์ส่วนตัวเพื่อติดตั้งใบรับรอง"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"ต้องใช้ใบรับรองเพื่อติดตั้งคีย์ส่วนตัว"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"ติดตั้ง <xliff:g id="CREDENTIAL">%s</xliff:g> แล้ว"</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"เลือกประเภทใบรับรอง"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"ติดตั้งใบรับรอง CA ไม่ได้"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"ใบรับรอง CA อาจทำให้ความเป็นส่วนตัวของคุณมีความเสี่ยงและจะต้องติดตั้งในการตั้งค่า"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"ปิด"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"ติดตั้งใบรับรองไม่ได้"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"ปิด"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"ใช้ไฟล์นี้เป็น <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g> ไม่ได้"</string>
+    <string name="certificate" msgid="8790577925509962529">"ใบรับรอง"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"ใบรับรอง CA"</string>
+    <string name="user_certificate" msgid="514888069820553128">"ใบรับรองผู้ใช้ VPN และแอป"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"ใบรับรอง Wi‑Fi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"ติดตั้งใบรับรอง CA แล้ว"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"ติดตั้งใบรับรองผู้ใช้แล้ว"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"ติดตั้งใบรับรอง Wi‑Fi แล้ว"</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="cert_temp_error" msgid="617276803992714550">"ใช้งานไม่ได้ชั่วคราว โปรดลองอีกครั้งภายหลัง"</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"เฉพาะเจ้าของอุปกรณ์นี้ที่สามารถติดตั้งใบรับรอง"</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"การใช้ข้อมูลรับรอง:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index c1faad3..e172a1e 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -21,12 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"I-extract ang certificate"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Ine-extract…"</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"I-extract mula sa %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Pangalanan ang certificate"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Pangalan ng certificate:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Pangalanan ang certificate na ito"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Pangalan ng certificate"</string>
     <string name="credential_password" msgid="3520176519550993326">"I-type ang password upang i-extract ang mga certificate."</string>
     <string name="credential_info" msgid="2436768402308470397">"Naglalaman ang package ng:"</string>
     <string name="p12_description" msgid="4128352087331630024">"Mga certificate sa PKCS12 keystore."</string>
     <string name="one_userkey" msgid="3500697912370644881">"isang key ng user"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"Algorithm:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"isang certificate ng user"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"isang certficate ng CA"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d Mga certificate ng CA"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Di-wasto ang certificate."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Kinakailangan ng pribadong key para mag-install ng certificate"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Kinakailangan ng certificate para mag-install ng pribadong key"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"Naka-install ang <xliff:g id="CREDENTIAL">%s</xliff:g>."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Pumili ng uri ng certificate"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Hindi ma-install ang mga CA certificate"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"Puwedeng malagay sa panganib ang iyong privacy dahil sa mga CA certificate at dapat i-install ang mga ito sa Mga Setting"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Isara"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Hindi ma-install ang mga certificate"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Isara"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Hindi puwedeng gamitin ang file na ito bilang <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Certificate"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA certificate"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN at certificate ng app user"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Certificate ng Wi-Fi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"Na-install na ang CA certificate"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Na-install na ang certificate ng user"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Na-install na ang certificate ng Wi-Fi"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Hindi ma-install dahil masyadong malaki ang certificate."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Hindi ma-install dahil hindi mahanap ang file ng certificate."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Hindi mai-install dahil hindi mabasa ang file ng certificate."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Pansamantalang hindi paggana. Subukan ulit sa ibang pagkakataon."</string>
     <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">
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index df2a719..d521307 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -21,12 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Sertifikayı çıkart"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Çıkarılıyor..."</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"%s dosyasından ayıkla"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Sertifikayı adlandırın"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Sertifika adı:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Bu sertifikaya ad verin"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Sertifika adı"</string>
     <string name="credential_password" msgid="3520176519550993326">"Sertifikaları çıkarmak için şifreyi yazın."</string>
     <string name="credential_info" msgid="2436768402308470397">"Paket şunları içeriyor:"</string>
     <string name="p12_description" msgid="4128352087331630024">"PKCS12 anahtar deposundaki sertifikalar."</string>
     <string name="one_userkey" msgid="3500697912370644881">"bir kullanıcı anahtarı"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"Algoritma:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"bir kullanıcı sertifikası"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"bir CA sertifikası"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA sertifikası"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Sertifika geçersiz."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Sertifika yüklemek için özel anahtar gerekli"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Özel anahtar yüklemek için sertifika gerekli"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> yüklendi."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Bir sertifika türü seçin"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"CA sertifikaları yüklenemiyor"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA sertifikaları gizliliğiniz için risk oluşturabilir ve Ayarlar\'da yüklenmelidir."</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Kapat"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Sertifikalar yüklenemiyor"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Kapat"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Bu dosya <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g> olarak kullanılamaz"</string>
+    <string name="certificate" msgid="8790577925509962529">"Sertifika"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA sertifikası"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN ve uygulama kullanıcı sertifikası"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Kablosuz sertifikası"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"CA sertifikası yüklendi"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Kullanıcı sertifikası yüklendi"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Kablosuz sertifikası yüklendi"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Sertifika boyutu çok büyük olduğundan yüklenemedi."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Sertifika dosyası bulunamadığından yüklenemedi."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Sertifika dosyası okunamadığından yüklenemedi."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Geçici hata. Lütfen daha sonra tekrar deneyin."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Sadece bu cihazın sahibi sertifikaları yükleyebilir."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Kimlik bilgisinin kullanımı:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 1d1ed92..3a80f17 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -21,12 +21,13 @@
     <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="name_credential_dialog_title" msgid="1481964824549786927">"Дайте назву цьому сертифікату"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Назва сертифіката"</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="userkey_type" msgid="6214833257030657106">"Алгоритм:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"один сертифікат корист."</string>
     <string name="one_cacrt" msgid="2667950425420663146">"один сертифікат ЦС"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d сертифікати ЦА"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Сертифікат недійсний."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Щоб установити сертифікат, потрібен секретний ключ"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Щоб установити секретний ключ, потрібен сертифікат"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> встановлено."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Виберіть тип сертифіката"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Не вдається встановити сертифікати ЦС"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"Сертифікати центру сертифікації можуть поставити вашу конфіденційність під загрозу. Їх потрібно встановлювати в Налаштуваннях"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Закрити"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Не вдається встановити сертифікати"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Закрити"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Цей файл не можна використовувати з такою ціллю (<xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>)"</string>
+    <string name="certificate" msgid="8790577925509962529">"Сертифікат"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"Сертифікат ЦС"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN і сертифікат користувача"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Сертифікат Wi‑Fi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"Сертифікат ЦС установлено"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Сертифікат користувача встановлено"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Сертифікат Wi‑Fi установлено"</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="cert_temp_error" msgid="617276803992714550">"Тимчасова помилка. Повторіть спробу."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Лише власник цього пристрою може встановлювати сертифікати."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Використання облікових даних:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index d93830d..f697c6c 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -21,12 +21,13 @@
     <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="name_credential_dialog_title" msgid="1481964824549786927">"اس سرٹیفکیٹ کا نام رکھیں"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"سرٹیفیکیٹ کا نام"</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="userkey_type" msgid="6214833257030657106">"الگورتھم:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"ایک صارف کا سرٹیفیکیٹ"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"‏ایک CA سرٹیفیکیٹ"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"‏‎%d CA سرٹیفیکیٹس"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"سرٹیفیکیٹ غلط ہے۔"</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"ایک سرٹیفکیٹ انسٹال کرنے کیلئے نجی کلید درکار ہے"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"ایک نجی کلید انسٹال کرنے کیلئے سرٹیفکیٹ درکار ہے"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> انسٹال ہے۔"</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"سرٹیفکیٹ کی قسم منتخب کریں"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"‏CA سرٹیفکیٹس کو انسٹال نہیں کیا جا سکا"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"‏CA سرٹیفکیٹس آپ کی رازداری کو خطرے میں ڈال سکتے ہیں اور انہیں ترتیبات میں انسٹال کرنا ضروری ہے"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"بند کریں"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"سرٹیفیکیٹس کو انسٹال نہیں کیا جا سکا"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"بند کریں"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"اس فائل کو بطور <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g> استعمال نہیں کیا جا سکتا"</string>
+    <string name="certificate" msgid="8790577925509962529">"سرٹیفکیٹ"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"‏CA سرٹیفکیٹ"</string>
+    <string name="user_certificate" msgid="514888069820553128">"‏VPN اور ایپ صارف کا سرٹیفکیٹ"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"‏Wi-Fi سرٹیفکیٹ"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"‏CA سرٹیفکیٹ انسٹال کیا گیا"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"صارف کا سرٹیفیکیٹ انسٹال کیا گیا"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"‏Wi-Fi کا سرٹیفکیٹ انسٹال کیا گیا"</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="cert_temp_error" msgid="617276803992714550">"عارضی ناکامی۔ براہ کرم بعد میں دوبارہ کوشش کریں۔"</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"صرف اس آلہ کا مالک ہی سرٹیفکیٹس انسٹال کر سکتا ہے۔"</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"اسناد کا استعمال:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 472021e..ce1e37c 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -21,12 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Ajratish sertifikati"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Chiqarib olinmoqda..."</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"%sdan ajratish"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Sertifikat nomini ko‘rsating"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Sertifikat nomi:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Bu sertifikatni nomlang"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Sertifikat nomi"</string>
     <string name="credential_password" msgid="3520176519550993326">"Sertifikatlarni chiqarib olish uchun parolni kiriting."</string>
     <string name="credential_info" msgid="2436768402308470397">"Paket tarkibi:"</string>
     <string name="p12_description" msgid="4128352087331630024">"PKCS12 kalitlar omborxonasidagi sertifikatlar"</string>
     <string name="one_userkey" msgid="3500697912370644881">"bitta foydalanuvchi kaliti"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"Algoritm:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"bitta foydalanuvchi sertifikati"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"sertifikatlashtirish markazining bitta sertifikati"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d CA sertifikatlari"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Sertifikatdan foydalanib bo‘lmaydi."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Sertifikatni o‘rnatish uchun shaxsiy kalit talab etiladi"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Shaxsiy kalitni o‘rnatish uchun sertifikat talab etiladi"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> o‘rnatildi."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Sertifikat turini tanlang"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"SM sertifikatlari oʻrnatilmadi"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"SM sertifikatlari xavfli boʻlishi mumkin. Uni Sozlamalar orqali oʻrnatish lozim."</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Yopish"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Sertifikatlar oʻrnatilmadi"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Yopish"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Bu fayldan <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g> sifatida foydalanish imkonsiz"</string>
+    <string name="certificate" msgid="8790577925509962529">"Sertifikat"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"SM sertifikati"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN va ilova foydalanuvchisi sertifikati"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Wi‑Fi sertifikati"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"SM sertifikati oʻrnatildi"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Foydalanuvchi sertifikati oʻrnatildi"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Wi‑Fi sertifikati oʻrnatildi"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"O‘rnatib bo‘lmadi, chunki sertifikat hajmi juda katta."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"O‘rnatib bo‘lmadi, chunki sertifikat fayli topilmadi."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"O‘rnatib bo‘lmadi, chunki sertifikat faylini o‘qib bo‘lmadi."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Vaqtinchalik xato Keyinroq qayta urining."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Sertifikatlarni faqat ushbu qurilma egasi o‘rnata oladi."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Foydalanish:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 54222f6..26bcfc8 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -21,14 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Trích xuất chứng chỉ"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Đang trích xuất..."</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Trích xuất từ %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Đặt tên chứng chỉ"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Tên chứng chỉ:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Đặt tên cho chứng chỉ này"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Tên chứng chỉ"</string>
     <string name="credential_password" msgid="3520176519550993326">"Nhập mật khẩu để trích xuất các chứng chỉ."</string>
     <string name="credential_info" msgid="2436768402308470397">"Gói chứa:"</string>
     <string name="p12_description" msgid="4128352087331630024">"Chứng chỉ trong kho khóa PKCS12."</string>
     <string name="one_userkey" msgid="3500697912370644881">"một khóa người dùng"</string>
-    <!-- no translation found for userkey_type (6214833257030657106) -->
-    <skip />
+    <string name="userkey_type" msgid="6214833257030657106">"Thuật toán:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"một chứng chỉ người dùng"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"một chứng chỉ CA"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d chứng chỉ CA"</string>
@@ -42,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Chứng chỉ không hợp lệ."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Yêu cầu có khóa riêng tư để cài đặt chứng chỉ"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Yêu cầu có chứng chỉ để cài đặt khóa riêng tư"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> đã được cài đặt."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Chọn một loại chứng chỉ"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Không thể cài đặt chứng chỉ CA"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"Bạn cần phải cài đặt các chứng chỉ CA trong phần Cài đặt để tránh các rủi ro về quyền riêng tư"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Đóng"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Không thể cài đặt chứng chỉ"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Đóng"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Bạn không thể dùng tệp này làm <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Chứng chỉ"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"Chứng chỉ CA"</string>
+    <string name="user_certificate" msgid="514888069820553128">"Chứng chỉ người dùng ứng dụng và VPN"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Chứng chỉ Wi‑Fi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"Đã cài đặt chứng chỉ CA"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Đã cài đặt chứng chỉ người dùng"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Đã cài đặt chứng chỉ Wi‑Fi"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Không thể cài đặt vì kích thước chứng chỉ quá lớn."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Không thể cài đặt vì không thể định vị tệp chứng chỉ."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Không thể cài đặt vì không thể đọc tệp chứng chỉ."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Lỗi tạm thời. Vui lòng thử lại sau."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Chỉ chủ sở hữu thiết bị này mới có thể cài đặt các chứng chỉ."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Sử dụng bản xác thực:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 8619806..4738df6 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -21,12 +21,13 @@
     <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="name_credential_dialog_title" msgid="1481964824549786927">"为此证书命名"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"证书名称"</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="userkey_type" msgid="6214833257030657106">"算法:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"一个用户证书"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"1个CA证书"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d个CA证书"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"该证书无效。"</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"需要提供私钥才能安装证书"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"需要提供证书才能安装私钥"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"已安装 <xliff:g id="CREDENTIAL">%s</xliff:g>。"</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"选择证书类型"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"无法安装 CA 证书"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA 证书可能会给您带来隐私权方面的风险,而且必须通过“设置”安装"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"关闭"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"无法安装证书"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"关闭"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"无法将此文件用作<xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"证书"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA 证书"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN 和应用用户证书"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"WLAN 证书"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"已安装 CA 证书"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"已安装用户证书"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"已安装 WLAN 证书"</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="cert_temp_error" msgid="617276803992714550">"出现临时错误。请稍后重试。"</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"只有设备的机主才能安装证书。"</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"凭据用途:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 1e673a1..63d6177 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -21,12 +21,13 @@
     <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="name_credential_dialog_title" msgid="1481964824549786927">"為此憑證命名"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"憑證名稱"</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="userkey_type" msgid="6214833257030657106">"演算法:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"一個使用者憑證"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"1 個 CA 憑證"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d 個 CA 憑證"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"憑證無效。"</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"需要私人密鑰才能安裝憑證"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"需要憑證才能安裝私人密鑰"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> 已安裝。"</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"選擇憑證類型"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"無法安裝 CA 憑證"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA 憑證可能會讓您的私隱承受風險,因此必須在「設定」中安裝"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"關閉"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"無法安裝憑證"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"關閉"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"這個檔案無法用作 <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"憑證"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA 憑證"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN 及應用程式使用者憑證"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Wi‑Fi 憑證"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"已安裝 CA 憑證"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"已安裝使用者憑證"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"已安裝 Wi‑Fi 憑證"</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="cert_temp_error" msgid="617276803992714550">"暫時故障,請稍後再試。"</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"只有這部裝置的擁有者可以安裝憑證。"</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"憑證用途:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index bccb3e6..0c4bb45 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -21,12 +21,13 @@
     <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="name_credential_dialog_title" msgid="1481964824549786927">"替這個憑證命名"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"憑證名稱"</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="userkey_type" msgid="6214833257030657106">"演算法:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"一個使用者憑證"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"一個 CA 憑證"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"%d 個 CA 憑證"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"憑證無效。"</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"需要私密金鑰才能安裝憑證"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"需要憑證才能安裝私密金鑰"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"已安裝<xliff:g id="CREDENTIAL">%s</xliff:g>。"</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"選擇憑證類型"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"無法安裝 CA 憑證"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"CA 憑證可能有隱私權風險,而且必須透過「設定」安裝"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"關閉"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"無法安裝憑證"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"關閉"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"無法將這個檔案做為「<xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>」使用"</string>
+    <string name="certificate" msgid="8790577925509962529">"憑證"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"CA 憑證"</string>
+    <string name="user_certificate" msgid="514888069820553128">"VPN 和應用程式使用者憑證"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Wi‑Fi 憑證"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"已安裝 CA 憑證"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"已安裝使用者憑證"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"已安裝 Wi‑Fi 憑證"</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="cert_temp_error" msgid="617276803992714550">"發生暫時性失敗,請稍後再試。"</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"只有這個裝置的擁有者可以安裝憑證。"</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"憑證用途:"</string>
   <string-array name="credential_usage">
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 59f9ba9..177f82a 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -21,12 +21,13 @@
     <string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Susa izitifiketi"</string>
     <string name="extracting_pkcs12" msgid="1881267738821799771">"Iyakhipha..."</string>
     <string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Khipha kwi %s"</string>
-    <string name="name_credential_dialog_title" msgid="277729846491554437">"Yetha igama isitifiketi"</string>
-    <string name="credential_name" msgid="1974979771369744378">"Igama lesitifiketi:"</string>
+    <string name="name_credential_dialog_title" msgid="1481964824549786927">"Qamba lesi sitifiketi"</string>
+    <string name="certificate_name" msgid="8415893401368824792">"Igama lesitifiketi"</string>
     <string name="credential_password" msgid="3520176519550993326">"Faka iphasiwedi ukukhipha amasitifiketi."</string>
     <string name="credential_info" msgid="2436768402308470397">"Iphakheji liqukethe:"</string>
     <string name="p12_description" msgid="4128352087331630024">"Isitifiketi sikukhiye wokugcina we-PKCS12."</string>
     <string name="one_userkey" msgid="3500697912370644881">"ukhiye oyedwa womsebenzisi"</string>
+    <string name="userkey_type" msgid="6214833257030657106">"I-Algorithm:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"isitifiketi esisodwa somsebenzisi"</string>
     <string name="one_cacrt" msgid="2667950425420663146">"isitifiketi esisodwa se-CA"</string>
     <string name="n_cacrts" msgid="2141498640685639208">"izitifiketi ze-%d C|A"</string>
@@ -40,10 +41,24 @@
     <string name="invalid_cert" msgid="7704228670980743590">"Isitifiketi ailungile."</string>
     <string name="action_missing_private_key" msgid="7543470057312920042">"Ukhiye oyimfihlo uyadingeka ukuze kufakwe isitifiketi"</string>
     <string name="action_missing_user_cert" msgid="3727411730202316771">"Isitifiketi siyadingeka ukuze kufakwe isitifiketi esiyimfihlo"</string>
-    <string name="cert_is_added" msgid="6996557598167000500">"<xliff:g id="CREDENTIAL">%s</xliff:g> ifakiwe."</string>
+    <string name="select_certificate_usage_title" msgid="8853023485944920851">"Khetha uhlobo lwesitifiketi"</string>
+    <string name="redirect_ca_certificate_title" msgid="6485888009061040788">"Ayikwazi ukufaka isitifiketi se-CA"</string>
+    <string name="redirect_ca_certificate_message" msgid="8856228614987350607">"Izitifiketi ze-CA zingabeka ubumfihlo bakho engcupheni futhi kumele zifakwe kuzilungiselelo"</string>
+    <string name="redirect_ca_certificate_close_button" msgid="4291301659747279488">"Vala"</string>
+    <string name="invalid_certificate_title" msgid="4642955675523621795">"Ayikwazi ukufaka izitifiketi"</string>
+    <string name="invalid_certificate_close_button" msgid="350986774973653102">"Vala"</string>
+    <string name="invalid_certificate_message" msgid="3508065546083182733">"Leli fayela alikwazi ukusetshenziswa njenge-<xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
+    <string name="certificate" msgid="8790577925509962529">"Isitifiketi"</string>
+    <string name="ca_certificate" msgid="7397198551290322945">"Isitifiketi se-CA"</string>
+    <string name="user_certificate" msgid="514888069820553128">"I-VPN nesitifiketi somsebenzisi sohlelo lokusebenza"</string>
+    <string name="wifi_certificate" msgid="5356595832360140989">"Isitifiketi se-Wi-Fi"</string>
+    <string name="ca_cert_is_added" msgid="2847081843756291802">"Isitifiketi se-CA sifakiwe"</string>
+    <string name="user_cert_is_added" msgid="3088794616560630823">"Isitifiketi somsebenzisi sifakiwe"</string>
+    <string name="wifi_cert_is_added" msgid="333220613655140428">"Isitifiketi se-Wi-Fi sifakiwe"</string>
     <string name="cert_too_large_error" msgid="8715414972725646285">"Ayikwazanga ukufaka ngoba usayizi wesitifiketi mkhulu kakhulu."</string>
     <string name="cert_missing_error" msgid="7040527352278728220">"Ayikwazanga ukufaka ngoba ifayela lesitifiketi alikwazanga ukutholwa."</string>
     <string name="cert_read_error" msgid="7353463360652419796">"Ayikwazanga ukufaka ngoba ifayela lesitifiketi alikwazanga ukufundwa."</string>
+    <string name="cert_temp_error" msgid="617276803992714550">"Ukuhluleka kwesikhashana. Sicela uzame futhi ngemuva kwesikhathi."</string>
     <string name="only_primary_user_allowed" msgid="4005084935023047716">"Umnikazi kuphela wale divayisi ongafaka izitifiketi."</string>
     <string name="credential_usage_label" msgid="1513892208033156805">"Ukusetshenziswa kokuqinisekisa:"</string>
   <string-array name="credential_usage">
diff --git a/res/values/config.xml b/res/values/config.xml
index 062c1ce..25f6905 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -15,8 +15,6 @@
 -->
 
 <resources>
-  <bool name="config_auto_cert_approval">true</bool>
-
   <string name="config_system_install_component" translatable="false">com.android.settings/com.android.settings.security.CredentialStorage</string>
 </resources>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 020a014..2b4d2b5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -26,10 +26,10 @@
     <string name="extracting_pkcs12">Extracting\u2026</string>
     <!-- Title of dialog to enter password for pkcs12 file -->
     <string name="pkcs12_file_password_dialog_title">Extract from %s</string>
-    <!-- Title of dialog to name a credential -->
-    <string name="name_credential_dialog_title">Name the certificate</string>
-    <!-- Description for the credential name input box -->
-    <string name="credential_name">Certificate name:</string>
+    <!-- Title of a dialog. This title is asking the user to name the certificate they're installing on their device. -->
+    <string name="name_credential_dialog_title">Name this certificate</string>
+    <!-- Input field in a dialog. This dialog is asking the user to name the certificate they are installing on their device. -->
+    <string name="certificate_name">Certificate name</string>
     <!-- Title of the credential info -->
     <!-- Description for the credential password input box -->
     <string name="credential_password">Type the password to extract the certificates.</string>
@@ -58,14 +58,48 @@
     <string name="action_missing_private_key">Private key required to install a certificate</string>
     <string name="action_missing_user_cert">Certificate required to install a private key</string>
 
-    <!-- toast message -->
-    <string name="cert_is_added"><xliff:g id="credential">%s</xliff:g> is installed.</string>
+    <!-- Title of dialog to select the certificate usage when installing a certificate outside Settings -->
+    <string name="select_certificate_usage_title">Choose a certificate type</string>
+    <!-- Title of dialog to redirect user when installing a CA certificate outside Settings -->
+    <string name="redirect_ca_certificate_title">Can\'t install CA certificates</string>
+    <!-- Message of dialog to redirect user when installing a CA certificate outside Settings -->
+    <string name="redirect_ca_certificate_message">CA certificates can put your privacy at risk and must be installed in Settings</string>
+    <!-- Button of dialog to redirect user when installing a CA certificate outside Settings -->
+    <string name="redirect_ca_certificate_close_button">Close</string>
+    <!-- Title of dialog to inform user that certificate selected is invalid -->
+    <string name="invalid_certificate_title">Can\'t install certificates</string>
+    <!-- Button of dialog to inform user that certificate selected is invalid -->
+    <string name="invalid_certificate_close_button">Close</string>
+    <!-- Message of dialog to inform user that certificate selected is invalid -->
+    <string name="invalid_certificate_message">This file can\'t be used as a <xliff:g id="certificate_usage">%1$s</xliff:g></string>
+    <!-- Default certificate type used in dialog to inform user that certificate selected is invalid -->
+    <string name="certificate">Certificate</string>
+    <!-- CA certificate type used in dialog to inform user that certificate selected is invalid -->
+    <string name="ca_certificate">CA certificate</string>
+    <!-- User certificate type used in dialog to inform user that certificate selected is invalid -->
+    <string name="user_certificate">VPN &amp; app user certificate</string>
+    <!-- WiFi certificate type used in dialog to inform user that certificate selected is invalid -->
+    <string name="wifi_certificate">Wi\u2011Fi certificate</string>
+    <!-- App Source certificate type used in dialog to inform user that certificate selected is invalid -->
+    <string name="app_src_certificate">App Source certificate</string>
+
+
+    <!-- Confirmation toast. This toast lets the user know that they successfully installed a CA certificate on their device. -->
+    <string name="ca_cert_is_added">CA certificate installed</string>
+    <!-- Confirmation toast. This toast lets the user know that they successfully installed a user certificate on their device. -->
+    <string name="user_cert_is_added">User certificate installed</string>
+    <!-- Confirmation toast. This toast lets the user know that they successfully installed a Wi-Fi certificate on their device. -->
+    <string name="wifi_cert_is_added">Wi\u2011Fi certificate installed</string>
+    <!-- Confirmation toast. This toast lets the user know that they successfully installed an App Source certificate on their device. -->
+    <string name="app_src_cert_is_added">App Source certificate installed</string>
     <!-- toast message -->
     <string name="cert_too_large_error">Couldn\'t install because the certificate size is too large.</string>
     <!-- toast message -->
     <string name="cert_missing_error">Couldn\'t install because the certificate file couldn\'t be located.</string>
     <!-- toast message -->
     <string name="cert_read_error">Couldn\'t install because the certificate file couldn\'t be read.</string>
+    <!-- toast message -->
+    <string name="cert_temp_error">Temporary failure. Please try again later.</string>
 
     <!-- Message displayed when a user other than the owner on a multi-user system tries to
          install a certificate into the certificate store. [CHAR LIMIT=NONE] -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index b1d493e..7bac29f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -28,4 +28,20 @@
         <item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>
         <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
+    <style name="dialog_title">
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:textSize">20sp</item>
+        <item name="android:layout_marginBottom">16dp</item>
+    </style>
+    <style name="dialog_edit_text">
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:backgroundTint">?android:attr/colorAccent</item>
+        <item name="android:singleLine">True</item>
+    </style>
+    <style name="dialog_button">
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:layout_marginBottom">12dp</item>
+        <item name="android:layout_marginLeft">4dp</item>
+    </style>
 </resources>
diff --git a/src/com/android/certinstaller/CertInstaller.java b/src/com/android/certinstaller/CertInstaller.java
index 8b381cb..82315d7 100644
--- a/src/com/android/certinstaller/CertInstaller.java
+++ b/src/com/android/certinstaller/CertInstaller.java
@@ -19,7 +19,6 @@
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.app.KeyguardManager;
 import android.app.ProgressDialog;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
@@ -27,17 +26,17 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Process;
+import android.security.Credentials;
 import android.security.KeyChain;
 import android.security.KeyChain.KeyChainConnection;
 import android.security.KeyStore;
 import android.text.TextUtils;
 import android.util.Log;
+import android.util.Slog;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.EditText;
-import android.widget.Spinner;
+import android.widget.RadioGroup;
 import android.widget.Toast;
 
 import java.io.Serializable;
@@ -55,17 +54,15 @@
     private static final int NAME_CREDENTIAL_DIALOG = 1;
     private static final int PKCS12_PASSWORD_DIALOG = 2;
     private static final int PROGRESS_BAR_DIALOG = 3;
+    private static final int REDIRECT_CA_CERTIFICATE_DIALOG = 4;
+    private static final int SELECT_CERTIFICATE_USAGE_DIALOG = 5;
+    private static final int INVALID_CERTIFICATE_DIALOG = 6;
 
     private static final int REQUEST_SYSTEM_INSTALL_CODE = 1;
-    private static final int REQUEST_CONFIRM_CREDENTIALS = 2;
 
     // key to states Bundle
     private static final String NEXT_ACTION_KEY = "na";
 
-    // Values for usage type spinner
-    private static final int USAGE_TYPE_SYSTEM = 0;
-    private static final int USAGE_TYPE_WIFI = 1;
-
     private final ViewHelper mView = new ViewHelper();
 
     private int mState;
@@ -94,29 +91,29 @@
             if (!mCredentials.containsAnyRawData()) {
                 toastErrorAndFinish(R.string.no_cert_to_saved);
                 finish();
+                return;
+            }
+
+            String certUsage = mCredentials.getCertUsageSelected();
+            if (installingCaCertificate(certUsage)) {
+                extractPkcs12OrInstall();
+            } else if (Credentials.CERTIFICATE_USAGE_APP_SOURCE.equals(certUsage)) {
+                byte[] certBytes = getIntent().getExtras().getByteArray(KeyChain.EXTRA_CERTIFICATE);
+                String filename = CredentialHelper.hashAppSourceCertificateInfo(certBytes);
+                if (filename == null) {
+                    toastErrorAndFinish(R.string.invalid_cert);
+                    finish();
+                    return;
+                }
+                mCredentials.setName(filename);
+                installCertificateToKeystore(this);
             } else {
-                // Confirm credentials if there's _only_ a CA certificate
-                // NOTE: This will affect WiFi CA certificates - those should not require
-                // confirming the lock screen credentials but the code currently cannot skip the
-                // confirmation for WiFi CA certificates because the user designates the certificate
-                // to a UID only after this stage.
-                if (mCredentials.hasCaCerts() && !mCredentials.hasPrivateKey() &&
-                        !mCredentials.hasUserCertificate()) {
-                    KeyguardManager keyguardManager = getSystemService(KeyguardManager.class);
-                    Intent intent = keyguardManager.createConfirmDeviceCredentialIntent(null, null);
-                    if (intent == null) { // No screenlock
-                        extractPkcs12OrInstall();
-                    } else {
-                        startActivityForResult(intent, REQUEST_CONFIRM_CREDENTIALS);
-                    }
+                if (mCredentials.hasUserCertificate() && !mCredentials.hasPrivateKey()) {
+                    toastErrorAndFinish(R.string.action_missing_private_key);
+                } else if (mCredentials.hasPrivateKey() && !mCredentials.hasUserCertificate()) {
+                    toastErrorAndFinish(R.string.action_missing_user_cert);
                 } else {
-                    if (mCredentials.hasUserCertificate() && !mCredentials.hasPrivateKey()) {
-                        toastErrorAndFinish(R.string.action_missing_private_key);
-                    } else if (mCredentials.hasPrivateKey() && !mCredentials.hasUserCertificate()) {
-                        toastErrorAndFinish(R.string.action_missing_user_cert);
-                    } else {
-                        extractPkcs12OrInstall();
-                    }
+                    extractPkcs12OrInstall();
                 }
             }
         } else {
@@ -126,6 +123,11 @@
         }
     }
 
+    private boolean installingCaCertificate(String certUsage) {
+        return Credentials.CERTIFICATE_USAGE_CA.equals(certUsage) && mCredentials.hasCaCerts() &&
+                !mCredentials.hasPrivateKey() && !mCredentials.hasUserCertificate();
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
@@ -161,7 +163,7 @@
                 return createPkcs12PasswordDialog();
 
             case NAME_CREDENTIAL_DIALOG:
-                return createNameCredentialDialog();
+                return createNameCertificateDialog();
 
             case PROGRESS_BAR_DIALOG:
                 ProgressDialog dialog = new ProgressDialog(this);
@@ -170,6 +172,15 @@
                 dialog.setCancelable(false);
                 return dialog;
 
+            case REDIRECT_CA_CERTIFICATE_DIALOG:
+                return createRedirectCaCertificateDialog();
+
+            case SELECT_CERTIFICATE_USAGE_DIALOG:
+                return createSelectCertificateUsageDialog();
+
+            case INVALID_CERTIFICATE_DIALOG:
+                return createInvalidCertificateDialog();
+
             default:
                 return null;
         }
@@ -185,26 +196,18 @@
                     return;
                 }
 
-                Log.d(TAG, "credential is added: " + mCredentials.getName());
-                Toast.makeText(this, getString(R.string.cert_is_added, mCredentials.getName()),
-                        Toast.LENGTH_LONG).show();
-
-                if (mCredentials.includesVpnAndAppsTrustAnchors()) {
-                    // more work to do, don't finish just yet
-                    new InstallVpnAndAppsTrustAnchorsTask().execute();
-                    return;
+                String certUsage = mCredentials.getCertUsageSelected();
+                Log.d(TAG, "credential is added for " + certUsage + ": " + mCredentials.getName());
+                if (Credentials.CERTIFICATE_USAGE_APP_SOURCE.equals(certUsage)) {
+                    Toast.makeText(this, R.string.app_src_cert_is_added, Toast.LENGTH_LONG).show();
+                } else if (Credentials.CERTIFICATE_USAGE_WIFI.equals(certUsage)) {
+                    Toast.makeText(this, R.string.wifi_cert_is_added, Toast.LENGTH_LONG).show();
+                } else {
+                    Toast.makeText(this, R.string.user_cert_is_added, Toast.LENGTH_LONG).show();
                 }
                 setResult(RESULT_OK);
                 finish();
                 break;
-            case REQUEST_CONFIRM_CREDENTIALS:
-                if (resultCode == RESULT_OK) {
-                    extractPkcs12OrInstall();
-                    return;
-                }
-                // Failed to confirm credentials, do nothing.
-                finish();
-                break;
             default:
                 Log.w(TAG, "unknown request code: " + requestCode);
                 finish();
@@ -220,14 +223,19 @@
                 new Pkcs12ExtractAction("").run(this);
             }
         } else {
-            MyAction action = new InstallOthersAction();
-            action.run(this);
+            if (mCredentials.calledBySettings()) {
+                MyAction action = new InstallOthersAction();
+                action.run(this);
+            } else {
+                createRedirectOrSelectUsageDialog();
+            }
         }
     }
 
     private class InstallVpnAndAppsTrustAnchorsTask extends AsyncTask<Void, Void, Boolean> {
 
-        @Override protected Boolean doInBackground(Void... unused) {
+        @Override
+        protected Boolean doInBackground(Void... unused) {
             try {
                 try (KeyChainConnection keyChainConnection = KeyChain.bind(CertInstaller.this)) {
                     return mCredentials.installVpnAndAppsTrustAnchors(CertInstaller.this,
@@ -239,8 +247,11 @@
             }
         }
 
-        @Override protected void onPostExecute(Boolean success) {
+        @Override
+        protected void onPostExecute(Boolean success) {
             if (success) {
+                Toast.makeText(getApplicationContext(), R.string.ca_cert_is_added,
+                        Toast.LENGTH_LONG).show();
                 setResult(RESULT_OK);
             }
             finish();
@@ -263,13 +274,40 @@
             return;
         }
 
-        nameCredential();
+        if (validCertificateSelected()) {
+            installCertificateOrShowNameDialog();
+        } else {
+            showDialog(INVALID_CERTIFICATE_DIALOG);
+        }
     }
 
-    private void nameCredential() {
+    private boolean validCertificateSelected() {
+        switch (mCredentials.getCertUsageSelected()) {
+            case Credentials.CERTIFICATE_USAGE_CA:
+                return mCredentials.hasOnlyVpnAndAppsTrustAnchors();
+            case Credentials.CERTIFICATE_USAGE_USER:
+                return mCredentials.hasUserCertificate()
+                        && !mCredentials.hasOnlyVpnAndAppsTrustAnchors();
+            case Credentials.CERTIFICATE_USAGE_WIFI:
+                return !mCredentials.hasOnlyVpnAndAppsTrustAnchors();
+            default:
+                return false;
+        }
+    }
+
+    private void installCertificateOrShowNameDialog() {
         if (!mCredentials.hasAnyForSystemInstall()) {
             toastErrorAndFinish(R.string.no_cert_to_saved);
+        } else if (mCredentials.getCertUsageSelected().equals(Credentials.CERTIFICATE_USAGE_WIFI)) {
+            installCertificateToKeystore(this);
+        } else if (mCredentials.hasOnlyVpnAndAppsTrustAnchors()) {
+            // If there's only a CA certificate to install, then it's going to be used
+            // as a trust anchor. Install it and skip importing to Keystore.
+
+            // more work to do, don't finish just yet
+            new InstallVpnAndAppsTrustAnchorsTask().execute();
         } else {
+            // Name is required if installing User certificate
             showDialog(NAME_CREDENTIAL_DIALOG);
         }
     }
@@ -299,7 +337,15 @@
         removeDialog(PROGRESS_BAR_DIALOG);
         if (success) {
             removeDialog(PKCS12_PASSWORD_DIALOG);
-            nameCredential();
+            if (mCredentials.calledBySettings()) {
+                if (validCertificateSelected()) {
+                    installCertificateOrShowNameDialog();
+                } else {
+                    showDialog(INVALID_CERTIFICATE_DIALOG);
+                }
+            } else {
+                createRedirectOrSelectUsageDialog();
+            }
         } else {
             showDialog(PKCS12_PASSWORD_DIALOG);
             mView.setText(R.id.credential_password, "");
@@ -307,6 +353,89 @@
         }
     }
 
+    private void createRedirectOrSelectUsageDialog() {
+        if (mCredentials.hasOnlyVpnAndAppsTrustAnchors()) {
+            showDialog(REDIRECT_CA_CERTIFICATE_DIALOG);
+        } else {
+            showDialog(SELECT_CERTIFICATE_USAGE_DIALOG);
+        }
+    }
+
+    private Dialog createRedirectCaCertificateDialog() {
+        Dialog d = new AlertDialog.Builder(this)
+                .setTitle(R.string.redirect_ca_certificate_title)
+                .setMessage(R.string.redirect_ca_certificate_message)
+                .setPositiveButton(R.string.redirect_ca_certificate_close_button,
+                        (dialog, id) -> toastErrorAndFinish(R.string.cert_not_saved))
+                .create();
+        d.setOnCancelListener(dialog -> toastErrorAndFinish(R.string.cert_not_saved));
+        return d;
+    }
+
+    private Dialog createSelectCertificateUsageDialog() {
+        ViewGroup view = (ViewGroup) View.inflate(this, R.layout.select_certificate_usage_dialog,
+                null);
+        mView.setView(view);
+
+        RadioGroup radioGroup = view.findViewById(R.id.certificate_usage);
+        radioGroup.setOnCheckedChangeListener((group, checkedId) -> {
+            switch (checkedId) {
+                case R.id.user_certificate:
+                    mCredentials.setCertUsageSelected(Credentials.CERTIFICATE_USAGE_USER);
+                    break;
+                case R.id.wifi_certificate:
+                    mCredentials.setCertUsageSelected(Credentials.CERTIFICATE_USAGE_WIFI);
+                    break;
+                default:
+                    Slog.i(TAG, "Unknown selection for scope");
+            }
+        });
+
+
+        final Context appContext = getApplicationContext();
+        Dialog d = new AlertDialog.Builder(this)
+                .setView(view)
+                .setPositiveButton(android.R.string.ok, (dialog, id) -> {
+                    if (radioGroup.getCheckedRadioButtonId() == R.id.user_certificate) {
+                        showDialog(NAME_CREDENTIAL_DIALOG);
+                    } else {
+                        installCertificateToKeystore(appContext);
+                    }
+                })
+                .setNegativeButton(android.R.string.cancel,
+                        (dialog, id) -> toastErrorAndFinish(R.string.cert_not_saved))
+                .create();
+        d.setOnCancelListener(dialog -> toastErrorAndFinish(R.string.cert_not_saved));
+        return d;
+    }
+
+    private Dialog createInvalidCertificateDialog() {
+        Dialog d = new AlertDialog.Builder(this)
+                .setTitle(R.string.invalid_certificate_title)
+                .setMessage(getString(R.string.invalid_certificate_message,
+                        getCertificateUsageName()))
+                .setPositiveButton(R.string.invalid_certificate_close_button,
+                        (dialog, id) -> toastErrorAndFinish(R.string.cert_not_saved))
+                .create();
+        d.setOnCancelListener(dialog -> finish());
+        return d;
+    }
+
+    String getCertificateUsageName() {
+        switch (mCredentials.getCertUsageSelected()) {
+            case Credentials.CERTIFICATE_USAGE_CA:
+                return getString(R.string.ca_certificate);
+            case Credentials.CERTIFICATE_USAGE_USER:
+                return getString(R.string.user_certificate);
+            case Credentials.CERTIFICATE_USAGE_WIFI:
+                return getString(R.string.wifi_certificate);
+            case Credentials.CERTIFICATE_USAGE_APP_SOURCE:
+                return getString(R.string.app_src_certificate);
+            default:
+                return getString(R.string.certificate);
+        }
+    }
+
     private Dialog createPkcs12PasswordDialog() {
         View view = View.inflate(this, R.layout.password_dialog, null);
         mView.setView(view);
@@ -334,53 +463,22 @@
         return d;
     }
 
-    private Dialog createNameCredentialDialog() {
-        ViewGroup view = (ViewGroup) View.inflate(this, R.layout.name_credential_dialog, null);
+    private Dialog createNameCertificateDialog() {
+        ViewGroup view = (ViewGroup) View.inflate(this, R.layout.name_certificate_dialog, null);
         mView.setView(view);
         if (mView.getHasEmptyError()) {
             mView.showError(R.string.name_empty_error);
             mView.setHasEmptyError(false);
         }
-        mView.setText(R.id.credential_info, mCredentials.getDescription(this).toString());
-        final EditText nameInput = view.findViewById(R.id.credential_name);
-        if (mCredentials.isInstallAsUidSet()) {
-            view.findViewById(R.id.credential_usage_group).setVisibility(View.GONE);
-        } else {
-            final Spinner usageSpinner = view.findViewById(R.id.credential_usage);
-            final View ca_capabilities_warning = view.findViewById(R.id.credential_capabilities_warning);
-
-            usageSpinner.setOnItemSelectedListener(new OnItemSelectedListener() {
-                @Override
-                public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                    switch ((int) id) {
-                        case USAGE_TYPE_SYSTEM:
-                            ca_capabilities_warning.setVisibility(
-                                    mCredentials.includesVpnAndAppsTrustAnchors() ?
-                                    View.VISIBLE : View.GONE);
-                            mCredentials.setInstallAsUid(KeyStore.UID_SELF);
-                            break;
-                        case USAGE_TYPE_WIFI:
-                            ca_capabilities_warning.setVisibility(View.GONE);
-                            mCredentials.setInstallAsUid(Process.WIFI_UID);
-                            break;
-                        default:
-                            Log.w(TAG, "Unknown selection for scope: " + id);
-                    }
-                }
-
-                @Override
-                public void onNothingSelected(AdapterView<?> parent) {
-                }
-            });
-        }
+        final EditText nameInput = view.findViewById(R.id.certificate_name);
         nameInput.setText(getDefaultName());
         nameInput.selectAll();
         final Context appContext = getApplicationContext();
+
         Dialog d = new AlertDialog.Builder(this)
                 .setView(view)
-                .setTitle(R.string.name_credential_dialog_title)
                 .setPositiveButton(android.R.string.ok, (dialog, id) -> {
-                    String name = mView.getText(R.id.credential_name);
+                    String name = mView.getText(R.id.certificate_name);
                     if (TextUtils.isEmpty(name)) {
                         mView.setHasEmptyError(true);
                         removeDialog(NAME_CREDENTIAL_DIALOG);
@@ -388,16 +486,7 @@
                     } else {
                         removeDialog(NAME_CREDENTIAL_DIALOG);
                         mCredentials.setName(name);
-
-                        // install everything to system keystore
-                        try {
-                            startActivityForResult(
-                                    mCredentials.createSystemInstallIntent(appContext),
-                                    REQUEST_SYSTEM_INSTALL_CODE);
-                        } catch (ActivityNotFoundException e) {
-                            Log.w(TAG, "systemInstall(): " + e);
-                            toastErrorAndFinish(R.string.cert_not_saved);
-                        }
+                        installCertificateToKeystore(appContext);
                     }
                 })
                 .setNegativeButton(android.R.string.cancel,
@@ -407,6 +496,25 @@
         return d;
     }
 
+    private void installCertificateToKeystore(Context context) {
+        String certUsage = mCredentials.getCertUsageSelected();
+        if (Credentials.CERTIFICATE_USAGE_WIFI.equals(certUsage)) {
+            mCredentials.setInstallAsUid(Process.WIFI_UID);
+        } else if (Credentials.CERTIFICATE_USAGE_APP_SOURCE.equals(certUsage)) {
+            mCredentials.setInstallAsUid(Process.FSVERITY_CERT_UID);
+        } else {
+            mCredentials.setInstallAsUid(KeyStore.UID_SELF);
+        }
+        try {
+            startActivityForResult(
+                    mCredentials.createSystemInstallIntent(context),
+                    REQUEST_SYSTEM_INSTALL_CODE);
+        } catch (ActivityNotFoundException e) {
+            Log.w(TAG, "installCertificateToKeystore(): ", e);
+            toastErrorAndFinish(R.string.cert_not_saved);
+        }
+    }
+
     private String getDefaultName() {
         String name = mCredentials.getName();
         if (TextUtils.isEmpty(name)) {
diff --git a/src/com/android/certinstaller/CertInstallerMain.java b/src/com/android/certinstaller/CertInstallerMain.java
index 7e93884..65e45b7 100644
--- a/src/com/android/certinstaller/CertInstallerMain.java
+++ b/src/com/android/certinstaller/CertInstallerMain.java
@@ -16,10 +16,14 @@
 
 package com.android.certinstaller;
 
+import android.app.ActivityTaskManager;
+import android.app.IActivityTaskManager;
+import android.app.KeyguardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.RemoteException;
 import android.os.UserManager;
 import android.preference.PreferenceActivity;
 import android.provider.DocumentsContract;
@@ -28,6 +32,8 @@
 import android.util.Log;
 import android.widget.Toast;
 
+import libcore.io.IoUtils;
+
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -35,8 +41,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import libcore.io.IoUtils;
-
 /**
  * The main class for installing certificates to the system keystore. It reacts
  * to the public {@link Credentials#INSTALL_ACTION} intent.
@@ -46,6 +50,7 @@
 
     private static final int REQUEST_INSTALL = 1;
     private static final int REQUEST_OPEN_DOCUMENT = 2;
+    private static final int REQUEST_CONFIRM_CREDENTIALS = 3;
 
     private static final String INSTALL_CERT_AS_USER_CLASS = ".InstallCertAsUser";
 
@@ -99,27 +104,57 @@
             // If bundle is empty of any actual credentials, ask user to open.
             // Otherwise, pass extras to CertInstaller to install those credentials.
             // Either way, we use KeyChain.EXTRA_NAME as the default name if available.
-            if (bundle == null
-                    || bundle.isEmpty()
-                    || (bundle.size() == 1
-                        && (bundle.containsKey(KeyChain.EXTRA_NAME)
-                            || bundle.containsKey(Credentials.EXTRA_INSTALL_AS_UID)))) {
-                final String[] mimeTypes = MIME_MAPPINGS.keySet().toArray(new String[0]);
-                final Intent openIntent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
-                openIntent.setType("*/*");
-                openIntent.putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes);
-                openIntent.putExtra(DocumentsContract.EXTRA_SHOW_ADVANCED, true);
-                startActivityForResult(openIntent, REQUEST_OPEN_DOCUMENT);
+            if (nullOrEmptyBundle(bundle) || bundleContainsNameOnly(bundle)
+                    || bundleContainsInstallAsUidOnly(bundle)
+                    || bundleContainsExtraCertificateUsageOnly(bundle)) {
+
+                if (needConfirmationWithCredential(bundle)) {
+                    confirmDeviceCredential();
+                } else {
+                    startOpenDocumentActivity();
+                }
             } else {
-                final Intent installIntent = new Intent(this, CertInstaller.class);
-                installIntent.putExtras(intent);
-                startActivityForResult(installIntent, REQUEST_INSTALL);
+                startInstallActivity(intent);
             }
         } else if (Intent.ACTION_VIEW.equals(action)) {
             startInstallActivity(intent.getType(), intent.getData());
         }
     }
 
+    private boolean nullOrEmptyBundle(Bundle bundle) {
+        return bundle == null || bundle.isEmpty();
+    }
+
+    private boolean bundleContainsNameOnly(Bundle bundle) {
+        return bundle.size() == 1 && bundle.containsKey(KeyChain.EXTRA_NAME);
+    }
+
+    private boolean bundleContainsInstallAsUidOnly(Bundle bundle) {
+        return bundle.size() == 1 && bundle.containsKey(Credentials.EXTRA_INSTALL_AS_UID);
+    }
+
+    private boolean bundleContainsExtraCertificateUsageOnly(Bundle bundle) {
+        return bundle.size() == 1 && bundle.containsKey(Credentials.EXTRA_CERTIFICATE_USAGE);
+    }
+
+    private boolean needConfirmationWithCredential(Bundle bundle) {
+        String certUsage = bundle.getString(Credentials.EXTRA_CERTIFICATE_USAGE);
+        return bundle != null && bundle.size() == 1 && (
+                Credentials.CERTIFICATE_USAGE_CA.equals(certUsage) ||
+                Credentials.CERTIFICATE_USAGE_APP_SOURCE.equals(certUsage));
+    }
+
+    private void confirmDeviceCredential() {
+        KeyguardManager keyguardManager = getSystemService(KeyguardManager.class);
+        Intent intent = keyguardManager.createConfirmDeviceCredentialIntent(null,
+                null);
+        if (intent == null) { // No screenlock
+            startOpenDocumentActivity();
+        } else {
+            startActivityForResult(intent, REQUEST_CONFIRM_CREDENTIALS);
+        }
+    }
+
     // The maximum amount of data to read into memory before aborting.
     // Without a limit, a sufficiently-large file will run us out of memory.  A
     // typical certificate or WiFi config is under 10k, so 10MiB should be more
@@ -146,6 +181,33 @@
         return bytes.toByteArray();
     }
 
+    private void startInstallActivity(Intent intent) {
+        final Intent installIntent = new Intent(this, CertInstaller.class);
+        if (intent.getExtras() != null && intent.getExtras().getString(Intent.EXTRA_REFERRER)
+                != null) {
+            Log.v(TAG, String.format(
+                    "Removing referrer extra with value %s which was not meant to be included",
+                    intent.getBundleExtra(Intent.EXTRA_REFERRER)));
+            intent.removeExtra(Intent.EXTRA_REFERRER);
+        }
+        installIntent.putExtras(intent);
+
+        try {
+            // The referrer is passed as an extra because the launched-from package needs to be
+            // obtained here and not in the CertInstaller.
+            // It is also safe to add the referrer as an extra because the CertInstaller activity
+            // is not exported, which means it cannot be called from other apps.
+            IActivityTaskManager activityTaskManager = ActivityTaskManager.getService();
+            installIntent.putExtra(Intent.EXTRA_REFERRER,
+                    activityTaskManager.getLaunchedFromPackage(getActivityToken()));
+            startActivityForResult(installIntent, REQUEST_INSTALL);
+        } catch (RemoteException e) {
+            Log.v(TAG, "Could not talk to activity manager.", e);
+            Toast.makeText(this, R.string.cert_temp_error, Toast.LENGTH_LONG).show();
+            finish();
+        }
+    }
+
     private void startInstallActivity(String mimeType, Uri uri) {
         if (mimeType == null) {
             mimeType = getContentResolver().getType(uri);
@@ -165,8 +227,10 @@
                 in = getContentResolver().openInputStream(uri);
 
                 final byte[] raw = readWithLimit(in);
-                startInstallActivity(target, raw);
 
+                Intent intent = getIntent();
+                intent.putExtra(target, raw);
+                startInstallActivity(intent);
             } catch (IOException e) {
                 Log.e(TAG, "Failed to read certificate: " + e);
                 Toast.makeText(this, R.string.cert_read_error, Toast.LENGTH_LONG).show();
@@ -176,13 +240,6 @@
         }
     }
 
-    private void startInstallActivity(String target, byte[] value) {
-        Intent intent = new Intent(this, CertInstaller.class);
-        intent.putExtra(target, value);
-
-        startActivityForResult(intent, REQUEST_INSTALL);
-    }
-
     private void startWifiInstallActivity(String mimeType, Uri uri) {
         Intent intent = new Intent(this, WiFiInstaller.class);
         try (BufferedInputStream in =
@@ -198,19 +255,40 @@
         }
     }
 
+    private void startOpenDocumentActivity() {
+        final String[] mimeTypes = MIME_MAPPINGS.keySet().toArray(new String[0]);
+        final Intent openIntent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
+        openIntent.setType("*/*");
+        openIntent.putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes);
+        openIntent.putExtra(DocumentsContract.EXTRA_SHOW_ADVANCED, true);
+        startActivityForResult(openIntent, REQUEST_OPEN_DOCUMENT);
+    }
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == REQUEST_OPEN_DOCUMENT) {
-            if (resultCode == RESULT_OK) {
-                startInstallActivity(null, data.getData());
-            } else {
+        switch (requestCode) {
+            case REQUEST_INSTALL:
+                setResult(resultCode);
                 finish();
-            }
-        } else if (requestCode == REQUEST_INSTALL) {
-            setResult(resultCode);
-            finish();
-        } else {
-            Log.w(TAG, "unknown request code: " + requestCode);
+                break;
+            case REQUEST_OPEN_DOCUMENT:
+                if (resultCode == RESULT_OK) {
+                    startInstallActivity(null, data.getData());
+                } else {
+                    finish();
+                }
+                break;
+            case REQUEST_CONFIRM_CREDENTIALS:
+                if (resultCode == RESULT_OK) {
+                    startOpenDocumentActivity();
+                    return;
+                }
+                // Failed to confirm credentials, do nothing.
+                finish();
+                break;
+            default:
+                Log.w(TAG, "unknown request code: " + requestCode);
+                break;
         }
     }
 }
diff --git a/src/com/android/certinstaller/CredentialHelper.java b/src/com/android/certinstaller/CredentialHelper.java
index 4ec2e7e..000bb6c 100644
--- a/src/com/android/certinstaller/CredentialHelper.java
+++ b/src/com/android/certinstaller/CredentialHelper.java
@@ -25,23 +25,26 @@
 import android.os.RemoteException;
 import android.os.UserHandle;
 import android.security.Credentials;
-import android.security.KeyChain;
 import android.security.IKeyChainService;
+import android.security.KeyChain;
 import android.text.Html;
 import android.text.TextUtils;
 import android.util.Log;
+
 import com.android.org.bouncycastle.asn1.ASN1InputStream;
 import com.android.org.bouncycastle.asn1.ASN1Sequence;
 import com.android.org.bouncycastle.asn1.DEROctetString;
 import com.android.org.bouncycastle.asn1.x509.BasicConstraints;
 import com.android.org.conscrypt.TrustedCertificateStore;
 
+import java.nio.ByteBuffer;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.security.KeyFactory;
+import java.security.KeyStore;
 import java.security.KeyStore.PasswordProtection;
 import java.security.KeyStore.PrivateKeyEntry;
-import java.security.KeyStore;
+import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.PrivateKey;
 import java.security.cert.Certificate;
@@ -55,6 +58,7 @@
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.List;
+import javax.security.auth.x500.X500Principal;
 
 /**
  * A helper class for accessing the raw data in the intent extra and handling
@@ -64,6 +68,7 @@
     private static final String DATA_KEY = "data";
     private static final String CERTS_KEY = "crts";
     private static final String USER_KEY_ALGORITHM = "user_key_algorithm";
+    private static final String SETTINGS_PACKAGE = "com.android.settings";
 
     private static final String TAG = "CredentialHelper";
 
@@ -71,6 +76,8 @@
     private HashMap<String, byte[]> mBundle = new HashMap<String, byte[]>();
 
     private String mName = "";
+    private String mCertUsageSelected = "";
+    private String mReferrer = "";
     private int mUid = -1;
     private PrivateKey mUserKey;
     private X509Certificate mUserCert;
@@ -91,6 +98,18 @@
             mName = name;
         }
 
+        String certUsageSelected = bundle.getString(Credentials.EXTRA_CERTIFICATE_USAGE);
+        bundle.remove(Credentials.EXTRA_CERTIFICATE_USAGE);
+        if (certUsageSelected != null) {
+            mCertUsageSelected = certUsageSelected;
+        }
+
+        String referrer = bundle.getString(Intent.EXTRA_REFERRER);
+        bundle.remove(Intent.EXTRA_REFERRER);
+        if (referrer != null) {
+            mReferrer = referrer;
+        }
+
         mUid = bundle.getInt(Credentials.EXTRA_INSTALL_AS_UID, -1);
         bundle.remove(Credentials.EXTRA_INSTALL_AS_UID);
 
@@ -274,6 +293,18 @@
         return mUid;
     }
 
+    void setCertUsageSelected(String certUsageSelected) {
+        mCertUsageSelected = certUsageSelected;
+    }
+
+    String getCertUsageSelected() {
+        return mCertUsageSelected;
+    }
+
+    boolean calledBySettings() {
+        return mReferrer != null && mReferrer.equals(SETTINGS_PACKAGE);
+    }
+
     Intent createSystemInstallIntent(final Context context) {
         Intent intent = new Intent("com.android.credentials.INSTALL");
         // To prevent the private key from being sniffed, we explicitly spell
@@ -281,22 +312,17 @@
         intent.setComponent(ComponentName.unflattenFromString(
                 context.getString(R.string.config_system_install_component)));
         intent.putExtra(Credentials.EXTRA_INSTALL_AS_UID, mUid);
+        intent.putExtra(Credentials.EXTRA_USER_KEY_ALIAS, mName);
         try {
             if (mUserKey != null) {
-                intent.putExtra(Credentials.EXTRA_USER_PRIVATE_KEY_NAME,
-                        Credentials.USER_PRIVATE_KEY + mName);
                 intent.putExtra(Credentials.EXTRA_USER_PRIVATE_KEY_DATA,
                         mUserKey.getEncoded());
             }
             if (mUserCert != null) {
-                intent.putExtra(Credentials.EXTRA_USER_CERTIFICATE_NAME,
-                        Credentials.USER_CERTIFICATE + mName);
                 intent.putExtra(Credentials.EXTRA_USER_CERTIFICATE_DATA,
                         Credentials.convertToPem(mUserCert));
             }
             if (!mCaCerts.isEmpty()) {
-                intent.putExtra(Credentials.EXTRA_CA_CERTIFICATES_NAME,
-                        Credentials.CA_CERTIFICATE + mName);
                 X509Certificate[] caCerts
                         = mCaCerts.toArray(new X509Certificate[mCaCerts.size()]);
                 intent.putExtra(Credentials.EXTRA_CA_CERTIFICATES_DATA,
@@ -340,12 +366,8 @@
     }
 
     private void maybeApproveCaCert(Context context, String alias) {
-        // Some CTS verifier test asks testers to reset auto approved CA cert by removing
-        // lock sreen, but it's not possible if we don't have Android lock screen. (e.g.
-        // Android is running in the container).  In this case, disable auto cert approval.
         final KeyguardManager keyguardManager = context.getSystemService(KeyguardManager.class);
-        if (keyguardManager.isDeviceSecure(UserHandle.myUserId())
-                && context.getResources().getBoolean(R.bool.config_auto_cert_approval)) {
+        if (keyguardManager.isDeviceSecure(UserHandle.myUserId())) {
             // Since the cert is installed by real user, the cert is approved by the user
             final DevicePolicyManager dpm = context.getSystemService(DevicePolicyManager.class);
             dpm.approveCaCert(alias, UserHandle.myUserId(), true);
@@ -432,10 +454,10 @@
     }
 
     /**
-     * Returns whether this credential contains CA certificates to be used as trust anchors
+     * Returns true if this credential contains _only_ CA certificates to be used as trust anchors
      * for VPN and apps.
      */
-    public boolean includesVpnAndAppsTrustAnchors() {
+    public boolean hasOnlyVpnAndAppsTrustAnchors() {
         if (!hasCaCerts()) {
             return false;
         }
@@ -452,4 +474,24 @@
             return true;
         }
     }
+
+    /**
+     * Return a hash string of certificate in bytes. This can be used as file name for storing such
+     * a certificate.
+     */
+    static String hashAppSourceCertificateInfo(byte[] certBytes) {
+        try {
+            CertificateFactory certFactory = CertificateFactory.getInstance("X.509");
+            X509Certificate cert = (X509Certificate) certFactory.generateCertificate(
+                    new ByteArrayInputStream(certBytes));
+            cert.checkValidity();
+
+            byte[] hashedCertificate =  MessageDigest.getInstance("SHA-256").digest(certBytes);
+            long valueOfPrefix = ByteBuffer.wrap(hashedCertificate, 0, Long.BYTES).getLong();
+            return Long.toHexString(valueOfPrefix);
+        } catch (CertificateException | NoSuchAlgorithmException e) {
+            Log.e(TAG, "Invalid app source certificate: " + e);
+            return null;
+        }
+    }
 }