Snap for 6524386 from f8d38ee547e86c7990bf3f22d7047a12c4de103f to mainline-release (cecdfb68) · Commits · e / os / android_frameworks_base

core/java/android/app/TEST_MAPPING

+6 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,12 @@
		},
		{
		"file_patterns": ["(/\|^)AppOpsManager.java"],
		"name": "UidAtomTests:testAppOps"
		"name": "CtsStatsdHostTestCases",
		"options": [
		{
		"include-filter": "android.cts.statsd.atom.UidAtomTests"
		}
		]
		},
		{
		"file_patterns": ["(/\|^)AppOpsManager.java"],

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

+2 −3

Original line number	Diff line number	Diff line
		@@ -210,8 +210,7 @@
		<string name="printing_disabled_by" msgid="3517499806528864633">"تم إيقاف الطباعة بواسطة <xliff:g id="OWNER_APP">%s</xliff:g>."</string>
		<string name="personal_apps_suspension_title" msgid="7561416677884286600">"تفعيل الملف الشخصي للعمل"</string>
		<string name="personal_apps_suspension_text" msgid="6115455688932935597">"تم حظر تطبيقاتك الشخصية إلى أن تفعِّل ملفك الشخصي للعمل."</string>
		<!-- no translation found for personal_apps_suspension_soon_text (8705436617422002146) -->
		<skip />
		<string name="personal_apps_suspension_soon_text" msgid="8705436617422002146">"سيتم حظر التطبيقات الشخصية في <xliff:g id="DATE">%1$s</xliff:g> في <xliff:g id="TIME">%2$s</xliff:g>. لا يمكن أن يظل الملف الشخصي للعمل غير مُفعَّل لأكثر من <xliff:g id="NUMBER">%3$d</xliff:g> يوم."</string>
		<string name="personal_apps_suspended_turn_profile_on" msgid="4278188538997940785">"تفعيل الملف الشخصي للعمل"</string>
		<string name="me" msgid="6207584824693813140">"أنا"</string>
		<string name="power_dialog" product="tablet" msgid="8333207765671417261">"خيارات الجهاز اللوحي"</string>
		@@ -2010,7 +2009,7 @@
		<string name="language_selection_title" msgid="52674936078683285">"إضافة لغة"</string>
		<string name="country_selection_title" msgid="5221495687299014379">"تفضيل المنطقة"</string>
		<string name="search_language_hint" msgid="7004225294308793583">"اكتب اسم اللغة"</string>
		<string name="language_picker_section_suggested" msgid="6556199184638990447">"اللغات المقترحة"</string>
		<string name="language_picker_section_suggested" msgid="6556199184638990447">"المناطق المقترحة"</string>
		<string name="language_picker_section_all" msgid="1985809075777564284">"جميع اللغات"</string>
		<string name="region_picker_section_all" msgid="756441309928774155">"كل المناطق"</string>
		<string name="locale_search_menu" msgid="6258090710176422934">"البحث"</string>

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -550,7 +550,7 @@
		<string name="biometric_error_device_not_secured" msgid="3129845065043995924">"Не заданы PIN-код, узор разблакіроўкі або пароль"</string>
		<string name="fingerprint_acquired_partial" msgid="8532380671091299342">"Адсканіравана толькі частка адбітка пальца. Паспрабуйце яшчэ раз."</string>
		<string name="fingerprint_acquired_insufficient" msgid="2545149524031515411">"Не атрымалася апрацаваць адбітак пальца. Паспрабуйце яшчэ раз."</string>
		<string name="fingerprint_acquired_imager_dirty" msgid="4694800187151533990">"Датчык адбіткаў пальцаў брудны. Ачысціце яго і паспрабуйце яшчэ раз."</string>
		<string name="fingerprint_acquired_imager_dirty" msgid="4694800187151533990">"Сканер адбіткаў пальцаў брудны. Ачысціце яго і паспрабуйце яшчэ раз."</string>
		<string name="fingerprint_acquired_too_fast" msgid="5151661932298844352">"Вы занадта хутка паднялі палец. Паспрабуйце яшчэ раз."</string>
		<string name="fingerprint_acquired_too_slow" msgid="6683510291554497580">"Палец рухаўся занадта павольна. Паспрабуйце яшчэ раз."</string>
		<string-array name="fingerprint_acquired_vendor">

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1441,7 +1441,7 @@
		<string name="car_mode_disable_notification_message" msgid="8954550232288567515">"Πατήστε για να εξέλθετε από την εφαρμογή οδήγησης."</string>
		<string name="back_button_label" msgid="4078224038025043387">"Πίσω"</string>
		<string name="next_button_label" msgid="6040209156399907780">"Επόμενο"</string>
		<string name="skip_button_label" msgid="3566599811326688389">"Παράλειψη"</string>
		<string name="skip_button_label" msgid="3566599811326688389">"Παράβλεψη"</string>
		<string name="no_matches" msgid="6472699895759164599">"Δεν υπάρχουν αποτελέσματα"</string>
		<string name="find_on_page" msgid="5400537367077438198">"Εύρεση στη σελίδα"</string>
		<plurals name="matches_found" formatted="false" msgid="1101758718194295554">

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -202,8 +202,7 @@
		<string name="printing_disabled_by" msgid="3517499806528864633">"<xliff:g id="OWNER_APP">%s</xliff:g> چاپ کردن را غیرفعال کرده است."</string>
		<string name="personal_apps_suspension_title" msgid="7561416677884286600">"نمایه کاری‌تان را روشن کنید"</string>
		<string name="personal_apps_suspension_text" msgid="6115455688932935597">"تا زمانی‌که نمایه کاری‌تان را روشن نکنید، برنامه‌های شخصی‌تان مسدودند"</string>
		<!-- no translation found for personal_apps_suspension_soon_text (8705436617422002146) -->
		<skip />
		<string name="personal_apps_suspension_soon_text" msgid="8705436617422002146">"برنامه‌های شخصی در تاریخ <xliff:g id="DATE">%1$s</xliff:g> ساعت <xliff:g id="TIME">%2$s</xliff:g> مسدود خواهند شد. نمایه کاری‌تان نباید بیشتر از <xliff:g id="NUMBER">%3$d</xliff:g> روز خاموش بماند."</string>
		<string name="personal_apps_suspended_turn_profile_on" msgid="4278188538997940785">"روشن کردن نمایه کاری"</string>
		<string name="me" msgid="6207584824693813140">"من"</string>
		<string name="power_dialog" product="tablet" msgid="8333207765671417261">"گزینه‌های رایانهٔ لوحی"</string>