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

Commit 190ec16c authored Mar 07, 2025 by Android Build Coastguard Worker

Snap for 13182071 from ea342bbd to 25Q2-release

Change-Id: I61652843b6db69bbbeef8b6a1ec1208fb0811b56

parents ea6e0eea ea342bbd

aconfig/catalyst/sound_screen.aconfig

+7 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,13 @@ flag {
		bug: "323791114"
		}

		flag {
		name: "catalyst_media_controls"
		namespace: "android_settings"
		description: "Flag for media page"
		bug: "337243570"
		}

		flag {
		name: "catalyst_vibration_intensity_screen"
		namespace: "android_settings"

aconfig/settings_globalintl_flag_declarations.aconfig

+0 −7

Original line number	Diff line number	Diff line
		@@ -28,10 +28,3 @@ flag {
		description: "Feature flag for regional preferences APIs"
		bug: "370379000"
		}

		flag {
		name: "settings_expressive_design_enabled"
		namespace: "globalintl"
		description: "Feature flag for expressive design"
		bug: "385659296"
		}
		No newline at end of file

res-product/values-ar/strings.xml

+3 −6

Original line number	Diff line number	Diff line
		@@ -220,12 +220,9 @@
		<string name="bluetooth_unpair_dialog_body" product="default" msgid="176620413491664050">"لن يتم إقران هاتفك بعد الآن بجهاز <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
		<string name="bluetooth_unpair_dialog_body" product="tablet" msgid="8098078685596880647">"لن يتم إقران جهازك اللوحي بعد الآن بجهاز <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
		<string name="bluetooth_unpair_dialog_body" product="device" msgid="563640675231461703">"لن يتم إقران جهازك بعد الآن بجهاز <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
		<!-- no translation found for bluetooth_unpair_dialog_with_associations_body (5994849277385675452) -->
		<skip />
		<!-- no translation found for bluetooth_unpair_dialog_with_associations_body (1783141603173138886) -->
		<skip />
		<!-- no translation found for bluetooth_unpair_dialog_with_associations_body (4096203730149218837) -->
		<skip />
		<string name="bluetooth_unpair_dialog_with_associations_body" product="default" msgid="5994849277385675452">"لن يتم إقران هاتفك بعد الآن بجهاز \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". ولن يدير تطبيق \"<xliff:g id="APP_NAME">%2$s</xliff:g>\" الجهاز بعد الآن"</string>
		<string name="bluetooth_unpair_dialog_with_associations_body" product="tablet" msgid="1783141603173138886">"لن يتم إقران جهازك اللوحي بعد الآن بجهاز \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". ولن يدير تطبيق \"<xliff:g id="APP_NAME">%2$s</xliff:g>\" الجهاز بعد الآن"</string>
		<string name="bluetooth_unpair_dialog_with_associations_body" product="device" msgid="4096203730149218837">"لن يتم إقران جهازك بعد الآن بجهاز \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". ولن يدير تطبيق \"<xliff:g id="APP_NAME">%2$s</xliff:g>\" الجهاز بعد الآن"</string>
		<string name="virtual_device_forget_dialog_body" product="default" msgid="2373694955133298944">"لن يكون جهاز \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" متصلاً بهذا الهاتف بعد الآن. وفي حال المتابعة، قد تتوقف بعض التطبيقات وعمليات بثّها عن العمل."</string>
		<string name="virtual_device_forget_dialog_body" product="tablet" msgid="6223163028932322388">"لن يكون جهاز \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" متصلاً بهذا الجهاز اللوحي بعد الآن. وفي حال المتابعة، قد تتوقف بعض التطبيقات وعمليات بثّها عن العمل."</string>
		<string name="virtual_device_forget_dialog_body" product="device" msgid="1888180822338607328">"لن يكون جهاز \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" متصلاً بهذا الجهاز بعد الآن. وفي حال المتابعة، قد تتوقف بعض التطبيقات وعمليات بثّها عن العمل."</string>

res-product/values-bg/strings.xml

+3 −6

Original line number	Diff line number	Diff line
		@@ -220,12 +220,9 @@
		<string name="bluetooth_unpair_dialog_body" product="default" msgid="176620413491664050">"Телефонът ви вече няма да бъде сдвоен с(ъс) <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
		<string name="bluetooth_unpair_dialog_body" product="tablet" msgid="8098078685596880647">"Таблетът ви вече няма да бъде сдвоен с(ъс) „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“"</string>
		<string name="bluetooth_unpair_dialog_body" product="device" msgid="563640675231461703">"Устройството ви вече няма да бъде сдвоено с/ъс „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“"</string>
		<!-- no translation found for bluetooth_unpair_dialog_with_associations_body (5994849277385675452) -->
		<skip />
		<!-- no translation found for bluetooth_unpair_dialog_with_associations_body (1783141603173138886) -->
		<skip />
		<!-- no translation found for bluetooth_unpair_dialog_with_associations_body (4096203730149218837) -->
		<skip />
		<string name="bluetooth_unpair_dialog_with_associations_body" product="default" msgid="5994849277385675452">"Телефонът ви вече няма да бъде сдвоен с(ъс) <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> вече няма да управлява устройството"</string>
		<string name="bluetooth_unpair_dialog_with_associations_body" product="tablet" msgid="1783141603173138886">"Таблетът ви вече няма да бъде сдвоен с(ъс) „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“. <xliff:g id="APP_NAME">%2$s</xliff:g> вече няма да управлява устройството"</string>
		<string name="bluetooth_unpair_dialog_with_associations_body" product="device" msgid="4096203730149218837">"Устройството ви вече няма да бъде сдвоено с(ъс) „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“. <xliff:g id="APP_NAME">%2$s</xliff:g> вече няма да управлява устройството"</string>
		<string name="virtual_device_forget_dialog_body" product="default" msgid="2373694955133298944">"Устройството <xliff:g id="DEVICE_NAME">%1$s</xliff:g> вече няма да бъде свързано с този телефон. Ако продължите, някои приложения и функцията за поточното им предаване може да спрат да работят."</string>
		<string name="virtual_device_forget_dialog_body" product="tablet" msgid="6223163028932322388">"Устройството <xliff:g id="DEVICE_NAME">%1$s</xliff:g> вече няма да бъде свързано с този таблет. Ако продължите, някои приложения и функцията за поточното им предаване може да спрат да работят."</string>
		<string name="virtual_device_forget_dialog_body" product="device" msgid="1888180822338607328">"Устройството <xliff:g id="DEVICE_NAME">%1$s</xliff:g> вече няма да бъде свързано с това устройство. Ако продължите, някои приложения и функцията за поточното им предаване може да спрат да работят."</string>

res-product/values-ca/strings.xml

+3 −6

Original line number	Diff line number	Diff line
		@@ -220,12 +220,9 @@
		<string name="bluetooth_unpair_dialog_body" product="default" msgid="176620413491664050">"El telèfon es desvincularà de: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
		<string name="bluetooth_unpair_dialog_body" product="tablet" msgid="8098078685596880647">"La tauleta es desvincularà de: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
		<string name="bluetooth_unpair_dialog_body" product="device" msgid="563640675231461703">"El teu dispositiu es desvincularà de: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
		<!-- no translation found for bluetooth_unpair_dialog_with_associations_body (5994849277385675452) -->
		<skip />
		<!-- no translation found for bluetooth_unpair_dialog_with_associations_body (1783141603173138886) -->
		<skip />
		<!-- no translation found for bluetooth_unpair_dialog_with_associations_body (4096203730149218837) -->
		<skip />
		<string name="bluetooth_unpair_dialog_with_associations_body" product="default" msgid="5994849277385675452">"El telèfon es desvincularà de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> deixarà de gestionar el dispositiu"</string>
		<string name="bluetooth_unpair_dialog_with_associations_body" product="tablet" msgid="1783141603173138886">"La tauleta es desvincularà de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> deixarà de gestionar el dispositiu"</string>
		<string name="bluetooth_unpair_dialog_with_associations_body" product="device" msgid="4096203730149218837">"El teu dispositiu es desvincularà de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. <xliff:g id="APP_NAME">%2$s</xliff:g> deixarà de gestionar el dispositiu"</string>
		<string name="virtual_device_forget_dialog_body" product="default" msgid="2373694955133298944">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> deixarà d\'estar connectat a aquest telèfon. Si continues, és possible que algunes aplicacions i l\'estríming d\'aplicacions deixin de funcionar."</string>
		<string name="virtual_device_forget_dialog_body" product="tablet" msgid="6223163028932322388">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> deixarà d\'estar connectat a aquesta tauleta. Si continues, és possible que algunes aplicacions i l\'estríming d\'aplicacions deixin de funcionar."</string>
		<string name="virtual_device_forget_dialog_body" product="device" msgid="1888180822338607328">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> deixarà d\'estar connectat a aquest dispositiu. Si continues, és possible que algunes aplicacions i l\'estríming d\'aplicacions deixin de funcionar."</string>