PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove wrong usage of DoNotTranslate

Browse Source 
We use the attritube 'translatable="false"' to mark a string that should
not be translated.

Bug: 78187305
Test: no test
Change-Id: I4b80f969a9a5c337e3658debc43fd810350b57eb
This commit is contained in:
Pengquan Meng
2018-04-17 11:32:48 -07:00
parent b74e635270
commit 4e0c446856
1 changed files with 15 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
res/values/arrays.xml
View File

@@ -215,12 +215,9 @@
<string-array name="wifi_security">
<!-- The Wi-Fi network does not have any security. -->
<item>@string/wifi_security_none</item>
<!-- Do not translate. -->
<item>@string/wifi_security_wep</item>
<!-- Do not translate. -->
<item>@string/wifi_security_psk_generic</item>
<!-- Do not translate. -->
<item>@string/wifi_security_eap</item>
<item translatable="false">@string/wifi_security_wep</item>
<item translatable="false">@string/wifi_security_psk_generic</item>
<item translatable="false">@string/wifi_security_eap</item>
</string-array>
@@ -229,40 +226,27 @@
<string-array name="wifi_security_no_eap">
<!-- The Wi-Fi network does not have any security. -->
<item>@string/wifi_security_none</item>
<!-- Do not translate. -->
<item>@string/wifi_security_wep</item>
<!-- Do not translate. -->
<item>@string/wifi_security_psk_generic</item>
<item translatable="false">@string/wifi_security_wep</item>
<item translatable="false">@string/wifi_security_psk_generic</item>
</string-array>
<!-- Match this with the constants in WifiDialog. --> <skip />
<!-- Wi-Fi settings. The type of EAP method a Wi-Fi network has. -->
<string-array name="wifi_eap_method">
<!-- Do not translate. -->
<string-array name="wifi_eap_method" translatable="false">
<item>PEAP</item>
<!-- Do not translate. -->
<item>TLS</item>
<!-- Do not translate. -->
<item>TTLS</item>
<!-- Do not translate. -->
<item>PWD</item>
<!-- Do not translate. -->
<item>SIM</item>
<!-- Do not translate. -->
<item>AKA</item>
<!-- Do not translate. -->
<item>AKA\'</item>
</string-array>
<!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
<string-array name="eap_method_without_sim_auth">
<!-- Do not translate. -->
<string-array name="eap_method_without_sim_auth" translatable="false">
<item>PEAP</item>
<!-- Do not translate. -->
<item>TLS</item>
<!-- Do not translate. -->
<item>TTLS</item>
<!-- Do not translate. -->
<item>PWD</item>
</string-array>
@@ -379,16 +363,11 @@
<!-- Type of EAP method when EAP SIM, AKA, AKA' are supported -->
<string-array name="wifi_peap_phase2_entries_with_sim_auth">
<item>None</item>
<!-- Do not translate. -->
<item>MSCHAPV2</item>
<!-- Do not translate. -->
<item>GTC</item>
<!-- Do not translate. -->
<item>SIM</item>
<!-- Do not translate. -->
<item>AKA</item>
<!-- Do not translate. -->
<item>AKA\'</item>
<item translatable="false">MSCHAPV2</item>
<item translatable="false">GTC</item>
<item translatable="false">SIM</item>
<item translatable="false">AKA</item>
<item translatable="false">AKA\'</item>
</string-array>
<!-- Phase 2 options for rest of EAP methods -->
@@ -513,12 +492,9 @@
<!-- MVNO Info used in APN editor -->
<string-array name="mvno_type_entries">
<item>None</item>
<!-- Do not translate. -->
<item>SPN</item>
<!-- Do not translate. -->
<item>IMSI</item>
<!-- Do not translate. -->
<item>GID</item>
<item translatable="false">SPN</item>
<item translatable="false">IMSI</item>
<item translatable="false">GID</item>
</string-array>
<string-array translatable="false" name="mvno_type_values">