Merge "Fix for 5088341 Security settings: String changes related to renaming "Timeout" to "Automatically lock". Changed instance of "Timeout" to "Automatically lock", and summary text to be shorter."

This commit is contained in:
Claudia de Veaux
2011-08-09 11:07:13 -07:00
committed by Android (Google) Code Review

View File

@@ -623,9 +623,9 @@
<!-- Security Settings --><skip />
<!-- Security settings screen, setting option name to change screen timeout -->
<string name="lock_after_timeout">Timeout</string>
<string name="lock_after_timeout">Automatically lock</string>
<!-- Security settings screen, setting option summary to change screen timeout -->
<string name="lock_after_timeout_summary">Lock screen <xliff:g id="timeout_string">%1$s</xliff:g> after screen automatically turns off</string>
<string name="lock_after_timeout_summary">After <xliff:g id="timeout_string">%1$s</xliff:g> of sleep</string>
<!-- Text shown next to checkbox for showing owner info on LockScreen [CHAR LIMIT=50]-->
<string name="show_owner_info_on_lockscreen_label">Show owner info on lock screen</string>
<!-- Text shown for title of owner info setting [CHAR LIMIT=20]-->