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

Commit 0f35dfb6 authored by /e/ robot's avatar /e/ robot
Browse files

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

parents ddf49fe7 369258ab

core/res/res/values/cm_strings.xml

+5 −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.
@@ -25,4 +25,8 @@ 
    <!-- ADB notification message-->

    <string name="adb_active_generic_notification_message">Touch to disable debugging.</string>



    <!-- Strings for Bluetooth service -->

    <!-- toast message informing user that Bluetooth stays on after airplane mode is turned on. [CHAR LIMIT=NONE] -->

    <string name="bluetooth_airplane_mode_toast">Bluetooth will stay on during airplane mode</string>



 </resources>

core/res/res/values/strings.xml

+0 −4
Original line number Diff line number Diff line
@@ -5399,10 +5399,6 @@ 
    <!-- Description of media type: presentation file, such as PPT. The 'extension' variable is the file name extension. [CHAR LIMIT=32] -->

    <string name="mime_type_presentation_ext"><xliff:g id="extension" example="PDF">%1$s</xliff:g> presentation</string>



    <!-- Strings for Bluetooth service -->

    <!-- toast message informing user that Bluetooth stays on after airplane mode is turned on. [CHAR LIMIT=NONE] -->

    <string name="bluetooth_airplane_mode_toast">Bluetooth will stay on during airplane mode</string>



    <!-- Strings for car -->

    <!-- String displayed when loading a user in the car [CHAR LIMIT=30] -->

    <string name="car_loading_profile">Loading</string>