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

Commit 7aa0345f authored by Pavel Zhamaitsiak's avatar Pavel Zhamaitsiak Committed by android-build-merger
Browse files

Merge "Wi-Fi Calling: Update strings" into lmp-mr1-wfc-dev 

automerge: eda354b7

* commit 'eda354b7':
  Wi-Fi Calling: Update strings
parents d35f8862 eda354b7

core/res/res/values-mcc310-mnc260/strings.xml

+7 −3
Original line number Diff line number Diff line
@@ -25,9 +25,13 @@ 
    <string-array name="wfcOperatorErrorCodes" translatable="false">

        <item>REG09</item>

    </string-array>

    <!-- WFC Operator Error Messages -->

    <string-array name="wfcOperatorErrorMessages">

        <item>Wi-Fi Calling isn\&apos;t available. Contact your carrier to enable Wi-Fi Calling.</item>

    <!-- WFC Operator Error Messages showed as alerts -->

    <string-array name="wfcOperatorErrorAlertMessages">

        <item>To make calls and send messages over Wi-Fi, first ask your carrier to set up this service. Then turn on Wi-Fi calling again from Settings.</item>

    </string-array>

    <!-- WFC Operator Error Messages showed as notifications -->

    <string-array name="wfcOperatorErrorNotificationMessages">

        <item>Register with your carrier</item>

    </string-array>

    <!-- Template for showing cellular network operator name while WFC is active -->

    <string name="wfcSpnFormat">%s Wi-Fi Calling</string>

core/res/res/values/strings.xml

+12 −2
Original line number Diff line number Diff line
@@ -249,10 +249,20 @@ 
    <string name="wfcRegErrorTitle">Wi-Fi Calling</string>

    <!-- WFC Operator Error Codes -->

    <string-array name="wfcOperatorErrorCodes" translatable="false" />

    <!-- WFC Operator Error Messages -->

    <string-array name="wfcOperatorErrorMessages" />

    <!-- WFC Operator Error Messages showed as alerts -->

    <string-array name="wfcOperatorErrorAlertMessages" />

    <!-- WFC Operator Error Messages showed as notifications -->

    <string-array name="wfcOperatorErrorNotificationMessages" />

    <!-- Template for showing cellular network operator name while WFC is active -->

    <string name="wfcSpnFormat">%s</string>

    <!-- WFC, summary for Disabled -->

    <string name="wifi_calling_off_summary">Off</string>

    <!-- WFC, summary for Wi-Fi Preferred -->

    <string name="wfc_mode_wifi_preferred_summary">Wi-Fi preferred</string>

    <!-- WFC, summary for Cellular Preferred -->

    <string name="wfc_mode_cellular_preferred_summary">Cellular preferred</string>

    <!-- WFC, summary for Wi-Fi Only -->

    <string name="wfc_mode_wifi_only_summary">Wi-Fi only</string>



    <!--

        {0} is one of "bearerServiceCode*"

core/res/res/values/symbols.xml

+6 −1
Original line number Diff line number Diff line
@@ -751,8 +751,13 @@ 
  <java-symbol type="string" name="phoneTypeWorkPager" />

  <java-symbol type="string" name="wfcRegErrorTitle" />

  <java-symbol type="array" name="wfcOperatorErrorCodes" />

  <java-symbol type="array" name="wfcOperatorErrorMessages" />

  <java-symbol type="array" name="wfcOperatorErrorAlertMessages" />

  <java-symbol type="array" name="wfcOperatorErrorNotificationMessages" />

  <java-symbol type="string" name="wfcSpnFormat" />

  <java-symbol type="string" name="wifi_calling_off_summary" />

  <java-symbol type="string" name="wfc_mode_wifi_preferred_summary" />

  <java-symbol type="string" name="wfc_mode_cellular_preferred_summary" />

  <java-symbol type="string" name="wfc_mode_wifi_only_summary" />

  <java-symbol type="string" name="policydesc_disableCamera" />

  <java-symbol type="string" name="policydesc_encryptedStorage" />

  <java-symbol type="string" name="policydesc_expirePassword" />