Merge "VpnSettings: rename some fields."

This commit is contained in:
Chia-chi Yeh
2011-06-30 23:36:52 -07:00
committed by Android (Google) Code Review
4 changed files with 30 additions and 27 deletions

View File

@@ -3511,7 +3511,7 @@ found in the list of installed applications.</string>
<!-- Selection label for the IPSec CA certificate of a VPN network. [CHAR LIMIT=40] -->
<string name="vpn_ipsec_ca_cert">IPSec CA certificate</string>
<!-- Input label for the DNS search domains of a VPN network. [CHAR LIMIT=40] -->
<string name="vpn_domains">DNS search domains</string>
<string name="vpn_search_domains">DNS search domains</string>
<!-- Input label for the forwarding routes of a VPN network. [CHAR LIMIT=40] -->
<string name="vpn_routes">Forwarding routes</string>
<!-- Input label for the username of a VPN network. [CHAR LIMIT=40] -->
@@ -3519,7 +3519,7 @@ found in the list of installed applications.</string>
<!-- Input label for the password of a VPN network. [CHAR LIMIT=40] -->
<string name="vpn_password">Password</string>
<!-- Checkbox label to save the username and the password for a VPN network. [CHAR LIMIT=40] -->
<string name="vpn_save_login">Save this information</string>
<string name="vpn_save_login">Save account information</string>
<!-- Hint for an optional input of a VPN network. [CHAR LIMIT=40] -->
<string name="vpn_not_used">(not used)</string>