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

Commit 9c81c6f1 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11162593 from 9b28d7f3 to 24Q1-release 

Change-Id: I6b80097c91d200b0c4485f6b7eb83b0a14ee85a8
parents cc2cd32e 9b28d7f3

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ android_library { 
        "android.hardware.dumpstate-V1-java",

        "android.hardware.dumpstate-V1.0-java",

        "android.hardware.dumpstate-V1.1-java",

        "android.nfc.flags-aconfig-java",

        "android.view.accessibility.flags-aconfig-java",

        "com_android_server_accessibility_flags_lib",

        "net-utils-framework-common",

res-product/values-it/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ 
    <string name="auto_rotate_summary_a11y" product="tablet" msgid="4708833814245913981">"Quando ruoti il tablet in orizzontale e verticale"</string>

    <string name="daltonizer_feature_summary" product="default" msgid="3940653889277283702">"Regola la modalità di visualizzazione dei colori sullo smartphone"</string>

    <string name="daltonizer_feature_summary" product="tablet" msgid="4006596881671077623">"Regola la modalità di visualizzazione dei colori sul tablet"</string>

    <string name="spatial_audio_speaker" product="default" msgid="7148176677982615792">"Speaker smartphone"</string>

    <string name="spatial_audio_speaker" product="tablet" msgid="5452617980485166854">"Speaker tablet"</string>

    <string name="spatial_audio_speaker" product="default" msgid="7148176677982615792">"Altoparlanti smartphone"</string>

    <string name="spatial_audio_speaker" product="tablet" msgid="5452617980485166854">"Altoparlanti tablet"</string>

    <string name="spatial_audio_speaker" product="device" msgid="6204289590128303795">"Speaker dispositivo"</string>

</resources>

res/layout/content_protection_preference_fragment.xml

+2 −1
Original line number Diff line number Diff line
@@ -40,8 +40,9 @@ 
    <com.android.settingslib.RestrictedSwitchPreference

        android:key="content_protection_preference_user_consent_work_profile_switch"

        android:title="@string/content_protection_preference_user_consent_work_profile_switch_title"

        settings:controller="com.android.settings.security.ContentProtectionWorkSwitchController"

        settings:restrictedSwitchSummary="@string/summary_placeholder"

        settings:controller="com.android.settings.security.ContentProtectionWorkSwitchController"/>

        settings:useAdditionalSummary="true"/>



    <com.android.settingslib.widget.FooterPreference

        android:key="content_protection_preference_subpage_footer"

res/values-af/strings.xml

+8 −19
Original line number Diff line number Diff line
@@ -580,8 +580,7 @@ 
    <string name="privatespace_setting_up_text" msgid="8532777749891406509">"Stel tans Privaat Ruimte op …"</string>

    <string name="privatespace_apps_hidden_title" msgid="6146605677591599107">"Gebruiksinligting vir Privaat Ruimte-apps is versteek wanneer dit gesluit is"</string>

    <string name="privatespace_access_from_apps_title" msgid="6787000636686810564">"Verkry toegang tot Privaat Ruimte vanaf jou applysinskrywing"</string>

    <!-- no translation found for privatespace_system_apps_installed_title (4782295812052574626) -->

    <skip />

    <string name="privatespace_system_apps_installed_title" msgid="4782295812052574626">"Sekere stelselapps in reeds in Privaat Ruimte geïnstalleer"</string>

    <string name="privatespace_error_screen_title" msgid="8658511165913662275">"Kon nie Privaat Ruimte opstel nie"</string>

    <string name="privatespace_error_screen_summary" msgid="5679626031159521676">"Probeer nou weer, of kom later terug"</string>

    <string name="privatespace_tryagain_label" msgid="4091466165724929876">"Probeer weer"</string>
@@ -590,8 +589,7 @@ 
    <string name="privatespace_use_screenlock_label" msgid="2775404941450049991">"Gebruik skermslot"</string>

    <string name="privatespace_set_lock_label" msgid="6277529807188602545">"Kies nuwe slot"</string>

    <string name="privatespace_success_title" msgid="4854425684898602993">"Gereed!"</string>

    <!-- no translation found for privatespace_access_text (1253541577173303723) -->

    <skip />

    <string name="privatespace_access_text" msgid="1253541577173303723">"Jy kan van jou applys af toegang tot Privaat Ruimte kry"</string>

    <string name="privatespace_done_label" msgid="5534818213879562387">"Klaar"</string>

    <string name="scrolldown_to_access" msgid="5160743933093369151">"Rollees af om toegang to Privaat Ruimte te kry"</string>

    <string name="privatespace_retry_signin_title" msgid="495054309243289223">"Meld aan om Privaat Ruimte op te stel"</string>
@@ -953,9 +951,7 @@ 
    <string name="lost_internet_access_cancel" msgid="1981171269794585284">"Bly op Wi‑Fi"</string>

    <string name="lost_internet_access_persist" msgid="6813604557672782197">"Moet nooit weer wys nie"</string>

    <string name="wifi_connect" msgid="2481467560349907397">"Koppel"</string>

    <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi is aangeskakel"</string>

    <string name="wifi_connected_to_message" msgid="8976048616505112896">"Gekoppel aan <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>

    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Koppel tans aan <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>

    <string name="wifi_connecting" msgid="7450277833386859724">"Koppel tans …"</string>

    <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Netwerkverbinding het misluk"</string>

    <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Netwerk nie binne sendbereik nie"</string>
@@ -1131,6 +1127,8 @@ 
    <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Skermaandag gebruik die voorste kamera om te sien of iemand na die skerm kyk. Dit werk op die toestel, en prente word nooit geberg of na Google toe gestuur nie."</string>

    <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Skakel skermaandag aan"</string>

    <string name="adaptive_sleep_contextual_slice_summary" msgid="2993867044745446094">"Hou skerm aan terwyl jy daarna kyk"</string>

    <!-- no translation found for power_consumption_footer_summary (4901490700555257237) -->

    <skip />

    <string name="auto_rotate_camera_lock_title" msgid="5369003176695105872">"Kamera is gesluit"</string>

    <string name="auto_rotate_camera_lock_summary" msgid="5699491516271544672">"Kamera moet ontsluit wees vir gesigbespeuring"</string>

    <string name="adaptive_sleep_camera_lock_summary" msgid="8417541183603618098">"Kamera moet ontsluit word vir skermaandag"</string>
@@ -1471,7 +1469,6 @@ 
    <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Gebruik warmkol en verbinding om deur jou Wi-Fi- of mobiele dataverbinding internet aan ander toestelle te verskaf. Programme kan ook \'n warmkol skep om inhoud met toestelle in die omtrek te deel."</string>

    <string name="tethering_help_button_text" msgid="2823655011510912001">"Hulp"</string>

    <string name="network_settings_title" msgid="4663717899931613176">"Mobiele netwerk"</string>

    <string name="manage_mobile_plan_title" msgid="5616930513733409064">"Mobiele plan"</string>

    <string name="sms_application_title" msgid="4791107002724108809">"SMS-program"</string>

    <string name="sms_change_default_dialog_title" msgid="2343439998715457307">"Verander SMS-program?"</string>

    <string name="sms_change_default_dialog_text" msgid="8777606240342982531">"Gebruik <xliff:g id="NEW_APP">%1$s</xliff:g> in plaas van <xliff:g id="CURRENT_APP">%2$s</xliff:g> as jou SMS-program?"</string>
@@ -1479,10 +1476,6 @@ 
    <string name="network_scorer_change_active_dialog_title" msgid="7005220310238618141">"Verander Wi-Fi-assistent?"</string>

    <string name="network_scorer_change_active_dialog_text" msgid="7006057749370850706">"Gebruik <xliff:g id="NEW_APP">%1$s</xliff:g> in plaas van <xliff:g id="CURRENT_APP">%2$s</xliff:g> om jou netwerkverbindings te bestuur?"</string>

    <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Gebruik <xliff:g id="NEW_APP">%s</xliff:g> om jou netwerkverbindings te bestuur?"</string>

    <string name="mobile_unknown_sim_operator" msgid="6650422533065760963">"Onbekende SIM-operateur"</string>

    <string name="mobile_no_provisioning_url" msgid="609462719893503773">"<xliff:g id="OPERATOR">%1$s</xliff:g> het geen bekende voorsieningwebwerf nie"</string>

    <string name="mobile_insert_sim_card" msgid="3639245241283948038">"Steek asseblief SIM-kaart in en herbegin"</string>

    <string name="mobile_connect_to_internet" msgid="8162654404357069060">"Koppel asseblief aan die internet"</string>

    <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Onlangse liggingversoeke"</string>

    <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Ligging vir werkprofiel"</string>

    <string name="location_app_level_permissions" msgid="907206607664629759">"Programliggingtoestemmings"</string>
@@ -2247,12 +2240,9 @@ 
    <string name="accessibility_service_action_perform_description" msgid="7807832069800034738">"Dit kan jou interaksies met \'n app of \'n hardewaresensor naspoor en namens jou met apps interaksie hê."</string>

    <string name="accessibility_dialog_button_allow" msgid="8274918676473216697">"Laat toe"</string>

    <string name="accessibility_dialog_button_deny" msgid="2037249860078259284">"Weier"</string>

    <!-- no translation found for accessibility_dialog_button_stop (7584815613743292151) -->

    <skip />

    <!-- no translation found for accessibility_dialog_button_cancel (8625997437316659966) -->

    <skip />

    <!-- no translation found for disable_service_title (8178020230162342801) -->

    <skip />

    <string name="accessibility_dialog_button_stop" msgid="7584815613743292151">"Skakel af"</string>

    <string name="accessibility_dialog_button_cancel" msgid="8625997437316659966">"Hou aan"</string>

    <string name="disable_service_title" msgid="8178020230162342801">"Skakel <xliff:g id="SERVICE">%1$s</xliff:g> af?"</string>

    <string name="accessibility_no_services_installed" msgid="3725569493860028593">"Geen dienste geïnstalleer nie"</string>

    <string name="accessibility_no_service_selected" msgid="1310596127128379897">"Geen diens is gekies nie"</string>

    <string name="accessibility_service_default_description" msgid="7801435825448138526">"Geen beskrywing verskaf nie."</string>
@@ -2779,8 +2769,7 @@ 
    <string name="vpn_require_connection" msgid="1027347404470060998">"Blokkeer verbindings sonder VPN"</string>

    <string name="vpn_require_connection_title" msgid="4186758487822779039">"Vereis VPN-verbinding?"</string>

    <string name="vpn_insecure_dialog_subtitle" msgid="1857621742868835300">"Nie veilig nie. Dateer op na \'n IKEv2 VPN"</string>

    <!-- no translation found for vpn_start_unsupported (7139925503292269904) -->

    <skip />

    <string name="vpn_start_unsupported" msgid="7139925503292269904">"Kon nie ongesteunde VPN begin nie."</string>

    <string name="vpn_lockdown_summary" msgid="4700625960550559029">"Kies \'n VPN-profiel om altyd aan gekoppel te bly. Netwerkverkeer sal net toegelaat word wanneer verbind aan hierdie VPN."</string>

    <string name="vpn_lockdown_none" msgid="455915403560910517">"Geen"</string>

    <string name="vpn_lockdown_config_error" msgid="1992071316416371316">"Altydaan-VPN vereis \'n IP-adres vir beide die bediener en DNS."</string>

res/values-am/strings.xml

+7 −19
Original line number Diff line number Diff line
@@ -580,8 +580,7 @@ 
    <string name="privatespace_setting_up_text" msgid="8532777749891406509">"የግል ቦታን በማዋቀር ላይ…"</string>

    <string name="privatespace_apps_hidden_title" msgid="6146605677591599107">"ሲቆለፍ የአጠቃቀም መረጃ ለግል ቦታ መተግበሪያዎች የተደበቀ ነው"</string>

    <string name="privatespace_access_from_apps_title" msgid="6787000636686810564">"ከእርስዎ የመተግበሪያዎች ዝርዝር የግል ቦታን ይድረሱ"</string>

    <!-- no translation found for privatespace_system_apps_installed_title (4782295812052574626) -->

    <skip />

    <string name="privatespace_system_apps_installed_title" msgid="4782295812052574626">"አንዳንድ የስርዓት መተግበሪያዎች አስቀድመው በግል ቦታ ላይ ተጭነዋል"</string>

    <string name="privatespace_error_screen_title" msgid="8658511165913662275">"የግል ቦታን ማዋቀር አልተቻለም"</string>

    <string name="privatespace_error_screen_summary" msgid="5679626031159521676">"አሁን እንደገና ይሞክሩ ወይም በኋላ ተመልሰው ይምጡ"</string>

    <string name="privatespace_tryagain_label" msgid="4091466165724929876">"እንደገና ይሞክሩ"</string>
@@ -590,8 +589,7 @@ 
    <string name="privatespace_use_screenlock_label" msgid="2775404941450049991">"ማያ ገፅ መቆለፊያን ይጠቀሙ"</string>

    <string name="privatespace_set_lock_label" msgid="6277529807188602545">"አዲስ ቁልፍ ይምረጡ"</string>

    <string name="privatespace_success_title" msgid="4854425684898602993">"ሁሉም ዝግጁ!"</string>

    <!-- no translation found for privatespace_access_text (1253541577173303723) -->

    <skip />

    <string name="privatespace_access_text" msgid="1253541577173303723">"የግል ቦታን ከመተግበሪያ ዝርዝርዎ መድረስ ይችላሉ"</string>

    <string name="privatespace_done_label" msgid="5534818213879562387">"ተከናውኗል"</string>

    <string name="scrolldown_to_access" msgid="5160743933093369151">"የግል ቦታን ለመድረስ ወደ ታች ያሸብልሉ"</string>

    <string name="privatespace_retry_signin_title" msgid="495054309243289223">"የግል ቦታን ለማዘጋጀት ይግቡ"</string>
@@ -953,9 +951,7 @@ 
    <string name="lost_internet_access_cancel" msgid="1981171269794585284">"በWi-Fi ላይ ይቆዩ"</string>

    <string name="lost_internet_access_persist" msgid="6813604557672782197">"በፍፁም ዳግመኛ አታሳይ"</string>

    <string name="wifi_connect" msgid="2481467560349907397">"አያይዝ"</string>

    <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi በርቷል"</string>

    <string name="wifi_connected_to_message" msgid="8976048616505112896">"ከ<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ጋር ተገናኝቷል"</string>

    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"ወደ <xliff:g id="NETWORK_NAME">%1$s</xliff:g> በመገናኘት ላይ"</string>

    <string name="wifi_connecting" msgid="7450277833386859724">"በመገናኘት ላይ…"</string>

    <string name="wifi_failed_connect_message" msgid="8538000546604347894">"ከአውታረ መረቡ ጋር መገናኘት አልተሳካም"</string>

    <string name="wifi_not_in_range_message" msgid="3885327464037574739">"አውታረ መረብ በክክል ውስጥ አይደለም"</string>
@@ -1131,6 +1127,7 @@ 
    <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"የማያ ገፅ ትኩረት በማያ ገጹ ላይ የሆነ ሰው እያየ መሆኑን ለመመልከት የፊት ካሜራውን ይጠቀማል። በመሣሪያ ላይ ይሠራል፣ እና ምስሎች በጭራሽ ወደ Google አይላኩም ወይም በዚያ አይከማቹም።"</string>

    <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"የማያ ገፅ ትኩረትን ያብሩ"</string>

    <string name="adaptive_sleep_contextual_slice_summary" msgid="2993867044745446094">"ማያ ገጹን ሲመለከቱት እንደበራ ይቆይ"</string>

    <string name="power_consumption_footer_summary" msgid="4901490700555257237">"ረዘም ያለ ማያ ጊዜው ማለቂያው ተጨማሪ ባትሪ ይጠቀማል።"</string>

    <string name="auto_rotate_camera_lock_title" msgid="5369003176695105872">"ካሜራ ተቆልፏል"</string>

    <string name="auto_rotate_camera_lock_summary" msgid="5699491516271544672">"ለመልክ ማወቂያ ካሜራ መከፈት አለበት"</string>

    <string name="adaptive_sleep_camera_lock_summary" msgid="8417541183603618098">"ለየማያ ገፅ ትኩረት ካሜራ መከፈት አለበት"</string>
@@ -1471,7 +1468,6 @@ 
    <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"በእርስዎ Wi-Fi ወይም የተንቀሳቃሽ ስልክ ውሂብ ግንኙነት በኩል በይነመረቡ ለሌሎች መሣሪያዎች ለማቅረብ የመገናኛ ነጥብን እና እንደ ሞደም መሰካትን ይጠቀሙ። መተግበሪያዎች እንዲሁም ይዘቶችን በአቅራቢያ ላሉ መሣሪያዎች ለማጋራት መገናኛ ነጥብን መፍጠር ይችላሉ።"</string>

    <string name="tethering_help_button_text" msgid="2823655011510912001">"እገዛ"</string>

    <string name="network_settings_title" msgid="4663717899931613176">"የተንቀሳቃሽ ስልክ አውታረ መረብ"</string>

    <string name="manage_mobile_plan_title" msgid="5616930513733409064">"የሞባይል ዕቅድ"</string>

    <string name="sms_application_title" msgid="4791107002724108809">"የኤስኤምኤስ መተግበሪያ"</string>

    <string name="sms_change_default_dialog_title" msgid="2343439998715457307">"የኤስ ኤም ኤስ መተግበሪያ ይለወጥ?"</string>

    <string name="sms_change_default_dialog_text" msgid="8777606240342982531">"ከ<xliff:g id="CURRENT_APP">%2$s</xliff:g> ይልቅ <xliff:g id="NEW_APP">%1$s</xliff:g> እንደ እርስዎ ኤስኤምኤስ መተግበሪያ ይጠቀሙበት?"</string>
@@ -1479,10 +1475,6 @@ 
    <string name="network_scorer_change_active_dialog_title" msgid="7005220310238618141">"የWi‑Fi ረዳት ይቀየር?"</string>

    <string name="network_scorer_change_active_dialog_text" msgid="7006057749370850706">"የአውታረ መረብ ግንኙነቶችዎን ለማቀናበር ከ<xliff:g id="CURRENT_APP">%2$s</xliff:g> ይልቅ <xliff:g id="NEW_APP">%1$s</xliff:g>ን ይጠቀሙ?"</string>

    <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"የአውታረ መረብ ግንኙነቶችዎን ለማቀናበር <xliff:g id="NEW_APP">%s</xliff:g>ን ይጠቀሙ?"</string>

    <string name="mobile_unknown_sim_operator" msgid="6650422533065760963">"ያልታወቀ የሲም አንቀሳቃሽ"</string>

    <string name="mobile_no_provisioning_url" msgid="609462719893503773">"<xliff:g id="OPERATOR">%1$s</xliff:g> ምንም የሚታወቅ የማቅረቢያ ድር ጣቢያ የለውም"</string>

    <string name="mobile_insert_sim_card" msgid="3639245241283948038">"እባክዎ SIM ካርድ ያስገቡና ዳግም ያስጀምሩ"</string>

    <string name="mobile_connect_to_internet" msgid="8162654404357069060">"እባክዎ ከበይነ መረብ ጋር ያገናኙ"</string>

    <string name="location_category_recent_location_requests" msgid="2205900488782832082">"የቅርብ ጊዜ የአካባቢ ጥያቄዎች"</string>

    <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"የስራ መገለጫ አካባቢ"</string>

    <string name="location_app_level_permissions" msgid="907206607664629759">"የመተግበሪያ አካባቢ ፈቃዶች"</string>
@@ -2247,12 +2239,9 @@ 
    <string name="accessibility_service_action_perform_description" msgid="7807832069800034738">"ከመተግበሪያ ጋር ወይም የሃርድዌር ዳሳሽ ጋር እርስዎ ያልዎትን መስተጋብሮች ዱካ መከታተል እና በእርስዎ ምትክ ከመተግበሪያዎች ጋር መስተጋብር መፈጸም ይችላል።"</string>

    <string name="accessibility_dialog_button_allow" msgid="8274918676473216697">"ፍቀድ"</string>

    <string name="accessibility_dialog_button_deny" msgid="2037249860078259284">"ከልክል"</string>

    <!-- no translation found for accessibility_dialog_button_stop (7584815613743292151) -->

    <skip />

    <!-- no translation found for accessibility_dialog_button_cancel (8625997437316659966) -->

    <skip />

    <!-- no translation found for disable_service_title (8178020230162342801) -->

    <skip />

    <string name="accessibility_dialog_button_stop" msgid="7584815613743292151">"አጥፋ"</string>

    <string name="accessibility_dialog_button_cancel" msgid="8625997437316659966">"አቆይ"</string>

    <string name="disable_service_title" msgid="8178020230162342801">"<xliff:g id="SERVICE">%1$s</xliff:g> ይጥፋ?"</string>

    <string name="accessibility_no_services_installed" msgid="3725569493860028593">"ምንም አገልግሎቶች አልተጫኑም"</string>

    <string name="accessibility_no_service_selected" msgid="1310596127128379897">"ምንም አገልግሎት አልተመረጠም"</string>

    <string name="accessibility_service_default_description" msgid="7801435825448138526">"ምንም መግለጫ አልቀረበም።"</string>
@@ -2779,8 +2768,7 @@ 
    <string name="vpn_require_connection" msgid="1027347404470060998">"ቪፒኤን የሌላቸው ግንኙነቶችን አግድ"</string>

    <string name="vpn_require_connection_title" msgid="4186758487822779039">"የVPN ግንኙነት ይጠይቅ?"</string>

    <string name="vpn_insecure_dialog_subtitle" msgid="1857621742868835300">"ደህንነቱ አልተጠበቀም። ወደ IKEv2 VPN ያዘምኑ"</string>

    <!-- no translation found for vpn_start_unsupported (7139925503292269904) -->

    <skip />

    <string name="vpn_start_unsupported" msgid="7139925503292269904">"ያልተደገፈ VPNን ማስጀመር አልተሳካም።"</string>

    <string name="vpn_lockdown_summary" msgid="4700625960550559029">"ሁልጊዜ እንደተገናኙ የሚቆዩበት የVPN መገለጫ ይምረጡ። ከዚህ VPN ጋር ሲገናኝ ብቻ ነው የአውታረ መረብ ትራፊክ የሚፈቀደው።"</string>

    <string name="vpn_lockdown_none" msgid="455915403560910517">"ምንም"</string>

    <string name="vpn_lockdown_config_error" msgid="1992071316416371316">"ሁልጊዜ የበራ VPN ለአገልጋይም ለDNSም የአይ.ፒ. አድራሻ ያስፈልገዋል።"</string>