summaryrefslogtreecommitdiffstats
path: root/res/values-zh-rCN
Commit message (Collapse)AuthorAgeFilesLines
* Import revised translations.Eric Fischer2011-01-121-43/+48
| | | | Change-Id: I989beece90deec6abb2542697d06caf88ae2f4a9
* Import revised translations.Eric Fischer2010-12-231-30/+51
| | | | Change-Id: Ia9338cf200345ea00eb0179ca06770a9c47c16d8
* Import revised translations.Eric Fischer2010-12-141-27/+15
| | | | Change-Id: Ic03653ba9e447830ec3d4b3ae5d9c7b4472d6170
* Import revised translations.Eric Fischer2010-12-091-48/+105
| | | | Change-Id: I58f1a7d3da4c09ad3e00a94bc5353393b99f7d6d
* Import revised translations.Eric Fischer2010-12-011-23/+26
| | | | Change-Id: Ifa67354329fd9a3c44ae870fc063df8048c2f7c8
* Import revised translations.Eric Fischer2010-11-292-52/+27
| | | | Change-Id: Ib13eef88a2489cc34caaa727680334f18489a3dc
* Import revised translations.Eric Fischer2010-11-171-20/+27
| | | | Change-Id: I2f6d6220057db8eb6fb8126ebec9e209d4eade36
* Import revised translations.Eric Fischer2010-11-092-80/+158
| | | | Change-Id: I8ff3fdad70919d2937c3a897b5698e45078d0227
* Import revised translations.Eric Fischer2010-10-272-136/+186
| | | | Change-Id: I0d19c79e3e0ac76527671d181bb77e8944ec4a5f
* Merge commit '47ad0cf3' into manualmergeKen Wakasa2010-09-301-3/+0
|\ | | | | | | | | | | | | | | Conflicts: res/xml/language_settings.xml src/com/android/settings/LanguageSettings.java Change-Id: I0dbfd4ee51682e2b55cad0af1caa90bbedd598a2
| * Revise the Language & keyboard settings layout.Ken Wakasa2010-09-291-3/+0
| | | | | | | | | | bug: 2954950 Change-Id: Ie5815023654c3ee45f73fb6ec08266b11e7ff017
| * Import revised translations. DO NOT MERGEEric Fischer2010-09-241-4/+4
| | | | | | | | Change-Id: Iad9da8a6c0559c93c87a3b9f7e8a9258d677705b
| * Import revised translations. DO NOT MERGEEric Fischer2010-09-101-26/+16
| | | | | | | | Change-Id: I3a1f1eeb653d982ddc30c765a4a530aa48a364bf
| * Preserve old translations for changed strings. DO NOT MERGEEric Fischer2010-09-031-12/+6
| | | | | | | | Change-Id: I7ce80a0d57a6ff09dd12abab5ba6df9019d740ca
| * Import revised translations. DO NOT MERGEEric Fischer2010-08-271-6/+7
| | | | | | | | Change-Id: I258c6a8b900eae6e101ad910b9414e5ba857246d
| * Import revised translations. DO NOT MERGEEric Fischer2010-08-171-0/+6
| | | | | | | | Change-Id: If954fbc7c9ff4898e76e6e4dcde4f9dffdd7cbf2
| * Import revised translations. DO NOT MERGEEric Fischer2010-08-101-2/+2
| | | | | | | | Change-Id: Iecf4053f74ab4c38b165291feef5211ce4cfc83e
| * Import revised translations. DO NOT MERGEEric Fischer2010-08-042-136/+139
| | | | | | | | Change-Id: Ic83849d97650cec0560d847a962756c53d65ea78
* | Import revised translations.Eric Fischer2010-09-242-37/+81
| | | | | | | | Change-Id: Iaf1681fd1e93df389d6028cf41d6f830f509b7ce
* | Import revised translations.Eric Fischer2010-09-102-70/+75
| | | | | | | | Change-Id: I518b97a1bb56438dddf7ea42b836d298f65b1c87
* | Import revised translationsEric Fischer2010-08-301-11/+53
| | | | | | | | Change-Id: I5ff43233cd7017d36238fe17384585cb3938e081
* | Import revised translations.Eric Fischer2010-08-171-0/+6
| | | | | | | | Change-Id: I22bb0d58dabccd19a4726c5abf97710f1970c211
* | Import revised translations.Eric Fischer2010-08-101-2/+2
| | | | | | | | Change-Id: Ib5a34ef0ce1f4639a4744efbc401788982ad43b3
* | Import revised translations.Eric Fischer2010-08-052-140/+182
|/ | | | Change-Id: I0b805e4c7d2cedf70ec4ca5309f2a8073010fa51
* am a4966840: am de3e5665: Add phase2 authentication settingsIrfan Sheriff2010-06-031-0/+1
|\ | | | | | | | | | | | | Merge commit 'a496684019497395b71c6d460501197a74e21e0e' into kraken * commit 'a496684019497395b71c6d460501197a74e21e0e': Add phase2 authentication settings
| * Add phase2 authentication settingsIrfan Sheriff2010-06-021-0/+1
| | | | | | | | | | Bug: 2734813 Change-Id: Iaf4455577be888f6c78f490b2cc046adef41403e
| * Import revised translationsKenny Root2010-05-172-20/+23
| | | | | | | | Change-Id: I6f0e1a9dbaa3b3e81b24de207c3731249d160a59
| * Import revised translationsKenny Root2010-04-292-44/+27
| | | | | | | | Change-Id: If5691d275bf86c94038a53beed65a93dad65b450
* | am 9fef437e: am b3c872bf: Merge "Import revised translations" into froyoKenny Root2010-04-282-39/+47
|\ \ | |/ | | | | | | | | | | Merge commit '9fef437e04edd18f6406a49095403a1b71becf58' into kraken * commit '9fef437e04edd18f6406a49095403a1b71becf58': Import revised translations
| * Import revised translationsKenny Root2010-04-282-39/+47
| | | | | | | | Change-Id: I91401f661d61a86d166baac1cad14b8897d0a467
* | am ee381422: Merge "Import revised translations" into froyoKenny Root2010-04-152-43/+48
|\ \ | |/ | | | | | | | | | | Merge commit 'ee3814226706eb0600928c573254997c4ac148b9' into kraken * commit 'ee3814226706eb0600928c573254997c4ac148b9': Import revised translations
| * Import revised translationsKenny Root2010-04-142-43/+48
| | | | | | | | Change-Id: Ia29e5c15fbd147579185c31d03844ccc5a11032e
* | am c0b5624c: Import revised translationsKenny Root2010-03-301-9/+14
|\ \ | |/ | | | | | | | | | | Merge commit 'c0b5624ccc3b88b6b22fb39da30eed227b87785b' into kraken * commit 'c0b5624ccc3b88b6b22fb39da30eed227b87785b': Import revised translations
| * Import revised translationsKenny Root2010-03-301-9/+14
| | | | | | | | Change-Id: Ib730899be1485cc95ed6254279bae0c9413332b3
| * DO NOT MERGEOscar Montemayor2010-03-261-10/+0
|/ | | | | | | Removing unused features from source tree. Please refer to Bug#2502219. Change-Id: Ib3321f3c0e3edf7dff947917ba9bad0f7da93c89
* Import revised translationsKenny Root2010-03-172-48/+94
| | | | Change-Id: I0f81ee1b861fa5df40700baccc29e2e6c52a39d1
* Import new translations.Eric Fischer2010-02-262-160/+225
|
* Refactor settings hierarchy and clump all volumes in one dialog.Amith Yamasani2010-01-251-3/+0
| | | | | | | | Bug:2362077 Bug:2312836 Bug:2166486 Split Sound and Display into separate top-level settings. All volume settings (including Alarm volume) now in one Volume dialog. Remove some sub-texts to reduce clutter.
* Update with latest translations.Eric Fischer2010-01-072-271/+238
|
* am 45bbba85: am f239f3e0: Merge change Iec5461bc into eclair-mr2Tammo Spalink2009-10-181-7/+0
|\ | | | | | | | | | | | | Merge commit '45bbba8543cb61dfef315d069d21bdd77d1dc81e' * commit '45bbba8543cb61dfef315d069d21bdd77d1dc81e': Remove OEM-specific bits from RadioInfo.
| * Remove OEM-specific bits from RadioInfo.Tammo Spalink2009-10-161-7/+0
| | | | | | | | | | | | | | | | | | | | | | The extracted bits will move into the HTC vendor tree, and it (or similar settings for other vendors) can be accessed via a generic OEM_RADIO_INFO activity. Addresses issue: http://buganizer/issue?id=1645706 Change-Id: Iec5461bcb3e241a1230f5f6d53baa3bb838ff4a9
| * Import revised translations. DO NOT MERGEEric Fischer2009-10-132-129/+218
| |
| * Import revised translations. DO NOT MERGEEric Fischer2009-09-172-117/+101
| |
| * Modify settings for 2.1Jaikumar Ganesh2009-09-111-1/+1
| | | | | | | | | | | | | | Add incoming pairing dialog Add DisplayPasskey handling of pairing keyboards with 2.1 devices. Modify code path to show errors when bonding request fails. Misc fixes like string changes.
| * Import revised translations. DO NOT MERGEEric Fischer2009-09-082-1190/+1059
| |
* | Reimport translations.Eric Fischer2009-10-132-1173/+1118
|/ | | | Change-Id: I0127a0ad80f0736263d4e5dd01371184f2e16cdf
* Removing translated text for compatibility option, which has been moved to ↵Mitsuru Oshima2009-07-201-6/+0
| | | | SpareParts
* Import new translationsEric Fischer2009-07-132-217/+712
|
* Remove Network Location" opt-in dialog from "Security and Settings"Mike Lockwood2009-06-071-8/+0
| | | | | | This dialog is being moved to the Network Location Provider itself. Signed-off-by: Mike Lockwood <lockwood@android.com>
* AI 144912: Merge from cupcake:Eric Fischer2009-04-071-0/+8
| | | | | | | Change 144891 on 2009/04/07 by enf@ebcdic Import a bunch of revised translations. Automated import of CL 144912
generated by cgit v1.1 at 2024-12-25 15:50:35 +0000