am 58ca8aa5: am 0f7542e7: Merge change I3fb6ea7a into eclair

Merge commit '58ca8aa513b32dff5e19622bc0dad72e95fe7c69'

* commit '58ca8aa513b32dff5e19622bc0dad72e95fe7c69':
  Change "Exchange" -> "Corporate" for AccountManager
This commit is contained in:
Marc Blank 2009-09-29 11:10:02 -07:00 committed by Android Git Automerger
commit 7ba9b99227

View File

@ -544,7 +544,7 @@
<string name="provider_note_t_online">Before setting up this email account, please visit the T-Online Web site and create a password for POP3 email access.</string>
<!-- Name of Microsoft Exchange account type; used by AccountManager -->
<string name="exchange_name">Exchange</string>
<string name="exchange_name">Corporate</string>
<!-- Message that appears if the AccountManager cannot create the system Account -->
<string name="system_account_create_failed">The AccountManager could not create the Account; please try again.</string>