[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 13cab6e0bf
am: 51b8c6664d -s ours
am skip reason: subject contains skip directive

Change-Id: I7930551dbe0ad1d17020a60cd0b9f8a81eb41fd2
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..2ddc5de 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 705bec3..dbb1960 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index e8657c0..56db52e 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -21,14 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 106ad48..0973164 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 6639bf7..0b4bcf2 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index bb7957c..ea71ba9 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 6d4876d..08df1e0 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 5666c51..53f3b3b 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 7e5f249..30b1e5e 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 55d31d9..a5240ce 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 5072dff..2ec9659 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -21,14 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 9f2de1f..1d7ab1c 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 9f5e87b..3465aa8 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index cd028a5..0ad9ceb 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -21,14 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 54271cb..022feac 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 0950fc8..c628396 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 0950fc8..c628396 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 0950fc8..c628396 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 0950fc8..c628396 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index f9694a1..1d4d170 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index e12d7f6..461da32 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 1b91b6a..c19279a 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -21,14 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index ee96724..ded17dc 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 0d4d511..a2711fa 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -21,14 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
@@ -50,7 +56,7 @@
     <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..ed24c52 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -19,14 +19,17 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
@@ -59,17 +67,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..6537b8c 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 3381300..e8f9078 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -21,14 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index a02c8c0..1821818 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -21,14 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 3730cfe..2442dbd 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 31bef27..8ae8ecb 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 66b192f..5cd76d9 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
@@ -51,7 +59,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 +76,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..498340d 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 0e138b9..24f3faf 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index c131f21..bb7a3f6 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -23,14 +23,15 @@
     <!-- 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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +45,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
@@ -62,7 +68,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..3d96072 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 8c664b7..50bf3cf 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 1894b20..fe9cbff 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 804694e..251036c 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index f836bac..b838ac1 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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 +43,22 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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="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..13d9521 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index dbfd4be..3530ad6 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -21,14 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 32a7811..880f793 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index ce742f3..570ac8b 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -21,14 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index ef7b0f2..8556fa5 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,13 +37,18 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 796db49..b99c6dc 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 349f421..9307e03 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 7524372..5bdd55a 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 23baf67..631c03c 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index e32f35d..41c73dd 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 8bd67e7..1b21388 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index e7a1547..bb071a4 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index de716d2..f9661af 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -21,14 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index faf8d19..7551102 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 67bc7ec..af86f33 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 74d41f2..eef7b61 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index b72eaa0..df43986 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index d38fbc0..86c7d5b 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index bb91ca7..b6c355e 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 4930503..6dd20ab 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 1bc4e72..09d4975 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index e8b3a59..d550184 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 430d71d..a3861d4 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -21,14 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index e8b3a59..d550184 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 7058f1b..a8aae5b 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 41f0b77..d318311 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index a4705f6..9f36b82 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -23,12 +23,15 @@
     <!-- 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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +45,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 6e71c9d..6f6d2a6 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -21,14 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
@@ -59,7 +65,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..8c2aecb 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 841da36..9376ec5 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 70da148..58ba0f7 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index c82b354..d616e17 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 856679a..b230657 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 751a033..b16b063 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -21,14 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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 +43,19 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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="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..32d6a26 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 00f7c7a..a13843d 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index c1faad3..74d36ef 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index df2a719..9b6ff99 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 1d1ed92..bbc22f9 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index d93830d..c10c2b8 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 472021e..d673fcc 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 54222f6..6d9d442 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -21,14 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 8619806..df0e058 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 1e673a1..f3e227b 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index bccb3e6..5a746ca 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 59f9ba9..50a87cc 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -21,12 +21,15 @@
     <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>
+    <!-- no translation found for name_credential_dialog_title (1481964824549786927) -->
+    <skip />
+    <!-- no translation found for certificate_name (8415893401368824792) -->
+    <skip />
     <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,7 +43,12 @@
     <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>
+    <!-- no translation found for ca_cert_is_added (2847081843756291802) -->
+    <skip />
+    <!-- no translation found for user_cert_is_added (3088794616560630823) -->
+    <skip />
+    <!-- no translation found for wifi_cert_is_added (333220613655140428) -->
+    <skip />
     <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>
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..44632fd 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,44 @@
     <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>
+
+
+    <!-- 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>
     <!-- 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..dfcd1e1 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;
@@ -95,20 +92,8 @@
                 toastErrorAndFinish(R.string.no_cert_to_saved);
                 finish();
             } 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 (installingCaCertificate()) {
+                    extractPkcs12OrInstall();
                 } else {
                     if (mCredentials.hasUserCertificate() && !mCredentials.hasPrivateKey()) {
                         toastErrorAndFinish(R.string.action_missing_private_key);
@@ -126,6 +111,11 @@
         }
     }
 
+    private boolean installingCaCertificate() {
+        return mCredentials.hasCaCerts() && !mCredentials.hasPrivateKey() &&
+                !mCredentials.hasUserCertificate();
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
@@ -161,7 +151,7 @@
                 return createPkcs12PasswordDialog();
 
             case NAME_CREDENTIAL_DIALOG:
-                return createNameCredentialDialog();
+                return createNameCertificateDialog();
 
             case PROGRESS_BAR_DIALOG:
                 ProgressDialog dialog = new ProgressDialog(this);
@@ -170,6 +160,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;
         }
@@ -186,25 +185,14 @@
                 }
 
                 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;
+                if (mCredentials.getCertUsageSelected().equals(Credentials.CERTIFICATE_USAGE_WIFI)) {
+                    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 +208,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 +232,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 +259,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 +322,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 +338,86 @@
         }
     }
 
+    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);
+                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);
+            default:
+                return getString(R.string.certificate);
+        }
+    }
+
     private Dialog createPkcs12PasswordDialog() {
         View view = View.inflate(this, R.layout.password_dialog, null);
         mView.setView(view);
@@ -334,53 +445,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 +468,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 +478,22 @@
         return d;
     }
 
+    private void installCertificateToKeystore(Context context) {
+        if (mCredentials.getCertUsageSelected().equals(Credentials.CERTIFICATE_USAGE_WIFI)) {
+            mCredentials.setInstallAsUid(Process.WIFI_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..0b37953 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,56 @@
             // 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)) {
+
+                // Confirm credentials if there's only a CA certificate
+                if (installingCaCertificate(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 installingCaCertificate(Bundle bundle) {
+        return bundle != null && bundle.size() == 1 && Credentials.CERTIFICATE_USAGE_CA.equals(
+                bundle.getString(Credentials.EXTRA_CERTIFICATE_USAGE));
+    }
+
+    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 +180,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 +226,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 +239,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 +254,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..8b5a228 100644
--- a/src/com/android/certinstaller/CredentialHelper.java
+++ b/src/com/android/certinstaller/CredentialHelper.java
@@ -25,11 +25,12 @@
 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;
@@ -39,9 +40,9 @@
 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.NoSuchAlgorithmException;
 import java.security.PrivateKey;
 import java.security.cert.Certificate;
@@ -64,6 +65,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 +73,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 +95,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 +290,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 +309,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 +363,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 +451,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;
         }