summaryrefslogtreecommitdiffstats
path: root/res/values-zh-rCN/strings.xml
Commit message (Collapse)AuthorAgeFilesLines
* CameraNext: dynamically generate available photo resolutionsWilhelm Fitzpatrick2019-10-251-18/+0
| | | | | | | | | | | Instead of depending on a large matching table, generated the list of picture sizes to show to the user directly from the supported list returned by the camera. The list is filtered to remove uselessly small resolutions on modern devices, to group resolutions by aspect ratio, and to filter out fairly similar sizes. Change-Id: I47a67a89786543baec133cf7e71df9819793ebac Signed-off-by: Chippa-a <vusal1372@gmail.com>
* Snap: Fix aapt warningsLars Greiss2019-10-251-2/+0
| | | | Change-Id: I6d48105f0407ded104244eb5ace4a3ace76eb402
* Snap: Remove CAF Chinese translationsMichael Bestas2019-10-251-491/+8
| | | | Change-Id: Icb15ed42b62a8a85a7691c5cfc606307689cbcae
* Camera2: Remove CAF video duration codeMichael Bestas2019-10-251-2/+0
| | | | | Change-Id: I583e212f3c43a5ddf80fdb16557b3ddd9e3161c2 Signed-off-by: Chippa-a <vusal1372@gmail.com>
* Snap: Use AOSP app labelMichael Bestas2019-10-251-1/+0
| | | | Change-Id: I3d589945ea31f40890a94b43555268b6b3060e37
* SnapdragonCamera: Add 48min 144min No Limit for 480fpsxianming wang2019-01-061-0/+2
| | | | | | | Add 48min 144min and No Limit for 480fps. CRS-Fixed: 2361398 Change-Id: Ie89e00edcb5fe10a544d873e6800a9ae7a10c574
* SnapdragonCamera: New feaures translate to ChineseWeijie Wang2017-09-031-35/+188
| | | | | | | New feaures translate to Chinese Change-Id: If6191dcb42b24081f9c2be0e9db0c0ca1b94452f CRs-Fixed: 2061674
* Revert "SnapdragonCamera: Sync LA.UM.6.4 to LA.UM.6.3"Weijie Wang2017-09-021-188/+35
| | | | | | This reverts commit b5533d51a7c97138235d29b35cec876d107aeadd. Change-Id: I8063422680802e25d03a374be91e884a86ad55e9
* SnapdragonCamera: Sync LA.UM.6.4 to LA.UM.6.3Weijie Wang2017-08-301-35/+188
| | | | | | Sync LA.UM.6.4 to LA.UM.6.3 Change-Id: Ide9a53b3b5ea6d17154003e4059ae3125f9f3346
* SnapdragonCamera: Add Chinese translationJing (Mia) Wang2016-09-271-0/+5
| | | | | | | Add Chinese translation for some strings Change-Id: I8f17c4ad6c5a50ea10744fd84b2c515b626d2a63 CRs-Fixed: 1065593
* Merge "SnapdragonCamera: update Chinese translation"Linux Build Service Account2015-09-291-1/+1
|\
| * SnapdragonCamera: update Chinese translationLikai Ding2015-09-241-1/+1
| | | | | | | | | | | | | | | | Update Chinese translation for "Store Location" in settings. The original translation might be confusing to users. Change-Id: Ib00cc9d69228347258e33ecec7da92342b319f61 CRs-Fixed: 905001
* | SnapdragonCamera: Update the options for the Picture qualitylikaid2015-09-241-0/+5
|/ | | | | | | | | Change the menu items for Picture quality setting Only leave three options for the Picture quality setting Change-Id: I09e615ffb933983352d4a15f44ffef23adbe64ea CRs-Fixed: 905006
* SnapdragonCamera: Add Chinese string for makeup levellikaid2015-09-061-0/+3
| | | | | | | | | | | The makeup level was defined as "Low" "Mid" and "High" with hard code English strings, which could not be changed after system language changed. Add Chinese strings for them in string.xml file. Change-Id: Icb5b570791dfa19494bde9d321188620ca675a35 CRs-Fixed: 892963
* SnapdragonCamera: string changesLikai Ding2015-08-211-2/+2
| | | | | | Replace some strings with their official version. Change-Id: I6b6f3aea7b594c536f0cf7fccda882f4054fc52f
* SnapdragonCamera: add Chinese translationslikaid2015-08-201-0/+57
| | | | | | | Add Chinese translations for certain string resources. CRs-Fixed: 889166 Change-Id: I544f93eb1dadf3872ba417583e2b27a2cdb2fc6b
* SnapdragonCamera: add Chinese translationslikaid2015-08-181-0/+2
| | | | | | | Add Chinese translations for certain string resources. CRs-Fixed: 885790 Change-Id: Ife63f963a1376ea469f43a971b6f9c79745cc1d0
* SnapdragonCamera: Add Chinese strings for some error messageslikaid2015-08-111-0/+4
| | | | | | | | | | Some of the error messages didn't have Chinese strings, that caused it shown the English strings under Chinese language context. Add Chinese strings for these messages. CRs-Fixed: 887677 Change-Id: I21186b1850588a4ff39c6de69259ddad37d1fc08
* Merge "SnapdragonCamera: Fix "Square" display abnormal in Chinese mode"Linux Build Service Account2015-07-151-0/+1
|\
| * SnapdragonCamera: Fix "Square" display abnormal in Chinese modelikaid2015-07-151-0/+1
| | | | | | | | | | | | | | | | | | There is no definition for string "Square" in Chinese mode. Add definition for "Square" string. Change-Id: Ic2e7050cae9b6c56771670f776a7a74abeb9bf3d CRs-Fixed: 866044
* | SnapdragonCamera: Add Chinese string for camera setting menu itemslikaid2015-07-141-0/+17
|/ | | | | | | | | some string on camera settings menu didn't translate to Chinese. Add Chinese string in values-zh-rCN/strings.xml. CRs-Fixed: 843181 Change-Id: I9e941247cbe886ebbbf1e7e5f46ee0b0a4bd9d68
* SnapdragonCamera: add touch animation for refocusLikai Ding2015-04-271-0/+4
| | | | | | also added a dialog to explain refocus mode Change-Id: I8c319c2cb64ca85d320eca453ade9c325fd4ac37
* SnapdragonCamera: Add cancel longshot prompt message in Chineselikaid2015-04-081-0/+1
| | | | | | | | | | | | The continue shooting need 40M memory at least, When the memory is not enough, it will show the warning message as "run out of memory, canceling longshot" and stop shooting. The string msg_cancel_longshot_for_limited_memory wasn't translate into Chinese. Add Chinese string for msg_cancel_longshot_for_limited_memory. Change-Id: Ib2a9df880ce44a106e11fe873216954b0575ec95 CRs-Fixed: 809502
* SnapdragonCamera: Add beautification feature to SnapdragonCamera.Zhang Zhenzhen2015-03-201-0/+11
| | | | Change-Id: Ie585527fc0b8679359753b3ff6245add3d1e5530
* SnapdragonCamera: show how many more pictures can be takenLikai Ding2014-12-221-0/+2
| | | | | | | Prompt to user an estimation of how many more pictures can be taken, calculated based on available storage. Change-Id: Iabc8268d548d3f6d86a6d065b511641b837a1de5
* Merge "Camera: Add CameraGestureActivity as alias of CameraActivity"Linux Build Service Account2014-12-161-0/+3
|\
| * Camera: Add CameraGestureActivity as alias of CameraActivityJing (Mia) Wang2014-12-101-0/+3
| | | | | | | | | | | | | | Make the activity could show above lock screen and turn on screen when it is started by gesture operation. Change-Id: I2099154f2325de83597b4262203c58a84b91f2d9
* | Merge "Camera2: fix SnapdragonCamera app no Chinese name"Linux Build Service Account2014-12-121-0/+1
|\ \
| * | Camera2: fix SnapdragonCamera app no Chinese namekaiyiz2014-12-121-0/+1
| |/ | | | | | | | | | | | | | | | | | | There is no snapcam_app_name string in values-zh-rCN. Add relate strings in the file. CRs-Fixed: 766929 Change-Id: Ib6c5f8b9bac493ab2f8d00ad863e9e92bd826316
* | Merge "Camera2: fix no correspond Chinese String for menu"Linux Build Service Account2014-12-121-0/+3
|\ \ | |/ |/|
| * Camera2: fix no correspond Chinese String for menukaiyiz2014-11-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | There is no Chinese strings for menu 'HDR need 1x frame'. Add Chinese string for this menu and modify the menu entries for show the menu on/off mode CRs-Fixed: 755394 Change-Id: I6b84e579b164b1585631fd240b7f53bcf6de628d
* | Merge "SnapdragonCamera: Add a option item for record video unlimit"Linux Build Service Account2014-12-061-0/+1
|\ \
| * | SnapdragonCamera: Add a option item for record video unlimitkaiyiz2014-12-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no menu item for select unlimit video duration. Add relate resource in video duration menu pref for select. CRs-Fixed: 763378 Change-Id: Ie64ce018822acb0d25dcf327a5626a8463a61a13
* | | SnapdragonCamera: fix app crash when there is no map appkaiyiz2014-11-301-0/+3
|/ / | | | | | | | | | | | | | | | | | | | | ActivityNotFoundException happened after click showOnMap menu when there is no map app. Catch the Exception to avoid app crash. CRs-Fixed: 753928 Change-Id: I1cf6e5f098f239719750840508b715a08e9a5e45
* / SnapdragonCamera: Fix 'Video HDR' still display English in Chinesekaiyiz2014-11-121-0/+3
|/ | | | | | | | | | There is no correspond Chinese string for "Video HDR" and it's entry. Add strings for "Video HDR" and it's entries. CRs-Fixed: 750804 Change-Id: Idfe7b116f606f7bdce0d1450ebb9532a28daa0e1
* Camera2: Fix some settings are English when system language is Chinesekaiyiz2014-07-091-1/+18
| | | | | | | | | | | There is no matched Chinese resource for these settings. Add matched Chinese string resource for settings include AE-Bracket/ Advanced features/AUTO HDR. CRs-Fixed: 690387 Change-Id: Ia67d4ac7b1197d74409e7eaf98fc22f85280906b
* Merge tag 'android-4.4.3_r1' into HEADChiou-Hao Hsu2014-06-111-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 4.4.3 release 1 * tag 'android-4.4.3_r1': Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Remove TRIM support Import translations. DO NOT MERGE Import translations. DO NOT MERGE Fix samsung video recording Fix WB indicator override Revert fixed focus area in CAF mode Add another HTC picture resolution Always set focus mode first before applying scene mode Reduce logging of flattened Preferences Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence. Conflicts: res/values/arrays.xml src/com/android/camera/FocusOverlayManager.java src/com/android/camera/PhotoModule.java src/com/android/camera/VideoModule.java Change-Id: I4be00366e24933c6504639776c711e1a874d1f2e
| * Import translations. DO NOT MERGEBaligh Uddin2013-12-091-2/+1
| | | | | | | | | | Change-Id: I2b510d8650a4854a3066596e28cee9d4d196dd09 Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEGeoff Mendal2013-12-041-1/+2
| | | | | | | | | | Change-Id: I108868d50a1376c9d638fae24f7a004733eedecb Auto-generated-cl: translation import
* | Camera2: Add missing Chinese resources.kaiyiz2014-06-041-0/+3
| | | | | | | | | | | | | | | | | | | | The toast message only define in English resources. Add Chinese strings for flash unsupport AE bracket message. CRs-fixed: 675100 Change-Id: I5d3fa7244e11bb52e9e3d3eff0827295c9c83e15
* | Merge "Camera2: Make Continuous Shot off when HDR on."Linux Build Service Account2014-06-031-0/+1
|\ \
| * | Camera2: Make Continuous Shot off when HDR on.kaiyiz2014-05-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The HDR function can not existed with the Continuous Shot function,so change code to achieve the function like that when we open HDR function ,make the Continuous Shot off, and we close HDR,make the Continuous Shot on. CRs-fixed: 667319 Change-Id: I75ab5d268c1feb2d95ff6a6b0f35dcf96d8cc953
* | | Camera2: Add some missing Chinese resources.kaiyiz2014-05-281-0/+4
|/ / | | | | | | | | | | | | | | | | | | The toast message only define in English resources. Add Chinese strings for HFR/HSR/DIS unsupport message. CRs-fixed: 671766 Change-Id: Icc74a54379b917b6ca3c7cb9ffda0c0e262397cf
* | Camera2: Add some missing Chinese resourceskaiyiz2014-05-261-0/+4
| | | | | | | | | | | | | | | | | | | | The toast message only define in English resources. Add Chinese strings for hdr_enable_message and scene_enable_message. CRs-fixed: 665366 Change-Id: Ib034c6e41a4cb300961a67f604ddd95cfa04b4dd
* | Camera2: update the Chinese translation for some menuKerong Sui2014-04-291-8/+10
| | | | | | | | | | | | | | | | As customer required, we need to translate some menu to Chinese. In order to pass the CMCC test Change-Id: I22c218493d8a4256109115b6a64c39c86adef894 CRs-fixed: 654580
* | Camera2: add UI option to on/off longshotFei Zhang2014-04-141-0/+1
| | | | | | | | | | | | Add a menu option to turn on/off longshot. Change-Id: I21b5b8e8181317dc2db5ece44a60be66a52f5d0a
* | Merge "Camera2: update the Chinese translation for some error message"Linux Build Service Account2014-04-111-0/+6
|\ \
| * | Camera2: update the Chinese translation for some error messageKerong Sui2014-04-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | As customer required, we need to translate the error message to Chinese. We need these patch to pass such as CMCC test Change-Id: Ie06d254b2beb75899d5f72e065ca2b0b853d7a30 CRs-fixed: 622522
* | | Merge "Camera2: Update white balance chinese translation"Linux Build Service Account2014-04-111-4/+4
|\ \ \ | |/ / |/| |
| * | Camera2: Update white balance chinese translationShuai Yuan2014-04-021-4/+4
| |/ | | | | | | | | | | Update white balance chinese translation. Change-Id: If6ba29f68595d1bb6db880edadd50760c0e14161