Merge "Clear only keystore credential entires" into mnc-dev

[android-x86/packages-apps-Settings.git] / res / values-zh-rCN / arrays.xml

diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 537c674..389a341 100644 (file)
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -120,9 +120,18 @@
     <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->
     <!-- no translation found for wifi_ap_security:0 (5251664683198623324) -->
     <!-- no translation found for wifi_ap_security:1 (7989073072260294673) -->
-    <!-- no translation found for wifi_eap_method:4 (8549485714107012129) -->
-    <!-- no translation found for wifi_eap_method:5 (1023893786681286517) -->
-    <!-- no translation found for wifi_eap_method:6 (3030483188676375009) -->
+  <string-array name="wifi_eap_method">
+    <item msgid="1160193392455075561">"PEAP"</item>
+    <item msgid="7981731051382306293">"TLS"</item>
+    <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
+    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="1023893786681286517">"AKA"</item>
+    <item msgid="3030483188676375009">"AKA\'"</item>
+  </string-array>
+    <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
+    <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
+    <!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"按钮"</item>
     <item msgid="1624323946324499595">"从对等设备获取的PIN码"</item>
@@ -210,9 +219,22 @@
     <item msgid="8084938354605535381">"IPv4/IPv6"</item>
   </string-array>
   <string-array name="bearer_entries">
-    <item msgid="1770285336669531300">"LTE"</item>
-    <item msgid="3044323519470167625">"eHRPD"</item>
-    <item msgid="6848428671997893147">"未指定"</item>
+    <item msgid="1697455674244601285">"未指定"</item>
+    <item msgid="1317061551798123908">"LTE"</item>
+    <item msgid="5005435684511894770">"HSPAP"</item>
+    <item msgid="7700603056475539235">"HSPA"</item>
+    <item msgid="245973007602397887">"HSUPA"</item>
+    <item msgid="6291566767651194016">"HSDPA"</item>
+    <item msgid="2005841400859926251">"UMTS"</item>
+    <item msgid="3757385691174882861">"EDGE"</item>
+    <item msgid="2979115073474306864">"GPRS"</item>
+    <item msgid="2271750502778879106">"eHRPD"</item>
+    <item msgid="4173379084783381337">"EVDO_B"</item>
+    <item msgid="2033682802005776093">"EVDO_A"</item>
+    <item msgid="5753917125831466719">"EVDO_0"</item>
+    <item msgid="4713807936577071142">"1xRTT"</item>
+    <item msgid="1142355797022021906">"IS95B"</item>
+    <item msgid="7471182818083460781">"IS95A"</item>
   </string-array>
   <string-array name="mvno_type_entries">
     <item msgid="4367119357633573465">"无"</item>
@@ -497,12 +519,11 @@
     <item msgid="5077768429488260031">"永不允许"</item>
     <item msgid="1417929597727989746">"始终允许"</item>
   </string-array>
-  <string-array name="ram_states">
-    <item msgid="7088762389498381203">"一般"</item>
-    <item msgid="4517779899383204000">"中"</item>
-    <item msgid="406385694840950802">"低"</item>
-    <item msgid="4212263919458209842">"严重不足"</item>
-  </string-array>
+    <!-- no translation found for ram_states:0 (3944681673818150669) -->
+    <!-- no translation found for ram_states:1 (3256987280393708586) -->
+    <!-- no translation found for ram_states:2 (4662917179231875995) -->
+    <!-- no translation found for ram_states:3 (5264929699714647509) -->
+    <!-- no translation found for ram_states:4 (5606155978847838966) -->
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"正常"</item>
     <item msgid="866544120205026771">"中等"</item>
@@ -540,4 +561,8 @@
     <item msgid="2686051673589572111">"音频来源"</item>
     <item msgid="7014054229609338176">"MIDI"</item>
   </string-array>
+    <!-- no translation found for usb_available_functions:0 (1052890583379911173) -->
+    <!-- no translation found for usb_available_functions:1 (5179287634369331675) -->
+    <!-- no translation found for usb_available_functions:2 (7367227752916579970) -->
+    <!-- no translation found for usb_available_functions:3 (3121694448025579443) -->
 </resources>