Merge cherrypicks of ['googleplex-android-review.googlesource.com/31391424'] into 25Q1-release.
Change-Id: I18dae44c8cb78e8c5066eafbd14ef1512efa1fb9
diff --git a/photopicker/res/values-es-rUS-feminine/core_strings.xml b/photopicker/res/values-es-rUS-feminine/core_strings.xml
deleted file mode 100644
index e93d29d..0000000
--- a/photopicker/res/values-es-rUS-feminine/core_strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2024 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="photopicker_item_content_desc" msgid="8606023869442295434">"<xliff:g id="ITEM_NAME">%1$s</xliff:g> tomada el <xliff:g id="TIME">%2$s</xliff:g>"</string>
-</resources>
diff --git a/photopicker/res/values-es-rUS-masculine/core_strings.xml b/photopicker/res/values-es-rUS-masculine/core_strings.xml
deleted file mode 100644
index 48eacb1..0000000
--- a/photopicker/res/values-es-rUS-masculine/core_strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2024 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="photopicker_item_content_desc" msgid="8606023869442295434">"<xliff:g id="ITEM_NAME">%1$s</xliff:g> tomado el <xliff:g id="TIME">%2$s</xliff:g>"</string>
-</resources>
diff --git a/photopicker/res/values-es-rUS-neuter/core_strings.xml b/photopicker/res/values-es-rUS-neuter/core_strings.xml
deleted file mode 100644
index 48eacb1..0000000
--- a/photopicker/res/values-es-rUS-neuter/core_strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2024 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="photopicker_item_content_desc" msgid="8606023869442295434">"<xliff:g id="ITEM_NAME">%1$s</xliff:g> tomado el <xliff:g id="TIME">%2$s</xliff:g>"</string>
-</resources>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index e06082c..d235fae 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -68,7 +68,7 @@
<string name="picker_personal_profile" msgid="639484258397758406">"Skakel oor na persoonlik"</string>
<string name="picker_personal_profile_label" msgid="6189198163209597344">"Persoonlik"</string>
<string name="picker_profile_admin_title" msgid="4172022376418293777">"Deur jou admin geblokkeer"</string>
- <string name="picker_profile_admin_msg_from_personal" msgid="1941639895084555723">"Toegang tot werkdata van \'n persoonlike program af word nie toegelaat nie"</string>
+ <string name="picker_profile_admin_msg_from_personal" msgid="1941639895084555723">"Toegang tot werkdata van \'n persoonlike app af word nie toegelaat nie"</string>
<string name="picker_profile_admin_msg_from_work" msgid="8048524337462790110">"Toegang tot persoonlike data van \'n werkprogram af word nie toegelaat nie"</string>
<string name="picker_profile_admin_msg" msgid="4060112887923255178">"Toegang tot <xliff:g id="PROFILE1">%1$s</xliff:g>-data van ’n <xliff:g id="PROFILE2">%2$s</xliff:g>-app af word nie toegelaat nie"</string>
<string name="picker_profile_switch_message" msgid="1133817927412489487">"Skakel oor na <xliff:g id="PROFILE">%s</xliff:g>"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 48b8a82..9eae3f9 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -164,7 +164,7 @@
<string name="transcode_progress_channel" msgid="6122609645085712101">"میزان پیشرفت تراتبدیل"</string>
<string name="dialog_error_message" msgid="5120432204743681606">"بعداً دوباره امتحان کنید. عکسهایتان پساز رفع مشکل دردسترس خواهد بود."</string>
<string name="dialog_error_title" msgid="636349284077820636">"برخیاز عکسها را نمیتوان بار کرد"</string>
- <string name="dialog_button_text" msgid="351366485240852280">"متوجهام"</string>
+ <string name="dialog_button_text" msgid="351366485240852280">"متوجهم"</string>
<string name="permlab_accessMediaOwnerPackageName" msgid="3849443148060165651">"دسترسی به نام بسته مالک رسانه"</string>
<string name="permdesc_accessMediaOwnerPackageName" msgid="7381563109363105371">"به برنامه اجازه میدهد به نام بستههای مالک همه فایلهای رسانه موجود دسترسی داشته باشد."</string>
</resources>
