From eb7acdfb367f4992953630c1bdc93e0da6809bcd Mon Sep 17 00:00:00 2001
From: Geoff Mendal <mendal@google.com>
Date: Wed, 5 Feb 2014 22:42:38 +0000
Subject: Revert "Revert "Import translations. DO NOT MERGE""

This reverts commit 22389deaded9152040140a4b4dfb9aa635264a9b.

Change-Id: I8be68e5fb89a28f5a4237540fad8656d6156e963
---
 res/values-zh-rCN/strings.xml | 88 +++++++++++++++++--------------------------
 1 file changed, 34 insertions(+), 54 deletions(-)

(limited to 'res/values-zh-rCN')

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index b4012c9b3..40a44090e 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -280,8 +280,7 @@
     <string name="saving_tiny_planet" msgid="8828265180177375494">"正在保存小星球图片…"</string>
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"缩放"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"旋转"</string>
-    <!-- no translation found for photo_editor (1521994560971367225) -->
-    <skip />
+    <string name="photo_editor" msgid="1521994560971367225">"照片编辑器"</string>
     <string name="crop_save" msgid="2841974981340098579">"保存"</string>
     <string name="cannot_load_image" msgid="4100136187076585580">"无法加载该图片！"</string>
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"胶卷视图"</string>
@@ -295,59 +294,40 @@
     <string name="mode_timelapse" msgid="1517168724627815453">"缩时拍摄"</string>
     <string name="mode_wideangle" msgid="1099640345041696830">"广角"</string>
     <string name="mode_panorama" msgid="6882648621305828861">"全景图"</string>
-    <!-- no translation found for mode_settings_desc (1189966170303887131) -->
-    <skip />
-    <!-- no translation found for mode_camera_desc (3670807361165657278) -->
-    <skip />
-    <!-- no translation found for mode_video_desc (4058407412929464689) -->
-    <skip />
-    <!-- no translation found for mode_photosphere_desc (2403816283825579161) -->
-    <skip />
-    <!-- no translation found for mode_craft_desc (8411543408424448562) -->
-    <skip />
-    <!-- no translation found for mode_advanced_camera_desc (6960004655720210841) -->
-    <skip />
-    <!-- no translation found for mode_timelapse_desc (6713275294166788276) -->
-    <skip />
-    <!-- no translation found for mode_wideangle_desc (5924237384871288501) -->
-    <skip />
-    <!-- no translation found for mode_panorama_desc (6023020404237519590) -->
-    <skip />
-    <!-- no translation found for refocus_off_desc (4043473941193970147) -->
-    <skip />
-    <!-- no translation found for refocus_on_desc (2549978881191009668) -->
-    <skip />
-    <!-- no translation found for settings_open_desc (6914471293841793766) -->
-    <skip />
-    <!-- no translation found for settings_close_desc (3095831199632813127) -->
-    <skip />
-    <!-- no translation found for hdr_plus_off_desc (5301287296717144319) -->
-    <skip />
-    <!-- no translation found for hdr_plus_on_desc (8204780034508139909) -->
-    <skip />
-    <!-- no translation found for hdr_off_desc (7921924739852874675) -->
-    <skip />
-    <!-- no translation found for hdr_on_desc (4591284110249047558) -->
-    <skip />
-    <!-- no translation found for flash_off_desc (7151559466286106797) -->
-    <skip />
-    <!-- no translation found for flash_auto_desc (3009043125539675717) -->
-    <skip />
-    <!-- no translation found for flash_on_desc (930372145324854699) -->
-    <skip />
-    <!-- no translation found for torch_on_desc (3069836196559213365) -->
-    <skip />
-    <!-- no translation found for torch_off_desc (8304675202998742618) -->
-    <skip />
-    <!-- no translation found for camera_id_back_desc (3566327490758890635) -->
-    <skip />
-    <!-- no translation found for camera_id_front_desc (7497517948130254220) -->
-    <skip />
-    <!-- no translation found for cancel_button_description (3801167024006905033) -->
-    <skip />
-    <!-- no translation found for done_button_description (1334963435441544592) -->
+    <string name="mode_settings_desc" msgid="1189966170303887131">"打开“设置”"</string>
+    <string name="mode_camera_desc" msgid="3670807361165657278">"切换到“相机”模式"</string>
+    <string name="mode_video_desc" msgid="4058407412929464689">"切换到“摄像机”模式"</string>
+    <string name="mode_photosphere_desc" msgid="2403816283825579161">"切换到“全景照片”模式"</string>
+    <string name="mode_craft_desc" msgid="8411543408424448562">"切换到“高级相机”模式"</string>
+    <string name="mode_advanced_camera_desc" msgid="6960004655720210841">"切换到“高级相机”模式"</string>
+    <string name="mode_timelapse_desc" msgid="6713275294166788276">"切换到“缩时拍摄”模式"</string>
+    <string name="mode_wideangle_desc" msgid="5924237384871288501">"切换到“广角”模式"</string>
+    <string name="mode_panorama_desc" msgid="6023020404237519590">"切换到“全景”模式"</string>
+    <string name="refocus_off_desc" msgid="4043473941193970147">"前景聚焦已关闭"</string>
+    <string name="refocus_on_desc" msgid="2549978881191009668">"前景聚焦已打开"</string>
+    <string name="settings_open_desc" msgid="6914471293841793766">"打开“设置”"</string>
+    <string name="settings_close_desc" msgid="3095831199632813127">"关闭“设置”"</string>
+    <string name="hdr_plus_off_desc" msgid="5301287296717144319">"HDR Plus已关闭"</string>
+    <string name="hdr_plus_on_desc" msgid="8204780034508139909">"HDR Plus已打开"</string>
+    <string name="hdr_off_desc" msgid="7921924739852874675">"HDR已关闭"</string>
+    <string name="hdr_on_desc" msgid="4591284110249047558">"HDR已打开"</string>
+    <string name="flash_off_desc" msgid="7151559466286106797">"闪光灯已关闭"</string>
+    <string name="flash_auto_desc" msgid="3009043125539675717">"自动闪光"</string>
+    <string name="flash_on_desc" msgid="930372145324854699">"闪光灯已打开"</string>
+    <string name="torch_on_desc" msgid="3069836196559213365">"电筒已打开"</string>
+    <string name="torch_off_desc" msgid="8304675202998742618">"电筒已关闭"</string>
+    <string name="camera_id_back_desc" msgid="3566327490758890635">"后置摄像头"</string>
+    <string name="camera_id_front_desc" msgid="7497517948130254220">"前置摄像头"</string>
+    <!-- no translation found for more_options_desc (4628738800610478353) -->
     <skip />
-    <!-- no translation found for retake_button_description (4234613030674787714) -->
+    <string name="cancel_button_description" msgid="3801167024006905033">"取消"</string>
+    <string name="done_button_description" msgid="1334963435441544592">"完成"</string>
+    <string name="retake_button_description" msgid="4234613030674787714">"重新拍摄"</string>
+    <string name="share_button_description" msgid="5108508790540832053">"分享"</string>
+    <string name="view_button_description" msgid="4985768837891362075">"查看"</string>
+    <string name="edit_button_description" msgid="98550816724901925">"编辑"</string>
+    <string name="delete_button_description" msgid="2251065309677200911">"删除"</string>
+    <!-- no translation found for button_change_announcement (3759686152778772111) -->
     <skip />
     <string name="setting_location" msgid="4459859689227893838">"位置信息"</string>
     <string name="setting_picture_size" msgid="3635524767133302049">"照片尺寸"</string>
-- 
cgit v1.2.3