From 24f2b19c929a20f8af724f49692bc95e6f360038 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20D=C3=A9camps?= <regisd@google.com>
Date: Thu, 9 Oct 2014 13:37:03 +0200
Subject: [PATCH] Replace "Corporate" by "Exchange".

Bug: 17925116 Change "Corporate" to "Exchange"
Change-Id: Ia7f8a8c2e393924cf13eb9a0895ae29d8acc7eb4
---
 res/values/strings.xml                 | 6 +++---
 res/xml/authenticator_eas.xml          | 2 +-
 res/xml/authenticator_legacy_eas.xml   | 2 +-
 res/xml/authenticator_legacy_email.xml | 2 +-
 4 files changed, 6 insertions(+), 6 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 -->
diff --git a/res/xml/authenticator_eas.xml b/res/xml/authenticator_eas.xml
index aaad04814..d1f3a952d 100644
--- a/res/xml/authenticator_eas.xml
+++ b/res/xml/authenticator_eas.xml
@@ -24,6 +24,6 @@
     android:accountType="@string/account_manager_type_exchange"
     android:icon="@mipmap/ic_launcher_mail"
     android:smallIcon="@drawable/ic_notification_mail_24dp"
-    android:label="@string/exchange_name"
+    android:label="@string/exchange_eas_name"
     android:accountPreferences="@xml/account_preferences"
 />
diff --git a/res/xml/authenticator_legacy_eas.xml b/res/xml/authenticator_legacy_eas.xml
index f138f65e3..424cf90be 100644
--- a/res/xml/authenticator_legacy_eas.xml
+++ b/res/xml/authenticator_legacy_eas.xml
@@ -24,6 +24,6 @@
     android:accountType="com.android.exchange"
     android:icon="@mipmap/ic_launcher_mail"
     android:smallIcon="@drawable/ic_notification_mail_24dp"
-    android:label="@string/exchange_name"
+    android:label="@string/exchange_eas_name"
     android:accountPreferences="@xml/account_preferences"
 />
diff --git a/res/xml/authenticator_legacy_email.xml b/res/xml/authenticator_legacy_email.xml
index db15300cf..5f1b2122f 100644
--- a/res/xml/authenticator_legacy_email.xml
+++ b/res/xml/authenticator_legacy_email.xml
@@ -24,6 +24,6 @@
     android:accountType="com.android.email"
     android:icon="@mipmap/ic_launcher_mail"
     android:smallIcon="@drawable/ic_notification_mail_24dp"
-    android:label="@string/exchange_name"
+    android:label="@string/exchange_eas_name"
     android:accountPreferences="@xml/account_preferences"
 />