summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorTony Mantler <nicoya@google.com>2013-11-05 17:22:37 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-05 17:22:37 -0800
commit88c357b0410e5807aab33f31f36e856d1a766bfd (patch)
tree56e0a76df4656756f0ec4c39b008c70a6e3003d3 /res
parentbd6d0edfb4754d59a106f4080754e05866855c18 (diff)
parentec1fb96505d1a7f239b01110bc451a298ad57867 (diff)
downloadandroid_packages_apps_Email-88c357b0410e5807aab33f31f36e856d1a766bfd.tar.gz
android_packages_apps_Email-88c357b0410e5807aab33f31f36e856d1a766bfd.tar.bz2
android_packages_apps_Email-88c357b0410e5807aab33f31f36e856d1a766bfd.zip
am ec1fb965: am 06e140e4: Update messaging when autodiscover fails due to an auth error
* commit 'ec1fb96505d1a7f239b01110bc451a298ad57867': Update messaging when autodiscover fails due to an auth error
Diffstat (limited to 'res')
-rw-r--r--res/values/strings.xml9
1 files changed, 9 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 442191324..e7ee441f4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -390,6 +390,15 @@
<!-- "Setup could not finish" dialog text; e.g., Username or password incorrect\n(ERR01 Account does not exist) -->
<string name="account_setup_failed_dlg_auth_message_fmt">Login failed.\n(<xliff:g id="error">%s</xliff:g>)</string>
+ <!-- Account setup autodiscover auth failure dialog title. This is shown when autodiscover hits
+ an "access denied" server error, which could imply incorrect username/password or that no
+ autodiscover service has been configured for the domain [CHAR LIMIT=40] -->
+ <string name="account_setup_autodiscover_dlg_authfail_title">Problem with account setup</string>
+ <!-- Account setup autodiscover auth failure dialog message. This is shown when autodiscover hits
+ an "access denied" server error, which could imply incorrect username/password or that no
+ autodiscover service has been configured for the domain [CHAR LIMIT=NONE] -->
+ <string name="account_setup_autodiscover_dlg_authfail_message">Confirm username, password, and account settings are correct.</string>
+
<!-- An error message presented to the user when the server's identity
cannot be established or trusted [CHAR LIMIT=NONE] -->
<string name="account_setup_failed_dlg_certificate_message"