summaryrefslogtreecommitdiffstats
path: root/res/values-zh-rCN/strings.xml
Commit message (Collapse)AuthorAgeFilesLines
* Settings: Simplified Chinese TranslationsAndrew Jiang2013-06-061-3/+3
| | | | | | | | Patch Set 2: Rebased, added crt-off option translations. Patch Set 3: Modifications, also restored some AOSP strings. Change-Id: I1c5910abcc323db0c6736d6fac63086619d870ab
* Settings: Simplified Chinese TranslationsAndrew Jiang2013-05-091-2/+0
| | | | Change-Id: I5faf7a19d6efd13740f3316375dc010d4c394779
* Settings : Refactor translationsDelPETER2013-05-061-1/+0
| | | | Change-Id: I81ab69decd39ee829807d1dc4823f5b88a542865
* Settings: Simplified Chinese TranslationsAndrew Jiang2013-04-181-797/+0
| | | | | | | | | | | | | Updated translations and reorganized all CM strings into cm_arrays.xml and cm_strings.xml respectively. Patch Set 2: Made the changes suggested by Engle Mars, as well as deleted all comments as per the new translation policy. Also added some new strings. Patch Set 3: Updated with new suggestions and strings. Change-Id: I03cdf2864a3f17b9a7fcc48d6d4acab0e684ba30
* Overhaul auto-brightness level UI.Danny Baumann2013-04-181-3/+0
| | | | | | | | | | | | This changes a few things: - Don't imply a 'bucket' type of algorithm is used by showing an ambient brightness range for each line - Allow manually entering the screen brightness - Add a preview window for the cubic spline interpolation - Add a help text JIRA:CYAN-612 Change-Id: I64274280872b9fe4f6fdc368d654aca81e0a4e0c
* Restore the opt-out for stats.Steve Kondik2013-04-031-0/+21
| | | | | | | | * Apparently this is a bigger issue for a small number of extremely vocal users. We should respect their wishes, no matter how off-base their claims are in this context. Change-Id: I9eef9a65260ec4e360d398f80d610a198c09c915
* cmstats: Remove preferences and always enable statsSteve Kondik2013-03-311-21/+0
| | | | | | | | | | * Not having an accurate count of how many people are using CM is painful. I am making an executive decision to remove the opt-out and always turn stats on. The data is anonymized and there is nothing evil that can be done with it. The only purpose here is to tell us if we are a successful project or not. Change-Id: I915c5e824d4e15c05feb37a3d8ed911464b5d61b
* Settings: Simplified Chinese TranslationsAndrew Jiang2013-03-171-42/+78
| | | | | | | | | | | | | | | | | | Patch Set 2: Added recent changes to lockscreen patterns. Patch Set 3: Reorganize strings. Patch Set 4: Reorganize strings, attempt #2. Patch Set 5: Added translations for navigation bar shortcuts. Patch Set 6: Added QuickSettings volume tile translations. Patch Set 7: Reorganize strings (Again). Patch Set 8: Some modifications for the sake of consistency. Change-Id: I121996d5d213e0bb9fae2d1f0ebee07f380d02bf
* Chinese: Update translationsYuanQY2013-02-151-3/+35
| | | | | | | | | | | | Patch Set 2: Modified translations and also add recent changes. Patch Set 3: Fixed expanded desktop translations (my bad), also added auto brightness customization strings. Patch Set 4: Rebased, added recent changes and also suggestions by John Hsing. Change-Id: I1dceb27aa6a324b1651df40c4717afe7b1e79640
* Merge commit 'android-4.2.2_r1' into mr1.1-stagingRicardo Cerqueira2013-02-151-24/+20
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: AndroidManifest.xml res/values-de/strings.xml res/values-el/strings.xml res/values-es/strings.xml res/values-fi/strings.xml res/values-hu/strings.xml res/values-it/strings.xml res/values-iw/strings.xml res/values-nl/strings.xml res/values-ru/strings.xml res/values-zh-rCN/strings.xml res/values/strings.xml src/com/android/settings/ChooseLockGeneric.java src/com/android/settings/ChooseLockPatternTutorial.java src/com/android/settings/DeviceInfoSettings.java src/com/android/settings/Settings.java Change-Id: I275be467a401ad6dcc7966924358a5adb0773b75
| * Import translations. DO NOT MERGEBaligh Uddin2012-12-071-6/+7
| | | | | | | | | | Change-Id: I0958247f9b14b944fb0bdc04517e65aabba166c1 Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEBaligh Uddin2012-12-041-1/+1
| | | | | | | | | | Change-Id: I2ef0dc90375c2d1b8d341b2e747352d4a3313925 Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEBaligh Uddin2012-12-031-19/+15
| | | | | | | | | | Change-Id: Id0c38bd59bc3019d70d4c8320019ce0cb0a697ef Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEBaligh Uddin2012-11-221-2/+1
| | | | | | | | | | Change-Id: Ibdf26abbd3f779772241bddcaa321ef7cec0d19b Auto-generated-cl: translation import
* | Settings: Simplified Chinese TranslationsAndrew Jiang2013-02-021-4/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added and modified strings to reflect recent changes. Partially ported from CM10. Patch Set 2: Added Wi-Fi AP priorities and UMS mode translations. Patch Set 3: Add custom lock screen background and sound-to-vibration conversion toggle translations. Patch Set 4: Fix typo. Patch Set 5: Some adjustments. Change-Id: I9434458dd29cc272c8c2d0d0c865ec65d24a917f
* | Goodbye Chronus, it was nice knowing you (2 of 2)DvTonder2013-01-311-1/+1
| | | | | | | | Change-Id: I200fd25a5f21bb19d04fb3fa5e94155e491b228f
* | Setting: Remove unneeded stringsVeeti Paananen2013-01-311-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit removes the unneeded strings which were removed in this (http://review.cyanogenmod.org/#/c/30909/) commit. Patch Set 1: * initial commit Patch Set 2: * remove all unneeded strings * remove the dot from somd disabled strings Patch Set 3-5: * remove code changes * remove another dot Change-Id: Id0108349047cc148c77cc5d9a60c081445fd5ffc
* | Settings: Simplified Chinese TranslationsAndrew Jiang2013-01-021-18/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Corrected some typos, and also changed quick pulldown translations to reflect recent changes in order to improve grammar. Patch Set 2: Fix derp Patch Set 3-4: Further revision. Patch Set 5: Added lock clock widget translations. Patch Set 6: Modify lock clock widget translations to reflect recent rename to Chronus. Patch set 7: Revert to using older lock_clock string id's until refactor gets merged Change-Id: Ia03cfa42c622ef6355297e7bc067a4ef1336028a
* | Remove or rename duplicate stringselektroschmock2012-12-311-1/+0
| | | | | | | | Change-Id: Ib955072f33385ca67081c2bbc589b062cae01a0d
* | Settings: Simplified Chinese TranslationsAndrew Jiang2012-12-241-2/+676
|/ | | | | | | | Mainly ported from CM10 with modifications. Patch Set 2: Fixed Whitespace errors. Change-Id: I2320ed7122f8da5f016de7e5943c7df8e22b3310
* Import translations. DO NOT MERGEBaligh Uddin2012-11-021-13/+9
| | | | | Change-Id: I4aeb203952a8889425968e0e600f846d0a216c81 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2012-10-291-3/+3
| | | | | Change-Id: Ifdee0ced0a57d8ccf512e12166ea1ec66418a6c2 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2012-10-281-7/+4
| | | | | Change-Id: I60f85bd27cdf76663190767052c90db3c521848f Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2012-10-241-8/+9
| | | | | Change-Id: I5e09f5b9727a8c8121eb2243bc519b99eb313903 Auto-generated-cl: translation import
* Manually enter translations for msgid: 9014073093293520112Baligh Uddin2012-10-231-2/+1
| | | | | | | | Per discussion with Maarten / pbrady, enter empty string for untranslated languages. Bug: 7383934 Change-Id: I0faa661820e1cb39603327f8d7d748535249e75d
* Import translations. DO NOT MERGEBaligh Uddin2012-10-221-8/+10
| | | | | Change-Id: Ia49c8378454cc2af782efffce6aa70c60568f3fd Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2012-10-161-9/+13
| | | | | Change-Id: Ica70679f4072603b62a08f46d26f1625a5820788 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2012-10-111-1/+8
| | | | | Change-Id: Iab3d6f1b9911ed3b1ef2472e083a3f55faa4a474 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2012-10-101-2/+1
| | | | | Change-Id: I9dbc7f4fa1f07b43c24be35b63f5dafe24876a61 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2012-10-081-8/+6
| | | | | Change-Id: Id0bdf68adcdbafb85d848aacc2ceccc5f619fba3 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2012-10-041-20/+10
| | | | | Change-Id: I1d77c147969acf45abfa5eb4924fb20639d409ee Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2012-10-031-36/+34
| | | | | Change-Id: I5e5c043d16bb59b50b4341a44827c824c564786c Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2012-10-011-11/+22
| | | | | Change-Id: I117727baf42a812b608c5931ad76cf9f70ff0c9e Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2012-09-281-3/+20
| | | | | Change-Id: Ib65119cb5455e20a3a10ff0a45f54aa0d819d8ec Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2012-09-271-16/+20
| | | | | Change-Id: Ifc3aa0738b4f2beccdc05c1c225ff60308def5d4 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2012-09-261-11/+17
| | | | | Change-Id: Ibdc7730e6559d27b4c9abd2e3cec90f2a0d97a76 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2012-09-251-62/+42
| | | | | Change-Id: Ic76cd17011c6da46ba5298eb2d1f081f7dc6f633 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2012-09-221-34/+129
| | | | | Change-Id: Ie4f6419929f793550859314eb624135452f845f4 Auto-generated-cl: translation import
* Revert "Import translations. DO NOT MERGE"Baligh Uddin2012-09-211-126/+34
| | | | | | | | Build Broken This reverts commit 8172ea490f5880b1e2df2856364c3d37c28ed155 Change-Id: I091c3300ecce597bb0133f62bc621f29af85e5ba
* Import translations. DO NOT MERGEBaligh Uddin2012-09-211-34/+126
| | | | | Change-Id: Iae4b42c08cd2e16f700c844579fcb9b1664a2960 Auto-generated-cl: translation import
* Revert "Import translations. DO NOT MERGE"Baligh Uddin2012-09-181-89/+32
| | | | | | | | Broke the build. This reverts commit b4b2857236e09cbca0faeba07a879e49ad5a9bb4 Change-Id: I51f5f569d717bf0973e5e5a868e9fdc53ca80f99
* Import translations. DO NOT MERGEBaligh Uddin2012-09-171-32/+89
| | | | | Change-Id: I4bbb7366b1791f33b685903e419dfee6ffcbc2f8 Auto-generated-cl: translation import
* Revert "Import translations. DO NOT MERGE"Baligh Uddin2012-09-171-102/+31
| | | | | | | | Build Broken. This reverts commit 4a44ed7bd7a692780e855eb44d7dd86d0bbf78e5 Change-Id: Ie61c8d7b1e5eb46fe8aed1836f8d63f989d23db4
* Import translations. DO NOT MERGEBaligh Uddin2012-09-141-31/+102
| | | | | Change-Id: I07c9987422c8e957459b8425f49d1e1fbd25190c Auto-generated-cl: translation import
* Revert "Import translations. DO NOT MERGE"Baligh Uddin2012-09-101-43/+13
| | | | | | | | Broken Build. This reverts commit e88b7faf434ef1ddecf341e6c3470bc055610bb7 Change-Id: I6860b5d4694e8f6338c190f14c6e615a45030076
* Import translations. DO NOT MERGEBaligh Uddin2012-09-101-13/+43
| | | | | Change-Id: Ibeb05d837712dbbc9c7728faa7f745ad4f37dcc3 Auto-generated-cl: translation import
* am 0c0d6052: am 105d879c: am 98d9380a: am 680c8c8e: resolved conflicts for ↵Elliott Hughes2012-09-061-2/+0
|\ | | | | | | | | | | | | merge of 33f86196 to stage-aosp-master * commit '0c0d605231e78c3a883b88b4abbc46ee29a7a194': Stop hard-coding sample 12- and 24-hour times.
| * am 98d9380a: am 680c8c8e: resolved conflicts for merge of 33f86196 to ↵Elliott Hughes2012-09-061-2/+0
| |\ | | | | | | | | | | | | | | | | | | stage-aosp-master * commit '98d9380a5c3c6a6bfa5687af993ea43c882226b9': Stop hard-coding sample 12- and 24-hour times.
| | * resolved conflicts for merge of 33f86196 to stage-aosp-masterElliott Hughes2012-09-061-2/+0
| | |\ | | | | | | | | | | | | Change-Id: Ifc5a986179d010358a93869d9e8867af8c30f9b8
| | | * Stop hard-coding sample 12- and 24-hour times.Elliott Hughes2012-09-061-2/+0
| | | | | | | | | | | | | | | | | | | | Bug: 6881640 Change-Id: I6b0d6404b0299f9efa8fd12779799f703f1c764f
generated by cgit v1.1 at 2025-01-09 06:38:42 +0000