diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-07-18 02:22:00 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-07-18 02:22:00 -0700 |
| commit | 39a32e1130df972a12f6bb44eaa0844a820f4247 (patch) | |
| tree | 06a25750e45a60fef8086cdec0feaaef7c675722 | |
| parent | f70993a87bd097adb7e3ca04d39577aa4971239d (diff) | |
| parent | deb2a04b18fea838fdfa7ccc9d45cc89fef36dca (diff) | |
| download | android_packages_apps_Snap-39a32e1130df972a12f6bb44eaa0844a820f4247.tar.gz android_packages_apps_Snap-39a32e1130df972a12f6bb44eaa0844a820f4247.tar.bz2 android_packages_apps_Snap-39a32e1130df972a12f6bb44eaa0844a820f4247.zip | |
Merge "Camera2: Fix some settings are English when system language is Chinese"
| -rw-r--r-- | res/values-zh-rCN/strings.xml | 19 | ||||
| -rw-r--r-- | res/values/qcomstrings.xml | 2 |
2 files changed, 19 insertions, 2 deletions
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 9eb1820e3..c60dd7d8b 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -495,5 +495,22 @@ <string name="HDR_disable_continuous_shot">"开启HDR将禁用连拍功能"</string> <!-- Toast showing non-supported functionality for flash in AE bracket --> - <string name="flash_aebracket_message">闪光灯不支持AE-Bracket模式</string> + <string name="flash_aebracket_message">闪光灯不支持自动包围曝光模式</string> + + <string name="pref_camera_ae_bracket_hdr_title">自动包围曝光</string> + + <!-- Settings screen, Selectable advanced features title --> + <string name="pref_camera_advanced_features_title">高级特性</string> + <!-- Settings screen, Selectable Zone Af dialog radio button choices --> + <string name="pref_camera_advanced_feature_entry_none">无</string> + + <!-- Settings screen, setting title text for Auto HDR--> + <string name="pref_camera_auto_hdr_title">自动 HDR</string> + + <!-- Settings screen, Auto HDR location dialog choices --> + <string name="pref_camera_auto_hdr_entry_enable">开</string> + <string name="pref_camera_auto_hdr_entry_disable">关</string> + + <!-- toast about switch storage --> + <string name="on_switch_save_path_to_sdcard">内部存储空间不足，已切换存储到SD卡</string> </resources> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 6d1815a77..134a6d053 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -232,7 +232,7 @@ <string name="pref_camera_ae_bracket_hdr_value_ae_bracket">AE-Bracket</string> - <string name="pref_camera_ae_bracket_hdr_title" translatable="false">AE-Bracket</string> + <string name="pref_camera_ae_bracket_hdr_title">AE-Bracket</string> <string name="pref_camera_ae_bracket_hdr_default" translatable="false">Off</string> |