Merge "Enterprise string clean-up for O"
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index f959df9..9d2c6a7 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -370,7 +370,7 @@
<string name="ssl_ca_cert_noti_by_unknown">By an unknown third party</string>
<!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning".
This indicates that an unspecified administrator is doing the monitoring. [CHAR LIMIT=100]-->
- <string name="ssl_ca_cert_noti_by_administrator">By your work profile administrator</string>
+ <string name="ssl_ca_cert_noti_by_administrator">By your work profile admin</string>
<!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning".
This indicates who is doing the monitoring. [CHAR LIMIT=100]-->
<string name="ssl_ca_cert_noti_managed">By <xliff:g id="managing_domain">%s</xliff:g></string>
@@ -381,15 +381,15 @@
<!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
the current profile owner gone missing. [CHAR LIMIT=100]-->
- <string name="work_profile_deleted_description">Work profile deleted due to missing admin app.</string>
+ <string name="work_profile_deleted_description">Work profile deleted due to missing admin app</string>
<!-- Content text for an expanded notification. The Title of the notification is "work_profile_deleted",
i.e. "Work profile deleted". This further explains that the profile is deleted by the system
as a result of the current profile admin gone missing. [CHAR LIMIT=NONE]-->
<string name="work_profile_deleted_details">The work profile admin app is either missing or corrupted.
- As a result, your work profile and related data have been deleted. Contact your administrator for assistance.</string>
+ As a result, your work profile and related data have been deleted. Contact your admin for assistance.</string>
<!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
- <string name="work_profile_deleted_description_dpm_wipe">Your work profile is no longer available on this device.</string>
+ <string name="work_profile_deleted_description_dpm_wipe">Your work profile is no longer available on this device</string>
<!-- Content title for a notification. This notification indicates that the device is managed
and network logging was activated by a device owner. [CHAR LIMIT=NONE]-->
@@ -403,8 +403,8 @@
<string name="factory_reset_warning">Your device will be erased</string>
<!-- Text message in the factory reset warning dialog. This says that the the device admin app
is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
- <string name="factory_reset_message">The admin app is missing components or corrupted, and can\'t be used.
- Your device will now be erased. Contact your administrator for assistance.</string>
+ <string name="factory_reset_message">The admin app can\'t be used. Your device will now be
+ erased.\n\nIf you have questions, contact your organization's admin.</string>
<!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
<string name="me">Me</string>
@@ -1460,7 +1460,7 @@
<!-- Description of policy access to limiting the user's password choices -->
<string name="policydesc_limitPassword">Control the length and the characters allowed in screen lock passwords and PINs.</string>
<!-- Title of policy access to watch user login attempts -->
- <string name="policylab_watchLogin">Monitor screen-unlock attempts</string>
+ <string name="policylab_watchLogin">Monitor screen unlock attempts</string>
<!-- Description of policy access to watch user login attempts -->
<string name="policydesc_watchLogin" product="tablet">Monitor the number of incorrect passwords
typed when unlocking the screen, and lock the tablet or erase all the tablet\'s
@@ -2385,7 +2385,7 @@
It is also used by the home screen's search "widget". It should be short -->
<string name="search_go">Search</string>
<!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
- <string name="search_hint">Search…</string>
+ <string name="search_hint">Search\u2026</string>
<!-- SearchView accessibility description for search button [CHAR LIMIT=NONE] -->
<string name="searchview_description_search">Search</string>
<!-- SearchView accessibility description for search text field [CHAR LIMIT=NONE] -->
@@ -3135,7 +3135,8 @@
<!-- Title of notification shown to indicate that bug report is still being collected after sharing was accepted. -->
<string name="sharing_remote_bugreport_notification_title">Sharing bug report\u2026</string>
<!-- Message of a notification shown to ask for user consent for sharing a bugreport that was requested remotely by the IT administrator. -->
- <string name="share_remote_bugreport_notification_message_finished">Your IT admin requested a bug report to help troubleshoot this device. Apps and data may be shared.</string>
+ <string name="share_remote_bugreport_notification_message_finished">Your admin requested a bug
+ report to help troubleshoot this device. Apps and data may be shared.</string>
<!-- Acceptance label of notification shown to ask for user consent for sharing the remote bugreport. -->
<string name="share_remote_bugreport_action">SHARE</string>
<!-- Decline label of notification shown to ask for user consent for sharing the remote bugreport. -->
@@ -3966,7 +3967,7 @@
<!-- Error message title [CHAR LIMIT=35] -->
<string name="error_message_title">Error</string>
<!-- Message informing user that the change was disallowed by an administrator. [CHAR LIMIT=none] -->
- <string name="error_message_change_not_allowed">This change isn\'t allowed by your administrator</string>
+ <string name="error_message_change_not_allowed">This change isn\'t allowed by your admin</string>
<!-- Message informing user that the requested activity could not be found [CHAR LIMIT=none] -->
<string name="app_not_found">No application found to handle this action</string>
<string name="revoke">Revoke</string>
@@ -4169,7 +4170,7 @@
<string name="print_service_installed_message">Tap to enable</string>
<!-- PIN entry dialog title for entering the administrator PIN [CHAR LIMIT=none] -->
- <string name="restr_pin_enter_admin_pin">Enter administrator PIN</string>
+ <string name="restr_pin_enter_admin_pin">Enter admin PIN</string>
<!-- PIN entry dialog label/hint for PIN [CHAR LIMIT=none] -->
<string name="restr_pin_enter_pin">Enter PIN</string>
<!-- PIN entry dialog label/hint for incorrect PIN entry [CHAR LIMIT=none] -->
@@ -4255,9 +4256,11 @@
<string name="date_picker_day_typeface">sans-serif-medium</string>
<!-- Notify use that they are in Lock-to-app -->
- <string name="lock_to_app_toast">To unpin this screen, touch & hold Back and Overview buttons.</string>
+ <string name="lock_to_app_toast">To unpin this screen, touch & hold Back and Overview
+ buttons</string>
+
<!-- Notify user that they are locked in lock-to-app mode -->
- <string name="lock_to_app_toast_locked">App is pinned: Unpinning isn\'t allowed on this device.</string>
+ <string name="lock_to_app_toast_locked">This app can\'t be unpinned</string>
<!-- Starting lock-to-app indication. -->
<string name="lock_to_app_start">Screen pinned</string>
<!-- Exting lock-to-app indication. -->
@@ -4271,11 +4274,11 @@
<string name="lock_to_app_unlock_password">Ask for password before unpinning</string>
<!-- Notification shown when device owner silently installs a package [CHAR LIMIT=NONE] -->
- <string name="package_installed_device_owner">Installed by your administrator</string>
+ <string name="package_installed_device_owner">Installed by your admin</string>
<!-- Notification shown when device owner silently updates a package [CHAR LIMIT=NONE] -->
- <string name="package_updated_device_owner">Updated by your administrator</string>
+ <string name="package_updated_device_owner">Updated by your admin</string>
<!-- Notification shown when device owner silently deletes a package [CHAR LIMIT=NONE] -->
- <string name="package_deleted_device_owner">Deleted by your administrator</string>
+ <string name="package_deleted_device_owner">Deleted by your admin</string>
<!-- [CHAR_LIMIT=NONE] Battery saver: Feature description -->
<string name="battery_saver_description">To help improve battery life, battery saver reduces your device’s performance and limits vibration, location services, and most background data. Email, messaging, and other apps that rely on syncing may not update unless you open them.\n\nBattery saver turns off automatically when your device is charging.</string>
@@ -4462,9 +4465,10 @@
<string name="locale_search_menu">Search</string>
<!-- Title for dialog displayed when work profile is turned off. [CHAR LIMIT=30] -->
- <string name="work_mode_off_title">Work mode is OFF</string>
+ <string name="work_mode_off_title">Turn on work mode?</string>
<!-- Message displayed in dialog when work profile is turned off. [CHAR LIMIT=NONE] -->
- <string name="work_mode_off_message">Allow work profile to function, including apps, background sync, and related features.</string>
+ <string name="work_mode_off_message">This will turn on your work profile, including apps,
+ background sync, and related features</string>
<!-- Title for button to turn on work profile. [CHAR LIMIT=NONE] -->
<string name="work_mode_turn_on">Turn on</string>
diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml
index ca34bb9..cc2dc1b 100644
--- a/packages/SettingsLib/res/values/strings.xml
+++ b/packages/SettingsLib/res/values/strings.xml
@@ -356,7 +356,7 @@
</string-array>
<!-- Title for profile selection dialog [CHAR LIMIT=30] -->
- <string name="choose_profile">Choose Profile</string>
+ <string name="choose_profile">Choose profile</string>
<!-- Header for items under the personal user [CHAR LIMIT=30] -->
<string name="category_personal">Personal</string>
@@ -850,9 +850,9 @@
<string name="disabled_by_admin_summary_text">Controlled by admin</string>
<!-- Summary for switch preference to denote it is switched on [CHAR LIMIT=50] -->
- <string name="enabled_by_admin">Enabled by administrator</string>
+ <string name="enabled_by_admin">Enabled by admin</string>
<!-- Summary for switch preference to denote it is switched off [CHAR LIMIT=50] -->
- <string name="disabled_by_admin">Disabled by administrator</string>
+ <string name="disabled_by_admin">Disabled by admin</string>
<!-- Option in navigation drawer that leads to Settings main screen [CHAR LIMIT=30] -->
<string name="home">Settings Home</string>
diff --git a/packages/SystemUI/res-keyguard/values/strings.xml b/packages/SystemUI/res-keyguard/values/strings.xml
index ff689aa..2f52227 100644
--- a/packages/SystemUI/res-keyguard/values/strings.xml
+++ b/packages/SystemUI/res-keyguard/values/strings.xml
@@ -327,7 +327,7 @@
<!-- An explanation text that the credential needs to be entered because a device admin has
locked the device. [CHAR LIMIT=80] -->
- <string name="kg_prompt_reason_device_admin">Device administrator locked device</string>
+ <string name="kg_prompt_reason_device_admin">Device locked by admin</string>
<!-- An explanation text that the credential needs to be entered because the user has clicked
the force lock button. [CHAR LIMIT=80] -->
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index 72bf9888..f300ead 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -190,7 +190,8 @@
<!-- Notification text displayed when we fail to save a screenshot. [CHAR LIMIT=100] -->
<string name="screenshot_failed_to_save_text">Can\'t save screenshot due to limited storage space.</string>
<!-- Notification text displayed when we fail to take a screenshot. [CHAR LIMIT=100] -->
- <string name="screenshot_failed_to_capture_text">Taking screenshots is not allowed by the app or your organization.</string>
+ <string name="screenshot_failed_to_capture_text">Taking screenshots isn\'t allowed by the app or
+ your organization</string>
<!-- Title for the USB function chooser in UsbPreferenceActivity. [CHAR LIMIT=30] -->
<string name="usb_preference_title">USB file transfer options</string>
@@ -1160,7 +1161,9 @@
<string name="legacy_vpn_name">VPN</string>
<!-- Monitoring dialog text for single app (no profile or device owner) [CHAR LIMIT=400] -->
- <string name="monitoring_description_app">You\'re connected to <xliff:g id="application">%1$s</xliff:g>, which can monitor your network activity including emails, apps, and websites.</string>
+ <string name="monitoring_description_app">You\'re connected to
+ <xliff:g id="application">%1$s</xliff:g>, which can monitor your network activity,
+ including emails, apps, and websites.</string>
<!-- Monitoring dialog text for single app (inside personal profile) [CHAR LIMIT=400] -->
<string name="monitoring_description_app_personal">You\'re connected to <xliff:g id="application">%1$s</xliff:g>, which can monitor your personal network activity, including emails, apps, and websites.</string>
@@ -1169,10 +1172,18 @@
<string name="branded_monitoring_description_app_personal">You\'re connected to <xliff:g id="application">%1$s</xliff:g>, which can monitor your personal network activity, including emails, apps, and websites.</string>
<!-- Monitoring dialog text for single app (inside work profile) [CHAR LIMIT=400] -->
- <string name="monitoring_description_app_work">Your work profile is managed by <xliff:g id="organization">%1$s</xliff:g>. It is connected to <xliff:g id="application">%2$s</xliff:g>, which can monitor your work network activity, including emails, apps, and websites.\n\nFor more information, contact your admin.</string>
+ <string name="monitoring_description_app_work">Your work profile is managed by
+ <xliff:g id="organization">%1$s</xliff:g>. The profile is connected to
+ <xliff:g id="application">%2$s</xliff:g>, which can monitor your work network activity,
+ including emails, apps, and websites.\n\nFor more information, contact your admin.</string>
<!-- Monitoring dialog text for multiple apps (in personal and work profiles) [CHAR LIMIT=400] -->
- <string name="monitoring_description_app_personal_work">Your work profile is managed by <xliff:g id="organization">%1$s</xliff:g>. It is connected to <xliff:g id="application_work">%2$s</xliff:g>, which can monitor your work network activity, including emails, apps, and websites.\n\nYou\'re also connected to <xliff:g id="application_personal">%3$s</xliff:g>, which can monitor your personal network activity.</string>
+ <string name="monitoring_description_app_personal_work">Your work profile is managed by
+ <xliff:g id="organization">%1$s</xliff:g>. The profile is connected to
+ <xliff:g id="application_work">%2$s</xliff:g>, which can monitor your work network activity,
+ including emails, apps, and websites.\n\nYou\'re also connected to
+ <xliff:g id="application_personal">%3$s</xliff:g>, which can monitor your personal network
+ activity.</string>
<!-- Indication on the keyguard that appears when the user disables trust agents until the next time they unlock manually. [CHAR LIMIT=NONE] -->
<string name="keyguard_indication_trust_disabled">Device will stay locked until you manually unlock</string>