am b12f46e0: am a08e88cd: Fix wording of security dialog per Roy West

Merge commit 'b12f46e04b7c12d34245b78a76be50e7741fc06d'

* commit 'b12f46e04b7c12d34245b78a76be50e7741fc06d':
  Fix wording of security dialog per Roy West
This commit is contained in:
Marc Blank 2009-11-11 14:56:54 -08:00 committed by Android Git Automerger
commit 9c4e48fb03

View File

@ -483,8 +483,8 @@
<string name="account_setup_failed_security">Unable to open connection to server due to security error.</string>
<!-- Additional diagnostic text when server connection failed due to io error (connection) -->
<string name="account_setup_failed_ioerror">Unable to open connection to server.</string>
<!-- Additional diagnostic text when validation vailed due to required provisioning not being supported -->
<string name="account_setup_failed_security_policies_required">Security policies not supported. Please contact your IT department.</string>
<!-- Additional diagnostic text when validation failed due to required provisioning not being supported -->
<string name="account_setup_failed_security_policies_required">This Exchange ActiveSync server requires security features your phone does not support.</string>
<!-- "Setup could not finish" dialog action button -->
<string name="account_setup_failed_dlg_edit_details_action">Edit details</string>