Merge "Fix numeric strings to not be translated"

This commit is contained in:
Irfan Sheriff
2011-03-11 17:31:05 -08:00
committed by Android (Google) Code Review

View File

@@ -313,8 +313,8 @@
<string name="proxy_clear_text">Clear</string> <string name="proxy_clear_text">Clear</string>
<!-- HTTP proxy settings. The port number label. --> <!-- HTTP proxy settings. The port number label. -->
<string name="proxy_port_label">Proxy port</string> <string name="proxy_port_label">Proxy port</string>
<!-- HTTP proxy settings. The hint text field for port. [CHAR LIMIT=50]--> <!-- HTTP proxy settings. The hint text field for port. -->
<string name="proxy_port_hint">8080</string> <string name="proxy_port_hint" translatable="false">8080</string>
<!-- HTTP proxy settings. The exclusion list label. --> <!-- HTTP proxy settings. The exclusion list label. -->
<string name="proxy_exclusionlist_label">Bypass proxy for</string> <string name="proxy_exclusionlist_label">Bypass proxy for</string>
<!-- HTTP proxy settings. The hint text for proxy exclusion list. [CHAR LIMIT=50]--> <!-- HTTP proxy settings. The hint text for proxy exclusion list. [CHAR LIMIT=50]-->
@@ -1100,8 +1100,8 @@
<string name="wifi_speed">Link speed</string> <string name="wifi_speed">Link speed</string>
<!-- Label for the IP address of the connection --> <!-- Label for the IP address of the connection -->
<string name="wifi_ip_address">IP address</string> <string name="wifi_ip_address">IP address</string>
<!-- Hint text for the IP address [CHAR LIMIT=25]--> <!-- Hint text for the IP address -->
<string name="wifi_ip_address_hint">192.168.1.128</string> <string name="wifi_ip_address_hint" translatable="false">192.168.1.128</string>
<!-- Label for the EAP method of the network --> <!-- Label for the EAP method of the network -->
<string name="wifi_eap_method">EAP method</string> <string name="wifi_eap_method">EAP method</string>
<!-- Label for the phase2 --> <!-- Label for the phase2 -->
@@ -1181,20 +1181,20 @@
<string name="wifi_ip_settings_invalid_network_prefix_length">Please type a network prefix length between 0 and 32.</string> <string name="wifi_ip_settings_invalid_network_prefix_length">Please type a network prefix length between 0 and 32.</string>
<!-- Label for the DNS (first one) --> <!-- Label for the DNS (first one) -->
<string name="wifi_dns1">DNS 1</string> <string name="wifi_dns1">DNS 1</string>
<!-- Hint text for DNS [CHAR LIMIT=25]--> <!-- Hint text for DNS -->
<string name="wifi_dns1_hint">8.8.8.8</string> <string name="wifi_dns1_hint" translatable="false">8.8.8.8</string>
<!-- Label for the DNS (second one)--> <!-- Label for the DNS (second one)-->
<string name="wifi_dns2">DNS 2</string> <string name="wifi_dns2">DNS 2</string>
<!-- Hint text for DNS [CHAR LIMIT=25]--> <!-- Hint text for DNS -->
<string name="wifi_dns2_hint">4.4.4.4</string> <string name="wifi_dns2_hint" translatable="false">4.4.4.4</string>
<!-- Label for the gateway of the network --> <!-- Label for the gateway of the network -->
<string name="wifi_gateway">Gateway</string> <string name="wifi_gateway">Gateway</string>
<!-- Hint text for the gateway [CHAR LIMIT=25]--> <!-- Hint text for the gateway -->
<string name="wifi_gateway_hint">192.168.1.1</string> <string name="wifi_gateway_hint" translatable="false">192.168.1.1</string>
<!-- Label for the network prefix of the network [CHAR LIMIT=25]--> <!-- Label for the network prefix of the network [CHAR LIMIT=25]-->
<string name="wifi_network_prefix_length">Network prefix length</string> <string name="wifi_network_prefix_length">Network prefix length</string>
<!-- Hint text for network prefix length [CHAR LIMIT=25] --> <!-- Hint text for network prefix length -->
<string name="wifi_network_prefix_length_hint">24</string> <string name="wifi_network_prefix_length_hint" translatable="false">24</string>
<!-- Wifi AP settings--> <!-- Wifi AP settings-->
<!-- Label for wifi tether checkbox. Toggles Access Point on/off --> <!-- Label for wifi tether checkbox. Toggles Access Point on/off -->