Merge "Update string for profile owner addition warning" into lmp-dev

This commit is contained in:
Amith Yamasani
2014-08-20 20:58:45 +00:00
committed by Android (Google) Code Review

View File

@@ -4434,9 +4434,9 @@
following operations:</string> following operations:</string>
<!-- Title for screen to set a profile owner [CHAR LIMIT=40] --> <!-- Title for screen to set a profile owner [CHAR LIMIT=40] -->
<string name="profile_owner_add_title">Profile owner</string> <string name="profile_owner_add_title">Activate Profile Manager?</string>
<!-- Warning when trying to add a profile owner admin after setup has completed. [CHAR LIMIT=none] --> <!-- Warning when trying to add a profile owner admin after setup has completed. [CHAR LIMIT=none] -->
<string name="adding_profile_owner_warning" translatable="false">This application wants to assume COMPLETE control of this user, including restricting critical operations. Only allow this if you trust this application.</string> <string name="adding_profile_owner_warning">By proceeding, your User will be managed by your Administrator which may also be able to store associated data, in addition to your personal data.\n\nYour Administrator has the ability to monitor and manage settings, access, apps, and data associated with this User, including network activity and your device\s location information.</string>
<!-- Name to assign to a Network Access Point that was saved without a name --> <!-- Name to assign to a Network Access Point that was saved without a name -->
<string name="untitled_apn">Untitled</string> <string name="untitled_apn">Untitled</string>