diff options
| author | Régis Décamps <regisd@google.com> | 2014-10-10 15:30:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-10 15:30:39 +0000 |
| commit | 8c0253a1f0d2ee064b183c9055bd4b80dfcf4333 (patch) | |
| tree | a82fefa6ebcf5d5a99292025396a2cb34cc023a4 /res/values | |
| parent | 746dcf06db03e99156d77b066f4814d80e2e2fd6 (diff) | |
| parent | 24f2b19c929a20f8af724f49692bc95e6f360038 (diff) | |
| download | android_packages_apps_Email-8c0253a1f0d2ee064b183c9055bd4b80dfcf4333.tar.gz android_packages_apps_Email-8c0253a1f0d2ee064b183c9055bd4b80dfcf4333.tar.bz2 android_packages_apps_Email-8c0253a1f0d2ee064b183c9055bd4b80dfcf4333.zip | |
Merge "Replace "Corporate" by "Exchange"." into ub-gmail-ur14-dev
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/strings.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index b6e5bc7cd..2f39425a4 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -582,9 +582,9 @@ <!-- Message that appears when adding a T-Online account --> <string name="provider_note_t_online">Before setting up this email account, visit the T-Online website and create a password for POP3 email access.</string> - <!-- Name of Microsoft Exchange account type; used by AccountManager --> - <string name="exchange_name">Corporate</string> - <!-- Name of Microsoft Exchange account type; used by AccountManager --> + <!-- Short name of Microsoft Exchange account type; used by AccountManager --> + <string name="exchange_eas_name" translatable="false">Exchange</string> + <!-- Long name of Microsoft Exchange account type; used by AccountManager --> <string name="exchange_name_alternate">Microsoft Exchange ActiveSync</string> <!-- Message that appears if the AccountManager cannot create the system Account --> |