Merge branch 'fetch_qt-qpr1-sysui-dev_5855545' into merge_qt-qpr1-sysui-dev_5855545

Test: manual, presubmit on the source branch

Merged-In: Idc3d5c39427722a5486552312552f7f77ef40980
Change-Id: Ieea5138da3d182735fb92eedd607f52750c91e19
This commit is contained in:
Miranda Kephart
2019-09-09 14:14:14 -04:00
2 changed files with 22 additions and 14 deletions

View File

@@ -423,13 +423,13 @@
<string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Eyes open to unlock"</string> <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Eyes open to unlock"</string>
<string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"When using face authentication, your eyes must be open"</string> <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"When using face authentication, your eyes must be open"</string>
<string name="security_settings_face_settings_require_confirmation" msgid="2559602923985027572">"Always require confirmation"</string> <string name="security_settings_face_settings_require_confirmation" msgid="2559602923985027572">"Always require confirmation"</string>
<string name="security_settings_face_settings_require_confirmation_details" msgid="2002651109571928756">"When authenticating in apps, always require confirmation"</string> <string name="security_settings_face_settings_require_confirmation_details" msgid="6466094680756211420">"When using Face Unlock in apps, always require confirmation step"</string>
<string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Remove face data"</string> <string name="security_settings_face_settings_remove_face_data" msgid="304401377141467791">"Delete face data"</string>
<string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Your face can be used to unlock your device and access apps. "<annotation id="url">"Learn more"</annotation></string> <string name="security_settings_face_settings_enroll" msgid="495403103503629382">"Set up Face Unlock"</string>
<!-- no translation found for security_settings_face_settings_remove_dialog_title (4829278778459836075) --> <string name="security_settings_face_settings_footer" msgid="6072833685685070967">"Use Face Unlock to unlock your device, sign in to apps and confirm payments.\n\nKeep in mind:\nLooking at the phone can unlock it when you dont intend to.\n\nYour phone can be unlocked by someone else if its held up to your face while your eyes are open.\n\nYour phone can be unlocked by someone who looks a lot like you, such as an identical sibling."</string>
<skip /> <string name="security_settings_face_settings_remove_dialog_title" msgid="4829278778459836075">"Delete face data?"</string>
<!-- no translation found for security_settings_face_settings_remove_dialog_details (2609671025686003946) --> <string name="security_settings_face_settings_remove_dialog_details" msgid="1959642447512807205">"The images and biometric data used by Face Unlock will be permanently and securely deleted. After removal, you will need your PIN, pattern or password to unlock your phone, sign in to apps and confirm payments."</string>
<skip /> <string name="security_settings_face_settings_context_subtitle" msgid="4381276009777294566">"Use face unlock to unlock your phone"</string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingerprint"</string> <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingerprint"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Manage fingerprints"</string> <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Manage fingerprints"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Use fingerprint for"</string> <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Use fingerprint for"</string>
@@ -4352,9 +4352,13 @@
<string name="game_driver_app_preference_default" msgid="7686384740483216333">"Default"</string> <string name="game_driver_app_preference_default" msgid="7686384740483216333">"Default"</string>
<string name="game_driver_app_preference_game_driver" msgid="6426312331295324606">"Game Driver"</string> <string name="game_driver_app_preference_game_driver" msgid="6426312331295324606">"Game Driver"</string>
<string name="game_driver_app_preference_system" msgid="8272672982113332753">"System Graphics Driver"</string> <string name="game_driver_app_preference_system" msgid="8272672982113332753">"System Graphics Driver"</string>
<!-- no translation found for game_driver_all_apps_preference_values:0 (7193648562434970105) -->
<!-- no translation found for game_driver_all_apps_preference_values:1 (7189663725490629463) -->
<!-- no translation found for game_driver_all_apps_preference_values:2 (7166160247759864796) -->
<!-- no translation found for game_driver_app_preference_values:0 (4271044622117073985) --> <!-- no translation found for game_driver_app_preference_values:0 (4271044622117073985) -->
<!-- no translation found for game_driver_app_preference_values:1 (6628516810440406199) --> <!-- no translation found for game_driver_app_preference_values:1 (6628516810440406199) -->
<!-- no translation found for game_driver_app_preference_values:2 (1760397725970916076) --> <!-- no translation found for game_driver_app_preference_values:2 (1760397725970916076) -->
<!-- no translation found for game_driver_app_preference_values:3 (6260984152570269090) -->
<string name="unsupported_setting_summary" product="default" msgid="11246953620654225">"Setting isnt supported on this phone"</string> <string name="unsupported_setting_summary" product="default" msgid="11246953620654225">"Setting isnt supported on this phone"</string>
<string name="unsupported_setting_summary" product="tablet" msgid="6328431665635673717">"Setting isnt supported on this tablet"</string> <string name="unsupported_setting_summary" product="tablet" msgid="6328431665635673717">"Setting isnt supported on this tablet"</string>
<string name="unsupported_setting_summary" product="device" msgid="2348970994972110886">"Setting isnt supported on this device"</string> <string name="unsupported_setting_summary" product="device" msgid="2348970994972110886">"Setting isnt supported on this device"</string>

