Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28812b0f authored by Miranda Kephart's avatar Miranda Kephart
Browse files

Merging from qt-qpr1-sysui-dev @ build 5855545 

Test: manual, presubmit on the source branch

Merged-In: Idc3d5c39427722a5486552312552f7f77ef40980
Merged-In: Ieea5138da3d182735fb92eedd607f52750c91e19
Change-Id: Iefbdac334e3e1807f61e4832f7ac66b9023047f6
parents 2d709131 6748951f

res/values-en-rCA/strings.xml

+4 −2
Original line number Diff line number Diff line
@@ -440,10 +440,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>
@@ -4389,9 +4389,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>

res/values-en-rXC/strings.xml

+3 −1
Original line number Diff line number Diff line
@@ -439,7 +439,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‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Keep in mind:‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Looking at the phone can unlock it when you don’t intend to.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Your phone can be unlocked by someone else if it’s held up to your face, even if your eyes are closed.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Your 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‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Keep in mind:‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Looking at the phone can unlock it when you don’t intend to.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Your phone can be unlocked by someone else if it’s held up to your face while your eyes are open.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Your 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>
@@ -4388,9 +4388,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>

res/values-fr/arrays.xml

+1 −1
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ 
    <item msgid="3863157480502955888">"Oui"</item>

  </string-array>

  <string-array name="dark_ui_mode_entries">

    <item msgid="4047603501491142527">"Sombre"</item>

    <item msgid="4047603501491142527">"Foncé"</item>

    <item msgid="2291969684082074001">"Clair"</item>

  </string-array>

  <string-array name="autofill_logging_level_entries">

res/values-hi/arrays.xml

+6 −6
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ 
    <item msgid="4600463921908905030">"मैसेज (एसएमएस) पाएं"</item>

    <item msgid="5958926493289432745">"आपातकालीन मैसेज (एसएमएस) पाएं"</item>

    <item msgid="4945269495221089540">"मल्टीमीडिया मैसेज (एमएमएस) पाएं"</item>

    <item msgid="5570472453573929087">"WAP पुश पाएं"</item>

    <item msgid="5570472453573929087">"WAP पुश प्राप्त करें"</item>

    <item msgid="7125408150230860501">"मैसेज (एसएमएस) भेजें"</item>

    <item msgid="7080337936612188061">"ICC मैसेज (एसएमएस) पढ़ें"</item>

    <item msgid="587124103118495063">"ICC मैसेज (एसएमएस) लिखें"</item>
@@ -263,7 +263,7 @@ 
    <item msgid="2029227495214047094">"सचेत रखें"</item>

    <item msgid="26109888160231211">"जगह की निगरानी करें"</item>

    <item msgid="5753382310468855812">"उच्च पावर वाली जगह की निगरानी करें"</item>

    <item msgid="3356591542543137332">"उपयोग के आंकड़े पाएं"</item>

    <item msgid="3356591542543137332">"उपयोग के आंकड़े प्राप्त करें"</item>

    <item msgid="3073734345226842233">"माइक्रोफ़ोन म्यूट/अनम्यूट करें"</item>

    <item msgid="2111767435887685265">"टोस्ट दिखाएं"</item>

    <item msgid="1091168669714823370">"प्रोजेक्ट मीडिया"</item>
@@ -282,7 +282,7 @@ 
    <item msgid="3591971310048485247">"मेमोरी पढ़ें"</item>

    <item msgid="4041187808621866119">"मेमोरी लिखें"</item>

    <item msgid="6628873315024166197">"स्क्रीन चालू करें"</item>

    <item msgid="3253368931113490863">"खाते पाएं"</item>

    <item msgid="3253368931113490863">"खाते प्राप्त करें"</item>

    <item msgid="780392378084812901">"पृष्ठभूमि में चलाएं"</item>

    <item msgid="2629748510881309577">"सुलभता सुविधाओं के लिए आवाज़"</item>

  </string-array>
@@ -330,7 +330,7 @@ 
    <item msgid="4665183401128289653">"सचेत रखें"</item>

    <item msgid="8584357129746649222">"जगह"</item>

    <item msgid="7669257279311110599">"जगह"</item>

    <item msgid="3459320345690097795">"उपयोग के आंकड़े पाएं"</item>

    <item msgid="3459320345690097795">"उपयोग के आंकड़े प्राप्त करें"</item>

    <item msgid="1312534577834048535">"माइक्रोफ़ोन म्यूट/अनम्यूट करें"</item>

    <item msgid="427580389823724225">"टोस्ट दिखाएं"</item>

    <item msgid="4992007785575926253">"प्रोजेक्ट मीडिया"</item>
@@ -349,7 +349,7 @@ 
    <item msgid="1246296877820358565">"मेमोरी पढ़ें"</item>

    <item msgid="2404067308793740341">"मेमोरी लिखें"</item>

    <item msgid="5832543806893763620">"स्क्रीन चालू करें"</item>

    <item msgid="5258373962467495905">"खाते पाएं"</item>

    <item msgid="5258373962467495905">"खाते प्राप्त करें"</item>

    <item msgid="334625385979270703">"पृष्ठभूमि में चलाएं"</item>

    <item msgid="9039213578110332702">"सुलभता सुविधाओं के लिए आवाज़"</item>

  </string-array>
@@ -359,7 +359,7 @@ 
    <item msgid="2372711992605524591">"ज़्यादा"</item>

  </string-array>

  <string-array name="captioning_typeface_selector_titles">

    <item msgid="1319652728542138112">"डिफ़ॉल्ट"</item>

    <item msgid="1319652728542138112">"सामान्य"</item>

    <item msgid="1016452621833735880">"Sans-serif"</item>

    <item msgid="2496277987934654454">"Sans-serif condensed"</item>

    <item msgid="7247838127505318669">"Sans-serif monospace"</item>

res/values-hy/arrays.xml

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ 
    <item msgid="8937994881315223448">"Միացված է <xliff:g id="NETWORK_NAME">%1$s</xliff:g>-ին"</item>

    <item msgid="1330262655415760617">"Անջատված"</item>

    <item msgid="7698638434317271902">"Անջատվում է <xliff:g id="NETWORK_NAME">%1$s</xliff:g>-ից…"</item>

    <item msgid="197508606402264311">"Անջատված է"</item>

    <item msgid="197508606402264311">"Անջատած է"</item>

    <item msgid="8578370891960825148">"Անհաջող"</item>

    <item msgid="5660739516542454527">"Արգելափակված"</item>

    <item msgid="1805837518286731242">"Վատ ցանցից ժամանակավոր խուսափում"</item>