Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Partial fix to bug 2992589: Edit dev admin strings." into gingerbread

Browse Source
This commit is contained in:
Roy West
2010-09-29 10:37:11 -07:00
committed by Android (Google) Code Review
parent 212d81a004 7d3d88eec0
commit d146c233c5
1 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
core/res/res/values/strings.xml Normal file → Executable file
View File

@@ -1237,31 +1237,28 @@
<!-- Policy administration --> <!-- Policy administration -->
<!-- Title of policy access to limiting the user's password choices --> <!-- Title of policy access to limiting the user's password choices -->
<string name="policylab_limitPassword">Limit password</string> <string name="policylab_limitPassword">Set password rules</string>
<!-- Description of policy access to limiting the user's password choices --> <!-- Description of policy access to limiting the user's password choices -->
<string name="policydesc_limitPassword">Restrict the types of passwords you <string name="policydesc_limitPassword">Control the length and the characters allowed in
are allowed to use.</string> screen-unlock passwords</string>
<!-- Title of policy access to watch user login attempts --> <!-- Title of policy access to watch user login attempts -->
<string name="policylab_watchLogin">Watch login attempts</string> <string name="policylab_watchLogin">Monitor screen-unlock attempts</string>
<!-- Description of policy access to watch user login attempts --> <!-- Description of policy access to watch user login attempts -->
<string name="policydesc_watchLogin">Monitor failed attempts to login to <string name="policydesc_watchLogin">Monitor the number of incorrect passwords entered when unlocking
the device, to perform some action.</string> the screen, and lock the phone or erase all the phone\'s data if too many incorrect passwords are entered
</string>
<!-- Title of policy access to reset user's password --> <!-- Title of policy access to reset user's password -->
<string name="policylab_resetPassword">Reset password</string> <string name="policylab_resetPassword">Change the screen-unlock password</string>
<!-- Description of policy access to reset user's password --> <!-- Description of policy access to reset user's password -->
<string name="policydesc_resetPassword">Force your password <string name="policydesc_resetPassword">Change the screen-unlock password</string>
to a new value, requiring the administrator give it to you
before you can log in.</string>
<!-- Title of policy access to force lock the device --> <!-- Title of policy access to force lock the device -->
<string name="policylab_forceLock">Force lock</string> <string name="policylab_forceLock">Lock the screen</string>
<!-- Description of policy access to limiting the user's password choices --> <!-- Description of policy access to limiting the user's password choices -->
<string name="policydesc_forceLock">Control when device locks, <string name="policydesc_forceLock">Control how and when the screen locks</string>
requiring you re-enter its password.</string>
<!-- Title of policy access to wipe the user's data --> <!-- Title of policy access to wipe the user's data -->
<string name="policylab_wipeData">Erase all data</string> <string name="policylab_wipeData">Erase all data</string>
<!-- Description of policy access to wipe the user's data --> <!-- Description of policy access to wipe the user's data -->
<string name="policydesc_wipeData">Perform a factory reset, deleting <string name="policydesc_wipeData">Erase the phone\'s data without warning, by performing a factory data reset</string>
all of your data without any confirmation.</string>
<!-- The order of these is important, don't reorder without changing Contacts.java --> <skip /> <!-- The order of these is important, don't reorder without changing Contacts.java --> <skip />
<!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. --> <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->