Merge "New strings for "Automatically lock"" into qt-r1-dev

    <!-- Security Settings --><skip />

    <!-- Security settings screen, setting option name to change screen timeout -->

    <string name="lock_after_timeout">Automatically lock</string>

    <string name="lock_after_timeout">Lock after screen timeout</string>

    <!-- Security settings screen, setting option summary to change screen timeout -->

    <string name="lock_after_timeout_summary"><xliff:g id="timeout_string">%1$s</xliff:g> after sleep</string>

    <string name="lock_after_timeout_summary"><xliff:g id="timeout_string">%1$s</xliff:g> after timeout</string>

    <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->

    <string name="lock_immediately_summary_with_exception">Immediately after sleep, except when kept unlocked by <xliff:g id="trust_agent_name">%1$s</xliff:g></string>

    <string name="lock_immediately_summary_with_exception">Immediately after timeout, except when kept unlocked by <xliff:g id="trust_agent_name">%1$s</xliff:g></string>

    <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->

    <string name="lock_after_timeout_summary_with_exception"><xliff:g id="timeout_string">%1$s</xliff:g> after sleep, except when kept unlocked by <xliff:g id="trust_agent_name">%2$s</xliff:g></string>

    <string name="lock_after_timeout_summary_with_exception"><xliff:g id="timeout_string">%1$s</xliff:g> after timeout, except when kept unlocked by <xliff:g id="trust_agent_name">%2$s</xliff:g></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]-->