summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-02-11 23:14:05 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-02-11 23:14:05 +0100
commitb35939047f9487ce4d7f60fce38af6cea983456a (patch)
tree22e04fd3b1800122feed5b4edd2c5cc37a089355 /res/values
parenta1bf2fd62ee9713770d0e45aaadcefa912fdeafb (diff)
parent67bd36ac806fc8ecddd8af5eb7d32b4528071204 (diff)
downloadpackages_apps_Settings-b35939047f9487ce4d7f60fce38af6cea983456a.zip
packages_apps_Settings-b35939047f9487ce4d7f60fce38af6cea983456a.tar.gz
packages_apps_Settings-b35939047f9487ce4d7f60fce38af6cea983456a.tar.bz2
Merge branch 'cm-13.0' of https://github.com/LineageOS/android_packages_apps_Settings into replicant-6.0
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Diffstat (limited to 'res/values')
-rw-r--r--res/values/cm_strings.xml23
-rwxr-xr-xres/values/config.xml1
2 files changed, 13 insertions, 11 deletions
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 7fa4160..f717cee 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2012-2016 The CyanogenMod Project
+ (C) 2017 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.
@@ -60,8 +61,8 @@
<!-- NFC PreferenceCategory title -->
<string name="nfc_title_category">NFC</string>
- <!-- About phone screen, CyanogenMod version -->
- <string name="mod_version">CyanogenMod version</string>
+ <!-- About phone screen, LineageOS version -->
+ <string name="mod_version">LineageOS version</string>
<string name="mod_version_default">Unknown</string>
<!-- About phone screen, Device model -->
@@ -69,8 +70,8 @@
<!-- About phone screen, Device name -->
<string name="device_name">Device name</string>
- <!-- About phone screen, CyanogenMod Api Level -->
- <string name="mod_api_level">CyanogenMod API level</string>
+ <!-- About phone screen, LineageOS Api Level -->
+ <string name="mod_api_level">LineageOS API level</string>
<string name="mod_api_level_default">Unknown</string>
<!-- About phone screen, build date -->
@@ -78,7 +79,7 @@
<string name="build_date_default" translatable="false">2015-01-01-0000</string>
<!-- CM Updater -->
- <string name="cmupdate_settings_title">CyanogenMod updates</string>
+ <string name="cmupdate_settings_title">LineageOS updates</string>
<!-- Settings switch for updating Cyanogen recovery -->
<string name="update_recovery_title">Update Cyanogen recovery</string>
@@ -856,7 +857,7 @@
<!-- Privacy Settings Header item -->
<string name="privacy_settings_cyanogenmod_title">Privacy</string>
- <string name="privacy_settings_cyanogenmod_category" translatable="false">CyanogenMod</string>
+ <string name="privacy_settings_cyanogenmod_category" translatable="false">LineageOS</string>
<!-- Privacy Guard -->
<string name="privacy_guard_default_title">Enabled by default</string>
@@ -995,11 +996,11 @@
<!-- Anonymous Statistics #CM -->
<!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
- <string name="anonymous_statistics_title">CyanogenMod statistics</string>
- <string name="anonymous_statistics_summary">Help make CyanogenMod better by opting into anonymous statistics reporting</string>
+ <string name="anonymous_statistics_title">LineageOS statistics</string>
+ <string name="anonymous_statistics_summary">Help make LineageOS better by opting into anonymous statistics reporting</string>
<string name="anonymous_statistics_warning_title">About</string>
- <string name="anonymous_statistics_warning">Opting into CyanogenMod Statistics will allow non-personal data to be submitted to the
- developers of CyanogenMod to track unique installations across devices. The information submitted includes an unique identifier,
+ <string name="anonymous_statistics_warning">Opting into LineageOS Statistics will allow non-personal data to be submitted to the
+ developers of LineageOS to track unique installations across devices. The information submitted includes an unique identifier,
which does not compromise your privacy or personal data. The data is submitted during each boot.\n\nFor an example of the data that is submitted, tap on Preview Data.</string>
<string name="enable_reporting_title">Enable reporting</string>
<string name="preview_data_title">Preview data</string>
@@ -1171,7 +1172,7 @@
<string name="interruptions_ignore_while_media_summary">Do not reduce media playback volume when a notification arrives</string>
<!-- CM Legal -->
- <string name="cmlicense_title">CyanogenMod legal</string>
+ <string name="cmlicense_title">LineageOS legal</string>
<!-- Menu label for reset the battery stats -->
<string name="menu_stats_reset">Reset stats</string>
diff --git a/res/values/config.xml b/res/values/config.xml
index 1761232..32d81ab 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2007 The Android Open Source Project
+ (C) 2017 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.