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

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

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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/32961326', 'googleplex-android-review.googlesource.com/32948947', 'googleplex-android-review.googlesource.com/32948948', 'googleplex-android-review.googlesource.com/32948949', 'googleplex-android-review.googlesource.com/32952147', 'googleplex-android-review.googlesource.com/32952194', 'googleplex-android-review.googlesource.com/32952338', 'googleplex-android-review.googlesource.com/32954537', 'googleplex-android-review.googlesource.com/32954538', 'googleplex-android-review.googlesource.com/32954967', 'googleplex-android-review.googlesource.com/32954986', 'googleplex-android-review.googlesource.com/32954987', 'googleplex-android-review.googlesource.com/32955219', 'googleplex-android-review.googlesource.com/32957378'] into 25Q2-release.

Change-Id: Id2237a897cae5d6c8ea5953137d337947eb12e2c
parents d97422fc 39f483f1

core/res/res/values-af/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -1971,7 +1971,7 @@ 
    <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string>

    <string name="battery_saver_description_with_learn_more" msgid="5444908404021316250">"Batterybespaarder skakel Donkertema aan en beperk of skakel agtergrondaktiwiteit, sommige visuele effekte, sekere kenmerke en sommige netwerkverbindings af"</string>

    <string name="battery_saver_description" msgid="8518809702138617167">"Batterybespaarder skakel Donkertema aan en beperk of skakel agtergrondaktiwiteit, sommige visuele effekte, sekere kenmerke en sommige netwerkverbindings af"</string>

    <string name="data_saver_description" msgid="4995164271550590517">"Databespaarder verhoed sommige apps om data in die agtergrond te stuur of te aanvaar om datagebruik te help verminder. \'n App wat jy tans gebruik kan by data ingaan, maar sal dit dalk minder gereeld doen. Dit kan byvoorbeeld beteken dat prente nie wys voordat jy op hulle tik nie."</string>

    <string name="data_saver_description" msgid="4995164271550590517">"Databespaarder verhoed sommige apps om data op die agtergrond te stuur of te ontvang om datagebruik te help verminder. ’n App wat jy tans gebruik kan by data ingaan, maar sal dit dalk minder gereeld doen. Dit kan byvoorbeeld beteken dat prente nie wys voordat jy op hulle tik nie."</string>

    <string name="data_saver_enable_title" msgid="7080620065745260137">"Skakel Databespaarder aan?"</string>

    <string name="data_saver_enable_button" msgid="4399405762586419726">"Skakel aan"</string>

    <string name="zen_mode_duration_minutes_summary" msgid="4555514757230849789">"{count,plural, =1{Een minuut lank (tot {formattedTime})}other{# minute lank (tot {formattedTime})}}"</string>

core/res/res/values-am/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -1729,7 +1729,7 @@ 
    <string name="display_manager_overlay_display_title" msgid="1480158037150469170">"<xliff:g id="NAME">%1$s</xliff:g>፦ <xliff:g id="WIDTH">%2$d</xliff:g>x<xliff:g id="HEIGHT">%3$d</xliff:g>፣ <xliff:g id="DPI">%4$d</xliff:g> dpi"</string>

    <string name="display_manager_overlay_display_secure_suffix" msgid="2810034719482834679">"፣ የተጠበቀ"</string>

    <string name="kg_forgot_pattern_button_text" msgid="406145459223122537">"ስርዓተ ጥለቱን እርሳ"</string>

    <string name="kg_wrong_pattern" msgid="1342812634464179931">"የተሳሳተ ስርዓተ ጥለት"</string>

    <string name="kg_wrong_pattern" msgid="1342812634464179931">"የተሳሳተ ሥርዓተ ጥለት"</string>

    <string name="kg_wrong_password" msgid="2384677900494439426">"የተሳሳተ ይለፍ ቃል"</string>

    <string name="kg_wrong_pin" msgid="3680925703673166482">"የተሳሳተ ፒን"</string>

    <string name="kg_pattern_instructions" msgid="8366024510502517748">"ስርዓተ ጥለትዎን ይሳሉ"</string>

core/res/res/values-ar/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -2215,7 +2215,7 @@ 
    <string name="nas_upgrade_notification_enable_action" msgid="3046406808378726874">"حسنًا"</string>

    <string name="nas_upgrade_notification_disable_action" msgid="3794833210043497982">"إيقاف"</string>

    <string name="nas_upgrade_notification_learn_more_action" msgid="7011130656195423947">"مزيد من المعلومات"</string>

    <string name="nas_upgrade_notification_learn_more_content" msgid="3735480566983530650">"‏تم إبدال الإشعارات التكيُّفية لنظام التشغيل Android في الإصدار 12 منه بالإشعارات المحسّنة. تعرض هذه الميزة إجراءات وردودًا مقترحة وتنظِّم الإشعارات.\n\nيمكن للإشعارات المحسّنة الوصول إلى محتوى الإشعارات، بما في ذلك المعلومات الشخصية، مثلاً أسماء جهات الاتصال والرسائل. يمكن لهذه الميزة أيضًا إغلاق الإشعارات أو الاستجابة لها، مثلاً الردّ على مكالمات الهاتف والتحكّم في ميزة \"عدم الإزعاج\"."</string>

    <string name="nas_upgrade_notification_learn_more_content" msgid="3735480566983530650">"‏تم استبدال \"الإشعارات التكيُّفية\" بـ \"الإشعارات المحسّنة\" في الإصدار 12 من Android. تعرض هذه الميزة إجراءات وردودًا مقترحة وتنظِّم الإشعارات.\n\nتستطيع \"الإشعارات المحسّنة\" الوصول إلى محتوى الإشعارات، بما في ذلك المعلومات الشخصية، مثلاً أسماء جهات الاتصال والرسائل. ويمكنها أيضًا إغلاق الإشعارات أو الاستجابة لها، مثلاً الردّ على مكالمات الهاتف والتحكّم في ميزة \"عدم الإزعاج\"."</string>

    <string name="dynamic_mode_notification_channel_name" msgid="2986926422100223328">"إشعار معلومات \"وضع سلسلة الإجراءات\""</string>

    <string name="dynamic_mode_notification_title" msgid="1388718452788985481">"تم تفعيل ميزة توفير شحن البطارية"</string>

    <string name="dynamic_mode_notification_summary" msgid="1639031262484979689">"يتم تقليل استخدام البطارية لإطالة عمرها."</string>

