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

Commit e0d01b91 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[TNU1.2] Add string for client number notification" into rvc-dev am: 975130e0

Change-Id: I42578eaac7d5e235331ed46ec5195c7e5bec61fe
parents 5ad2541c 975130e0
Loading
Loading
Loading
Loading
+22 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2020 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 may 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.
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <!-- String for tethered notification title with client number info. -->
    <plurals name="tethered_notification_title_with_client_number">
        <item quantity="one"><xliff:g>%1$d</xliff:g> device connected.</item>
        <item quantity="other"><xliff:g>%1$d</xliff:g> devices connected.</item>
    </plurals>
</resources>
 No newline at end of file
+22 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2020 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 may 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.
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <!-- String for tethered notification title with client number info. -->
    <plurals name="tethered_notification_title_with_client_number">
        <item quantity="one"><xliff:g>%1$d</xliff:g> device connected.</item>
        <item quantity="other"><xliff:g>%1$d</xliff:g> devices connected.</item>
    </plurals>
</resources>
 No newline at end of file
+22 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2020 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 may 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.
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <!-- String for tethered notification title with client number info. -->
    <plurals name="tethered_notification_title_with_client_number">
        <item quantity="one"><xliff:g>%1$d</xliff:g> device connected.</item>
        <item quantity="other"><xliff:g>%1$d</xliff:g> devices connected.</item>
    </plurals>
</resources>
 No newline at end of file
+4 −1
Original line number Diff line number Diff line
@@ -13,12 +13,15 @@
     See the License for the specific language governing permissions and
     limitations under the License.
-->
<resources>
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <!-- Shown when the device is tethered -->
    <!-- String for tethered notification title [CHAR LIMIT=200] -->
    <string name="tethered_notification_title">Tethering or hotspot active</string>
    <!-- String for tethered notification message [CHAR LIMIT=200] -->
    <string name="tethered_notification_message">Tap to set up.</string>
    <!-- String for tethered notification title with client number info. -->
    <plurals name="tethered_notification_title_with_client_number">
    </plurals>

    <!-- This notification is shown when tethering has been disabled on a user's device.
    The device is managed by the user's employer. Tethering can't be turned on unless the