Merge "Align multiple admin related strings with UX design" into udc-dev am: d280e9e110
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22617660 Change-Id: If186294c620facbc450b3024ceae382a6af1358a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -6380,7 +6380,7 @@
|
|||||||
<!-- Title of preference to enable calling and SMS [CHAR LIMIT=45] -->
|
<!-- Title of preference to enable calling and SMS [CHAR LIMIT=45] -->
|
||||||
<string name="user_enable_calling_sms">Turn on phone calls & SMS</string>
|
<string name="user_enable_calling_sms">Turn on phone calls & SMS</string>
|
||||||
<!-- Title of preference to grant user admin privileges [CHAR LIMIT=45] -->
|
<!-- Title of preference to grant user admin privileges [CHAR LIMIT=45] -->
|
||||||
<string name="user_grant_admin">Give this user admin privileges</string>
|
<string name="user_grant_admin">Make this user an admin</string>
|
||||||
<!-- Title of preference to remove the user [CHAR LIMIT=35] -->
|
<!-- Title of preference to remove the user [CHAR LIMIT=35] -->
|
||||||
<string name="user_remove_user">Delete user</string>
|
<string name="user_remove_user">Delete user</string>
|
||||||
<!-- Title for confirmation of turning on calls and SMS [CHAR LIMIT=45] -->
|
<!-- Title for confirmation of turning on calls and SMS [CHAR LIMIT=45] -->
|
||||||
@@ -6390,7 +6390,7 @@
|
|||||||
<!-- Title for confirmation of revoking admin privileges [CHAR LIMIT=45] -->
|
<!-- Title for confirmation of revoking admin privileges [CHAR LIMIT=45] -->
|
||||||
<string name="user_revoke_admin_confirm_title">Remove admin privileges?</string>
|
<string name="user_revoke_admin_confirm_title">Remove admin privileges?</string>
|
||||||
<!-- Message for confirmation of revoking admin privileges [CHAR LIMIT=none] -->
|
<!-- Message for confirmation of revoking admin privileges [CHAR LIMIT=none] -->
|
||||||
<string name="user_revoke_admin_confirm_message">Are you sure you want to remove this user\'s admin privileges?</string>
|
<string name="user_revoke_admin_confirm_message">If you remove admin privileges for this user, you or another admin can give them back later.</string>
|
||||||
<!-- Title for the emergency info preference [CHAR LIMIT=40] -->
|
<!-- Title for the emergency info preference [CHAR LIMIT=40] -->
|
||||||
<string name="emergency_info_title">Emergency information</string>
|
<string name="emergency_info_title">Emergency information</string>
|
||||||
<!-- Summary for the emergency info preference [CHAR LIMIT=40] -->
|
<!-- Summary for the emergency info preference [CHAR LIMIT=40] -->
|
||||||
|
Reference in New Issue
Block a user