From 5a238464dd37cd6d697d2d907a67cc4784dfefe3 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Tue, 5 Jul 2016 19:37:55 -0700
Subject: [PATCH] Import translations. DO NOT MERGE

Change-Id: If1956ac983530432b46246ee0a53bfdccd81fcb1
Auto-generated-cl: translation import
---
 packages/SettingsLib/res/values-my-rMM/strings.xml | 10 +++++-----
 packages/SettingsLib/res/values-zh-rCN/strings.xml |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/packages/SettingsLib/res/values-my-rMM/strings.xml b/packages/SettingsLib/res/values-my-rMM/strings.xml
index 905ccc9a9fa3..561691dda46e 100644
--- a/packages/SettingsLib/res/values-my-rMM/strings.xml
+++ b/packages/SettingsLib/res/values-my-rMM/strings.xml
@@ -71,7 +71,7 @@
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"ááá·áºáá½ááºá¸áááºá¡áá¯á¶á¸áá¼á¯áááº"</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"á¡áá°áá½á²áá«"</string>
     <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"áá»á­ááºáá½á²áááº"</string>
-    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"ááá¯ááºáá±á¬á·áá«"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"ááá¯ááºáá±á¬á·"</string>
     <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"áá»á­ááºáá½á²áá¾á¯á áá»á­ááºáááºáá¬á¸áá»á¾ááº áááºá á¡áááºá¡áá½ááºáá»á¬á¸ áá¾áá·áº áá±á«áºáá­á¯áá¾á¯ áá¾ááºáááºá¸áá­á¯ ááá°áá½áá·áº áá¼á¯áááºá"</string>
     <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>áá¾áá·áº áá½á²áá»á­ááºáááá«"</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"áááºáá¶áá«ááº áá­á¯á·ááá¯ááº áá¼ááºáááºá¸áá½áá·áºáá®á¸ááá¾ááºáááºáá±á¬áá¼á±á¬áá·áº<xliff:g id="DEVICE_NAME">%1$s</xliff:g>áá¾áá·áº áá½á²áá»á­ááºáááá«á"</string>
@@ -159,8 +159,8 @@
     <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"á¡ááá¼á¯áá¼ááºá¸áá­áá­áá¬á¡á¬á¸ áá±á¬á·áá½áá·áºáááº áá½áá·áºáá¼á¯áááº"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM áá±á¬á·áá½áá·áºáá¼ááºá¸ áá½áá·áºáá¼á¯ááá¬á¸?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ááá­áá±á¸áá»ááº: á¤áá»á­ááºáá¾á­áá»ááºáá½áá·áºáá¬á¸áá»á¾ááºá á¤áááºááá¹áááºá¸áá±á«áºáá½ááº áááºááá¹áááºá¸áá¬áá½ááºááá·áº á¡áá°á¸áá¼á¯áá¯ááºáá»ááº á¡áá¯ááºáá¯ááºáááºááá¯ááºáá«á"</string>
-    <string name="mock_location_app" msgid="7966220972812881854">"áááºáá±áá¬á¡áá¯áá¼á¯ á¡ááºááº áá½á±á¸áááº"</string>
-    <string name="mock_location_app_not_set" msgid="809543285495344223">"áááºáá±áá¬á¡áá¯áá¼ á¡ááºááº áááºáá¾ááºáá¬á¸áá¼ááºá¸ááá¾á­áá«"</string>
+    <string name="mock_location_app" msgid="7966220972812881854">"áááºáá±áá¬á¡áá¯áá¼á¯ á¡ááºááºáá½á±á¸áááº"</string>
+    <string name="mock_location_app_not_set" msgid="809543285495344223">"áááºáá±áá¬á¡áá¯áá¼ á¡ááºááºáááºáá¾ááºáá¬á¸áá¼ááºá¸ááá¾á­áá«"</string>
     <string name="mock_location_app_set" msgid="8966420655295102685">"áááºáá±áá¬á¡áá¯áá¼ á¡ááºááº- <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <string name="debug_networking_category" msgid="7044075693643009662">"áá½ááºáááºáá¯ááºáááºá¸"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"áá¼á­á¯á¸áá²á·áá¼ááá¾á¯ á¡áá­á¡áá¾ááºáá¼á¯áááºáá¾ááº"</string>
