Skip to content

Commit

Permalink
Merge tag 'android-13.0.0_r74' into thirteen
Browse files Browse the repository at this point in the history
Android 13.0.0 Release 74 (TQ3C.230805.001.B2)

* tag 'android-13.0.0_r74' of https://android.googlesource.com/platform/packages/apps/Settings:
  Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency.
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  String change to highlight calculation stopped at last even hour
  Replace the SlicePreference with Preference
  Replace the SlicePreference with Preference

Change-Id: I269fa3337bdbed136885f3c096e2fd9415b6f8b5
  • Loading branch information
whyredfire committed Aug 8, 2023
2 parents e4a13b3 + 872377a commit 29c6af6
Show file tree
Hide file tree
Showing 93 changed files with 709 additions and 17 deletions.
2 changes: 2 additions & 0 deletions res/values-af/strings.xml
Expand Up @@ -3123,6 +3123,8 @@ Kom meer te wete by g.co/pixel/faceunlock."</string>
<string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Stelselgebruik vir die afgelope 24 u."</string>
<string name="battery_system_usage_for" msgid="3248552137819897140">"Stelselgebruik vir <xliff:g id="SLOT">%s</xliff:g>"</string>
<string name="battery_app_usage_for" msgid="7309909074935858949">"Programgebruik vir <xliff:g id="SLOT">%s</xliff:g>"</string>
<string name="battery_system_usage_since_last_full_charge_to" msgid="4196795733829841971">"Stelselgebruik sedert battery laas volgelaai is tot <xliff:g id="SLOT_TIMESTAMP">%s</xliff:g>"</string>
<string name="battery_app_usage_since_last_full_charge_to" msgid="4339201995118102114">"Appgebruik sedert battery laas volgelaai is tot <xliff:g id="SLOT_TIMESTAMP">%s</xliff:g>"</string>
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Total: minder as \'n min."</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Agtergrond: minder as \'n min."</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Totaal: <xliff:g id="TIME">%s</xliff:g>"</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-am/strings.xml
Expand Up @@ -3123,6 +3123,8 @@ g.co/pixel/faceunlock ላይ የበለጠ ይወቁ።"</string>
<string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"ላለፉት 24 ሰዓቶች የሥርዓት አጠቃቀም"</string>
<string name="battery_system_usage_for" msgid="3248552137819897140">"የ<xliff:g id="SLOT">%s</xliff:g> የሥርዓት አጠቃቀም"</string>
<string name="battery_app_usage_for" msgid="7309909074935858949">"የ<xliff:g id="SLOT">%s</xliff:g> የመተግበሪያ አጠቃቀም"</string>
<string name="battery_system_usage_since_last_full_charge_to" msgid="4196795733829841971">"ሙሉ ኃይል ከተሞላበት የመጨረሻ ጊዜ ጀምሮ እስከ <xliff:g id="SLOT_TIMESTAMP">%s</xliff:g> ያለ የሥርዓት አጠቃቀም"</string>
<string name="battery_app_usage_since_last_full_charge_to" msgid="4339201995118102114">"ሙሉ ኃይል ከተሞላበት የመጨረሻው ጊዜ ጀምሮ እስከ <xliff:g id="SLOT_TIMESTAMP">%s</xliff:g> ድረስ ያለ የመተግበሪያ አጠቃቀም"</string>
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"ጠቅላላ፦ ከአንድ ደቂቃ በታች"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"ዳራ፦ ከአንድ ደቂቃ በታች"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"ጠቅላላ፦ <xliff:g id="TIME">%s</xliff:g>"</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-ar/strings.xml
Expand Up @@ -3275,6 +3275,8 @@
<string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"استخدام النظام خلال آخر 24 ساعة"</string>
<string name="battery_system_usage_for" msgid="3248552137819897140">"استخدام النظام خلال <xliff:g id="SLOT">%s</xliff:g>"</string>
<string name="battery_app_usage_for" msgid="7309909074935858949">"استخدام التطبيق خلال <xliff:g id="SLOT">%s</xliff:g>"</string>
<string name="battery_system_usage_since_last_full_charge_to" msgid="4196795733829841971">"استخدام النظام للبطارية منذ آخر شحن كامل حتى <xliff:g id="SLOT_TIMESTAMP">%s</xliff:g>"</string>
<string name="battery_app_usage_since_last_full_charge_to" msgid="4339201995118102114">"استخدام التطبيق للبطارية منذ آخر شحن كامل حتى <xliff:g id="SLOT_TIMESTAMP">%s</xliff:g>"</string>
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"مدة الاستخدام الإجمالي: أقل من دقيقة"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"مدة استخدام البطارية في الخلفية: أقل من دقيقة"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"مدة الاستخدام الإجمالي: <xliff:g id="TIME">%s</xliff:g>"</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-as/strings.xml
Expand Up @@ -3123,6 +3123,8 @@ g.co/pixel/faceunlockত অধিক জানক।"</string>
<string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"যোৱা ২৪ ঘণ্টাত হোৱা ছিষ্টেমৰ ব্যৱহাৰ"</string>
<string name="battery_system_usage_for" msgid="3248552137819897140">"<xliff:g id="SLOT">%s</xliff:g>ৰ বাবে ছিষ্টেমৰ ব্যৱহাৰ"</string>
<string name="battery_app_usage_for" msgid="7309909074935858949">"<xliff:g id="SLOT">%s</xliff:g>ৰ বাবে এপৰ ব্যৱহাৰ"</string>
<string name="battery_system_usage_since_last_full_charge_to" msgid="4196795733829841971">"<xliff:g id="SLOT_TIMESTAMP">%s</xliff:g>লৈ অন্তিমবাৰ সম্পূৰ্ণৰূপে চাৰ্জ হোৱাৰ পাছত ছিষ্টেমৰ ব্যৱহাৰ"</string>
<string name="battery_app_usage_since_last_full_charge_to" msgid="4339201995118102114">"<xliff:g id="SLOT_TIMESTAMP">%s</xliff:g>লৈকে অন্তিমবাৰ সম্পূৰ্ণৰূপে চাৰ্জ হোৱাৰ পাছত এপৰ ব্যৱহাৰ"</string>
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"মুঠ: এক মিনিটতকৈ কম"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"নেপথ্য: এক মিনিটতকৈ কম"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"মুঠ: <xliff:g id="TIME">%s</xliff:g>"</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-az/strings.xml
Expand Up @@ -3123,6 +3123,8 @@
<string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Son 24 saat üçün sistem istifadəsi"</string>
<string name="battery_system_usage_for" msgid="3248552137819897140">"<xliff:g id="SLOT">%s</xliff:g> üçün sistem istifadəsi"</string>
<string name="battery_app_usage_for" msgid="7309909074935858949">"<xliff:g id="SLOT">%s</xliff:g> üçün tətbiq istifadəsi"</string>
<string name="battery_system_usage_since_last_full_charge_to" msgid="4196795733829841971">"Son tam şarjdan <xliff:g id="SLOT_TIMESTAMP">%s</xliff:g> radələrinə qədər sistem istifadəsi"</string>
<string name="battery_app_usage_since_last_full_charge_to" msgid="4339201995118102114">"Son tam şarjdan <xliff:g id="SLOT_TIMESTAMP">%s</xliff:g> radələrinə qədər tətbiq istifadəsi"</string>
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Cəmi: bir dəqiqədən az"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Arxa fon: bir dəqiqədən az"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Cəmi: <xliff:g id="TIME">%s</xliff:g>"</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-b+sr+Latn/strings.xml
Expand Up @@ -3161,6 +3161,8 @@ Saznajte više na g.co/pixel/faceunlock."</string>
<string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Potrošnja od strane sistema u poslednja 24 sata"</string>
<string name="battery_system_usage_for" msgid="3248552137819897140">"Potrošnja od strane sistema za: <xliff:g id="SLOT">%s</xliff:g>"</string>
<string name="battery_app_usage_for" msgid="7309909074935858949">"Potrošnja od strane aplikacija za: <xliff:g id="SLOT">%s</xliff:g>"</string>
<string name="battery_system_usage_since_last_full_charge_to" msgid="4196795733829841971">"Korišćenje sistema od poslednjeg potpunog punjenja do <xliff:g id="SLOT_TIMESTAMP">%s</xliff:g>"</string>
<string name="battery_app_usage_since_last_full_charge_to" msgid="4339201995118102114">"Korišćenje aplikacija od poslednjeg potpunog punjenja do <xliff:g id="SLOT_TIMESTAMP">%s</xliff:g>"</string>
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Ukupno: manje od minut"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Pozadina: manje od minut"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Ukupno: <xliff:g id="TIME">%s</xliff:g>"</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-be/strings.xml
Expand Up @@ -3199,6 +3199,8 @@
<string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Выкарыстанне сістэмай зараду за апошнія 24 гадз"</string>
<string name="battery_system_usage_for" msgid="3248552137819897140">"Выкарыстанне сістэмай за <xliff:g id="SLOT">%s</xliff:g>"</string>
<string name="battery_app_usage_for" msgid="7309909074935858949">"Выкарыстанне праграмай за <xliff:g id="SLOT">%s</xliff:g>"</string>
<string name="battery_system_usage_since_last_full_charge_to" msgid="4196795733829841971">"Выкарыстанне сістэмы з моманту апошняй поўнай зарадкі да <xliff:g id="SLOT_TIMESTAMP">%s</xliff:g>"</string>
<string name="battery_app_usage_since_last_full_charge_to" msgid="4339201995118102114">"Выкарыстанне праграм з моманту апошняй поўнай зарадкі да <xliff:g id="SLOT_TIMESTAMP">%s</xliff:g>"</string>
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Усяго: менш адной хвіліны"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"У фонавым рэжыме: менш адной хвіліны"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Усяго: <xliff:g id="TIME">%s</xliff:g>"</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-bg/strings.xml
Expand Up @@ -3123,6 +3123,8 @@
<string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Използване от системата за последните 24 ч"</string>
<string name="battery_system_usage_for" msgid="3248552137819897140">"Използване от системата за <xliff:g id="SLOT">%s</xliff:g>"</string>
<string name="battery_app_usage_for" msgid="7309909074935858949">"Използване от приложенията за <xliff:g id="SLOT">%s</xliff:g>"</string>
<string name="battery_system_usage_since_last_full_charge_to" msgid="4196795733829841971">"Използване на системата от последното пълно зареждане до <xliff:g id="SLOT_TIMESTAMP">%s</xliff:g>"</string>
<string name="battery_app_usage_since_last_full_charge_to" msgid="4339201995118102114">"Използване на приложенията от последното пълно зареждане до <xliff:g id="SLOT_TIMESTAMP">%s</xliff:g>"</string>
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Общо: По-малко от една минута"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"На заден план: По-малко от една минута"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Общо: <xliff:g id="TIME">%s</xliff:g>"</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-bn/strings.xml
Expand Up @@ -3123,6 +3123,8 @@ g.co/pixel/faceunlock লিঙ্ক থেকে আরও জানুন।"
<string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"গত ২৪ ঘন্টা ব্যাটারি সিস্টেম ব্যবহারের তথ্য"</string>
<string name="battery_system_usage_for" msgid="3248552137819897140">"<xliff:g id="SLOT">%s</xliff:g>-এর জন্য সিস্টেমের ব্যবহার"</string>
<string name="battery_app_usage_for" msgid="7309909074935858949">"<xliff:g id="SLOT">%s</xliff:g>-এর জন্য অ্যাপের ব্যবহার"</string>
<string name="battery_system_usage_since_last_full_charge_to" msgid="4196795733829841971">"শেষবার সম্পূর্ণ চার্জ হওয়া থেকে <xliff:g id="SLOT_TIMESTAMP">%s</xliff:g> পর্যন্ত সিস্টেমের ব্যবহার"</string>
<string name="battery_app_usage_since_last_full_charge_to" msgid="4339201995118102114">"শেষবার সম্পূর্ণ চার্জ হওয়া থেকে <xliff:g id="SLOT_TIMESTAMP">%s</xliff:g> পর্যন্ত অ্যাপের ব্যবহার"</string>
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"মোট: এক মিনিটের থেকে কম"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"ব্যাকগ্রাউন্ড: এক মিনিটের থেকে কম"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"মোট: <xliff:g id="TIME">%s</xliff:g>"</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-bs/strings.xml
Expand Up @@ -3161,6 +3161,8 @@ Saznajte više na g.co/pixel/faceunlock."</string>
<string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Korištenje sistema u posljednja 24 h"</string>
<string name="battery_system_usage_for" msgid="3248552137819897140">"Korištenje sistema za: <xliff:g id="SLOT">%s</xliff:g>"</string>
<string name="battery_app_usage_for" msgid="7309909074935858949">"Korištenje aplikacije za: <xliff:g id="SLOT">%s</xliff:g>"</string>
<string name="battery_system_usage_since_last_full_charge_to" msgid="4196795733829841971">"Korištenje sistema od posljednjeg potpunog punjenja do dana <xliff:g id="SLOT_TIMESTAMP">%s</xliff:g>"</string>
<string name="battery_app_usage_since_last_full_charge_to" msgid="4339201995118102114">"Korištenje aplikacija od posljednjeg potpunog punjenja do dana <xliff:g id="SLOT_TIMESTAMP">%s</xliff:g>"</string>
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Ukupno: manje od minute"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Pozadina: manje od minute"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Ukupno: <xliff:g id="TIME">%s</xliff:g>"</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-ca/strings.xml
Expand Up @@ -3123,6 +3123,8 @@ Obtén més informació a g.co/pixel/faceunlock."</string>
<string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Ús del sistema durant les 24 darreres hores"</string>
<string name="battery_system_usage_for" msgid="3248552137819897140">"Ús del sistema entre <xliff:g id="SLOT">%s</xliff:g>"</string>
<string name="battery_app_usage_for" msgid="7309909074935858949">"Ús d\'aplicacions entre <xliff:g id="SLOT">%s</xliff:g>"</string>
<string name="battery_system_usage_since_last_full_charge_to" msgid="4196795733829841971">"Ús del sistema des de la darrera càrrega completa fins a <xliff:g id="SLOT_TIMESTAMP">%s</xliff:g>"</string>
<string name="battery_app_usage_since_last_full_charge_to" msgid="4339201995118102114">"Ús de les aplicacions des de la darrera càrrega completa fins a <xliff:g id="SLOT_TIMESTAMP">%s</xliff:g>"</string>
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Total: menys d\'un minut"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"En segon pla: menys d\'un minut"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Total: <xliff:g id="TIME">%s</xliff:g>"</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-cs/strings.xml
Expand Up @@ -3199,6 +3199,8 @@ Další informace: g.co/pixel/faceunlock."</string>
<string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Využití baterie systémem za posledních 24 hodin"</string>
<string name="battery_system_usage_for" msgid="3248552137819897140">"Využití baterie systémem: <xliff:g id="SLOT">%s</xliff:g>"</string>
<string name="battery_app_usage_for" msgid="7309909074935858949">"Využití baterie aplikací: <xliff:g id="SLOT">%s</xliff:g>"</string>
<string name="battery_system_usage_since_last_full_charge_to" msgid="4196795733829841971">"Využití systémem od posledního nabití do <xliff:g id="SLOT_TIMESTAMP">%s</xliff:g>"</string>
<string name="battery_app_usage_since_last_full_charge_to" msgid="4339201995118102114">"Využití aplikacemi od posledního nabití do <xliff:g id="SLOT_TIMESTAMP">%s</xliff:g>"</string>
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Celkem: méně než minuta"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Na pozadí: méně než minuta"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Celkem: <xliff:g id="TIME">%s</xliff:g>"</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-da/strings.xml
Expand Up @@ -3123,6 +3123,8 @@ Få flere oplysninger på g.co/pixel/faceunlock."</string>
<string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Systemforbrug for de seneste 24 timer"</string>
<string name="battery_system_usage_for" msgid="3248552137819897140">"Systemforbrug for <xliff:g id="SLOT">%s</xliff:g>"</string>
<string name="battery_app_usage_for" msgid="7309909074935858949">"Appforbrug for <xliff:g id="SLOT">%s</xliff:g>"</string>
<string name="battery_system_usage_since_last_full_charge_to" msgid="4196795733829841971">"Systemforbrug siden sidste fulde opladning <xliff:g id="SLOT_TIMESTAMP">%s</xliff:g>"</string>
<string name="battery_app_usage_since_last_full_charge_to" msgid="4339201995118102114">"Appforbrug siden sidste fulde opladning <xliff:g id="SLOT_TIMESTAMP">%s</xliff:g>"</string>
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"I alt: Under et minut"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Baggrund: Under et minut"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"I alt: <xliff:g id="TIME">%s</xliff:g>"</string>
Expand Down
2 changes: 2 additions & 0 deletions res/values-de/strings.xml
Expand Up @@ -3124,6 +3124,8 @@ Weitere Informationen findest du unter g.co/pixel/faceunlock"</string>
<string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Systemnutzung während der letzten 24 Stunden"</string>
<string name="battery_system_usage_for" msgid="3248552137819897140">"Systemnutzung im Zeitraum <xliff:g id="SLOT">%s</xliff:g>"</string>
<string name="battery_app_usage_for" msgid="7309909074935858949">"App-Nutzung im Zeitraum <xliff:g id="SLOT">%s</xliff:g>"</string>
<string name="battery_system_usage_since_last_full_charge_to" msgid="4196795733829841971">"Systemnutzung von letzter vollständiger Aufladung bis <xliff:g id="SLOT_TIMESTAMP">%s</xliff:g>"</string>
<string name="battery_app_usage_since_last_full_charge_to" msgid="4339201995118102114">"App-Nutzung von letzter vollständiger Aufladung bis <xliff:g id="SLOT_TIMESTAMP">%s</xliff:g>"</string>
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Gesamt: weniger als eine Minute"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Hintergrund: weniger als eine Minute"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Gesamt: <xliff:g id="TIME">%s</xliff:g>"</string>
Expand Down

0 comments on commit 29c6af6

Please sign in to comment.