Merge Android 12L

Bug: 222710654
Merged-In: I2a6ffed6a72d9f92469427d218fa3c896eadaa8d
Change-Id: Ie8d1a3506a95100a452e9ab89886d411af9bf3ad

5 files changed, 4 insertions, 5 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4dea01b..56ce764 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -37,7 +37,6 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-
     </application>
 
 </manifest>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index d8e79fb..5f85e4a 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -23,7 +23,7 @@
     <string name="all_day_event" msgid="5817490740700803034">"Egun osokoak"</string>
     <!-- no translation found for phone_number (3879925006862072135) -->
     <skip />
-    <string name="phone_number_with_pin" msgid="6760582665093825412">"<xliff:g id="NUMBER">%1$s</xliff:g> zenbakiaren PINa: <xliff:g id="PIN_0">%2$s</xliff:g>"</string>
+    <string name="phone_number_with_pin" msgid="6760582665093825412">"<xliff:g id="NUMBER">%1$s</xliff:g> zenbakiaren PIN kodea: <xliff:g id="PIN_0">%2$s</xliff:g>"</string>
     <plurals name="all_day_title" formatted="false" msgid="7938279592034934265">
       <item quantity="other">Egun osoko %d gertaera</item>
       <item quantity="one">Egun osoko %d gertaera</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index e21316d..8bca97b 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -25,7 +25,7 @@
     <skip />
     <string name="phone_number_with_pin" msgid="6760582665093825412">"PIN del numero <xliff:g id="NUMBER">%1$s</xliff:g>: <xliff:g id="PIN_0">%2$s</xliff:g>"</string>
     <plurals name="all_day_title" formatted="false" msgid="7938279592034934265">
-      <item quantity="one">%d eventi che durano tutto il giorno</item>
       <item quantity="other">%d eventi che durano tutto il giorno</item>
+      <item quantity="one">%d evento che dura tutto il giorno</item>
     </plurals>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 32888c0..5ce55d2 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -25,7 +25,7 @@
     <skip />
     <string name="phone_number_with_pin" msgid="6760582665093825412">"<xliff:g id="NUMBER">%1$s</xliff:g> PIN: <xliff:g id="PIN_0">%2$s</xliff:g>"</string>
     <plurals name="all_day_title" formatted="false" msgid="7938279592034934265">
-      <item quantity="one">%d evento de todo o dia</item>
       <item quantity="other">%d eventos de todo o dia</item>
+      <item quantity="one">%d evento de todo o dia</item>
     </plurals>
 </resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 24f6f3e..1e3902c 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -19,7 +19,7 @@
     <string name="app_name" msgid="1756632159204796305">"Calendar"</string>
     <string name="no_dialler" msgid="1448265958659890310">"డయలర్ అందుబాటులో లేదు"</string>
     <string name="no_events" msgid="2454460886004475314">"షెడ్యూల్ చేసిన ఈవెంట్‌లు లేవు. మీరు ఖాళీగా ఉన్నారు!"</string>
-    <string name="no_calendars" msgid="5059614627806215716">"క్యాలెండర్ ప్రారంభం కావడానికి సమయం పడుతున్నట్టు ఉంది, లేదా సహచర యాప్‌లోని మీ సెట్టింగ్‌లను చెక్ చేసి చూడండి"</string>
+    <string name="no_calendars" msgid="5059614627806215716">"Calendar ప్రారంభం కావచ్చు, లేదా మీరు సెట్టింగ్‌లను మీ సహచర యాప్‌లో చెక్ చేయాలి"</string>
     <string name="all_day_event" msgid="5817490740700803034">"పూర్తి రోజు"</string>
     <!-- no translation found for phone_number (3879925006862072135) -->
     <skip />