summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2009-08-27 18:49:31 +0800
committerHung-ying Tyan <tyanh@google.com>2009-08-28 11:25:44 +0800
commit7ca3655dcb620c8635ad84d1465ab2afc3ef31a0 (patch)
tree566eb19b820fd43f7e0d8b544c275d3d844a6a75 /res
parentd1de20d883725ce98931fbebeef9bed8c340352d (diff)
downloadpackages_apps_Settings-7ca3655dcb620c8635ad84d1465ab2afc3ef31a0.zip
packages_apps_Settings-7ca3655dcb620c8635ad84d1465ab2afc3ef31a0.tar.gz
packages_apps_Settings-7ca3655dcb620c8635ad84d1465ab2afc3ef31a0.tar.bz2
Handle two new err codes:
REMOTE_PPP_HUNG_UP and PPP_NEGOTIATION_FAILED. Also refactor the dialog creation code to directly use the err code as the dialog id and make it easier to tell which type of dialog (reconnect or edit) is invoked for which err code.
Diffstat (limited to 'res')
-rw-r--r--res/values/strings.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index bd6a078..9c0c30d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1883,6 +1883,8 @@ found in the list of installed applications.</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>
+ <string name="vpn_remote_ppp_hung_up_error_dialog_msg">Server hung up. It is possible that you are behind a firewall that prevents you from connecting to the server. Do you want to try again?</string>
+ <string name="vpn_ppp_negotiation_failed_dialog_msg">Server negotiation failed. The server may not agree with your encryption option. Do you want to check your encryption setting?</string>
<!-- VPN type selection activity title -->
<string name="vpn_type_title">Add VPN</string>