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

Commit 777b974f authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-16.0' into v1-pie

parents 31f8dc31 10346a41
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -403,4 +403,7 @@
    <!-- Hotspot lineage extras -->
    <string name="tethering_allow_vpn_upstreams_title">Allow clients to use VPNs</string>
    <string name="tethering_allow_vpn_upstreams_summary">Permit hotspot clients to use this device\u2019s VPN connections for upstream connectivity</string>

    <!-- Label for settings shortcut: mobile network -->
    <string name="network_settings_shortcut_title">Mobile network</string>
</resources>

res/values/lineage_strings.xml

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
     Copyright (C) 2012-2016 The CyanogenMod Project
     Copyright (C) 2019 The LineageOS 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">
    <!-- Label for settings shortcut: mobile network -->
    <string name="network_settings_shortcut_title">Mobile network</string>
</resources>