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

Commit 29dd5f9e authored by Zoey Chen's avatar Zoey Chen Committed by Automerger Merge Worker
Browse files

Merge "[Provider Model] Update the preferred status to the latest" into sc-dev...

Merge "[Provider Model] Update the preferred status to the latest" into sc-dev am: 28f3a570 am: 39dbfb91

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448950

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1999858a985b1ae59732e7320fd3739833a1a37a
parents ea8e384d 39dbfb91
Loading
Loading
Loading
Loading
+6 −5
Original line number Diff line number Diff line
@@ -12528,19 +12528,20 @@
    <!-- Provider Model: Summary for calling preference -->
    <string name="calls_sms_wfc_summary">Make and receive calls over Wi\u2011Fi</string>
    <!-- Provider Model: Label for footnote on calling preference -->
    <string name="calls_sms_footnote">With Wi\u2011Fi calling, calls are made and received over non-carrier Wi\u2011Fi networks.</string>
    <string name="calls_sms_footnote">With Wi\u2011Fi calling, calls are made and received over non\u2011carrier Wi\u2011Fi networks.
        <annotation id="url">Learn more</annotation></string>
    <!-- Provider Model: Calls preference title -->
    <string name="calls_preference_title">Calls</string>
    <!-- Provider Model: SMS preference title -->
    <string name="sms_preference_title">SMS</string>
    <!-- Provider Model: Preferred status in summary for Calls & SMS -->
    <string name="calls_sms_preferred">preferred</string>
    <string name="calls_sms_preferred">Preferred for calls &amp; SMS</string>
    <!-- Provider Model: Calls Preferred status in summary for Calls & SMS -->
    <string name="calls_sms_calls_preferred">calls preferred</string>
    <string name="calls_sms_calls_preferred">Preferred for calls</string>
    <!-- Provider Model: SMS Preferred status in summary for Calls & SMS -->
    <string name="calls_sms_sms_preferred">SMS preferred</string>
    <string name="calls_sms_sms_preferred">Preferred for SMS</string>
    <!-- Provider Model: Unavailable status in summary for Calls & SMS -->
    <string name="calls_sms_unavailable">unavailable</string>
    <string name="calls_sms_unavailable">Temporarily unavailable</string>
    <!-- Provider Model: No SIM status in summary for Calls & SMS -->
    <string name="calls_sms_no_sim">No SIM</string>
    <!-- Network & internet preferences title [CHAR LIMIT=NONE] -->