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

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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/25827196',...

Merge cherrypicks of ['googleplex-android-review.googlesource.com/25827196', 'googleplex-android-review.googlesource.com/25829031', 'googleplex-android-review.googlesource.com/25829032', 'googleplex-android-review.googlesource.com/25831333'] into 24Q1-release.

Change-Id: Ie403608528856f1d049a1c166d602e3055788f7c
parents 4254387c a0ff01dc
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@
    <string name="reduce_bright_colors_preference_summary" product="default" msgid="2025941326724094318">"Zatamnite ekran više od minimalne osvijetljenosti telefona"</string>
    <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="3106979202311807559">"Zatamnite ekran više od minimalne osvijetljenosti tableta"</string>
    <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="9162440023310121356">"Dodatno zatamnjenje može biti korisno u slučajevima: &lt;ol&gt; &lt;li&gt; kada je zadana minimalna osvijetljenost telefona i dalje presvijetla&lt;/li&gt; &lt;li&gt; kada koristite telefon u tamnom okruženju, naprimjer noću ili u tamnoj sobi prije spavanja&lt;/li&gt; &lt;/ol&gt;"</string>
    <string name="reduce_bright_colors_preference_subtitle" product="tablet" msgid="5747242697890472822">"Dodatno zatamnjivanje može biti korisno u slučajevima: &lt;ol&gt; &lt;li&gt; kada je zadana minimalna osvijetljenost tableta i dalje presvijetla&lt;/li&gt; &lt;li&gt; kada koristite tablet u tamnim okruženjima, naprimjer noću ili u tamnoj sobi prije spavanja&lt;/li&gt; &lt;/ol&gt;"</string>
    <string name="reduce_bright_colors_preference_subtitle" product="tablet" msgid="5747242697890472822">"Dodatno zatamnjenje može biti korisno u slučajevima: &lt;ol&gt; &lt;li&gt; kada je zadana minimalna osvijetljenost tableta i dalje presvijetla&lt;/li&gt; &lt;li&gt; kada koristite tablet u tamnim okruženjima, naprimjer noću ili u tamnoj sobi prije spavanja&lt;/li&gt; &lt;/ol&gt;"</string>
    <string name="battery_tip_summary_summary" product="default" msgid="1880496476760792933">"Telefon ima uobičajenu potrošnju baterije u pozadini"</string>
    <string name="battery_tip_summary_summary" product="tablet" msgid="865695079664997057">"Tablet ima uobičajenu potrošnju baterije u pozadini"</string>
    <string name="battery_tip_summary_summary" product="device" msgid="45436555475195632">"Uređaj ima uobičajenu potrošnju baterije u pozadini"</string>
+1 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@
    <string name="reduce_bright_colors_preference_summary" product="default" msgid="2025941326724094318">"Diminuer encore la luminosité minimale du téléphone"</string>
    <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="3106979202311807559">"Diminuer encore la luminosité minimale de la tablette"</string>
    <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="9162440023310121356">"Encore moins lumineux peut être utile dans les cas suivants : &lt;ol&gt; &lt;li&gt; La luminosité minimale par défaut de votre téléphone est encore trop forte&lt;/li&gt; &lt;li&gt; Vous utilisez votre téléphone dans le noir (par exemple, la nuit ou dans une pièce sans éclairage avant de vous endormir)&lt;/li&gt; &lt;/ol&gt;"</string>
    <string name="reduce_bright_colors_preference_subtitle" product="tablet" msgid="5747242697890472822">"La fonctionnalité Encore moins lumineux peut être utile dans les cas suivants : &lt;ol&gt; &lt;li&gt; La luminosité minimale par défaut de votre tablette est encore trop forte&lt;/li&gt; &lt;li&gt; Vous utilisez votre tablette dans le noir (par exemple, la nuit ou dans une pièce sans éclairage avant de vous endormir)&lt;/li&gt; &lt;/ol&gt;"</string>
    <string name="reduce_bright_colors_preference_subtitle" product="tablet" msgid="5747242697890472822">"La fonctionnalité Luminosité ultra-réduite peut être utile dans les cas suivants : &lt;ol&gt; &lt;li&gt; La luminosité minimale par défaut de votre tablette est encore trop forte&lt;/li&gt; &lt;li&gt; Vous utilisez votre tablette dans le noir (par exemple, la nuit ou dans une pièce sans éclairage avant de vous endormir)&lt;/li&gt; &lt;/ol&gt;"</string>
    <string name="battery_tip_summary_summary" product="default" msgid="1880496476760792933">"L\'utilisation en arrière-plan de la batterie par le téléphone est normale"</string>
    <string name="battery_tip_summary_summary" product="tablet" msgid="865695079664997057">"L\'utilisation en arrière-plan de la batterie par la tablette est normale"</string>
    <string name="battery_tip_summary_summary" product="device" msgid="45436555475195632">"L\'utilisation en arrière-plan de la batterie par l\'appareil est normale"</string>
