3 files changed, 54 insertions, 8 deletions
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index 4d72caa03..3580a6b05 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -16,7 +16,13 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- pixels counted by ten thousands for Chinese -->
+  <!-- common aspect ratios -->
+  <!-- aspect ratio greater than 16:9, so "widescreen" or "cinematic" -->
+  <string name="pref_camera_aspectratio_wide">宽</string>
+  <!-- Format for entries in the picture size menu. Parameter one is aspect ratio,
+         parameter two is size in megapixels, e.g. "(4:3) 12.1 megapixels"
+         NOTE: for Chinese (zh) and Korean (ko) the pixel number (parameter two)
+         will be multiplied by 100 as those languages want to count by ten thousands -->
   <string name="pref_camera_megapixel_format">(%1$s) %2$1.0f 万像素</string>
   <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">微距+</string>
@@ -97,4 +103,7 @@
   <!-- Shutter speed -->
   <string name="pref_camera_shutter_speed_title">快门速度</string>
   <string name="auto_hdr_enabled">自动 HDR 已启用</string>
+  <!-- Advanced options -->
+  <string name="developer_menu_enabled">您已启用高级相机选项</string>
+  <string name="developer_menu_disabled">您已禁用高级相机选项</string>
 </resources>
diff --git a/res/values-zh-rCN/qcomstrings.xml b/res/values-zh-rCN/qcomstrings.xml
index 554f4afd1..108c95a35 100644
--- a/res/values-zh-rCN/qcomstrings.xml
+++ b/res/values-zh-rCN/qcomstrings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <!--
-    Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
+    Copyright (c) 2012-2014, 2016, The Linux Foundation. All rights reserved.
     Copyright (C) 2014-2016 The CyanogenMod Project
 
     Not a Contribution.
@@ -66,7 +66,6 @@
   <string name="pref_camera_manual_focus_entry_diopter_mode">屈光模式</string>
   <string name="pref_camera_manual_focus_entry_off">关闭</string>
   <!-- Still More -->
-  <string name="pref_camera_advanced_feature_entry_stillmore">还有更多</string>
   <!-- Video HDR-->
   <string name="pref_camera_video_hdr_title">视频 HDR</string>
   <!-- CDS mode-->
@@ -100,6 +99,14 @@
   <!-- See More -->
   <!-- Denoise -->
   <string name="pref_camera_denoise_title">降噪</string>
+  <!-- Default noise reduction setting. Do not translate. -->
+  <!-- Settings screen, Select See More title -->
+  <string name="pref_camera_noise_reduction_title">降噪</string>
+  <!-- Settings screen, see more radio button choices -->
+  <string name="pref_camera_noise_reduction_entry_off">关闭</string>
+  <string name="pref_camera_noise_reduction_entry_fast">快速</string>
+  <string name="pref_camera_noise_reduction_entry_high_quality">高质量</string>
+  <!-- see more entry values. Do not translate. -->
   <!-- ISO -->
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">自动</string>
@@ -266,5 +273,32 @@
   <string name="video_quality_4k_disable_IS">启用 4K 视频尺寸将会禁用稳定化</string>
   <!-- Toast after 2k4k video is enabled to inform SeeMore has been disabled -->
   <string name="video_quality_4k_disable_SeeMore">SeeMore 功能无法在录制 4K 视频时启用</string>
+  <!-- Toast after SeeMore has been enabled to show CDS is disabled -->
+  <string name="disable_CDS_during_SeeMore">启用 SeeMore 将会禁用 CDS</string>
+  <!-- Toast after SeeMore has been enabled to show TNR is disabled -->
+  <string name="disable_TNR_during_SeeMore">启用 SeeMore 将会禁用 TNR</string>
   <!-- TODO: Remove these? -->