@@ -241,7 +241,7 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"áááºáááºá¡áá½ááºáá¼á±á¬ááºá¸áá¼ááºá¸"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"áá¾á¯ááºáá¾á¬á¸áá¾á¯áá¼á¬áá»á­ááºááá±á¸"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"ááá·áºáá½á¬á¸áá»ááºáá¾á¬áá¼ááºáá»á¬á¸á¡áá½ááºáá±á¬ááºáááº"</string>
-    <string name="debug_applications_category" msgid="4206913653849771549">"á¡ááá®áá±á¸áá¾ááºá¸áá»á¬á¸"</string>
+    <string name="debug_applications_category" msgid="4206913653849771549">"á¡ááºááºáá»á¬á¸"</string>
     <string name="immediately_destroy_activities" msgid="1579659389568133959">"áá±á¬ááºáá½ááºáá¾á¯áá»á¬á¸áá­á¯ ááá­ááºá¸áá¬á¸áá«áá¾áá·áº"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"á¡áá¯á¶á¸áá¼á¯áá°áá½ááºáá½á«áá½á¬á¸áááºáá¾áá·áº áá¯ááºáá±á¬ááºáá»ááºáá»á¬á¸áá­á¯ áá»ááºáááºáááº"</string>
     <string name="app_process_limit_title" msgid="4280600650253107163">"áá±á¬ááºáá¶áá¯ááºáááºá¸áááºááá·áºáááºáá¼ááºá¸"</string>
@@ -269,7 +269,7 @@
     <item msgid="8280754435979370728">"áá»ááºáá¯á¶á¸áá¾áá½á±á·áááá·áº ááá¬áá¡áá±á¬ááº"</item>
     <item msgid="5363960654009010371">"áá®áá»ááºáááºá¡áá¼á±á¬ááºá¸á¡áá¬á¡áá½ááº áá¼ááºáááºáá¬á¸ááá·áº á¡áá±á¬ááºáá»á¬á¸"</item>
   </string-array>
-    <string name="inactive_apps_title" msgid="1317817863508274533">"á¡áá¯ááºááá¯ááºáá±á¬ á¡ááºááº áá»á¬á¸"</string>
+    <string name="inactive_apps_title" msgid="1317817863508274533">"á¡áá¯ááºááá¯ááºáá±á¬ á¡ááºááºáá»á¬á¸"</string>
     <string name="inactive_app_inactive_summary" msgid="5091363706699855725">"áá½áá·áºááá±áá«á áá¼á±á¬ááºá¸áááºáá­á¯á·áá«á"</string>
     <string name="inactive_app_active_summary" msgid="4174921824958516106">"áá½áá·áºáá±áááºá áá¼á±á¬ááºá¸áááºáá­á¯á·áá«á"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"á¡áá¯ááºáá¯ááºáá±áá±á¬áááºáá±á¬ááºáá¾á¯áá»á¬á¸"</string>
diff --git a/packages/SettingsLib/res/values-zh-rCN/strings.xml b/packages/SettingsLib/res/values-zh-rCN/strings.xml
index 09c12dcf9470..e82693caf4d6 100644
--- a/packages/SettingsLib/res/values-zh-rCN/strings.xml
+++ b/packages/SettingsLib/res/values-zh-rCN/strings.xml
@@ -132,8 +132,8 @@
     <item msgid="164347302621392996">"å¿«"</item>
     <item msgid="5794028588101562009">"è¾å¿«"</item>
     <item msgid="7163942783888652942">"éå¸¸å¿«"</item>
-    <item msgid="7831712693748700507">"è¿é"</item>
-    <item msgid="5194774745031751806">"å¾è¿é"</item>
+    <item msgid="7831712693748700507">"è¶å¿«"</item>
+    <item msgid="5194774745031751806">"æå¿«"</item>
     <item msgid="9085102246155045744">"æå¿«"</item>
   </string-array>
     <string name="choose_profile" msgid="8229363046053568878">"éæ©ä¸ªäººèµæ"</string>
-- 
2.11.0

