summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2014-12-12 03:08:46 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2014-12-12 03:08:46 -0800
commit313ca2adb838fa1965fe2381b36a9d11b06c44da (patch)
tree18275265334346d7aa6c5173df432ac56c25dd6c
parent3b828c566e03ecc5c6bc398852dc58546d857678 (diff)
parent6cebf7d5de6bea69aa7f8a055ce373a058fe0754 (diff)
downloadandroid_packages_apps_Snap-313ca2adb838fa1965fe2381b36a9d11b06c44da.tar.gz
android_packages_apps_Snap-313ca2adb838fa1965fe2381b36a9d11b06c44da.tar.bz2
android_packages_apps_Snap-313ca2adb838fa1965fe2381b36a9d11b06c44da.zip
Merge "Camera2: fix no correspond Chinese String for menu"
-rw-r--r--res/values-zh-rCN/strings.xml3
-rw-r--r--res/values/qcomstrings.xml6
2 files changed, 6 insertions, 3 deletions
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index fafdef192..1c3d4518d 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -503,6 +503,9 @@
<string name="pref_camera_ae_bracket_hdr_title">自动包围曝光</string>
+ <!-- Settings screen, Selectable HDR need 1x frame title -->
+ <string name="pref_camera_hdr_need_1x_title">多帧HDR</string>
+
<!-- Settings screen, Selectable advanced features title -->
<string name="pref_camera_advanced_features_title">高级特性</string>
<!-- Settings screen, Selectable Zone Af dialog radio button choices -->
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index a3cb048ba..7e4988a01 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -823,14 +823,14 @@
<string name="pref_hdr_mode_value_multi_frame">hdr-mode-multiframe</string>
<!-- Settings screen, Selectable HDR need 1x frame default value -->
- <string name="pref_camera_hdr_need_1x_default">true</string>
+ <string name="pref_camera_hdr_need_1x_default">@string/pref_hdr_need_1x_value_true</string>
<!-- Settings screen, Selectable HDR need 1x frame title -->
<string name="pref_camera_hdr_need_1x_title">HDR need 1x frame</string>
<!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
- <string name="pref_camera_hdr_need_1x_entry_false">False</string>
- <string name="pref_camera_hdr_need_1x_entry_true">True</string>
+ <string name="pref_camera_hdr_need_1x_entry_false">@string/setting_off</string>
+ <string name="pref_camera_hdr_need_1x_entry_true">@string/setting_on</string>
<!-- HDR need 1x frame entry values. Do not translate. -->
<string name="pref_hdr_need_1x_value_false">false</string>