commit 91e802ad4f77667a5fee7f745358e83dcecc0509
author Karsten Tausche <karsten@fairphone.com> Wed Mar 15 20:00:06 2023 +0100
committer Karsten Tausche <karsten@fairphone.com> Wed Mar 15 20:00:06 2023 +0100
tree 68b031027ca3c06bfd675b3eb5bb6c11ca281ec3
parent 81531f293126a3ef5aa08f2b3ef3f829a91a2eb6
parent 9657afc9cd82cc933fa73d7ecec1c3c0ea8d4d92

Merge tag 'android-13.0.0_r32' into int/13/fp3

Android 13.0.0 release 32

* tag 'android-13.0.0_r32':
  Revert "Use Mockito 4.6.1 API"
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Use Mockito 4.6.1 API
  Import translations. DO NOT MERGE ANYWHERE
  Removes unnecessary permission from the EmergencyInfo app.
  Removes unnecessary permission from the EmergencyInfo app.

Change-Id: Ia14e83c0bb7ea97177b491d6aff123d23fde3bd0

EmergencyGestureAction/res/values-iw/strings.xml

diff --git a/EmergencyGestureAction/res/values-iw/strings.xml b/EmergencyGestureAction/res/values-iw/strings.xml
index 8914829..ae3e8f6 100644
--- a/EmergencyGestureAction/res/values-iw/strings.xml
+++ b/EmergencyGestureAction/res/values-iw/strings.xml
@@ -21,6 +21,6 @@
     <string name="emergency_action_title" msgid="4329795972111990414">"מצב חירום"</string>
     <string name="emergency_action_subtitle" msgid="5667616628096114616">"המערכת מתכוננת להתקשר אל <xliff:g id="EMERGENCY_NUMBER">%1$s</xliff:g>"</string>
     <string name="count_down_unit" msgid="7461042666268976220">"שנ\'"</string>
-    <string name="countdown_text_content_description" msgid="322778383478285712">"{seconds_left,plural, =1{שנייה אחת}two{# שניות}many{# שניות}other{# שניות}}"</string>
+    <string name="countdown_text_content_description" msgid="322778383478285712">"{seconds_left,plural, =1{שנייה אחת}one{# שניות}two{# שניות}other{# שניות}}"</string>
     <string name="slider_seek_bar_content_description" msgid="811285658152645524">"יש להסיט בעזרת שתי אצבעות כדי להפעיל"</string>
 </resources>

EmergencyGestureAction/res/values-te/strings.xml

diff --git a/EmergencyGestureAction/res/values-te/strings.xml b/EmergencyGestureAction/res/values-te/strings.xml
index bfe98af..a227306 100644
--- a/EmergencyGestureAction/res/values-te/strings.xml
+++ b/EmergencyGestureAction/res/values-te/strings.xml
@@ -17,7 +17,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cancel" msgid="1942863792086990604">"రద్దు చేయి"</string>
+    <string name="cancel" msgid="1942863792086990604">"రద్దు చేయండి"</string>
     <string name="emergency_action_title" msgid="4329795972111990414">"ఎమర్జెన్సీ సహాయం"</string>
     <string name="emergency_action_subtitle" msgid="5667616628096114616">"<xliff:g id="EMERGENCY_NUMBER">%1$s</xliff:g>కు కాల్‌ను సిద్ధం చేస్తోంది"</string>
     <string name="count_down_unit" msgid="7461042666268976220">"సె"</string>

res/values-te/strings.xml

diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 3d8d632..0a3da35 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -95,7 +95,7 @@
     <string name="remove_contact_icon_text" msgid="4576641386490101363">"కాంటాక్ట్‌ను తీసివేయండి"</string>
     <string name="fail_add_contact" msgid="6511490846952942291">"కాంటాక్ట్ సమాచారాన్ని సరిగ్గా చదవడం సాధ్యం కాదు"</string>
     <string name="remove" msgid="1243949503772376064">"తీసివేయండి"</string>
-    <string name="cancel" msgid="7401575239009060939">"రద్దు చేయి"</string>
+    <string name="cancel" msgid="7401575239009060939">"రద్దు చేయండి"</string>
     <string name="ok" msgid="163967937451981024">"సరే"</string>
     <string name="phone_type_and_phone_number" msgid="5034188169563878371">"<xliff:g id="PHONE_TYPE">%1$s</xliff:g> • <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
     <string name="no_info_provided" msgid="716200382010821001">"ఫోన్ యజమాని గురించి సమాచారం ఏదీ లేదు"</string>