+  <string name="pref_camera2_camera2_title" translatable="true">Camera2 模式</string>
+  <string name="pref_camera2_camera2_entry_enable" translatable="true">启用</string>
+  <string name="pref_camera2_camera2_entry_disable" translatable="true">禁用</string>
+  <string name="pref_camera2_mono_only_title" translatable="true">仅单色</string>
+  <string name="pref_camera2_mono_preview_title" translatable="true">单色预览</string>
+  <string name="pref_camera2_mono_preview_entry_on" translatable="true">开</string>
+  <string name="pref_camera2_mono_preview_entry_off" translatable="true">关闭</string>
+  <string name="pref_camera2_clearsight_title" translatable="true">ClearSight</string>
+  <string name="pref_camera2_clearsight_entry_on" translatable="true">开</string>
+  <string name="pref_camera2_clearsight_entry_off" translatable="true">关闭</string>
+  <string name="clearsight_capture_success">ClearSight 拍摄成功</string>
+  <string name="clearsight_capture_fail">ClearSight 拍摄失败</string>
+  <string name="pref_camera2_mpo_title" translatable="true">MPO 格式</string>
+  <string name="pref_camera2_mpo_entry_on" translatable="true">开</string>
+  <string name="pref_camera2_mpo_entry_off" translatable="true">关闭</string>
+  <string name="pref_camera2_makeup_title" translatable="true">美颜</string>
+  <string name="pref_camera2_noise_reduction_title" translatable="true">降噪</string>
+  <string name="pref_camera2_noise_reduction_entry_off" translatable="true">关闭</string>
+  <string name="pref_camera2_noise_reduction_entry_fast" translatable="true">快速</string>
+  <string name="pref_camera2_noise_reduction_entry_high_quality" translatable="true">高质量</string>
+  <string name="pref_camera2_videosnap_title" translatable="true">自动快照大小</string>
+  <string name="pref_camera2_videosnap_entry_enable" translatable="true">启用</string>
+  <string name="pref_camera2_videosnap_entry_disable" translatable="true">禁用</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 45b8d9a1d..b308d150d 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -139,6 +139,10 @@
   <string name="cannot_connect_camera">无法连接到相机。</string>
   <!-- message for the dialog showing the camera is disabled because of security policies. Camera cannot be used. -->
   <string name="camera_disabled">由于安全政策的限制，相机已被禁用。</string>
+  <!-- message for the dialog showing that the app does not have sufficient permissions [CHAR LIMIT=NONE] -->
+  <string name="error_permissions">应用没有运行所需的关键权限。请检查您的权限设置。</string>
+  <!-- Dialog "Dismiss" button. Closes the dialog [CHAR LIMIT=12]-->
+  <string name="dialog_dismiss">忽略</string>
   <!-- alert to the user to wait for some operation to complete -->
   <string name="wait">请稍候…</string>
   <!-- alert to the user that an SD card must be installed before using the camera -->
@@ -265,7 +269,6 @@
   <string name="pref_camera_scenemode_entry_sunset">日落</string>
   <!-- Scene mode optimized for taking indoor low-lights pictures. [CHAR LIMIT=16] -->
   <string name="pref_camera_scenemode_entry_party">派对</string>
-  <string name="pref_camera_scenemode_entry_optizoom">光学变焦</string>
   <!-- Settings menu, scene mode labels [CHAR LIMIT=50] -->
   <string name="pref_camera_scenemode_label_auto">无</string>
   <!-- Scene mode that takes an image quickly with little motion blur. [CHAR LIMIT=50] -->
@@ -288,10 +291,10 @@
   <string name="pref_camera_countdown_label_fifteen">15 秒</string>
   <!-- Toast after trying to select a setting that is not allowed to change in scene mode [CHAR LIMIT=NONE] -->
   <string name="not_selectable_in_scene_mode">无法在取景模式下选择。</string>
-  <!-- Toast after SeeMore has been enabled to show CDS is disabled -->
-  <string name="disable_CDS_during_SeeMore">SeeMore 将会禁用 CDS 。</string>
-  <!-- Toast after SeeMore has been enabled to show TNR is disabled -->
-  <string name="disable_TNR_during_SeeMore">SeeMore 将会禁用 TNR。</string>
+  <!-- Toast after High Quality Noise Reduction has been enabled to show CDS is disabled -->
+  <string name="disable_CDS_during_HighQualityNoiseReduction">高品质降噪将禁用 CDS</string>
+  <!-- Toast after High Quality Noise Reduction has been enabled to show TNR is disabled -->
+  <string name="disable_TNR_during_HighQualityNoiseReduction">高品质降噪将禁用 TNR</string>
   <!-- Exposure settings in preference -->
   <string name="pref_exposure_title">曝光</string>
   <!--  menu label exposure compensation [CHAR LIMIT=50] -->