core/res/res/values-bs/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -1395,7 +1395,7 @@ 
    <string name="network_switch_metered_detail" msgid="1358296010128405906">"Kada <xliff:g id="PREVIOUS_NETWORK">%2$s</xliff:g> nema pristup internetu, uređaj koristi mrežu <xliff:g id="NEW_NETWORK">%1$s</xliff:g>. Moguća je naplata usluge."</string>

    <string name="network_switch_metered_toast" msgid="501662047275723743">"Prebačeno iz mreže <xliff:g id="PREVIOUS_NETWORK">%1$s</xliff:g> u <xliff:g id="NEW_NETWORK">%2$s</xliff:g> mrežu"</string>

  <string-array name="network_switch_type_name">

    <item msgid="2255670471736226365">"prijenos podataka na mobilnoj mreži"</item>

    <item msgid="2255670471736226365">"prenos podataka na mobilnoj mreži"</item>

    <item msgid="5520925862115353992">"WiFi"</item>

    <item msgid="1055487873974272842">"Bluetooth"</item>

    <item msgid="1616528372438698248">"Ethernet"</item>
@@ -2212,7 +2212,7 @@ 
    <string name="nas_upgrade_notification_enable_action" msgid="3046406808378726874">"Uredu"</string>

    <string name="nas_upgrade_notification_disable_action" msgid="3794833210043497982">"Isključi"</string>

    <string name="nas_upgrade_notification_learn_more_action" msgid="7011130656195423947">"Saznajte više"</string>

    <string name="nas_upgrade_notification_learn_more_content" msgid="3735480566983530650">"Poboljšana obavještenja su zamijenila prilagodljiva obavještenja Androida u verziji Android 12. Ova funkcija prikazuje predložene radnje i odgovore te organizira vaša obavještenja.\n\nPoboljšana obavještenja mogu pristupiti sadržaju obavještenja, uključujući lične informacije kao što su imena kontakata i poruke. Ova funkcija također može odbacivati obavještenja ili reagirati na njih, npr. može odgovarati na telefonske pozive i kontrolirati funkciju Ne ometaj."</string>

    <string name="nas_upgrade_notification_learn_more_content" msgid="3735480566983530650">"Poboljšana obavještenja su zamijenila Androidova prilagodljiva obavještenja u Androidu 12. Ova funkcija prikazuje predložene radnje i odgovore te organizira vaša obavještenja.\n\nPoboljšana obavještenja mogu pristupiti sadržaju obavještenja, uključujući lične informacije kao što su imena kontakata i poruke. Ova funkcija također može odbacivati obavještenja ili reagirati na njih, npr. može odgovarati na telefonske pozive i kontrolirati funkciju Ne ometaj."</string>

    <string name="dynamic_mode_notification_channel_name" msgid="2986926422100223328">"Obavještenje za informacije Rutinskog načina"</string>

    <string name="dynamic_mode_notification_title" msgid="1388718452788985481">"Ušteda baterije je uključena"</string>

    <string name="dynamic_mode_notification_summary" msgid="1639031262484979689">"Smanjena je potrošnja baterije da se produži vijek trajanja baterije"</string>

core/res/res/values-de/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -1971,7 +1971,7 @@ 
    <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string>

    <string name="battery_saver_description_with_learn_more" msgid="5444908404021316250">"Der Energiesparmodus aktiviert das dunkle Design. Hintergrundaktivitäten, einige Funktionen und optische Effekte und manche Netzwerkverbindungen werden eingeschränkt oder deaktiviert."</string>

    <string name="battery_saver_description" msgid="8518809702138617167">"Der Energiesparmodus aktiviert das dunkle Design. Hintergrundaktivitäten, einige Funktionen und optische Effekte sowie manche Netzwerkverbindungen werden eingeschränkt oder deaktiviert."</string>

    <string name="data_saver_description" msgid="4995164271550590517">"Der Datensparmodus verhindert, dass manche Apps im Hintergrund Daten senden oder empfangen, sodass weniger Daten verbraucht werden. Auch werden die Datenzugriffe der gerade aktiven App eingeschränkt, was z. B. dazu führen kann, dass Bilder erst angetippt werden müssen, bevor sie sichtbar werden."</string>

    <string name="data_saver_description" msgid="4995164271550590517">"Der Datensparmodus verhindert, dass manche Apps im Hintergrund Daten senden oder empfangen. So werden weniger Daten verbraucht. Auch die Datenzugriffe der gerade aktiven App werden eingeschränkt, was etwa dazu führen kann, dass Bilder erst angetippt werden müssen, bevor sie sichtbar werden."</string>

    <string name="data_saver_enable_title" msgid="7080620065745260137">"Datensparmodus aktivieren?"</string>

    <string name="data_saver_enable_button" msgid="4399405762586419726">"Aktivieren"</string>

    <string name="zen_mode_duration_minutes_summary" msgid="4555514757230849789">"{count,plural, =1{Für eine Minute (bis {formattedTime})}other{Für # Minuten (bis {formattedTime})}}"</string>