Merging from qt-qpr1-sysui-dev @ build 5855545
Test: manual, presubmit on the source branch
Change-Id: Idc3d5c39427722a5486552312552f7f77ef40980
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 89ae25f..0bdd5a9 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -438,10 +438,10 @@
<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="304401377141467791">"Delete face data"</string>
<string name="security_settings_face_settings_enroll" msgid="495403103503629382">"Set up Face Unlock"</string>
- <string name="security_settings_face_settings_footer" msgid="1233594882557106034">"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 don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face, even if your eyes are closed.\n\nYour phone can be unlocked by someone who looks a lot like you, say, an identical sibling."</string>
+ <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 don’t intend to.\n\nYour phone can be unlocked by someone else if it’s 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>
<string name="security_settings_face_settings_remove_dialog_title" msgid="4829278778459836075">"Delete face data?"</string>
<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>
- <string name="security_settings_face_settings_context_subtitle" msgid="4381276009777294566">"Use Face Unlock to unlock your phone"</string>
+ <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="fingerprint_manage_category_title" msgid="8293801041700001681">"Manage fingerprints"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Use fingerprint for"</string>
@@ -4384,9 +4384,11 @@
<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:1 (6628516810440406199) -->
<!-- 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 isn’t supported on this phone"</string>
<string name="unsupported_setting_summary" product="tablet" msgid="6328431665635673717">"Setting isn’t supported on this tablet"</string>
<string name="unsupported_setting_summary" product="device" msgid="2348970994972110886">"Setting isn’t supported on this device"</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 197d0c7..cb96e20 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -437,7 +437,7 @@
<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="304401377141467791">"Delete face data"</string>
<string name="security_settings_face_settings_enroll" msgid="495403103503629382">"Set up face unlock"</string>
- <string name="security_settings_face_settings_footer" msgid="1233594882557106034">"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 don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face, even if your eyes are closed.\n\nYour phone can be unlocked by someone who looks a lot like you, say, an identical sibling."</string>
+ <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 don’t intend to.\n\nYour phone can be unlocked by someone else if it’s 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>
<string name="security_settings_face_settings_remove_dialog_title" msgid="4829278778459836075">"Delete face data?"</string>
<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>
<string name="security_settings_face_settings_context_subtitle" msgid="4381276009777294566">"Use face unlock to unlock your phone"</string>
@@ -4383,9 +4383,11 @@
<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:1 (6628516810440406199) -->
<!-- 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 isn’t supported on this phone"</string>
<string name="unsupported_setting_summary" product="tablet" msgid="6328431665635673717">"Setting isn’t supported on this tablet"</string>
<string name="unsupported_setting_summary" product="device" msgid="2348970994972110886">"Setting isn’t supported on this device"</string>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index f446ac4..eb0b2c3 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -270,7 +270,7 @@
<item msgid="485564189219029300">"啟用 VPN"</item>
<item msgid="7155384795265164395">"寫入桌布"</item>
<item msgid="1835836196806147034">"輔助結構"</item>
- <item msgid="5989890403088155055">"輔助螢幕截圖"</item>
+ <item msgid="5989890403088155055">"輔助螢幕擷取畫面"</item>
<item msgid="8582699692765917557">"讀取手機狀態"</item>
<item msgid="1474039653814954902">"新增語音留言"</item>
<item msgid="7222837656938871633">"使用 SIP"</item>
@@ -298,7 +298,7 @@
<item msgid="6093344633066170692">"讀取日曆"</item>
<item msgid="1334886368750347692">"修改日曆"</item>
<item msgid="1638204101698708656">"位置"</item>
- <item msgid="2154671955760380322">"發布通知"</item>
+ <item msgid="2154671955760380322">"發佈通知"</item>
<item msgid="4282477730595931828">"位置"</item>
<item msgid="4891423912898525905">"撥打電話"</item>
<item msgid="2623604824935968113">"讀取簡訊/MMS"</item>
@@ -337,7 +337,7 @@
<item msgid="2482631530338029480">"啟用 VPN"</item>
<item msgid="1662979573471871926">"寫入桌布"</item>
<item msgid="5964768335278263478">"輔助結構"</item>
- <item msgid="2657138701132782702">"輔助螢幕截圖"</item>
+ <item msgid="2657138701132782702">"輔助螢幕擷取畫面"</item>
<item msgid="8571369610363539266">"讀取手機狀態"</item>
<item msgid="4542463358215230845">"新增語音留言"</item>
<item msgid="864565065016166003">"使用 SIP"</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3f11e52..0c3f8ce 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -970,7 +970,7 @@
<!-- Dialog title shown when the user removes an enrollment [CHAR LIMIT=35] -->
<string name="security_settings_face_settings_remove_dialog_title">Delete face data?</string>
<!-- Dialog contents shown when the user removes an enrollment [CHAR LIMIT=NONE] -->
- <string name="security_settings_face_settings_remove_dialog_details">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>
+ <string name="security_settings_face_settings_remove_dialog_details">The images and face model 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>
<!-- Subtitle shown for contextual setting face enrollment [CHAR LIMIT=NONE] -->
<string name="security_settings_face_settings_context_subtitle">Use face unlock to unlock your phone</string>