summaryrefslogtreecommitdiffstats
path: root/res/values-zh-rCN
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'cm-13.0' of ↵replicant-6.0-0001Wolfgang Wiedmeyer2017-05-021-3/+3
|\ | | | | | | https://github.com/LineageOS/android_packages_apps_Settings into replicant-6.0
| * Automatic translation importAbhisek Devkota2017-04-281-1/+1
| | | | | | | | Change-Id: Id822d8c6ffeb9e67399c0092ba6661728f8d5635
| * Automatic translation importAbhisek Devkota2017-02-201-2/+2
| | | | | | | | Change-Id: I7d05f649b723de01161d1e69d8ca3e3386e09052
* | Replicant rebrandingWolfgang Wiedmeyer2017-02-131-9/+9
|/ | | | Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
* Automatic translation importAbhisek Devkota2017-02-021-0/+3
| | | | Change-Id: Ib281a747d6e4428b4b10e699e4681da6e2afd6ea
* Automatic translation importAbhisek Devkota2017-01-271-30/+27
| | | | Change-Id: Ib8d8f1f7fea13e14167ef08513b183a8fa19b87d
* Settings: Rebrand to LineageOSSimon Shields2016-12-291-9/+10
| | | | Change-Id: I7326fd71621b398345d318c9c38dbc44433c732a
* Automatic translation importinky@build012016-12-021-2/+2
| | | | | Change-Id: I8991cabc252267d4db6f08dbfaf5513e218029e0 Ticket: -
* Automatic translation importinky@build012016-11-291-0/+15
| | | | | Change-Id: I6accc5d5e84063b20a7837ccac93dbcd78c67f21 Ticket: -
* Automatic translation importpinky@build012016-09-251-0/+6
| | | | | Change-Id: I351c2ff04445423b5404e6c5f610ad06bac3efc4 Ticket: -
* Automatic translation importclyde@build012016-09-101-0/+4
| | | | | Change-Id: I239439318d045bb69f69cd88ee067e618d08baa4 Ticket: -
* Automatic translation importpinky@build012016-08-271-0/+6
| | | | | Change-Id: I07d3bda3746ddb983302208b7fecce1a23ac02d4 Ticket: -
* Automatic translation importblinky@build012016-08-131-9/+4
| | | | | Change-Id: I4e7d6adaf0c00d032921fe688b3e9f742437c017 Ticket: -
* Automatic translation importblinky@build012016-08-081-0/+3
| | | | | Change-Id: I9b865e55bc5b3b50b7a41567eb8099719d66d2e3 Ticket: -
* Revert "Settings: Add screen color settings"Steve Kondik2016-08-051-8/+0
| | | | | | | | | | * We now have support for HSIC controls in LiveDisplay and this can be deprecated. A new UI to bring the same kind of functionality is underway as well. This reverts commit 853513841512a0fbf15dc22c7164a98d0a2de80b. Change-Id: I4fa3af25f64b05338a78ba7832e75333cf15e448
* Automatic translation importinky@build012016-07-311-0/+1
| | | | | Change-Id: I181b7c06e3af2101e5506bd2490d8ae35c45a0b9 Ticket: -
* Automatic translation importinky@build012016-07-281-0/+2
| | | | | Change-Id: I2db12f567932f5357531631a68c436657f49f59c Ticket: -
* Automatic translation importclyde@build012016-07-271-1/+0
| | | | | Change-Id: I75b51c7dd6065f768c28d1ae09d173ea55239845 Ticket: -
* Automatic translation importpinky@build012016-07-161-0/+1
| | | | | Change-Id: I9c038a2823e8c6360864dc6c8bbd94b4fb54650b Ticket: -
* Automatic translation importinky@build012016-07-151-2/+1
| | | | | Change-Id: I16a91343278b13d1dea55f9133bcf5f5d3112d64 Ticket: -
* Automatic translation importpinky@build012016-07-141-0/+2
| | | | | Change-Id: Ib44237410311e2373b9ced02125aa2e4dbc9b1e5 Ticket: -
* Automatic translation importclyde@build012016-07-111-0/+5
| | | | | Change-Id: I8cac94e7ac0bc215be6ea57da04497f0e61ce2e4 Ticket: -
* Automatic translation importblinky@build012016-07-041-0/+2
| | | | Change-Id: I0563baf29e6b805719a9e4c83437e8e84e3d5dce
* Automatic translation importinky@build012016-06-291-0/+2
| | | | Change-Id: I098f8fcf30976e41cb277231b172a0532550b9f9
* Automatic translation importblinky@build012016-06-201-0/+1
| | | | Change-Id: I25897fe9a0ce867df8c7df0a6e3f232e23519a49
* Automatic translation importinky@build012016-06-171-1/+16
| | | | Change-Id: I553fea6885f7da29740630a236f986a6b1a135fe
* Automatic translation importinky@build012016-06-061-0/+2
| | | | Change-Id: Ie5bb0b8e6e1980a4e29cedea2820beb893fb7e23
* Automatic translation importclyde@build012016-06-031-0/+4
| | | | Change-Id: I75ed7f58e6fbc7a961b4fe10278393ffde4ef418
* Automatic translation importinky@build012016-06-011-0/+1
| | | | Change-Id: Ida39cf15dc6a0a21286d0177a21437747b616775
* Automatic translation importJessica Wagantall2016-05-261-0/+2
| | | | | Change-Id: I319222d474b4254d912be3ad8a29a2a5f578b1ac Ticket: RM-214
* Automatic translation importAbhisek Devkota2016-05-151-0/+15
| | | | Change-Id: Ibe9208e0bacb2af41239bc770df6b1b87df67264
* Automatic translation importMichael Bestas2016-05-101-0/+7
| | | | Change-Id: Idf93c9826109ee82aa18fc78a5fe6dff47bc5588
* Automatic translation importMichael Bestas2016-04-291-0/+1
| | | | Change-Id: Ibcb688db7bff937cd92b2a0be1a784830b2e3dc7
* Automatic translation importMichael Bestas2016-04-161-1/+6
| | | | Change-Id: I5c7350a9323a8d526fcffcd72be0b53a80f10282
* livedisplay: Update Settings for new LiveDisplay APISteve Kondik2016-04-121-7/+0
| | | | | | | | | * LiveDisplay is getting a proper API. This patch refactors the settings to use it. * Also kill off the deprecated "gamma calibration" tunable which nobody should be using at this point. Change-Id: I948b8845cd06c8c634a201cb5d5b93b5766cc51d
* Automatic translation importMichael Bestas2016-04-061-0/+20
| | | | Change-Id: I3d5131973925152ad0d2ebd21d4c57f03c5d1cd2
* Automatic translation importMichael Bestas2016-03-281-0/+6
| | | | Change-Id: I9b569411eef8996b0fa20d164062f54d3162e49e
* Automatic translation importMichael Bestas2016-03-181-0/+10
| | | | Change-Id: Ide7fdb04e25ae1d25205a835b37ff8a004660ad4
* Merge tag 'android-6.0.1_r22' of ↵Steve Kondik2016-03-101-44/+51
|\ | | | | | | | | | | | | | | https://android.googlesource.com/platform/packages/apps/Settings into cm-13.0 Android 6.0.1 release 22 Change-Id: Ided010bc125199d47ca59d10f0ed5032a26632ff
| * Import translations. DO NOT MERGEGeoff Mendal2016-01-271-2/+6
| | | | | | | | | | Change-Id: I24a034300aade7c9b389c92a29433347cac07070 Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEGeoff Mendal2016-01-181-0/+3
| | | | | | | | | | Change-Id: I415c6bc5d49ea34685d6219dfb8482294f17b692 Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEGeoff Mendal2015-12-112-409/+599
| | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 26151591 Change-Id: Ie838ac1e234ebb27ad5be9fde95d25173a571e78
| * Revert "Import translations. DO NOT MERGE"Geoff Mendal2015-12-122-599/+409
| | | | | | | | | | | | This reverts commit df57be8aef6dd1760e72d7f76490048eeb425a3e. Change-Id: Ie47ab587c4ea43cdd6fb608b0c5dfe26e534ab93
| * Import translations. DO NOT MERGEGeoff Mendal2015-12-112-409/+599
| | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 26151591 Change-Id: If1d7f9358c3fa2e17826385ea967c09442f08285
* | Automatic translation importMichael Bestas2016-03-051-0/+158
| | | | | | | | Change-Id: I05b544653c16ee0275a3259bfb604bf583a12212
* | Automatic translation importMichael Bestas2016-02-221-1/+5
| | | | | | | | Change-Id: Ie08c59c97a1b0ec263e7430d58387eeecbd8d4d8
* | Automatic translation importMichael Bestas2016-02-141-9/+19
| | | | | | | | Change-Id: I7edab2a2d800acd4ef514ca1d71d7e2f4f5988c4
* | Automatic translation importMichael Bestas2016-02-021-1/+16
| | | | | | | | Change-Id: I593d60dbddc30ead5a0830ab4c45ed69b084ced2
* | Automatic translation importMichael Bestas2016-01-251-3/+21
| | | | | | | | Change-Id: I976c45499030cc38127e57a9ecec7aa602e6722f
* | Automatic translation importMichael Bestas2016-01-112-16/+189
| | | | | | | | Change-Id: I6a73233e7c5689c683bc444bcea93b910f69124e