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

Commit 8d674ee7 authored by Xin Li's avatar Xin Li
Browse files

Merge Coral/Flame into AOSP master 

Bug: 141248619
Change-Id: I27135c7b3f0feaf5a55c82e1e147803746e96adf
Merged-In: Iad4780ba5877afa0a1d3c7a94f10f958c56136f0
parents e696a550 1fe9a2ea

res/values-af/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
    <string name="alarm_today" msgid="7873594221106531654">"Vandag"</string>

    <string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Maak toe"</string>

    <string name="alarm_missed_title" msgid="3828345099754063392">"Wekker gemis"</string>

    <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>

    <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>

    <string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Gesluimer"</string>

    <plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">

      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min.</item>
@@ -239,8 +239,8 @@ 
    <string name="missed_named_timer_notification_label" msgid="665604640028289175">"Afteller gemis: <xliff:g id="NAME">%s</xliff:g>"</string>

    <string name="timer_pause" msgid="3748323712728398743">"Laat wag"</string>

    <string name="timer_reset_all" msgid="7530633132757866087">"Stel alle aftellers terug"</string>

    <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>

    <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>

    <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>

    <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>

    <!-- no translation found for seconds (6550091082396571898) -->

    <skip />

  <string-array name="sw_share_strings">

res/values-am/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
    <string name="alarm_today" msgid="7873594221106531654">"ዛሬ"</string>

    <string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"አሰናብት"</string>

    <string name="alarm_missed_title" msgid="3828345099754063392">"ያመለጠ ማንቂያ"</string>

    <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>

    <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>

    <string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"አንቀላፍቷል"</string>

    <plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">

      <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> ደቂቃ</item>
@@ -239,8 +239,8 @@ 
    <string name="missed_named_timer_notification_label" msgid="665604640028289175">"ያመለጠ ሰዓት ቆጣሪ፦ <xliff:g id="NAME">%s</xliff:g>"</string>

    <string name="timer_pause" msgid="3748323712728398743">"ለአፍታ አቁም"</string>

    <string name="timer_reset_all" msgid="7530633132757866087">"ሁሉንም ሰዓት ቆጣሪዎች ዳግም አስጀምር"</string>

    <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>

    <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>

    <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>

    <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>

    <!-- no translation found for seconds (6550091082396571898) -->

    <skip />

  <string-array name="sw_share_strings">

res/values-ar/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
    <string name="alarm_today" msgid="7873594221106531654">"اليوم"</string>

    <string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"تجاهل"</string>

    <string name="alarm_missed_title" msgid="3828345099754063392">"تنبيه فائت"</string>

    <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>

    <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>

    <string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"تم التأجيل"</string>

    <plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">

      <item quantity="zero"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -275,8 +275,8 @@ 
    <string name="missed_named_timer_notification_label" msgid="665604640028289175">"الموقِّت الفائت: <xliff:g id="NAME">%s</xliff:g>"</string>

    <string name="timer_pause" msgid="3748323712728398743">"إيقاف مؤقت"</string>

    <string name="timer_reset_all" msgid="7530633132757866087">"إعادة ضبط الموقتات"</string>

    <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>

    <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>

    <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>

    <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>

    <!-- no translation found for seconds (6550091082396571898) -->

    <skip />

  <string-array name="sw_share_strings">

res/values-as/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
    <string name="alarm_today" msgid="7873594221106531654">"আজি"</string>

    <string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"বাতিল কৰক"</string>

    <string name="alarm_missed_title" msgid="3828345099754063392">"আপুনি সজাগ হ\'ব নোৱাৰা এলাৰ্ম"</string>

    <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>

    <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>

    <string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"স্নুজ কৰা হ’ল"</string>

    <plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">

      <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> মিনিট</item>
@@ -239,8 +239,8 @@ 
    <string name="missed_named_timer_notification_label" msgid="665604640028289175">"সজাগ হ\'ব নোৱাৰা টাইমাৰ: <xliff:g id="NAME">%s</xliff:g>"</string>

    <string name="timer_pause" msgid="3748323712728398743">"পজ কৰক"</string>

    <string name="timer_reset_all" msgid="7530633132757866087">"সকলো টাইমাৰ ৰিছেট কৰক"</string>

    <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>

    <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>

    <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>

    <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>

    <!-- no translation found for seconds (6550091082396571898) -->

    <skip />

  <string-array name="sw_share_strings">

res/values-az/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
    <string name="alarm_today" msgid="7873594221106531654">"Bu gün"</string>

    <string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Burax"</string>

    <string name="alarm_missed_title" msgid="3828345099754063392">"Buraxılmış zənglər"</string>

    <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>

    <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>

    <string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Mürgülü"</string>

    <plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">

      <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> dəq</item>
@@ -239,8 +239,8 @@ 
    <string name="missed_named_timer_notification_label" msgid="665604640028289175">"Buraxılmış taymer: <xliff:g id="NAME">%s</xliff:g>"</string>

    <string name="timer_pause" msgid="3748323712728398743">"Durdurun"</string>

    <string name="timer_reset_all" msgid="7530633132757866087">"Bütün taymerləri sıfırlayın"</string>

    <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>

    <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>

    <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>

    <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>

    <!-- no translation found for seconds (6550091082396571898) -->

    <skip />

  <string-array name="sw_share_strings">