OSDN Git Service

Merge cherrypicks of [10460465, 10460521, 10460352, 10458819] into qt-qpr2-release
[android-x86/packages-apps-Settings.git] / res / values-zh-rCN-nokeys /
2019-12-12 Automerger Merge... [automerger skipped] Prevent accounts page directly...
2019-12-12 Automerger Merge... [automerger skipped] Prevent accounts page directly...
2019-12-11 Automerger Merge... Prevent accounts page directly opening in screen pinnin...
2019-12-06 TreeHugger RobotMerge changes from topic "update_battery_icon" into...
2019-11-22 Hai ShalomMerge "Revert submission" into qt-qpr1-dev
2019-11-19 TreeHugger RobotMerge "Add a dark theme slice" into qt-qpr1-dev
2019-11-18 Hai ShalomMerge "[WPA3] Hide connect button for cloned networks...
2019-11-17 android-build-team... Snap for 6013205 from 80972abd63e37837e6d056e9234b28086...
2019-11-16 TreeHugger RobotMerge "Fix non responding slice toggling" into qt-qpr1-dev
2019-11-15 Bill YiImport translations. DO NOT MERGE
2017-08-15 android-build-team... release-request-8c6f0e6c-413f-4241-b3dc-c159fdcc7655...
2017-08-14 Bill YiMerge "Revert "Import translations. DO NOT MERGE""
2017-08-14 Bill YiRevert "Import translations. DO NOT MERGE"
2017-08-13 android-build-team... release-request-631994b2-37c0-4d03-8caa-bfd01530db29...
2017-08-12 Bill YiImport translations. DO NOT MERGE am: a2a4037f59 ...
2017-08-12 Bill YiImport translations. DO NOT MERGE am: a2a4037f59 ...
2017-08-12 TreeHugger RobotMerge "Import translations. DO NOT MERGE"
2017-08-12 Bill YiImport translations. DO NOT MERGE
2016-12-06 TreeHugger RobotMerge "Add search provider for dashboard fragments...
2016-12-06 TreeHugger RobotMerge "Add InstrumentFragment for non-PreferenceFragmen...
2016-12-06 TreeHugger RobotMerge "Add search indexing for new gesture pages."
2016-12-05 Bill YiRevert "Import translations. DO NOT MERGE"
2016-12-03 Bill YiImport translations. DO NOT MERGE
2012-08-13 Jean-Baptiste QueruMerge "Settings: Use ICS alert drawable"
2012-08-01 Justin Koham 7b065464: Move BT settings appliance check after...
2012-07-03 Irfan Sheriffam 2fad853b: Merge "Limit length of SSID input string...
2012-07-03 Irfan Sheriffam d80ff0a4: Merge "wifi: update text displayed during...
2012-06-14 Jean-Baptiste Queruam 60ec22d1: (-s ours) Merge "Settings: Fixed German...
2012-06-12 Jean-Baptiste Queruresolved conflicts for merge of 051f46d7 to jb-dev...
2012-06-11 Jean-Baptiste Queruam c56b0146: Merge "Fixing pin_too_short text"
2012-06-08 Jean-Baptiste Queruam 5a0b3230: Merge "Add account type check for invisibl...
2012-05-25 Amith Yamasaniam 8ad7abbc: Merge "Corrected return value for updatePr...
2012-05-22 Jean-Baptiste Queruam 1a47dff3: Merge "Remove title bar background drawabl...
2012-05-21 Jean-Baptiste Queruam c0653a12: Merge "Expandable NumberPicker width in...
2012-05-04 Wink Savilleam 69801b36: Merge "RadioInfo: Update the network type...
2012-05-03 Amith Yamasaniam b3c17c57: Merge "Removing static reference from...
2012-05-01 Jean-Baptiste Queruam 299ed152: (-s ours) Merge "Wifi: Update message...
2012-05-01 Justin Koham 519dda9c: Disables BluetoothPairingDialog if in...
2012-05-01 Jean-Baptiste Queruam 7bb1c807: Merge "Settings: PT-BR translation fix"
2012-04-14 Eric Fischeram dad12ddb: (-s ours) am 6ce339f6: Import translations...
2012-04-14 Eric Fischeram ee365b41: (-s ours) Import translations. DO NOT...
2012-04-10 Eric Fischeram 13741f2f: (-s ours) Import translations. DO NOT...
2012-04-05 Eric Fischeram a3b3f7e8: (-s ours) am d52d02bf: Import translations...
2012-03-31 Eric Fischeram 5797c502: (-s ours) am ca0d6822: Import translations...
2012-03-30 Eric Fischeram f8512644: (-s ours) am 841ad7ba: Import translations...
2012-03-28 Kenny RootMerge "Convert to new KeyStore format"
2012-03-28 Kenny RootMerge "Update Wifi to use new keystore function"
2012-03-28 Kenny RootMerge "Switch VPN to use keystore ENGINE"
2012-03-27 Eric Fischeram fe8b3e9a: (-s ours) am f4ce8c93: Import translations...
2012-03-27 Eric Fischeram 819c7192: (-s ours) am c51c5310: Import translations...
2012-03-27 Eric Fischeram 412daa41: (-s ours) am f8b96014: Import translations...
2012-03-26 The Android Automergermerge in jb-release history after reset to master
2012-03-23 Eric FischerMerge "Import translations. DO NOT MERGE"
2012-03-23 Eric FischerImport translations. DO NOT MERGE
2010-06-15 The Android Open... merge from open-source master
2010-06-14 The Android Open... ignore from open-source master
2010-06-14 The Android Open... merge from open-source master
2010-06-14 The Android Open... merge from open-source master
2010-06-11 The Android Open... merge from open-source master
2010-05-19 The Android Open... merge from open-source master
2010-05-19 The Android Open... merge from open-source master
2010-05-12 The Android Open... merge from open-source master
2010-05-12 The Android Open... merge from open-source master
2010-04-21 The Android Open... merge from open-source master
2010-03-18 David BrownMerge "Fix 2520977: NPE in com.android.settings.devicei...
2010-03-18 Eric FischerMerge "Import revised translations"
2010-03-18 Kenny RootImport revised translations
2009-10-13 Eric FischerReimport translations.
2009-10-13 Eric Fischeram b8ecb297: (-s ours) am 5204b662: am 9ef9801f: (...
2009-10-13 Jaikumar Ganesham 9e976090: am db99bb36: am c065348e: Show an error...
2009-10-13 Eric Fischeram 978a9512: Merge branch \'eclair-plus-aosp\' of ssh...
2009-10-13 Michael Chanam 875a034b: am 81cdaff7: b/2173596 Cancel Bluetooth...
2009-10-12 Nick Pellyam 1577fac1: am 94ca23dc: am d1a04291: Update applicati...
2009-10-12 Nick Pellyam c7423763: Merge branch \'eclair-plus-aosp\' of ssh...
2009-10-12 Elliott Hughesam c4cd095d: am c52637df: Merge change I8e1b0fb7 into...
2009-10-12 Eric Fischeram 8ba6a2d5: (-s ours) am c197f154: am 06a111be: (...
2009-10-12 Hung-ying Tyanam b08ff302: am 1cd02cac: am c0e34db1: Merge change...
2009-10-12 Amith Yamasaniam 33aa0fad: am cab9fe2d: Merge change I3c9f79ba into...
2009-10-12 Jaikumar Ganesham ec77e2b0: am f43b1a9d: am 98d76cc9: Remove STOPSHIP...
2009-10-12 Chia-chi Yeham b01a6f96: am 0bc5e275: SecuritySettings: reduce...
2009-10-12 Dan Vacuraam a89d3d35: Merge branch \'eclair-plus-aosp\' of ssh...
2009-10-12 Chung-yih Wangam 059c3f5d: am a8f2f72d: Add the auth_alg field back.
2009-10-12 Eric Fischeram 9ff282bb: (-s ours) am 6de9fb39: (-s ours) Import...
2009-10-12 Jaikumar Ganesham 6e6d2362: Merge change I25f2afba into eclair
2009-10-12 Chia-chi Yeham 85ed0862: Merge change I454a0dbf into eclair
2009-10-12 Chia-chi Yeham 9767612c: Merge change If764d20a into eclair
2009-10-12 Chia-chi Yeham e61a2403: Merge change I844d3db3 into eclair
2009-10-12 Chia-chi Yeham 1e98dfb4: Merge change I446bf8b5 into eclair
2009-10-12 Chia-chi Yeham b83ff4af: Merge change Ibf07c83d into eclair
2009-10-12 Chia-chi Yeham 51e97b33: Merge change Ia7c57145 into eclair
2009-10-12 Chia-chi Yeham c49ca127: Merge change I02f58e89 into eclair
2009-10-12 Chia-chi Yeham d2fa30ba: Merge change I28f1a0fc into eclair
2009-10-01 android-build Shar... am 3a0fc70b: am 40906ea2: empty merge to avoid future...
2009-10-01 Michael Chanam 93979854: am 7bf9e031: Merge change Ie7e8a7ef into...
2009-10-01 Amith Yamasaniam 7c8a08d5: am ee52bed5: Merge change I39527366 into...
2009-10-01 Mike Cleronam d6372e99: am c5648906: Merge change I00ab9f0b into...
2009-10-01 Michael Chanam f30ebb8b: am e6531e25: b/2154978 Show only connectab...
2009-10-01 Amith Yamasaniam 962d3f4a: am e5cff265: Merge change Ibe023c8a into...
2009-10-01 Jaikumar Ganesham 8c5ff4b7: am 1eb1df08: Add strings for authenticatio...
2009-10-01 Michael Chanam eedf612f: am e3b59f19: Merge change I5eab1270 into...
next