+3 −3
Original line number Diff line number Diff line
@@ -265,8 +265,8 @@
    <string name="bluetooth_tethering_subtext" product="default" msgid="3638886236597805392">"通过蓝牙共享手机的互联网连接"</string>
    <string name="ethernet_tethering_subtext" product="default" msgid="8652438909365718644">"通过以太网共享手机的互联网连接"</string>
    <string name="ethernet_tethering_subtext" product="tablet" msgid="2227710549796706455">"通过以太网共享平板电脑的互联网连接"</string>
    <string name="about_settings" product="tablet" msgid="1471390492111370330">"关于平板电脑"</string>
    <string name="about_settings" product="default" msgid="2621311564780208250">"关于机"</string>
    <string name="about_settings" product="tablet" msgid="1471390492111370330">"关于本机"</string>
    <string name="about_settings" product="default" msgid="2621311564780208250">"关于机"</string>
    <string name="about_settings" product="device" msgid="7595574154492383452">"关于设备"</string>
    <string name="about_settings" product="emulator" msgid="1099246296173401003">"关于模拟设备"</string>
    <string name="install_all_warning" product="tablet" msgid="1732116924846572063">"您的平板电脑和个人数据更容易受到未知应用的攻击。安装来自该来源的应用即表示,您同意对因使用这些应用可能导致的平板电脑损坏或数据丢失承担责任。"</string>
@@ -315,7 +315,7 @@
    <string name="user_cannot_manage_message" product="default" msgid="8596259161937605316">"只有手机的机主可以管理用户。"</string>
    <string name="user_confirm_remove_self_message" product="tablet" msgid="6880861846664267876">"您将丢失自己在这台平板电脑上的空间和数据,此操作无法撤消。"</string>
    <string name="user_confirm_remove_self_message" product="default" msgid="3209762447055039706">"您将丢失自己在这部手机上的空间和数据,此操作无法撤消。"</string>
    <string name="support_summary" product="default" msgid="2044721479256103419">"帮助文章、电话与聊天支持"</string>
    <string name="support_summary" product="default" msgid="2044721479256103419">"帮助中心文章、电话与聊天支持"</string>
    <string name="support_summary" product="tablet" msgid="2588832599234347108">"帮助文章、平板电脑与聊天支持"</string>
    <string name="support_summary" product="device" msgid="6821511162132497205">"帮助文章、设备与聊天支持"</string>
    <string name="ambient_display_title" product="default" msgid="8027137727044125809">"点按两次即显示"</string>
+6 −43
Original line number Diff line number Diff line
@@ -79,8 +79,8 @@
    <string name="bluetooth_screen_related" msgid="7976543255501825536">"Soortgelyk"</string>
    <string name="bluetooth_ringtone_title" msgid="3177308461256892085">"Luitoon en wekkers"</string>
    <string name="bluetooth_call_title" msgid="6851464952021874072">"Oudio tydens oproepe"</string>
    <string name="bluetooth_media_title" msgid="2878373577382067290">"Media- en stelselklanke"</string>
    <string name="bluetooth_notification_title" msgid="8708962394926222039">"Kennisgewings"</string>
    <string name="bluetooth_media_title" msgid="343705257183053699">"Media"</string>
    <string name="bluetooth_system_sounds_title" msgid="6746938637128763205">"Kennsgewings en stelselklanke"</string>
    <string name="bluetooth_audio_routing_footer_summary" msgid="410260713589309293">"Oudio-uitvoer word by verstek deur individuele apps bepaal"</string>
    <string name="bluetooth_device" msgid="2217973503732544291">"Onbenoemde Bluetooth-toestel"</string>
    <string name="progress_scanning" msgid="2564746192843011826">"Soek"</string>
