Merge "Fix for Bug 5110980 Settings: "VPN settings" renamed to "VPN". Changed two instances of "VPN settings" to "VPN"."

This commit is contained in:
Claudia de Veaux
2011-08-05 18:24:20 -07:00
committed by Android (Google) Code Review

View File

@@ -2987,7 +2987,7 @@ found in the list of installed applications.</string>
<string name="gadget_toggle_bluetooth">Updating Bluetooth setting</string>
<!-- Title of preference to enter the VPN settings activity -->
<string name="vpn_settings_title">VPN settings</string>
<string name="vpn_settings_title">VPN</string>
<!-- Title of preference group for credential storage settings [CHAR LIMIT=30] -->
<string name="credentials_title">Credential storage</string>
@@ -3521,7 +3521,7 @@ found in the list of installed applications.</string>
<string name="vpn_connect_to">Connect to <xliff:g id="network" example="School">%s</xliff:g></string>
<!-- Preference title for VPN settings. [CHAR LIMIT=40] -->
<string name="vpn_title">VPN settings</string>
<string name="vpn_title">VPN</string>
<!-- Preference title to create a new VPN network. [CHAR LIMIT=40] -->
<string name="vpn_create">Add VPN network</string>
<!-- Menu item to edit a VPN network. [CHAR LIMIT=40] -->