summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-08-17 18:32:53 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2015-08-17 18:32:53 -0700
commit60f620a1f0b12f78292619a93a42790e84a529bf (patch)
treed5fce6f3f71c66000e8bbc711ee0684a45b02671 /res
parent4fa682387b55e0c5893de94b762a84105ce4200a (diff)
parent19105ee12d21e70f31beed9a85b328c9cba7e82b (diff)
downloadandroid_packages_apps_Snap-60f620a1f0b12f78292619a93a42790e84a529bf.tar.gz
android_packages_apps_Snap-60f620a1f0b12f78292619a93a42790e84a529bf.tar.bz2
android_packages_apps_Snap-60f620a1f0b12f78292619a93a42790e84a529bf.zip
Merge "SnapdragonCamera: Add Chinese strings for some error messages"
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 baebcb1a9..8d23269b1 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -563,4 +563,8 @@
<string name="pref_camera_video_tnr_title">视频TNR模式</string>
<!-- Settings menu, setting title text for video rotation title -->
<string name="pref_camera_video_rotation_title">视频旋转</string>
+
+ <string name="camera_thermal_shutdown">手机过热,关闭相机。</string>
+ <string name="camera_server_died">媒体服务终止,关闭相机。</string>
+ <string name="camera_unknown_error">未知错误,关闭相机。</string>
</resources>