From 884829a2e744e565c586f1e18487890846f5ac35 Mon Sep 17 00:00:00 2001
From: Koji Arai <jca02266@gmail.com>
Date: Sat, 20 Nov 2010 19:44:06 +0000
Subject: [PATCH] Newly added Japanese 2 providers.

---
 res/values-ja/strings.xml |  2 ++
 res/values/strings.xml    |  2 ++
 res/xml/providers.xml     | 11 +++++++++++
 3 files changed, 15 insertions(+)

diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index a16cc1009..879dd14c3 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -750,6 +750,8 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
 
     <string name="provider_note_live">このプログラムでPOPアクセスが許可されているのは一部の「Plus」アカウントだけです。有料の「Plus」アカウントがなければ、正しいメールアドレスとパスワードを入力してもログインできません。これらのアカウントにはブラウザからアクセスしてください。</string>
 
+    <string name="provider_note_yahoojp">Yahoo! JapanでPOP3アクセスを使う場合は、Yahoo!メールサイトの「メールの設定」にてPOPアクセスが許可されていることを確認してください。</string>
+
     <string name="account_setup_failed_dlg_invalid_certificate_title">証明書が無効です</string>
     <string name="account_setup_failed_dlg_invalid_certificate_accept">許可</string>
     <string name="account_setup_failed_dlg_invalid_certificate_reject">拒否</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a60b63ec3..ca802a50f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -770,6 +770,8 @@ Welcome to K-9 Mail setup.  K-9 is an open source mail client for Android origin
         \"Plus\" account. Please launch the Web browser to gain access to
         these mail accounts.</string>
 
+    <string name="provider_note_yahoojp">If you would like to use POP3 for this provider, You should permit to use POP3 on Yahoo mail settings page.</string>
+
     <string name="account_setup_failed_dlg_invalid_certificate_title">Unrecognized Certificate</string>
     <string name="account_setup_failed_dlg_invalid_certificate_accept">Accept Key</string>
     <string name="account_setup_failed_dlg_invalid_certificate_reject">Reject Key</string>
diff --git a/res/xml/providers.xml b/res/xml/providers.xml
index f710cf44c..96bafde40 100644
--- a/res/xml/providers.xml
+++ b/res/xml/providers.xml
@@ -255,6 +255,17 @@
         <outgoing uri="smtp+ssl://poczta.o2.pl" username="$user" />
     </provider>
 
+   <!-- Japanese -->
+    <provider id="nifty" label="Nifty" domain="nifty.com">
+        <incoming uri="pop3://pop.nifty.com" username="$email" />
+        <outgoing uri="smtp://smtp.nifty.com:587" username="$email" />
+    </provider>
+    <provider id="yahoo-jp" label="Yahoo Japan" domain="yahoo.co.jp"
+              note="@string/provider_note_yahoojp">
+        <incoming uri="pop3+ssl+://pop.mail.yahoo.co.jp"  username="$user" />
+        <outgoing uri="smtp://smtp.mail.yahoo.co.jp:587" username="$user" />
+    </provider>
+
     <!-- Developers' vanity providers -->
     <provider id="fsck.com" label="Jesse's personal mail" domain="fsck.com" >
         <incoming uri="imap+ssl://fsck.com"  username="$user" />