Merge "Moving ssl_certificate layout, resources, and helper code to SslCertificate Add IKeyChainService.deleteCaCertificate"

42 files changed, 937 insertions, 8 deletions

diff --git a/core/java/android/net/http/SslCertificate.java b/core/java/android/net/http/SslCertificate.java
index 5079c23ceb64..f35002ad244c 100644
--- a/core/java/android/net/http/SslCertificate.java
+++ b/core/java/android/net/http/SslCertificate.java
@@ -16,15 +16,19 @@
 
 package android.net.http;
 
+import android.content.Context;
 import android.os.Bundle;
+import android.text.format.DateFormat;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
 
+import java.security.cert.X509Certificate;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Vector;
 
-import java.security.cert.X509Certificate;
-
 import com.android.org.bouncycastle.asn1.DERObjectIdentifier;
 import com.android.org.bouncycastle.asn1.x509.X509Name;
 
@@ -58,7 +62,7 @@ public class SslCertificate {
      */
     private Date mValidNotAfter;
 
-     /**
+    /**
      * Bundle key names
      */
     private static final String ISSUED_TO = "issued-to";
@@ -108,8 +112,10 @@ public class SslCertificate {
      * Creates a new SSL certificate object
      * @param issuedTo The entity this certificate is issued to
      * @param issuedBy The entity that issued this certificate
-     * @param validNotBefore The not-before date from the certificate validity period in ISO 8601 format
-     * @param validNotAfter The not-after date from the certificate validity period in ISO 8601 format
+     * @param validNotBefore The not-before date from the certificate
+     *     validity period in ISO 8601 format
+     * @param validNotAfter The not-after date from the certificate
+     *     validity period in ISO 8601 format
      * @deprecated Use {@link #SslCertificate(X509Certificate)}
      */
     @Deprecated
@@ -202,9 +208,8 @@ public class SslCertificate {
      * @return A string representation of this certificate for debugging
      */
     public String toString() {
-        return
-            "Issued to: " + mIssuedTo.getDName() + ";\n" +
-            "Issued by: " + mIssuedBy.getDName() + ";\n";
+        return ("Issued to: " + mIssuedTo.getDName() + ";\n"
+                + "Issued by: " + mIssuedBy.getDName() + ";\n");
     }
 
     /**
@@ -328,4 +333,65 @@ public class SslCertificate {
             return mUName != null ? mUName : "";
         }
     }
+
+    /**
+     * Inflates the SSL certificate view (helper method).
+     * @return The resultant certificate view with issued-to, issued-by,
+     * issued-on, expires-on, and possibly other fields set.
+     * If the input certificate is null, returns null.
+     *
+     * @hide Used by Browser and Settings
+     */
+    public View inflateCertificateView(Context context) {
+        LayoutInflater factory = LayoutInflater.from(context);
+
+        View certificateView = factory.inflate(
+            com.android.internal.R.layout.ssl_certificate, null);
+
+        // issued to:
+        SslCertificate.DName issuedTo = getIssuedTo();
+        if (issuedTo != null) {
+            ((TextView) certificateView.findViewById(com.android.internal.R.id.to_common))
+                .setText(issuedTo.getCName());
+            ((TextView) certificateView.findViewById(com.android.internal.R.id.to_org))
+                .setText(issuedTo.getOName());
+            ((TextView) certificateView.findViewById(com.android.internal.R.id.to_org_unit))
+                .setText(issuedTo.getUName());
+        }
+
+        // issued by:
+        SslCertificate.DName issuedBy = getIssuedBy();
+        if (issuedBy != null) {
+            ((TextView) certificateView.findViewById(com.android.internal.R.id.by_common))
+                .setText(issuedBy.getCName());
+            ((TextView) certificateView.findViewById(com.android.internal.R.id.by_org))
+                .setText(issuedBy.getOName());
+            ((TextView) certificateView.findViewById(com.android.internal.R.id.by_org_unit))
+                .setText(issuedBy.getUName());
+        }
+
+        // issued on:
+        String issuedOn = formatCertificateDate(context, getValidNotBeforeDate());
+        ((TextView) certificateView.findViewById(com.android.internal.R.id.issued_on))
+            .setText(issuedOn);
+
+        // expires on:
+        String expiresOn = formatCertificateDate(context, getValidNotAfterDate());
+        ((TextView) certificateView.findViewById(com.android.internal.R.id.expires_on))
+            .setText(expiresOn);
+
+        return certificateView;
+    }
+
+    /**
+     * Formats the certificate date to a properly localized date string.
+     * @return Properly localized version of the certificate date string and
+     * the "" if it fails to localize.
+     */
+    private String formatCertificateDate(Context context, Date certificateDate) {
+        if (certificateDate == null) {
+            return "";
+        }
+        return DateFormat.getDateFormat(context).format(certificateDate);
+    }
 }
diff --git a/core/res/res/layout-land/ssl_certificate.xml b/core/res/res/layout-land/ssl_certificate.xml
new file mode 100644
index 000000000000..56e4e70ca033
--- /dev/null
+++ b/core/res/res/layout-land/ssl_certificate.xml
@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 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:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
+
+        <!-- Placeholder for the success message or one or more warnings -->
+        <LinearLayout
+            android:id="@+id/placeholder"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:layout_marginTop="12dip"
+            android:orientation="vertical" />
+
+        <!-- Dialog-title line separator -->
+        <ImageView
+            android:id="@+id/title_separator"
+            android:src="@android:drawable/divider_horizontal_dark"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:scaleType="fitXY"
+            android:layout_weight="1"
+            android:gravity="fill_horizontal"
+            android:layout_marginLeft="20dip"
+            android:layout_marginRight="20dip"
+            android:layout_marginBottom="12dip" />
+
+        <TableLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:shrinkColumns="1"
+            android:orientation="vertical">
+
+            <!-- Issued to: -->
+            <TextView
+                android:id="@+id/issued_to_header"
+                android:text="@string/issued_to"
+                android:textStyle="bold"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_marginLeft="20dip"
+                android:layout_marginRight="20dip"
+                android:layout_marginBottom="7dip" />
+
+            <!-- Common name: -->
+            <TableRow>
+                <TextView
+                    android:id="@+id/to_common_header"
+                    android:text="@string/common_name"
+                    android:gravity="left"
+                    android:layout_marginLeft="20dip" />
+
+                <TextView
+                    android:id="@+id/to_common"
+                    android:gravity="left"
+                    android:layout_marginLeft="10dip"
+                    android:layout_marginRight="20dip"
+                    android:layout_marginBottom="7dip" />
+            </TableRow>
+
+            <!-- Organization: -->
+            <TableRow>
+                <TextView
+                    android:id="@+id/to_org_header"
+                    android:text="@string/org_name"
+                    android:gravity="left"
+                    android:layout_marginLeft="20dip" />
+
+                <TextView
+                    android:id="@+id/to_org"
+                    android:gravity="left"
+                    android:layout_marginLeft="10dip"
+                    android:layout_marginRight="20dip"
+                    android:layout_marginBottom="7dip" />
+            </TableRow>
+
+            <!-- Organizational unit: -->
+            <TableRow>
+                <TextView
+                    android:id="@+id/to_org_unit_header"
+                    android:text="@string/org_unit"
+                    android:gravity="left"
+                    android:layout_marginLeft="20dip" />
+
+                <TextView
+                    android:id="@+id/to_org_unit"
+                    android:gravity="left"
+                    android:layout_marginLeft="10dip"
+                    android:layout_marginRight="20dip"
+                    android:layout_marginBottom="12dip" />
+            </TableRow>
+
+            <!-- Issued by: -->
+            <TextView
+                android:id="@+id/issued_to_header"
+                android:text="@string/issued_by"
+                android:textStyle="bold"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_marginLeft="20dip"
+                android:layout_marginRight="20dip"
+                android:layout_marginBottom="7dip" />
+
+            <!-- Common name: -->
+            <TableRow>
+                <TextView
+                    android:id="@+id/by_common_header"
+                    android:text="@string/common_name"
+                    android:gravity="left"
+                    android:layout_marginLeft="20dip" />
+
+                <TextView
+                    android:id="@+id/by_common"
+                    android:gravity="left"
+                    android:layout_marginLeft="10dip"
+                    android:layout_marginRight="20dip"
+                    android:layout_marginBottom="7dip" />
+            </TableRow>
+
+            <!-- Organization: -->
+            <TableRow>
+                <TextView
+                    android:id="@+id/by_org_header"
+                    android:text="@string/org_name"
+                    android:gravity="left"
+                    android:layout_marginLeft="20dip" />
+
+                <TextView
+                    android:id="@+id/by_org"
+                    android:gravity="left"
+                    android:layout_marginLeft="10dip"
+                    android:layout_marginRight="20dip"
+                    android:layout_marginBottom="7dip" />
+            </TableRow>
+
+            <!-- Organizational unit: -->
+            <TableRow>
+                <TextView
+                    android:id="@+id/by_org_unit_header"
+                    android:text="@string/org_unit"
+                    android:gravity="left"
+                    android:layout_marginLeft="20dip" />
+
+                <TextView
+                    android:id="@+id/by_org_unit"
+                    android:gravity="left"
+                    android:layout_marginLeft="10dip"
+                    android:layout_marginRight="20dip"
+                    android:layout_marginBottom="12dip" />
+            </TableRow>
+
+            <!-- Validity Dates: -->
+            <TextView
+                android:id="@+id/validity_header"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:text="@string/validity_period"
+                android:textStyle="bold"
+                android:layout_marginLeft="20dip"
+                android:layout_marginRight="20dip"
+                android:layout_marginBottom="7dip" />
+
+            <!-- Issued On: -->
+            <TableRow>
+                <TextView
+                    android:id="@+id/issued_on_header"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/issued_on"
+                    android:gravity="left"
+                    android:layout_marginLeft="20dip" />
+
+                <TextView
+                    android:id="@+id/issued_on"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:gravity="left"
+                    android:layout_marginLeft="10dip"
+                    android:layout_marginRight="20dip"
+                    android:layout_marginBottom="7dip" />
+
+            </TableRow>
+
+            <!-- Expires On: -->
+            <TableRow>
+                <TextView
+                    android:id="@+id/expires_on_header"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/expires_on"
+                    android:gravity="left"
+                    android:layout_marginLeft="20dip" />
+
+                <TextView
+                    android:id="@+id/expires_on"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:gravity="left"
+                    android:layout_marginLeft="10dip"
+                    android:layout_marginRight="20dip"
+                    android:layout_marginBottom="12dip" />
+            </TableRow>
+
+        </TableLayout>
+
+    </LinearLayout>
+
+</ScrollView>
diff --git a/core/res/res/layout/ssl_certificate.xml b/core/res/res/layout/ssl_certificate.xml
new file mode 100644
index 000000000000..7206077ce6f5
--- /dev/null
+++ b/core/res/res/layout/ssl_certificate.xml
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 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:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
+
+        <!-- Placeholder for the success message or one or more warnings -->
+        <LinearLayout
+            android:id="@+id/placeholder"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:layout_marginTop="12dip"
+            android:orientation="vertical" />
+
+        <!-- Dialog-title line separator -->
+        <ImageView
+            android:id="@+id/title_separator"
+            android:src="@android:drawable/divider_horizontal_dark"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:scaleType="fitXY"
+            android:layout_weight="1"
+            android:gravity="fill_horizontal"
+            android:layout_marginRight="20dip"
+            android:layout_marginLeft="20dip"
+            android:layout_marginBottom="12dip" />
+
+        <TableLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <!-- Issued to: -->
+            <TextView
+                android:id="@+id/issued_to_header"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:text="@string/issued_to"
+                android:textStyle="bold"
+                android:layout_marginLeft="20dip"
+                android:layout_marginRight="20dip"
+                android:layout_marginBottom="10dip" />
+
+            <!-- Common name: -->
+            <TextView
+                android:id="@+id/to_common_header"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:text="@string/common_name"
+                android:gravity="left"
+                android:layout_marginLeft="20dip"
+                android:layout_marginRight="20dip" />
+
+            <TextView
+                android:id="@+id/to_common"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:gravity="left"
+                android:layout_marginLeft="20dip"
+                android:layout_marginRight="20dip"
+                android:layout_marginBottom="10dip" />
+
+            <!-- Organization: -->
+            <TextView
+                android:id="@+id/to_org_header"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:text="@string/org_name"
+                android:gravity="left"
+                android:layout_marginLeft="20dip"
+                android:layout_marginRight="20dip" />
+
+            <TextView
+                android:id="@+id/to_org"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:gravity="left"
+                android:layout_marginLeft="20dip"
+                android:layout_marginRight="20dip"
+                android:layout_marginBottom="10dip" />
+
+            <!-- Organizational unit: -->
+            <TextView
+                android:id="@+id/to_org_unit_header"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:text="@string/org_unit"
+                android:gravity="left"
+                android:layout_marginLeft="20dip"
+                android:layout_marginRight="20dip" />
+
+            <TextView
+                android:id="@+id/to_org_unit"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:gravity="left"
+                android:layout_marginLeft="20dip"
+                android:layout_marginRight="20dip"
+                android:layout_marginBottom="12dip" />
+
+            <!-- Issued by: -->
+            <TextView
+                android:id="@+id/issued_to_header"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:text="@string/issued_by"
+                android:textStyle="bold"
+                android:layout_marginLeft="20dip"
+                android:layout_marginRight="20dip"
+                android:layout_marginBottom="10dip" />
+
+            <!-- Common name: -->
+            <TextView
+                android:id="@+id/by_common_header"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/common_name"
+                android:gravity="left"
+                android:layout_marginLeft="20dip"
+                android:layout_marginRight="20dip" />
+
+            <TextView
+                android:id="@+id/by_common"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:gravity="left"
+                android:layout_marginLeft="20dip"
+                android:layout_marginRight="20dip"
+                android:layout_marginBottom="10dip" />
+
+            <!-- Organization: -->
+            <TextView
+                android:id="@+id/by_org_header"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:text="@string/org_name"
+                android:gravity="left"
+                android:layout_marginLeft="20dip"
+                android:layout_marginRight="20dip" />
+
+            <TextView
+                android:id="@+id/by_org"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:gravity="left"
+                android:layout_marginLeft="20dip"
+                android:layout_marginRight="20dip"
+                android:layout_marginBottom="10dip" />
+
+            <!-- Organizational unit: -->
+            <TextView
+                android:id="@+id/by_org_unit_header"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:text="@string/org_unit"
+                android:gravity="left"
+                android:layout_marginLeft="20dip"
+                android:layout_marginRight="20dip" />
+
+            <TextView
+                android:id="@+id/by_org_unit"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:gravity="left"
+                android:layout_marginLeft="20dip"
+                android:layout_marginRight="20dip"
+                android:layout_marginBottom="12dip" />
+
+            <!-- Validity Dates: -->
+            <TextView
+                android:id="@+id/validity_header"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:text="@string/validity_period"
+                android:textStyle="bold"
+                android:layout_marginLeft="20dip"
+                android:layout_marginRight="20dip"
+                android:layout_marginBottom="10dip" />
+
+            <!-- Issued On: -->
+            <TextView
+                android:id="@+id/issued_on_header"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/issued_on"
+                android:gravity="left"
+                android:layout_marginLeft="20dip"
+                android:layout_marginRight="20dip" />
+
+            <TextView
+                android:id="@+id/issued_on"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:gravity="left"
+                android:layout_marginLeft="20dip"
+                android:layout_marginRight="20dip"
+                android:layout_marginBottom="10dip" />
+
+            <!-- Expires On: -->
+            <TextView
+                android:id="@+id/expires_on_header"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/expires_on"
+                android:gravity="left"
+                android:layout_marginLeft="20dip"
+                android:layout_marginRight="20dip" />
+
+            <TextView
+                android:id="@+id/expires_on"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:gravity="left"
+                android:layout_marginLeft="20dip"
+                android:layout_marginRight="20dip"
+                android:layout_marginBottom="12dip" />
+
+        </TableLayout>
+
+    </LinearLayout>
+
+</ScrollView>
diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml
index a3267125b84c..648f6656c4c7 100644
--- a/core/res/res/values-ar/strings.xml
+++ b/core/res/res/values-ar/strings.xml
@@ -1106,4 +1106,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"شهادة الأمان"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"هذه الشهادة صالحة."</string>
+    <string name="issued_to" msgid="9032338008819841339">"تم الإصدار إلى:"</string>
+    <string name="common_name" msgid="5745530093500062357">"الاسم الشائع:"</string>
+    <string name="org_name" msgid="8868889052889991293">"المؤسسة:"</string>
+    <string name="org_unit" msgid="4489056376307768196">"وحدة تنظيمية:"</string>
+    <string name="issued_by" msgid="6959484326943152487">"تم الإصدار بواسطة:"</string>
+    <string name="validity_period" msgid="57988851973181309">"الصلاحية:"</string>
+    <string name="issued_on" msgid="2082890654801808368">"تم الإصدار في:"</string>
+    <string name="expires_on" msgid="8061200430557020704">"تنتهي الصلاحية في:"</string>
 </resources>
diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml
index 563380741219..6401b1c79f66 100644
--- a/core/res/res/values-bg/strings.xml
+++ b/core/res/res/values-bg/strings.xml
@@ -1106,4 +1106,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"Сертификат за сигурност"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Сертификатът е валиден."</string>
+    <string name="issued_to" msgid="9032338008819841339">"Издаден на:"</string>
+    <string name="common_name" msgid="5745530093500062357">"Общо име:"</string>
+    <string name="org_name" msgid="8868889052889991293">"Организация:"</string>
+    <string name="org_unit" msgid="4489056376307768196">"Организационна единица:"</string>
+    <string name="issued_by" msgid="6959484326943152487">"Издаден от:"</string>
+    <string name="validity_period" msgid="57988851973181309">"Валидност:"</string>
+    <string name="issued_on" msgid="2082890654801808368">"Издаден на:"</string>
+    <string name="expires_on" msgid="8061200430557020704">"Изтича на:"</string>
 </resources>
diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml
index e812217c3746..a2e75d3e476e 100644
--- a/core/res/res/values-ca/strings.xml
+++ b/core/res/res/values-ca/strings.xml
@@ -1106,4 +1106,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"Certificat de seguretat"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Aquest certificat és vàlid."</string>
+    <string name="issued_to" msgid="9032338008819841339">"Emès per a:"</string>
+    <string name="common_name" msgid="5745530093500062357">"Nom comú:"</string>
+    <string name="org_name" msgid="8868889052889991293">"Organització:"</string>
+    <string name="org_unit" msgid="4489056376307768196">"Unitat organitzativa:"</string>
+    <string name="issued_by" msgid="6959484326943152487">"Publicat per:"</string>
+    <string name="validity_period" msgid="57988851973181309">"Validesa:"</string>
+    <string name="issued_on" msgid="2082890654801808368">"Publicat el:"</string>
+    <string name="expires_on" msgid="8061200430557020704">"Caduca el:"</string>
 </resources>
diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml
index d10e1b4654e1..ca3035d1f320 100644
--- a/core/res/res/values-cs/strings.xml
+++ b/core/res/res/values-cs/strings.xml
@@ -1106,4 +1106,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"Certifikát zabezpečení"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Tento certifikát je platný."</string>
+    <string name="issued_to" msgid="9032338008819841339">"Vydáno komu:"</string>
+    <string name="common_name" msgid="5745530093500062357">"Běžný název:"</string>
+    <string name="org_name" msgid="8868889052889991293">"Organizace:"</string>
+    <string name="org_unit" msgid="4489056376307768196">"Organizační jednotka:"</string>
+    <string name="issued_by" msgid="6959484326943152487">"Vydal:"</string>
+    <string name="validity_period" msgid="57988851973181309">"Platnost:"</string>
+    <string name="issued_on" msgid="2082890654801808368">"Datum vydání:"</string>
+    <string name="expires_on" msgid="8061200430557020704">"Platnost vyprší:"</string>
 </resources>
diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml
index a7f62ecc9015..715341615b58 100644
--- a/core/res/res/values-da/strings.xml
+++ b/core/res/res/values-da/strings.xml
@@ -1106,4 +1106,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"Sikkerhedscertifikat"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Dette certifikat er gyldigt."</string>
+    <string name="issued_to" msgid="9032338008819841339">"Udstedt til:"</string>
+    <string name="common_name" msgid="5745530093500062357">"Fællesnavn:"</string>
+    <string name="org_name" msgid="8868889052889991293">"Organisation:"</string>
+    <string name="org_unit" msgid="4489056376307768196">"Organisatorisk enhed:"</string>
+    <string name="issued_by" msgid="6959484326943152487">"Udstedt af:"</string>
+    <string name="validity_period" msgid="57988851973181309">"Gyldighed:"</string>
+    <string name="issued_on" msgid="2082890654801808368">"Udstedt den:"</string>
+    <string name="expires_on" msgid="8061200430557020704">"Udløber den:"</string>
 </resources>
diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml
index afa606f3c7ac..975348250c6b 100644
--- a/core/res/res/values-de/strings.xml
+++ b/core/res/res/values-de/strings.xml
@@ -1106,4 +1106,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"Sicherheitszertifikat"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Dies ist ein gültiges Zertifikat."</string>
+    <string name="issued_to" msgid="9032338008819841339">"Ausgegeben an:"</string>
+    <string name="common_name" msgid="5745530093500062357">"Allgemeiner Name."</string>
+    <string name="org_name" msgid="8868889052889991293">"Organisation:"</string>
+    <string name="org_unit" msgid="4489056376307768196">"Organisationseinheit:"</string>
+    <string name="issued_by" msgid="6959484326943152487">"Ausgegeben von:"</string>
+    <string name="validity_period" msgid="57988851973181309">"Gültigkeit:"</string>
+    <string name="issued_on" msgid="2082890654801808368">"Ausgegeben am:"</string>
+    <string name="expires_on" msgid="8061200430557020704">"Läuft ab am:"</string>
 </resources>
diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml
index 65d04b48278e..81b9107ee5d0 100644
--- a/core/res/res/values-el/strings.xml
+++ b/core/res/res/values-el/strings.xml
@@ -1106,4 +1106,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"Πιστοποιητικό ασφαλείας"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Αυτό το πιστοποιητικό είναι έγκυρο."</string>
+    <string name="issued_to" msgid="9032338008819841339">"Εκδόθηκε στις:"</string>
+    <string name="common_name" msgid="5745530093500062357">"Κοινό όνομα:"</string>
+    <string name="org_name" msgid="8868889052889991293">"Οργανισμός:"</string>
+    <string name="org_unit" msgid="4489056376307768196">"Μονάδα οργάνωσης:"</string>
+    <string name="issued_by" msgid="6959484326943152487">"Εκδόθηκε:"</string>
+    <string name="validity_period" msgid="57988851973181309">"Ισχύς:"</string>
+    <string name="issued_on" msgid="2082890654801808368">"Εκδόθηκε στις:"</string>
+    <string name="expires_on" msgid="8061200430557020704">"Λήγει:"</string>
 </resources>
diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml
index c048b99f7e1f..7c2cc2f89168 100644
--- a/core/res/res/values-es/strings.xml
+++ b/core/res/res/values-es/strings.xml
@@ -1106,4 +1106,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"Certificado de seguridad"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Este certificado es válido."</string>
+    <string name="issued_to" msgid="9032338008819841339">"Emitido para:"</string>
+    <string name="common_name" msgid="5745530093500062357">"Nombre común:"</string>
+    <string name="org_name" msgid="8868889052889991293">"Organización:"</string>
+    <string name="org_unit" msgid="4489056376307768196">"Departamento:"</string>
+    <string name="issued_by" msgid="6959484326943152487">"Emitido por:"</string>
+    <string name="validity_period" msgid="57988851973181309">"Validez:"</string>
+    <string name="issued_on" msgid="2082890654801808368">"Fecha de emisión:"</string>
+    <string name="expires_on" msgid="8061200430557020704">"Fecha de caducidad:"</string>
 </resources>
diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml
index 4ea2aa7218a5..48ad6f169484 100644
--- a/core/res/res/values-fa/strings.xml
+++ b/core/res/res/values-fa/strings.xml
@@ -1106,4 +1106,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"گواهی امنیتی"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"این گواهی معتبر است."</string>
+    <string name="issued_to" msgid="9032338008819841339">"صدور برای:"</string>
+    <string name="common_name" msgid="5745530093500062357">"نام عادی:"</string>
+    <string name="org_name" msgid="8868889052889991293">"سازمان:"</string>
+    <string name="org_unit" msgid="4489056376307768196">"واحد سازمانی:"</string>
+    <string name="issued_by" msgid="6959484326943152487">"صدور توسط:"</string>
+    <string name="validity_period" msgid="57988851973181309">"اعتبار:"</string>
+    <string name="issued_on" msgid="2082890654801808368">"صدور در:"</string>
+    <string name="expires_on" msgid="8061200430557020704">"تاریخ انقضا:"</string>
 </resources>
diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml
index 50c02680c445..5ddbb4554b82 100644
--- a/core/res/res/values-fi/strings.xml
+++ b/core/res/res/values-fi/strings.xml
@@ -1106,4 +1106,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"Suojausvarmenne"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Varmenne on voimassa."</string>
+    <string name="issued_to" msgid="9032338008819841339">"Varmenteen saaja:"</string>
+    <string name="common_name" msgid="5745530093500062357">"Yleinen nimi:"</string>
+    <string name="org_name" msgid="8868889052889991293">"Organisaatio:"</string>
+    <string name="org_unit" msgid="4489056376307768196">"Organisaatioyksikkö:"</string>
+    <string name="issued_by" msgid="6959484326943152487">"Myöntäjä:"</string>
+    <string name="validity_period" msgid="57988851973181309">"Voimassa:"</string>
+    <string name="issued_on" msgid="2082890654801808368">"Myönnetty:"</string>
+    <string name="expires_on" msgid="8061200430557020704">"Vanhenee:"</string>
 </resources>
diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml
index 8d9533820ea4..fe1dd13c5850 100644
--- a/core/res/res/values-fr/strings.xml
+++ b/core/res/res/values-fr/strings.xml
@@ -1106,4 +1106,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"Certificat de sécurité"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Ce certificat est valide."</string>
+    <string name="issued_to" msgid="9032338008819841339">"Émis à :"</string>
+    <string name="common_name" msgid="5745530093500062357">"Nom commun :"</string>
+    <string name="org_name" msgid="8868889052889991293">"Organisation :"</string>
+    <string name="org_unit" msgid="4489056376307768196">"Unité d\'organisation :"</string>
+    <string name="issued_by" msgid="6959484326943152487">"Émis par :"</string>
+    <string name="validity_period" msgid="57988851973181309">"Validité :"</string>
+    <string name="issued_on" msgid="2082890654801808368">"Émis le :"</string>
+    <string name="expires_on" msgid="8061200430557020704">"Expire le :"</string>
 </resources>
diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml
index 71d49cc75c55..391fd08cc5bb 100644
--- a/core/res/res/values-hr/strings.xml
+++ b/core/res/res/values-hr/strings.xml
@@ -1106,4 +1106,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"Certifikat o sigurnosti"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Ovaj je certifikat valjan."</string>
+    <string name="issued_to" msgid="9032338008819841339">"Izdano do:"</string>
+    <string name="common_name" msgid="5745530093500062357">"Zajednički naziv:"</string>
+    <string name="org_name" msgid="8868889052889991293">"Tvrtka ili ustanova:"</string>
+    <string name="org_unit" msgid="4489056376307768196">"Organizacijska jedinica:"</string>
+    <string name="issued_by" msgid="6959484326943152487">"Izdao:"</string>
+    <string name="validity_period" msgid="57988851973181309">"Vrijedi do:"</string>
+    <string name="issued_on" msgid="2082890654801808368">"Izdano dana:"</string>
+    <string name="expires_on" msgid="8061200430557020704">"Ističe dana:"</string>
 </resources>
diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml
index bbe635f42869..c5e16cfa7dc2 100644
--- a/core/res/res/values-hu/strings.xml
+++ b/core/res/res/values-hu/strings.xml
@@ -1106,4 +1106,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"Biztonsági tanúsítvány"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"A tanúsítvány érvényes."</string>
+    <string name="issued_to" msgid="9032338008819841339">"Kiállítva a következőnek:"</string>
+    <string name="common_name" msgid="5745530093500062357">"Név:"</string>
+    <string name="org_name" msgid="8868889052889991293">"Szervezet:"</string>
+    <string name="org_unit" msgid="4489056376307768196">"Szervezeti egység:"</string>
+    <string name="issued_by" msgid="6959484326943152487">"Kiállította:"</string>
+    <string name="validity_period" msgid="57988851973181309">"Érvényesség:"</string>
+    <string name="issued_on" msgid="2082890654801808368">"Kiállítva:"</string>
+    <string name="expires_on" msgid="8061200430557020704">"Lejár:"</string>
 </resources>
diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml
index 53d245a20216..4e7504a610f1 100644
--- a/core/res/res/values-in/strings.xml
+++ b/core/res/res/values-in/strings.xml
@@ -1106,4 +1106,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"Sertifikat keamanan"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Sertifikat ini valid."</string>
+    <string name="issued_to" msgid="9032338008819841339">"Diterbitkan ke:"</string>
+    <string name="common_name" msgid="5745530093500062357">"Nama umum:"</string>
+    <string name="org_name" msgid="8868889052889991293">"Organisasi:"</string>
+    <string name="org_unit" msgid="4489056376307768196">"Unit organisasi:"</string>
+    <string name="issued_by" msgid="6959484326943152487">"Diterbitkan oleh:"</string>
+    <string name="validity_period" msgid="57988851973181309">"Validitas:"</string>
+    <string name="issued_on" msgid="2082890654801808368">"Diterbitkan pada:"</string>
+    <string name="expires_on" msgid="8061200430557020704">"Kedaluwarsa pada:"</string>
 </resources>
diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml
index 3c9d90901616..10d1787fc62d 100644
--- a/core/res/res/values-it/strings.xml
+++ b/core/res/res/values-it/strings.xml
@@ -1106,4 +1106,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"Certificato di protezione"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Questo certificato è valido."</string>
+    <string name="issued_to" msgid="9032338008819841339">"Rilasciato a:"</string>
+    <string name="common_name" msgid="5745530093500062357">"Nome comune:"</string>
+    <string name="org_name" msgid="8868889052889991293">"Organizzazione:"</string>
+    <string name="org_unit" msgid="4489056376307768196">"Unità organizzativa:"</string>
+    <string name="issued_by" msgid="6959484326943152487">"Rilasciato da:"</string>
+    <string name="validity_period" msgid="57988851973181309">"Validità:"</string>
+    <string name="issued_on" msgid="2082890654801808368">"Rilasciato il:"</string>
+    <string name="expires_on" msgid="8061200430557020704">"Scade il:"</string>
 </resources>
diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml
index 71aa9f199193..3fce696481f4 100644
--- a/core/res/res/values-iw/strings.xml
+++ b/core/res/res/values-iw/strings.xml
@@ -1106,4 +1106,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"אישור אבטחה"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"אישור זה תקף."</string>
+    <string name="issued_to" msgid="9032338008819841339">"הופק עבור:"</string>
+    <string name="common_name" msgid="5745530093500062357">"שם משותף:"</string>
+    <string name="org_name" msgid="8868889052889991293">"ארגון:"</string>
+    <string name="org_unit" msgid="4489056376307768196">"יחידה ארגונית:"</string>
+    <string name="issued_by" msgid="6959484326943152487">"הופק על ידי:"</string>
+    <string name="validity_period" msgid="57988851973181309">"חוקיות:"</string>
+    <string name="issued_on" msgid="2082890654801808368">"הונפק בתאריך:"</string>
+    <string name="expires_on" msgid="8061200430557020704">"פג תוקף ב:"</string>
 </resources>
diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml
index 388b47b23d1c..9771a29459a3 100644
--- a/core/res/res/values-ja/strings.xml
+++ b/core/res/res/values-ja/strings.xml
@@ -1106,4 +1106,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"セキュリティ証明書"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"この証明書は有効です。"</string>
+    <string name="issued_to" msgid="9032338008819841339">"発行先:"</string>
+    <string name="common_name" msgid="5745530093500062357">"共通名:"</string>
+    <string name="org_name" msgid="8868889052889991293">"組織:"</string>
+    <string name="org_unit" msgid="4489056376307768196">"組織単位:"</string>
+    <string name="issued_by" msgid="6959484326943152487">"発行者:"</string>
+    <string name="validity_period" msgid="57988851973181309">"有効期間:"</string>
+    <string name="issued_on" msgid="2082890654801808368">"発行:"</string>
+    <string name="expires_on" msgid="8061200430557020704">"有効期限:"</string>
 </resources>
diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml
index f7e1a757366b..a50f743df9f4 100644
--- a/core/res/res/values-ko/strings.xml
+++ b/core/res/res/values-ko/strings.xml
@@ -1106,4 +1106,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"보안 인증서"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"유효한 인증서입니다."</string>
+    <string name="issued_to" msgid="9032338008819841339">"발급 대상:"</string>
+    <string name="common_name" msgid="5745530093500062357">"일반 이름:"</string>
+    <string name="org_name" msgid="8868889052889991293">"조직:"</string>
+    <string name="org_unit" msgid="4489056376307768196">"조직 구성 단위:"</string>
+    <string name="issued_by" msgid="6959484326943152487">"발급 기관:"</string>
+    <string name="validity_period" msgid="57988851973181309">"유효성:"</string>
+    <string name="issued_on" msgid="2082890654801808368">"발급 날짜:"</string>
+    <string name="expires_on" msgid="8061200430557020704">"만료 날짜:"</string>
 </resources>
diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml
index 549641ff4cec..d99d0ec92a7b 100644
--- a/core/res/res/values-lt/strings.xml
+++ b/core/res/res/values-lt/strings.xml
@@ -1106,4 +1106,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"Saugos sertifikatas"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Šis sertifikatas galioja."</string>
+    <string name="issued_to" msgid="9032338008819841339">"Išduota:"</string>
+    <string name="common_name" msgid="5745530093500062357">"Bendras pavadinimas:"</string>
+    <string name="org_name" msgid="8868889052889991293">"Organizacija:"</string>
+    <string name="org_unit" msgid="4489056376307768196">"Organizacinis vienetas:"</string>
+    <string name="issued_by" msgid="6959484326943152487">"Išdavė:"</string>
+    <string name="validity_period" msgid="57988851973181309">"Galiojimas:"</string>
+    <string name="issued_on" msgid="2082890654801808368">"Išduota:"</string>
+    <string name="expires_on" msgid="8061200430557020704">"Galiojimas baigiasi:"</string>
 </resources>
diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml
index e32df3be9b7c..553f3eed2f96 100644
--- a/core/res/res/values-lv/strings.xml
+++ b/core/res/res/values-lv/strings.xml
@@ -1106,4 +1106,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"Drošības sertifikāts"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Sertifikāts ir derīgs."</string>
+    <string name="issued_to" msgid="9032338008819841339">"Izdots:"</string>
+    <string name="common_name" msgid="5745530093500062357">"Kopējais nosaukums:"</string>
+    <string name="org_name" msgid="8868889052889991293">"Organizācija:"</string>
+    <string name="org_unit" msgid="4489056376307768196">"Organizācijas vienība:"</string>
+    <string name="issued_by" msgid="6959484326943152487">"Izsniedzējs:"</string>
+    <string name="validity_period" msgid="57988851973181309">"Derīgums:"</string>
+    <string name="issued_on" msgid="2082890654801808368">"Izsniegšanas datums:"</string>
+    <string name="expires_on" msgid="8061200430557020704">"Derīguma termiņš:"</string>
 </resources>
diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml
index 15896ae6e5e2..f432672985ff 100644
--- a/core/res/res/values-ms/strings.xml
+++ b/core/res/res/values-ms/strings.xml
@@ -1127,4 +1127,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"Sijil keselamatan"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Sijil ini sah."</string>
+    <string name="issued_to" msgid="9032338008819841339">"Dikeluarkan kepada:"</string>
+    <string name="common_name" msgid="5745530093500062357">"Nama biasa:"</string>
+    <string name="org_name" msgid="8868889052889991293">"Organisasi:"</string>
+    <string name="org_unit" msgid="4489056376307768196">"Unit Organisasi:"</string>
+    <string name="issued_by" msgid="6959484326943152487">"Dikeluarkan oleh:"</string>
+    <string name="validity_period" msgid="57988851973181309">"Kesahan:"</string>
+    <string name="issued_on" msgid="2082890654801808368">"Dikeluarkan pada:"</string>
+    <string name="expires_on" msgid="8061200430557020704">"Tamat tempoh pada:"</string>
 </resources>
diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml
index ca6d608c96c8..aca95fd5c229 100644
--- a/core/res/res/values-nb/strings.xml
+++ b/core/res/res/values-nb/strings.xml
@@ -1106,4 +1106,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"Sikkerhetssertifikat"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Sertifikatet er gyldig."</string>
+    <string name="issued_to" msgid="9032338008819841339">"Utstedt til:"</string>
+    <string name="common_name" msgid="5745530093500062357">"Ordinært navn:"</string>
+    <string name="org_name" msgid="8868889052889991293">"Organisasjon:"</string>
+    <string name="org_unit" msgid="4489056376307768196">"Organisasjonsenhet:"</string>
+    <string name="issued_by" msgid="6959484326943152487">"Utstedt av:"</string>
+    <string name="validity_period" msgid="57988851973181309">"Gyldighet:"</string>
+    <string name="issued_on" msgid="2082890654801808368">"Utstedt:"</string>
+    <string name="expires_on" msgid="8061200430557020704">"Utløper den:"</string>
 </resources>
diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml
index 8f543311167a..5fe75fc77d0e 100644
--- a/core/res/res/values-nl/strings.xml
+++ b/core/res/res/values-nl/strings.xml
@@ -1106,4 +1106,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"Beveiligingscertificaat"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Dit certificaat is geldig."</string>
+    <string name="issued_to" msgid="9032338008819841339">"Uitgegeven voor:"</string>
+    <string name="common_name" msgid="5745530093500062357">"Algemene naam:"</string>
+    <string name="org_name" msgid="8868889052889991293">"Organisatie:"</string>
+    <string name="org_unit" msgid="4489056376307768196">"Organisatie-eenheid:"</string>
+    <string name="issued_by" msgid="6959484326943152487">"Uitgegeven door:"</string>
+    <string name="validity_period" msgid="57988851973181309">"Geldigheid:"</string>
+    <string name="issued_on" msgid="2082890654801808368">"Uitgegeven op:"</string>
+    <string name="expires_on" msgid="8061200430557020704">"Verloopt op:"</string>
 </resources>
diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml
index 10bc6149e06c..0221da7fefe2 100644
--- a/core/res/res/values-pl/strings.xml
+++ b/core/res/res/values-pl/strings.xml
@@ -1106,4 +1106,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"Certyfikat zabezpieczeń"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Ten certyfikat jest prawidłowy."</string>
+    <string name="issued_to" msgid="9032338008819841339">"Otrzymujący:"</string>
+    <string name="common_name" msgid="5745530093500062357">"Nazwa pospolita:"</string>
+    <string name="org_name" msgid="8868889052889991293">"Organizacja:"</string>
+    <string name="org_unit" msgid="4489056376307768196">"Jednostka organizacyjna:"</string>
+    <string name="issued_by" msgid="6959484326943152487">"Wystawca:"</string>
+    <string name="validity_period" msgid="57988851973181309">"Poprawność:"</string>
+    <string name="issued_on" msgid="2082890654801808368">"Data wystawienia:"</string>
+    <string name="expires_on" msgid="8061200430557020704">"Wygasa:"</string>
 </resources>
diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml
index a17277e65a0a..09f08766bdb3 100644
--- a/core/res/res/values-pt/strings.xml
+++ b/core/res/res/values-pt/strings.xml
@@ -1106,4 +1106,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"Certificado de segurança"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Este certificado é válido."</string>
+    <string name="issued_to" msgid="9032338008819841339">"Emitido para:"</string>
+    <string name="common_name" msgid="5745530093500062357">"Nome comum:"</string>
+    <string name="org_name" msgid="8868889052889991293">"Organização:"</string>
+    <string name="org_unit" msgid="4489056376307768196">"Unidade organizacional:"</string>
+    <string name="issued_by" msgid="6959484326943152487">"Emitido por:"</string>
+    <string name="validity_period" msgid="57988851973181309">"Validade:"</string>
+    <string name="issued_on" msgid="2082890654801808368">"Emitido em:"</string>
+    <string name="expires_on" msgid="8061200430557020704">"Expira em:"</string>
 </resources>
diff --git a/core/res/res/values-rm/strings.xml b/core/res/res/values-rm/strings.xml
index b1fa2179d262..c6fea8eff1fa 100644
--- a/core/res/res/values-rm/strings.xml
+++ b/core/res/res/values-rm/strings.xml
@@ -1223,4 +1223,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"Certificat da segirezza"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Quest certificat è valid."</string>
+    <string name="issued_to" msgid="9032338008819841339">"Emess a:"</string>
+    <string name="common_name" msgid="5745530093500062357">"Num general:"</string>
+    <string name="org_name" msgid="8868889052889991293">"Organisaziun:"</string>
+    <string name="org_unit" msgid="4489056376307768196">"Unitad d\'organisaziun:"</string>
+    <string name="issued_by" msgid="6959484326943152487">"Emess da:"</string>
+    <string name="validity_period" msgid="57988851973181309">"Validitad:"</string>
+    <string name="issued_on" msgid="2082890654801808368">"Emess ils:"</string>
+    <string name="expires_on" msgid="8061200430557020704">"Scroda ils:"</string>
 </resources>
diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml
index 404570a59147..25fdb541284f 100644
--- a/core/res/res/values-ro/strings.xml
+++ b/core/res/res/values-ro/strings.xml
@@ -1106,4 +1106,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"Certificat de securitate"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Certificatul este valid."</string>
+    <string name="issued_to" msgid="9032338008819841339">"Emis de:"</string>
+    <string name="common_name" msgid="5745530093500062357">"Nume comun:"</string>
+    <string name="org_name" msgid="8868889052889991293">"Organizaţie:"</string>
+    <string name="org_unit" msgid="4489056376307768196">"Organizaţie:"</string>
+    <string name="issued_by" msgid="6959484326943152487">"Emis de:"</string>
+    <string name="validity_period" msgid="57988851973181309">"Validitate:"</string>
+    <string name="issued_on" msgid="2082890654801808368">"Emis pe:"</string>
+    <string name="expires_on" msgid="8061200430557020704">"Expiră pe:"</string>
 </resources>
diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml
index 44cc9dfbcef7..170ee8548b2a 100644
--- a/core/res/res/values-ru/strings.xml
+++ b/core/res/res/values-ru/strings.xml
@@ -1106,4 +1106,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"Сертификат безопасности"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Этот сертификат действителен."</string>
+    <string name="issued_to" msgid="9032338008819841339">"Владелец сертификата:"</string>
+    <string name="common_name" msgid="5745530093500062357">"Стандартное имя:"</string>
+    <string name="org_name" msgid="8868889052889991293">"Организация:"</string>
+    <string name="org_unit" msgid="4489056376307768196">"Подразделение организации:"</string>
+    <string name="issued_by" msgid="6959484326943152487">"Выпущен:"</string>
+    <string name="validity_period" msgid="57988851973181309">"Срок действия:"</string>
+    <string name="issued_on" msgid="2082890654801808368">"Дата издания:"</string>
+    <string name="expires_on" msgid="8061200430557020704">"Дата окончания действия:"</string>
 </resources>
diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml
index dc962b17dd23..4ef89b7dfbfd 100644
--- a/core/res/res/values-sk/strings.xml
+++ b/core/res/res/values-sk/strings.xml
@@ -1106,4 +1106,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"Certifikát zabezpečenia"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Certifikát je platný."</string>
+    <string name="issued_to" msgid="9032338008819841339">"Vydané pre:"</string>
+    <string name="common_name" msgid="5745530093500062357">"Bežný názov:"</string>
+    <string name="org_name" msgid="8868889052889991293">"Organizácia:"</string>
+    <string name="org_unit" msgid="4489056376307768196">"Organizačná jednotka:"</string>
+    <string name="issued_by" msgid="6959484326943152487">"Vydal:"</string>
+    <string name="validity_period" msgid="57988851973181309">"Platnosť:"</string>
+    <string name="issued_on" msgid="2082890654801808368">"Dátum vydania:"</string>
+    <string name="expires_on" msgid="8061200430557020704">"Platnosť vyprší:"</string>
 </resources>
diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml
index e613bf07a5d6..86546e02a1b4 100644
--- a/core/res/res/values-sl/strings.xml
+++ b/core/res/res/values-sl/strings.xml
@@ -1106,4 +1106,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"Varnostno potrdilo"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Potrdilo je veljavno."</string>
+    <string name="issued_to" msgid="9032338008819841339">"Izdano za:"</string>
+    <string name="common_name" msgid="5745530093500062357">"Pogosto ime:"</string>
+    <string name="org_name" msgid="8868889052889991293">"Organizacija:"</string>
+    <string name="org_unit" msgid="4489056376307768196">"Organizacijska enota:"</string>
+    <string name="issued_by" msgid="6959484326943152487">"Izdal:"</string>
+    <string name="validity_period" msgid="57988851973181309">"Veljavnost:"</string>
+    <string name="issued_on" msgid="2082890654801808368">"Izdano:"</string>
+    <string name="expires_on" msgid="8061200430557020704">"Velja do:"</string>
 </resources>
diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml
index 455e1a9d48c6..2fd051c26d4f 100644
--- a/core/res/res/values-sr/strings.xml
+++ b/core/res/res/values-sr/strings.xml
@@ -1106,4 +1106,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"Безбедносни сертификат"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Овај сертификат је важећи."</string>
+    <string name="issued_to" msgid="9032338008819841339">"Издато за:"</string>
+    <string name="common_name" msgid="5745530093500062357">"Уобичајени назив:"</string>
+    <string name="org_name" msgid="8868889052889991293">"Организација:"</string>
+    <string name="org_unit" msgid="4489056376307768196">"Организациона јединица:"</string>
+    <string name="issued_by" msgid="6959484326943152487">"Издавалац:"</string>
+    <string name="validity_period" msgid="57988851973181309">"Ваљаност:"</string>
+    <string name="issued_on" msgid="2082890654801808368">"Издато дана:"</string>
+    <string name="expires_on" msgid="8061200430557020704">"Датум истека:"</string>
 </resources>
diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml
index 22ca7e26cf2d..a17dc8d8c3c4 100644
--- a/core/res/res/values-sv/strings.xml
+++ b/core/res/res/values-sv/strings.xml
@@ -1106,4 +1106,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"Säkerhetscertifikat"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Detta certifikat är giltigt."</string>
+    <string name="issued_to" msgid="9032338008819841339">"Utfärdat till:"</string>
+    <string name="common_name" msgid="5745530093500062357">"Nätverksnamn:"</string>
+    <string name="org_name" msgid="8868889052889991293">"Organisation:"</string>
+    <string name="org_unit" msgid="4489056376307768196">"Organisationsenhet:"</string>
+    <string name="issued_by" msgid="6959484326943152487">"Utfärdat av:"</string>
+    <string name="validity_period" msgid="57988851973181309">"Giltighet:"</string>
+    <string name="issued_on" msgid="2082890654801808368">"Utfärdat den:"</string>
+    <string name="expires_on" msgid="8061200430557020704">"Upphör att gälla:"</string>
 </resources>
diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml
index b6de800c89a4..2eb1b79165f6 100644
--- a/core/res/res/values-th/strings.xml
+++ b/core/res/res/values-th/strings.xml
@@ -1106,4 +1106,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"ใบรับรองความปลอดภัย"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"ใบรับรองนี้ใช้งานได้"</string>
+    <string name="issued_to" msgid="9032338008819841339">"ออกให้แก่:"</string>
+    <string name="common_name" msgid="5745530093500062357">"ชื่อทั่วไป:"</string>
+    <string name="org_name" msgid="8868889052889991293">"องค์กร:"</string>
+    <string name="org_unit" msgid="4489056376307768196">"หน่วยองค์กร:"</string>
+    <string name="issued_by" msgid="6959484326943152487">"ออกโดย:"</string>
+    <string name="validity_period" msgid="57988851973181309">"อายุการใช้งาน:"</string>
+    <string name="issued_on" msgid="2082890654801808368">"ออกเมื่อ:"</string>
+    <string name="expires_on" msgid="8061200430557020704">"หมดอายุวันที่:"</string>
 </resources>
diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml
index bba5e2f70d31..760724b8a9aa 100644
--- a/core/res/res/values-tl/strings.xml
+++ b/core/res/res/values-tl/strings.xml
@@ -1106,4 +1106,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"Certificate na pangseguridad"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Wasto ang certificate na ito."</string>
+    <string name="issued_to" msgid="9032338008819841339">"Ibinigay kay:"</string>
+    <string name="common_name" msgid="5745530093500062357">"Karaniwang pangalan:"</string>
+    <string name="org_name" msgid="8868889052889991293">"Samahan:"</string>
+    <string name="org_unit" msgid="4489056376307768196">"Unit na pangsamahan:"</string>
+    <string name="issued_by" msgid="6959484326943152487">"Ibinigay ni:"</string>
+    <string name="validity_period" msgid="57988851973181309">"Pagpapatunay:"</string>
+    <string name="issued_on" msgid="2082890654801808368">"Ibinigay noong:"</string>
+    <string name="expires_on" msgid="8061200430557020704">"Mag-e-expire sa:"</string>
 </resources>
diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml
index 3bce91b76e78..f9f2a1647726 100644
--- a/core/res/res/values-tr/strings.xml
+++ b/core/res/res/values-tr/strings.xml
@@ -1106,4 +1106,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"Güvenlik sertifikası"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Bu sertifika geçerli."</string>
+    <string name="issued_to" msgid="9032338008819841339">"Alıcı:"</string>
+    <string name="common_name" msgid="5745530093500062357">"Ortak ad:"</string>
+    <string name="org_name" msgid="8868889052889991293">"Kuruluş:"</string>
+    <string name="org_unit" msgid="4489056376307768196">"Kuruluş birimi:"</string>
+    <string name="issued_by" msgid="6959484326943152487">"Yayınlayan:"</string>
+    <string name="validity_period" msgid="57988851973181309">"Geçerlilik:"</string>
+    <string name="issued_on" msgid="2082890654801808368">"Yayınlanma tarihi:"</string>
+    <string name="expires_on" msgid="8061200430557020704">"Sona erme tarihi:"</string>
 </resources>
diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml
index 3bb3788b6745..02636af03b6e 100644
--- a/core/res/res/values-uk/strings.xml
+++ b/core/res/res/values-uk/strings.xml
@@ -1106,4 +1106,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"Сертифікат безпеки"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Цей сертифікат є дійсним."</string>
+    <string name="issued_to" msgid="9032338008819841339">"Кому видано:"</string>
+    <string name="common_name" msgid="5745530093500062357">"Загальне ім\'я:"</string>
+    <string name="org_name" msgid="8868889052889991293">"Організація:"</string>
+    <string name="org_unit" msgid="4489056376307768196">"Організац. підрозділ:"</string>
+    <string name="issued_by" msgid="6959484326943152487">"Ким видано:"</string>
+    <string name="validity_period" msgid="57988851973181309">"Чинність:"</string>
+    <string name="issued_on" msgid="2082890654801808368">"Дата видачі:"</string>
+    <string name="expires_on" msgid="8061200430557020704">"Діє до:"</string>
 </resources>
diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml
index db408d8e6ecd..1b1c8ba2accb 100644
--- a/core/res/res/values-vi/strings.xml
+++ b/core/res/res/values-vi/strings.xml
@@ -1106,4 +1106,14 @@
     <skip />
     <!-- no translation found for data_usage_limit_body (2182247539226163759) -->
     <skip />
+    <string name="ssl_certificate" msgid="5226747157992111668">"Chứng chỉ bảo mật"</string>
+    <string name="ssl_certificate_is_valid" msgid="7096160815933145579">"Chứng chỉ này hợp lệ."</string>
+    <string name="issued_to" msgid="9032338008819841339">"Cấp cho:"</string>
+    <string name="common_name" msgid="5745530093500062357">"Tên chung:"</string>
+    <string name="org_name" msgid="8868889052889991293">"Tổ chức:"</string>
+    <string name="org_unit" msgid="4489056376307768196">"Đơn vị tổ chức:"</string>
+    <string name="issued_by" msgid="6959484326943152487">"Cấp bởi:"</string>
+    <string name="validity_period" msgid="57988851973181309">"Tính hợp lệ:"</string>
+    <string name="issued_on" msgid="2082890654801808368">"Cấp vào:"</string>
+    <string name="expires_on" msgid="8061200430557020704">"Hết hạn vào:"</string>
 </resources>
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index b5f408423adf..cd52a5aea219 100755
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -2959,4 +2959,26 @@
     <!-- Notification body when data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
     <string name="data_usage_limit_body">tap to enable</string>
 
+    <!-- SSL Certificate dialogs -->
+    <!-- Title for an SSL Certificate dialog -->
+    <string name="ssl_certificate">Security certificate</string>
+    <!-- Message on an SSL Certificate dialog -->
+    <string name="ssl_certificate_is_valid">This certificate is valid.</string>
+    <!-- Label for an information field on an SSL Certificate Dialog -->
+    <string name="issued_to">Issued to:</string>
+    <!-- Label for an information field on an SSL Certificate Dialog -->
+    <string name="common_name">Common name:</string>
+    <!-- Label for an information field on an SSL Certificate Dialog -->
+    <string name="org_name">Organization:</string>
+    <!-- Label for an information field on an SSL Certificate Dialog -->
+    <string name="org_unit">Organizational unit:</string>
+    <!-- Label for an information field on an SSL Certificate Dialog -->
+    <string name="issued_by">Issued by:</string>
+    <!-- Label for an information field on an SSL Certificate Dialog -->
+    <string name="validity_period">Validity:</string>
+    <!-- Label for an information field on an SSL Certificate Dialog -->
+    <string name="issued_on">Issued on:</string>
+    <!-- Label for an information field on an SSL Certificate Dialog -->
+    <string name="expires_on">Expires on:</string>
+
 </resources>
diff --git a/keystore/java/android/security/IKeyChainService.aidl b/keystore/java/android/security/IKeyChainService.aidl
index 2763e46f3bef..23ffd59f2fa6 100644
--- a/keystore/java/android/security/IKeyChainService.aidl
+++ b/keystore/java/android/security/IKeyChainService.aidl
@@ -30,5 +30,6 @@ interface IKeyChainService {
     void installCaCertificate(in byte[] caCertificate);
 
     // APIs used by Settings
+    boolean deleteCaCertificate(String alias);
     boolean reset();
 }