summaryrefslogtreecommitdiffstats
path: root/res/values-zh-rCN
Commit message (Collapse)AuthorAgeFilesLines
* Automatic translation importblinky@build012016-08-131-0/+1
| | | | | Change-Id: Icde9e62950b8ae18e970956d74f13ef5c812047a Ticket: -
* Automatic translation importblinky@build012016-08-072-0/+7
| | | | | Change-Id: I617b9f444fcef38ad4a1a0c02923d8c7fa368144 Ticket: -
* Automatic translation importclyde@build012016-07-111-0/+2
| | | | | Change-Id: Ide5dee2b9e521d65c6d206bbaf15da1c215bdd4d Ticket: -
* Automatic translation importblinky@build012016-07-041-1/+1
| | | | Change-Id: Ia200f17753e768323d281d9357ea3559613f801a
* Automatic translation importinky@build012016-06-291-0/+8
| | | | Change-Id: Ie86567f7309044fe1c3f6fa5708f675f05d6664c
* Automatic translation importMichael Bestas2016-03-053-0/+381
| | | | Change-Id: I11e58d2823fe001e1bba61bccae1e7fb654bdb5d
* Automatic translation importMichael Bestas2016-02-222-0/+4
| | | | Change-Id: Ic01c27ccf8e2f1d063c14c605a1f6ca41fd8532a
* Automatic translation importMichael Bestas2016-02-141-3/+4
| | | | Change-Id: I7590024e38db54ca4ee8cab74e0683196a65089f
* Automatic translation importMichael Bestas2016-02-022-1/+3
| | | | Change-Id: Ibf6570431f34e33bdcec72bcae2a93aa3aabba80
* Automatic translation importMichael Bestas2016-01-253-270/+583
| | | | Change-Id: I8a5ba161884f24c304c4ed250f1a68f3177a5f68
* Snap: Fix aapt warningsLars Greiss2016-01-111-2/+0
| | | | Change-Id: I6d48105f0407ded104244eb5ace4a3ace76eb402
* Snap: Remove CAF Chinese translationsMichael Bestas2016-01-091-245/+8
| | | | Change-Id: Icb15ed42b62a8a85a7691c5cfc606307689cbcae
* Snap: Remove CAF beautification featureMichael Bestas2015-09-201-11/+0
| | | | | | | | | | | | Revert "SnapdragonCamera: Move the files to the correct location" This reverts commit c25b2d510285512dbb60547353190433f1dbb984. Revert "SnapdragonCamera: Add beautification feature to SnapdragonCamera." This reverts commit c1cea7c15b2e463f37c17f2a4ce61ce689ec7088. Change-Id: If01e4f438a58e4210a3eddf090d426895ecbae87
* Snap: Use AOSP app labelMichael Bestas2015-08-291-1/+0
| | | | Change-Id: I3d589945ea31f40890a94b43555268b6b3060e37
* Merge "SnapdragonCamera: Add cancel longshot prompt message in Chinese"Linux Build Service Account2015-04-021-0/+1
|\
| * SnapdragonCamera: Add cancel longshot prompt message in Chineselikaid2015-03-191-0/+1
| | | | | | | | | | Change-Id: Ib2a9df880ce44a106e11fe873216954b0575ec95 CRs-Fixed: 809502
* | SnapdragonCamera: Add beautification feature to SnapdragonCamera.Zhang Zhenzhen2015-03-231-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
* / Camera2: translate some setting menu to ChineseKerong Sui2014-03-311-1/+184
|/ | | | | | | | Some setting in kk branch have not translate to Chinese.This patch will translate them to Chinese which will improve the user's experience Change-Id: Ibe488d3e568d1c896c88aa7abb15a0df0d8e39c0 CRs-fixed: 622530
* Import translations. DO NOT MERGEBaligh Uddin2013-11-111-10/+5
| | | | | Change-Id: I19829aa0316b38df602b026e39213f11ca02d4d9 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2013-11-061-6/+11
| | | | | Change-Id: I89b964b8ab69359b791eac89bf99b8d518678e27 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2013-11-041-0/+2
| | | | | Change-Id: I0f4b4f2b969168513e77763bcd64027fc2a67445 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2013-10-141-8/+4
| | | | | Change-Id: I80c7902d8de92127a13f6d2f66452c876090a7ac Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2013-10-121-0/+9
| | | | | Change-Id: I4ff93327a41e4a0c3263e3fb32b510b19f60ab8c Auto-generated-cl: translation import
* Fix build break.Sameer Padala2013-10-111-96/+0
| | | | | | | | | | | | | | | ag/369626/ added a cannot_load_image string which was translated in ag/370960/ However, this translation resulted in a duplicate string since this string already existed in translated versions of filtershow_strings.xml which was deleted in ag/339346 but the translated versions weren't deleted. Deleting all the translated versions of that file caused a problem because ag/362583/ added source code that depended on a setting_wallpaper string which only existed in the translated string files. This change deletes the translated filtershow_strings.xml and adds the untranslated setting_wallpaper string. Change-Id: I1b8ac8c854c6f06abde9a71db2105c4d2dd44934 (cherry picked from commit 73a18da0f6181d882d04d648ddcbcc82047f5d71)
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 18:49:42 +0000