diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-30 05:23:06 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-30 05:23:06 -0700 |
| commit | 9c432349a79cd0f19ebdee18deb2b0b8550d661f (patch) | |
| tree | 9e9564c5eb6cb4ec9345c7d7380e421cd16042a6 /res | |
| parent | c538b651a23287ab25584995c6c4b7a68ece027c (diff) | |
| parent | 7be218e7f7bb57049d9e3586cbd65cfc8f218f9d (diff) | |
| download | packages_apps_Settings-9c432349a79cd0f19ebdee18deb2b0b8550d661f.zip packages_apps_Settings-9c432349a79cd0f19ebdee18deb2b0b8550d661f.tar.gz packages_apps_Settings-9c432349a79cd0f19ebdee18deb2b0b8550d661f.tar.bz2 | |
Merge change 9142 into donut
* changes:
Add encryption option to PPTP UI.
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 108bd5f..5d89800 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1848,8 +1848,10 @@ found in the list of installed applications.</string> <string name="vpn_confirm_edit_profile_cancellation">Are you sure you want to discard the changes made to this profile?</string> <string name="vpn_confirm_reconnect">Unable to connect to the network. Do you want to try again?</string> <string name="vpn_unknown_server_dialog_msg">Server name cannot be resolved. Do you want to check your server name setting?</string> + <string name="vpn_challenge_error_dialog_msg">Challenge error. Do you want to check your secret setting?</string> <string name="vpn_secret_not_set_dialog_msg">One or more secrets are missing in this VPN configuration. Do you want to check your secret setting?</string> <string name="vpn_auth_error_dialog_msg">The username or password you entered is incorrect. Do you want to try again?</string> + <string name="vpn_remote_hung_up_error_dialog_msg">Server hung up. The username or password you entered could be incorrect. Do you want to try again?</string> <!-- VPN type selection activity title --> <string name="vpn_type_title">Add VPN</string> @@ -1895,6 +1897,8 @@ found in the list of installed applications.</string> <!-- Complete term --> <string name="vpn_l2tp_secret">L2TP secret</string> <string name="vpn_a_l2tp_secret">an L2TP secret</string> + <string name="vpn_pptp_encryption_title">encryption</string> + <string name="vpn_pptp_encryption">PPTP encryption</string> <!-- Preference title --> <string name="vpn_ipsec_presharedkey_title">Set IPSec pre-shared key</string> |