summaryrefslogtreecommitdiffstats
path: root/res/values-zh-rCN
Commit message (Collapse)AuthorAgeFilesLines
* 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)
* Revert "Revert "Import translations. DO NOT MERGE""Baligh Uddin2013-10-111-4/+4
| | | | | | This reverts commit faa0615fd6d67fdfdbf28df099cb40a02c34c2f0. Change-Id: I8043d94a45a975412c6f73e64628e1af3cc4d8fe
* Revert "Import translations. DO NOT MERGE"Baligh Uddin2013-10-111-4/+4
| | | | | | This reverts commit 69e938dd6c3e49bfda29fc665b44340bf35b3e09. Change-Id: I8a37595707a87b950c36a25003726d052ba2ab9d
* Import translations. DO NOT MERGEBaligh Uddin2013-10-111-4/+4
| | | | | Change-Id: Ib699ef5577f778618a8657f9f58d317def9268ab Auto-generated-cl: translation import
* Revert "Import translations. DO NOT MERGE"Baligh Uddin2013-10-081-4/+4
| | | | | | This reverts commit 5d00bc10562d86312bc88c34d00da20f41cc3ad9. Change-Id: I82e49f95a3e0705a506cbb409130b19a63e582c1
* Import translations. DO NOT MERGEBaligh Uddin2013-10-071-4/+4
| | | | | Change-Id: I6a24d5d07950f17fe0886365c359ea1514df7c07 Auto-generated-cl: translation import
* Revert "Remove translated filtershow_strings.xml files."Baligh Uddin2013-10-071-0/+96
| | | | | | This reverts commit b17ba7b90fc7ad2d4a12ba5bf86a0b0bd04c6900. Change-Id: Ib5bc636f29af4dee5c4bca520fb3d183187a1b7a
* Remove translated filtershow_strings.xml files.Baligh Uddin2013-10-041-96/+0
|
* Build broken.Baligh Uddin2013-10-051-6/+4
| | | | | | | | Revert "Import translations. DO NOT MERGE" This reverts commit 0028336423130a5a0227cd932d3295581f83dd22. Change-Id: Id3638d0d093d03c037d30a3b1f49e242ff67af85
* Import translations. DO NOT MERGEBaligh Uddin2013-10-041-4/+6
| | | | | Change-Id: Ie6c099841e72853be3243fffc8d6c266c8c802da Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2013-10-021-0/+1
| | | | | Change-Id: Ib171940890f7da47381b6f33a9dddc893cfe60d5 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2013-09-301-254/+255
| | | | | Change-Id: I250289ddbb5e5e2a3062ee895b4ebfaf6004db8f Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2013-09-251-0/+2
| | | | | Change-Id: I760c80468210f750e4d614d7e4099680e032963a Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2013-09-231-2/+4
| | | | | Change-Id: I69db8d31a7314f67babd49ec59d5c0fb5fb66516 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2013-09-191-0/+2
| | | | | Change-Id: Id078acbb97019f81cab8f877aa2939192b099e2f Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2013-09-161-9/+5
| | | | | Change-Id: Ib51b9e17820f90dcc176c4f8196d60bca3b0d0a5 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2013-09-141-0/+8
| | | | | Change-Id: Icb32a9036f201b08701bfeea02cbf38552b1f24e Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2013-09-091-161/+0
| | | | | Change-Id: Id933394699ad53eace19d97d160e4b86f2181d90 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2013-09-031-363/+400
| | | | | Change-Id: Iad77e8a0d648ed7b2bb3205e1d6ab1e73dafde76 Auto-generated-cl: translation import
* am ba81a885: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2013-04-101-2/+0
| | | | | | | gb-ub-photos-bryce * commit 'ba81a885844c3a04e58f70f6eed90de01b5ea44e': Import translations. DO NOT MERGE
* Import translations. DO NOT MERGEBaligh Uddin2013-04-101-0/+2
| | | | | Change-Id: I7d953d7ca29bd4ffd4ba96270845448fb6c3d194 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2013-04-031-0/+4
| | | | | Change-Id: I67a90d5cfd30f854cda228e0a5f54cd640813e16 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2013-03-221-2/+4
| | | | | Change-Id: I5037cd2630cb0f95db7ca665133a85c0826240d3 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2013-03-181-3/+5
| | | | | Change-Id: Ida36bea845582d04f3f8d8c8dea9576a6279be5e Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2013-03-061-2/+1
| | | | | Change-Id: Ie62ac98733f3baad857d0b1e7ebc4b6898b7c10f Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2013-03-041-1/+2
| | | | | Change-Id: Id6aba0c7b2d7a9efe94a6f5cd15c146f58b45e13 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2013-03-011-2/+1
| | | | | Change-Id: If43bbaaf4c504da6aa0031b5f1e81bd1c90afa26 Auto-generated-cl: translation import
* Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2013-02-271-2/+1
|\
| * Import translations. DO NOT MERGEBaligh Uddin2013-02-271-2/+1
| | | | | | | | | | Change-Id: Ib435e397fb94039d4a4cc4da66ae4afcc198dac2 Auto-generated-cl: translation import
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 18:03:18 +0000