View File

@@ -422,13 +422,13 @@
<string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Eyes open to unlock"</string> <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Eyes open to unlock"</string>
<string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"When using face authentication, your eyes must be open"</string> <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"When using face authentication, your eyes must be open"</string>
<string name="security_settings_face_settings_require_confirmation" msgid="2559602923985027572">"Always require confirmation"</string> <string name="security_settings_face_settings_require_confirmation" msgid="2559602923985027572">"Always require confirmation"</string>
<string name="security_settings_face_settings_require_confirmation_details" msgid="2002651109571928756">"When authenticating in apps, always require confirmation"</string> <string name="security_settings_face_settings_require_confirmation_details" msgid="6466094680756211420">"When using face unlock in apps, always require confirmation step"</string>
<string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Remove face data"</string> <string name="security_settings_face_settings_remove_face_data" msgid="304401377141467791">"Delete face data"</string>
<string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Your face can be used to unlock your device and access apps. "<annotation id="url">"Learn more"</annotation>""</string> <string name="security_settings_face_settings_enroll" msgid="495403103503629382">"Set up face unlock"</string>
<!-- no translation found for security_settings_face_settings_remove_dialog_title (4829278778459836075) --> <string name="security_settings_face_settings_footer" msgid="6072833685685070967">"Use face unlock to unlock your device, sign in to apps, and confirm payments.\n\nKeep in mind:\nLooking at the phone can unlock it when you dont intend to.\n\nYour phone can be unlocked by someone else if its held up to your face while your eyes are open.\n\nYour phone can be unlocked by someone who looks a lot like you, say, an identical sibling."</string>
<skip /> <string name="security_settings_face_settings_remove_dialog_title" msgid="4829278778459836075">"Delete face data?"</string>
<!-- no translation found for security_settings_face_settings_remove_dialog_details (2609671025686003946) --> <string name="security_settings_face_settings_remove_dialog_details" msgid="1959642447512807205">"The images and biometric data used by face unlock will be permanently and securely deleted. After removal, you will need your PIN, pattern, or password to unlock your phone, sign in to apps, and confirm payments."</string>
<skip /> <string name="security_settings_face_settings_context_subtitle" msgid="4381276009777294566">"Use face unlock to unlock your phone"</string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingerprint"</string> <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingerprint"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Manage fingerprints"</string> <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Manage fingerprints"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Use fingerprint for"</string> <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Use fingerprint for"</string>
@@ -4351,9 +4351,13 @@
<string name="game_driver_app_preference_default" msgid="7686384740483216333">"Default"</string> <string name="game_driver_app_preference_default" msgid="7686384740483216333">"Default"</string>
<string name="game_driver_app_preference_game_driver" msgid="6426312331295324606">"Game Driver"</string> <string name="game_driver_app_preference_game_driver" msgid="6426312331295324606">"Game Driver"</string>
<string name="game_driver_app_preference_system" msgid="8272672982113332753">"System Graphics Driver"</string> <string name="game_driver_app_preference_system" msgid="8272672982113332753">"System Graphics Driver"</string>
<!-- no translation found for game_driver_all_apps_preference_values:0 (7193648562434970105) -->
<!-- no translation found for game_driver_all_apps_preference_values:1 (7189663725490629463) -->
<!-- no translation found for game_driver_all_apps_preference_values:2 (7166160247759864796) -->
<!-- no translation found for game_driver_app_preference_values:0 (4271044622117073985) --> <!-- no translation found for game_driver_app_preference_values:0 (4271044622117073985) -->
<!-- no translation found for game_driver_app_preference_values:1 (6628516810440406199) --> <!-- no translation found for game_driver_app_preference_values:1 (6628516810440406199) -->
<!-- no translation found for game_driver_app_preference_values:2 (1760397725970916076) --> <!-- no translation found for game_driver_app_preference_values:2 (1760397725970916076) -->
<!-- no translation found for game_driver_app_preference_values:3 (6260984152570269090) -->
<string name="unsupported_setting_summary" product="default" msgid="11246953620654225">"Setting isnt supported on this phone"</string> <string name="unsupported_setting_summary" product="default" msgid="11246953620654225">"Setting isnt supported on this phone"</string>
<string name="unsupported_setting_summary" product="tablet" msgid="6328431665635673717">"Setting isnt supported on this tablet"</string> <string name="unsupported_setting_summary" product="tablet" msgid="6328431665635673717">"Setting isnt supported on this tablet"</string>
<string name="unsupported_setting_summary" product="device" msgid="2348970994972110886">"Setting isnt supported on this device"</string> <string name="unsupported_setting_summary" product="device" msgid="2348970994972110886">"Setting isnt supported on this device"</string>