Import translations. DO NOT MERGE

Change-Id: I5386ba5861b8c9b623bd6031d936474ad457ca1f
Auto-generated-cl: translation import

2 files changed, 26 insertions, 10 deletions

diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index b2e206a0f..a88de7a49 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -170,6 +170,9 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+    <!-- no translation found for wifi_peap_phase2_entries:0 (2577747762745812488) -->
+    <!-- no translation found for wifi_peap_phase2_entries:1 (937786527870979616) -->
+    <!-- no translation found for wifi_peap_phase2_entries:2 (5302613883318643629) -->
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"无"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -211,6 +214,17 @@
     <item msgid="3738430123799803530">"可卸载的 SD 卡"</item>
     <item msgid="4498124044785815005">"由系统确定"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"位置"</item>
+    <item msgid="255608127647030286">"个人"</item>
+    <item msgid="4731988992916537734">"设备"</item>
+  </string-array>
+    <!-- no translation found for app_ops_names:0 (1042289750411525731) -->
+    <!-- no translation found for app_ops_names:1 (1703021487345935608) -->
+    <!-- no translation found for app_ops_names:4 (1502480489983592093) -->
+    <!-- no translation found for app_ops_names:5 (4747300568727144811) -->
+    <!-- no translation found for app_ops_names:6 (1013736950661424537) -->
+    <!-- no translation found for app_ops_names:7 (7387037304984751800) -->
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"短"</item>
     <item msgid="2560532955514699713">"中"</item>
@@ -266,9 +280,12 @@
     <item msgid="5397807424362304288">"Systrace（图形）"</item>
     <item msgid="1340692776955662664">"glGetError 上的调用堆栈"</item>
   </string-array>
-    <!-- no translation found for track_frame_time_entries:1 (2751513398307949636) -->
-    <!-- no translation found for track_frame_time_entries:2 (8272260411216018353) -->
-    <!-- no translation found for track_frame_time_entries:3 (120512413928262547) -->
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"关闭"</item>
+    <item msgid="2751513398307949636">"在屏幕上显示为条形图"</item>
+    <item msgid="8272260411216018353">"在屏幕上显示为线型图"</item>
+    <item msgid="120512413928262547">"在 adb shell dumpsys gfxinfo 中"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"标准限制"</item>
     <item msgid="4071574792028999443">"不允许后台进程"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 12cdcd21b..9b0784b5c 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -612,8 +612,8 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"不要跳过"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"警告：您可能需要额外支付运营商数据费。"\n\n"平板电脑设置过程可能会消耗大量网络流量。"</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"警告：您可能需要额外支付运营商数据费。"\n\n"手机设置过程可能会消耗大量网络流量。"</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"警告：平板电脑无法验证您的软件是否是最新版本。"</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"警告：手机无法验证您的软件是否是最新版本。"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"警告：您必须连接到互联网，平板电脑才能验证您所使用的软件是否为最新版本。"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"警告：您必须连接到互联网，手机才能验证您所使用的软件是否为最新版本。"</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"平板电脑无法连接到此 Wi-Fi 网络。"</string>
     <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"手机无法连接到此 Wi-Fi 网络。"</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"高级 Wi-Fi 设置"</string>
@@ -1082,6 +1082,8 @@
     <string name="filter" msgid="2018011724373033887">"过滤"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"选择过滤选项"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"全部"</string>
+    <!-- no translation found for filter_apps_disabled (5364447573326472890) -->
+    <skip />
     <string name="filter_apps_third_party" msgid="7786348047690140979">"已下载"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"正在运行"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB 存储设备"</string>
@@ -1141,6 +1143,8 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"如果您停用内置应用，其他应用可能无法运行。您的数据也将会删除。"</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"要关闭通知吗？"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"如果关闭此应用的通知，您可能会错过重要提醒和最新动态信息。"</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"应用操作"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"正在运行"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"存储空间使用情况"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"查看应用使用的存储空间"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"正在运行的服务"</string>
@@ -1643,11 +1647,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"从最优到最差：蓝、绿、淡红、红"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"停用 HW 叠加层"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"始终使用 GPU 进行屏幕合成"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"启用跟踪"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"选择要启用的跟踪"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"当前未启用任何跟踪"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"当前已启用 <xliff:g id="NUM">%1$d</xliff:g> 项跟踪"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"当前已启用所有跟踪"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"启用 OpenGL 跟踪"</string>
     <string name="debug_layout" msgid="5981361776594526155">"显示布局边界"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"显示剪辑边界、边距等。"</string>