From 845cd2a4da22ae26039ecae5f5d13034802f4ecc Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@fsck.com>
Date: Tue, 8 Jun 2010 02:37:09 +0000
Subject: [PATCH] Cleanup our Yahoo provider note

---
 res/values/strings.xml | 1 -
 res/xml/providers.xml  | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 33722f17b..55f8f4513 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -655,7 +655,6 @@ Welcome to K-9 Mail setup.  K-9 is an open source mail client for Android origin
     <string name="account_clear_dlg_title">Clear Account</string>
     <string name="account_clear_dlg_instructions_fmt">All messages in \"<xliff:g id="account">%s</xliff:g>\" will be removed from K-9 Mail, but account settings will be retained.</string>
     
-    <string name="provider_note_yahoo">Free Yahoo! Mail accounts only work over T-Mobile wireless networks. Yahoo! Mail Plus users should configure POP settings manually.</string>
     <string name="provider_note_live">Only some \"Plus\" accounts include POP access
         allowing this program to connect. If you are not able to sign in with
         your correct email address and password, you may not have a paid
diff --git a/res/xml/providers.xml b/res/xml/providers.xml
index 4dad66df7..024b5f539 100644
--- a/res/xml/providers.xml
+++ b/res/xml/providers.xml
@@ -72,7 +72,7 @@
             username="$email" />
         <outgoing uri="smtp://smtp.aim.com:587" username="$email" />
     </provider>
-    <provider id="yahoo" label="Yahoo" domain="yahoo.com" note="@string/provider_note_yahoo">
+    <provider id="yahoo" label="Yahoo" domain="yahoo.com">
         <incoming uri="imap+tls://imap.mail.yahoo.com"
             username="$user" />
         <outgoing uri="smtp+tls://smtp.mobile.mail.yahoo.com"