@@ -542,16 +542,13 @@
    <string name="privacy_header" msgid="5526002421324257007">"Privaatheid"</string>
    <string name="work_profile_category_header" msgid="85707750968948517">"Werkprofiel"</string>
    <string name="private_space_title" msgid="7078627930195569767">"Privaat ruimte"</string>
    <string name="private_space_summary" msgid="2274405892301976238">"Behou private apps gesluit en versteek"</string>
    <string name="private_space_summary" msgid="8237652417163408001">"Versteek apps in ’n privaat vouer"</string>
    <string name="private_space_description" msgid="5494963647270826210">"Versteek apps in ’n privaat vouer waartoe net jy toegang kan kry"</string>
    <string name="private_space_lock_title" msgid="3006539720164938296">"Privaat Ruimte-slot"</string>
    <string name="private_space_one_lock_summary" msgid="2759953747682959371">"Jy kan Privaat Ruimte ontsluit nes jy jou toestel ontsluit of jy kan ’n ander slot kies"</string>
    <string name="private_space_screen_lock_title" msgid="8679383894967823163">"Gebruik toestelskermslot"</string>
    <string name="private_space_biometric_title" msgid="3934339826674553174">"Gesig- en Vingerafdrukslot"</string>
    <string name="private_space_biometric_summary" msgid="4403837276018724581">"Tik om op te stel"</string>
    <string name="private_space_fingerprint_unlock_title" msgid="5804023571114910034">"Vingerafdrukslot vir Privaat Ruimte"</string>
    <string name="private_space_face_unlock_title" msgid="6613018437620070183">"Gesigslot vir Privaat Ruimte"</string>
    <string name="private_space_category_ways_to_unlock" msgid="4356631225316950046">"Maniere om te ontsluit"</string>
    <string name="private_space_screen_lock_summary" msgid="394837965365561070">"Dieselfde as toestelskermslot"</string>
    <string name="private_space_new_lock_title" msgid="7306873010565337671">"Wil jy ’n nuwe slot vir Privaat Ruimte kies?"</string>
    <string name="private_space_hide_title" msgid="8687034008994037610">"Versteek as dit gesluit is"</string>
@@ -582,7 +579,7 @@
    <string name="private_space_apps_permission_text" msgid="7030946025253366172">"Apps in jou privaat ruimte sal nie in toestemmingbestuurder, privaatheidkontroleskerm en ander instellings verskyn wanneer jou privaat ruimte gesluit is nie.\n\nJou privaat ruimte kan nie na ’n nuwe toestel geskuif word nie. Jy sal ’n ander privaat ruimte moet opstel as jy dit op ’n ander toestel wil gebruik.\n\nEnigiemand wat jou toestel aan ’n rekenaar koppel of skadelike apps op jou toestel installeer, sal moontlik toegang tot jou privaat ruimte kan kry."</string>
    <string name="private_space_setting_up_text" msgid="8458035555212009528">"Stel tans privaat ruimte op …"</string>
    <string name="private_space_notifications_hidden_title" msgid="4377296080723608107">"Kennisgewings vanaf apps in privaat ruimte word versteek as dit gesluit is"</string>
    <string name="private_space_share_photos_title" msgid="2102594859384040485">"Ontsluit jou privaat ruimte om foto’s of lêers vanuit privaat ruimte-apps te deel"</string>
    <string name="private_space_share_photos_title" msgid="2276051999632122847">"Ontsluit jou ruimte om foto’s of lêers vanaf privaatruimte-apps te deel"</string>
    <string name="private_space_apps_installed_title" msgid="2428207301009983268">"Sommige apps is reeds in jou privaat ruimte geïnstalleer"</string>
    <string name="private_space_error_screen_title" msgid="1210906480024148398">"Kon nie privaat ruimte opstel nie"</string>
    <string name="private_space_tryagain_label" msgid="8305362615231738367">"Probeer weer"</string>
