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

Commit 5fa5cd15 authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-17.1' into v1-q

parents 542f796e c840b681
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
     Copyright (C) 2017 The LineageOS Project
     Copyright (C) 2012-2014 The CyanogenMod Project
     Copyright (c) 2013, The Linux Foundation. All rights reserved.
     Copyright (C) 2017-2020 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.
+1 −1
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
     Copyright (C) 2017 The LineageOS Project
     Copyright (C) 2012-2014 The CyanogenMod Project
     Copyright (c) 2013, The Linux Foundation. All rights reserved.
     Copyright (C) 2017-2020 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.
+1 −1
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
     Copyright (C) 2017 The LineageOS Project
     Copyright (C) 2012-2014 The CyanogenMod Project
     Copyright (c) 2013, The Linux Foundation. All rights reserved.
     Copyright (C) 2017-2020 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.
+1 −1
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
     Copyright (C) 2017 The LineageOS Project
     Copyright (C) 2012-2014 The CyanogenMod Project
     Copyright (c) 2013, The Linux Foundation. All rights reserved.
     Copyright (C) 2017-2020 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.
+2 −1
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
     Copyright (C) 2017 The LineageOS Project
     Copyright (C) 2012-2014 The CyanogenMod Project
     Copyright (c) 2013, The Linux Foundation. All rights reserved.
     Copyright (C) 2017-2020 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.
@@ -20,4 +20,5 @@
    <string name="adb_net_active_notification_title">Şəbəkə üzərindən ADB fəaldır</string>
    <string name="adb_both_active_notification_title">USB &amp; şəbəkə üzərindən ADB fəaldır</string>
    <string name="adb_active_generic_notification_message">Sazlamanı sıradan çıxartmaq üçün toxun.</string>
    <string name="bluetooth_airplane_mode_toast">Təyyarə rejimində Bluetooth açıq qalacaq</string>
</resources>
Loading