am f24a5de9: am d606e825: am f62b6843: am 8c0253a1: Merge "Replace "Corporate" by "Exchange"." into ub-gmail-ur14-dev

* commit 'f24a5de95bbe5d4ee9fd92877bb24bb7c9198ed0':
  Replace "Corporate" by "Exchange".
This commit is contained in:
Régis Décamps 2014-11-02 18:53:09 +00:00 committed by Android Git Automerger
commit 66af7782fe
4 changed files with 6 additions and 6 deletions

View File

@ -582,9 +582,9 @@
<!-- Message that appears when adding a T-Online account --> <!-- 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> <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 --> <!-- Short name of Microsoft Exchange account type; used by AccountManager -->
<string name="exchange_name">Corporate</string> <string name="exchange_eas_name" translatable="false">Exchange</string>
<!-- Name of Microsoft Exchange account type; used by AccountManager --> <!-- Long name of Microsoft Exchange account type; used by AccountManager -->
<string name="exchange_name_alternate">Microsoft Exchange ActiveSync</string> <string name="exchange_name_alternate">Microsoft Exchange ActiveSync</string>
<!-- Message that appears if the AccountManager cannot create the system Account --> <!-- Message that appears if the AccountManager cannot create the system Account -->

View File

@ -24,6 +24,6 @@
android:accountType="@string/account_manager_type_exchange" android:accountType="@string/account_manager_type_exchange"
android:icon="@mipmap/ic_launcher_mail" android:icon="@mipmap/ic_launcher_mail"
android:smallIcon="@drawable/ic_notification_mail_24dp" android:smallIcon="@drawable/ic_notification_mail_24dp"
android:label="@string/exchange_name" android:label="@string/exchange_eas_name"
android:accountPreferences="@xml/account_preferences" android:accountPreferences="@xml/account_preferences"
/> />

View File

@ -24,6 +24,6 @@
android:accountType="com.android.exchange" android:accountType="com.android.exchange"
android:icon="@mipmap/ic_launcher_mail" android:icon="@mipmap/ic_launcher_mail"
android:smallIcon="@drawable/ic_notification_mail_24dp" android:smallIcon="@drawable/ic_notification_mail_24dp"
android:label="@string/exchange_name" android:label="@string/exchange_eas_name"
android:accountPreferences="@xml/account_preferences" android:accountPreferences="@xml/account_preferences"
/> />

View File

@ -24,6 +24,6 @@
android:accountType="com.android.email" android:accountType="com.android.email"
android:icon="@mipmap/ic_launcher_mail" android:icon="@mipmap/ic_launcher_mail"
android:smallIcon="@drawable/ic_notification_mail_24dp" android:smallIcon="@drawable/ic_notification_mail_24dp"
android:label="@string/exchange_name" android:label="@string/exchange_eas_name"
android:accountPreferences="@xml/account_preferences" android:accountPreferences="@xml/account_preferences"
/> />