@@ -598,9 +595,6 @@
    <string name="private_space_retry_summary" msgid="1976929616948459609">"Jy moet by ’n rekening aanmeld om ’n privaat ruimte op te stel"</string>
    <string name="private_space_lock_setup_title" msgid="6541564212199510787">"Kies ’n slot vir jou privaat ruimte"</string>
    <string name="private_space_lock_setup_description" msgid="423405593476300918">"Jy kan jou privaat ruimte met jou vingerafdruk ontsluit. Om veiligheidsredes vereis hierdie opsie ’n rugsteunslot."</string>
    <string name="private_space_choose_your_pin_header" msgid="4560802934975898265">"Stel \'n PIN vir jou privaat ruimte"</string>
    <string name="private_space_choose_your_password_header" msgid="7660259341095044434">"Stel \'n wagwoord vir jou privaat ruimte"</string>
    <string name="private_space_choose_your_pattern_header" msgid="2165607102459936724">"Stel \'n patroon vir jou privaat ruimte"</string>
    <string name="privatespace_unhide_header" msgid="1192011539687584004">"Om Privaat Ruimte te wys (nie finale UX nie)"</string>
    <string name="privatespace_open_settings" msgid="5038101805604421393">"Maak die Instellings-program oop"</string>
    <string name="privatespace_tap_settings" msgid="928932826450238276">"Tik op Sekuriteit &amp; privaatheid &gt; Privaat Ruimte &gt; Versteek Privaat Ruimte wanneer gesluit"</string>
@@ -842,12 +836,6 @@
    <string name="wifi_in_airplane_mode" msgid="1235412508135267981">"In vliegtuigmodus"</string>
    <string name="wifi_notify_open_networks" msgid="2610323626246818961">"Stel in kennis oor publieke netwerke"</string>
    <string name="wifi_notify_open_networks_summary" msgid="191058832201741013">"Stel in kennis wanneer \'n publieke netwerk van hoë gehalte beskikbaar is"</string>
    <!-- no translation found for wifi_allow_wep_networks (8772342993235292010) -->
    <skip />
    <!-- no translation found for wifi_allow_wep_networks_summary (3033397893296724615) -->
    <skip />
    <!-- no translation found for wifi_allow_wep_networks_summary_carrier_not_allow (6298103289728210026) -->
    <skip />
    <string name="wifi_wakeup" msgid="3834327315861781611">"Skakel Wi-Fi outomaties aan"</string>
    <string name="wifi_wakeup_summary" msgid="5778059083790221465">"Wi‑Fi sal weer aanskakel naby gestoorde netwerke van hoë gehalte, soos jou tuisnetwerk"</string>
    <string name="wifi_wakeup_summary_no_location" msgid="681323616606485096">"Onbeskikbaar omdat ligging afgeskakel is. Skakel "<annotation id="link">"ligging"</annotation>" aan."</string>
@@ -869,18 +857,6 @@
    <string name="wifi_settings_scanning_required_info" msgid="1473411566072565789">"Wi-fi-opsporing maak dit vir programme en dienste moontlik om enige tyd na Wi-Fi-netwerke te soek, selfs wanneer Wi-Fi af is. Dit kan byvoorbeeld gebruik word om ligginggegronde kenmerke en dienste te verbeter."</string>
    <string name="wifi_settings_scanning_required_turn_on" msgid="1112223196123955447">"Skakel aan"</string>
    <string name="wifi_settings_scanning_required_enabled" msgid="4721729158927146365">"Wi‑Fi-opsporing is aangeskakel"</string>
    <!-- no translation found for wifi_settings_warning_wep_network (2655077013800385646) -->
    <skip />
    <!-- no translation found for wifi_settings_wep_networks_blocked_title (8337700496544833669) -->
    <skip />
    <!-- no translation found for wifi_settings_wep_networks_summary_toggle_off (1113138364046142949) -->
    <skip />
    <!-- no translation found for wifi_settings_wep_networks_summary_blocked_by_carrier (6085673947156094523) -->
    <skip />
    <!-- no translation found for wifi_settings_wep_networks_button_allow (2807926329019873706) -->
    <skip />
    <!-- no translation found for wifi_settings_ssid_block_button_close (3013886895576949908) -->
    <skip />
    <string name="wifi_show_advanced" msgid="2969378109942071741">"Gevorderde opsies"</string>
    <string name="wifi_advanced_toggle_description" msgid="7299179796727934885">"Gevorderde Opsies-aftreklys"</string>
    <string name="wifi_advanced_toggle_description_collapsed" msgid="3615140699129928913">"vou uit"</string>
