diff --git a/res/values/strings.xml b/res/values/strings.xml index 51c54c9be0f..11bda60862d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5318,7 +5318,12 @@ Trust or remove certificate Trust or remove certificates - + + + %s has installed a certificate authority on your device, which may allow them to monitor your device network activity, including emails, apps, and secure websites. You can choose to either trust or remove this certificate.\n\nFor more information about this certificate, contact your admin. + %s has installed certificate authorities on your device, which may allow them to monitor your device network activity, including emails, apps, and secure websites. You can choose to either trust or remove these certificates.\n\nFor more information about these certificates, contact your admin. + + %s has installed a certificate authority for your work profile, which may allow them to monitor work network activity, including emails, apps, and secure websites. You can choose to either trust or remove this certificate.\n\nFor more information about this certificate, contact your admin. %s has installed certificate authorities for your work profile, which may allow them to monitor work network activity, including emails, apps, and secure websites. You can choose to either trust or remove these certificates.\n\nFor more information about these certificates, contact your admin. diff --git a/src/com/android/settings/MonitoringCertInfoActivity.java b/src/com/android/settings/MonitoringCertInfoActivity.java index 7bf57680941..9df34134aca 100644 --- a/src/com/android/settings/MonitoringCertInfoActivity.java +++ b/src/com/android/settings/MonitoringCertInfoActivity.java @@ -57,8 +57,9 @@ public class MonitoringCertInfoActivity extends Activity implements OnClickListe builder.setMessage(getResources().getQuantityString(R.plurals.ssl_ca_cert_info_message, numberOfCertificates, dpm.getProfileOwnerName())); } else if (dpm.getDeviceOwnerComponentOnCallingUser() != null) { - builder.setMessage(getResources().getQuantityString(R.plurals.ssl_ca_cert_info_message, - numberOfCertificates, dpm.getDeviceOwnerNameOnAnyUser())); + builder.setMessage(getResources().getQuantityString( + R.plurals.ssl_ca_cert_info_message_device_owner, numberOfCertificates, + dpm.getDeviceOwnerNameOnAnyUser())); } else { // Consumer case. Show scary warning. builder.setIcon(android.R.drawable.stat_notify_error);