summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2014-06-01 20:49:47 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2014-06-01 20:49:47 -0700
commit1e1660788569a7adc6416672ff55010743dfacaf (patch)
tree7174f7d6832af334cda8f3fa70e946efeac29c57 /res
parent5a55b0610029cc8cf1edb5872cbbb7c11221fffa (diff)
parentc31edd2073fafcd5b1a7710958b8611063778d25 (diff)
downloadandroid_packages_apps_Snap-1e1660788569a7adc6416672ff55010743dfacaf.tar.gz
android_packages_apps_Snap-1e1660788569a7adc6416672ff55010743dfacaf.tar.bz2
android_packages_apps_Snap-1e1660788569a7adc6416672ff55010743dfacaf.zip
Merge "Camera2: Add some missing Chinese resources."
Diffstat (limited to 'res')
-rw-r--r--res/values-zh-rCN/strings.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index b2c2319a2..86195a52c 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -480,6 +480,10 @@
<string name="error_app_unsupported">"此编码格式不支持当前的分辨率设置,请切换至H264"</string>
<string name="error_app_unsupported_raw">"RAW图片格式下不支持零秒快拍,已为您切换至JPEG格式"</string>
<string name="error_app_unsupported_hsr">当前格式下不支持HSR</string>
+ <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
+ <string name="error_app_unsupported_hfr_selection">HFR/HSR不支持DIS/延时拍摄/HDR模式</string>
+ <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
+ <string name="error_app_unsupported_dis">DIS不支持当前的分辨率设置</string>
<string name="pref_camera_longshot_title">连拍</string>
<string name="pref_camera_skinToneEnhancement_title">肤色增强</string>