@@ -1139,12 +1115,7 @@
    <string name="display_white_balance_title" msgid="2624544323029364713">"Wys witbalans"</string>
    <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
    <string name="fold_lock_behavior_title" msgid="786228803694268449">"Hou aan om apps te gebruik wanneer gevou"</string>
    <!-- no translation found for disable_game_default_frame_rate_title (3712908601744143753) -->
    <skip />
    <!-- no translation found for disable_game_default_frame_rate_summary (4436762704707434225) -->
    <skip />
    <!-- no translation found for peak_refresh_rate_title (2056355754210341011) -->
    <skip />
    <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Gladde Vertoning"</string>
    <string name="peak_refresh_rate_summary" msgid="3212309985294885790">"Verhoog die herlaaitempo vir sommige inhoud outomaties na <xliff:g id="ID_1">%1$d</xliff:g> Hz. Verhoog batterygebruik."</string>
    <string name="force_high_refresh_rate_toggle" msgid="3325789621928312050">"Dwing na hoogste herlaaikoers"</string>
    <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Hoogste herlaaikoers vir verbeterde raaksensitiwiteit en animasiegehalte. Verhoog batterygebruik."</string>
@@ -3824,12 +3795,6 @@
    <string name="free_memory" msgid="439783742246854785">"Beskikbaar"</string>
    <string name="memory_usage_apps" msgid="5776108502569850579">"Geheue wat deur programme gebruik word"</string>
    <string name="memory_usage_apps_summary" msgid="7168292864155527974">"{count,plural, =1{1 app het geheue gebruik in die afgelope {time}}other{# apps het geheue gebruik in die afgelope {time}}}"</string>
    <!-- no translation found for force_enable_pss_profiling_title (2253816522775341523) -->
    <skip />
    <!-- no translation found for force_enable_pss_profiling_summary (7714294324548399136) -->
    <skip />
    <!-- no translation found for pss_profiling_disabled (1967278421143514850) -->
    <skip />
    <string name="running_frequency" msgid="7260225121706316639">"Frekwensie"</string>
    <string name="memory_maximum_usage" msgid="2047013391595835607">"Maksimum gebruik"</string>
    <string name="no_data_usage" msgid="4665617440434654132">"Geen data is gebruik nie"</string>
@@ -4667,8 +4632,7 @@
    <string name="media_controls_resume_description" msgid="3163482266454802097">"Mediaspeler bly oop in Kitsinstellings om terugspeel vinnig te hervat"</string>
    <string name="media_controls_lockscreen_title" msgid="2188311721857512510">"Wys media op sluitskerm"</string>
    <string name="media_controls_lockscreen_description" msgid="3320333660404439510">"Mediaspeler bly oop op sluitskerm om terugspeel vinnig te hervat"</string>
    <!-- no translation found for media_controls_recommendations_title (3012692549413927608) -->
    <skip />
    <string name="media_controls_recommendations_title" msgid="3012692549413927608">"Wys media-aanbevelings vir Assistent"</string>
    <string name="media_controls_recommendations_description" msgid="7596498733126824030">"Gegrond op jou aktiwiteit"</string>
    <string name="media_controls_hide_player" msgid="2751439192580884015">"Versteek speler"</string>
    <string name="media_controls_show_player" msgid="8504571042365814021">"Wys speler"</string>
@@ -4978,5 +4942,4 @@
    <string name="content_protection_preference_user_consent_work_profile_switch_title" msgid="3004347470520916069">"Gebruik skandering vir misleidende werkapps"</string>
    <string name="content_protection_preference_subpage_summary" msgid="3595621220981703364"></string>
    <string name="content_protection_preference_subpage_info" msgid="6890886357653365489"></string>
    <string name="accessibility_setup_password_complete" msgid="6358749253318369077">"Wagwoord is nou opgestel"</string>
</resources>
+5 −38

File changed.

Preview size limit exceeded, changes collapsed.

Loading