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

Commit 070b73a4 authored by Pavel Zhamaitsiak's avatar Pavel Zhamaitsiak Committed by Android (Google) Code Review
Browse files

Merge "Consolidate WiFi Calling string resources" into nyc-dev

parents 5ce4e2e7 7b7c4fc2

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

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2016, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You my obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->



<!-- These resources are around just to allow their values to be customized

     for different hardware and product builds. -->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">



    <!-- WFC Operator Error Codes -->

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

        <item>REG09</item>

    </string-array>

    <!-- 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>

</resources>

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

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2016, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You my obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->



<!-- These resources are around just to allow their values to be customized

     for different hardware and product builds. -->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">



    <!-- WFC Operator Error Codes -->

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

        <item>REG09</item>

    </string-array>

    <!-- 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>

</resources>

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

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2016, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You my obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->



<!-- These resources are around just to allow their values to be customized

     for different hardware and product builds. -->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">



    <!-- WFC Operator Error Codes -->

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

        <item>REG09</item>

    </string-array>

    <!-- 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>

</resources>

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

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2016, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You my obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->



<!-- These resources are around just to allow their values to be customized

     for different hardware and product builds. -->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">



    <!-- WFC Operator Error Codes -->

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

        <item>REG09</item>

    </string-array>

    <!-- 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>

</resources>

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

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2016, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You my obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->



<!-- These resources are around just to allow their values to be customized

     for different hardware and product builds. -->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">



    <!-- WFC Operator Error Codes -->

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

        <item>REG09</item>

    </string-array>

    <!-- 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>

</resources>