Updated Japanese translation.

2001-05-19 Akira TAGOH <tagoh@gnome.gr.jp> * ja.po: Updated Japanese translation. svn path=/trunk/; revision=9887
author: Akira TAGOH <tagoh@gnome.gr.jp> 2001-05-19 18:06:35 +0800
committer: Akira Tagoh <tagoh@src.gnome.org> 2001-05-19 18:06:35 +0800
commit: 040905c9a295fee00e98260175559f54bc6c6110 (patch)
tree: 370a84272accee16117a2a2c1d43e6dddacfbddb /po/ja.po
parent: 98c32c5c1150085a7073ba258ad2cd362abf53fb (diff)
download: gsoc2013-evolution-040905c9a295fee00e98260175559f54bc6c6110.tar
gsoc2013-evolution-040905c9a295fee00e98260175559f54bc6c6110.tar.gz
gsoc2013-evolution-040905c9a295fee00e98260175559f54bc6c6110.tar.bz2
gsoc2013-evolution-040905c9a295fee00e98260175559f54bc6c6110.tar.lz
gsoc2013-evolution-040905c9a295fee00e98260175559f54bc6c6110.tar.xz
gsoc2013-evolution-040905c9a295fee00e98260175559f54bc6c6110.tar.zst
gsoc2013-evolution-040905c9a295fee00e98260175559f54bc6c6110.zip
1 files changed, 2490 insertions, 1776 deletions
diff --git a/po/ja.po b/po/ja.po
index 46e1865c02..2041c8f4f9 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,20 +4,20 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution CVS-20010408\n"
-"POT-Creation-Date: 2001-04-20 01:02+0900\n"
-"PO-Revision-Date: 2001-04-20 02:56+0900\n"
+"Project-Id-Version: evolution CVS-20010519\n"
+"POT-Creation-Date: 2001-05-19 17:16+0900\n"
+"PO-Revision-Date: 2001-05-19 19:04+0900\n"
 "Last-Translator: Akira TAGOH <tagoh@gnome.gr.jp>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3209
+#: addressbook/backend/ebook/e-card.c:3314
 msgid "Card: "
 msgstr "名刺: "
 
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3316
 msgid ""
 "\n"
 "Name: "
@@ -25,7 +25,7 @@ msgstr ""
 "\n"
 "名前: "
 
-#: addressbook/backend/ebook/e-card.c:3212
+#: addressbook/backend/ebook/e-card.c:3317
 msgid ""
 "\n"
 "  Prefix:     "
@@ -33,7 +33,7 @@ msgstr ""
 "\n"
 "  敬称(前つけ):     "
 
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3318
 msgid ""
 "\n"
 "  Given:      "
@@ -41,13 +41,13 @@ msgstr ""
 "\n"
 "  姓:      "
 
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3319
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3215
+#: addressbook/backend/ebook/e-card.c:3320
 msgid ""
 "\n"
 "  Family:     "
@@ -55,7 +55,7 @@ msgstr ""
 "\n"
 "  ファミリー名:     "
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3321
 msgid ""
 "\n"
 "  Suffix:     "
@@ -63,7 +63,7 @@ msgstr ""
 "\n"
 "  敬称(後つけ):     "
 
-#: addressbook/backend/ebook/e-card.c:3230
+#: addressbook/backend/ebook/e-card.c:3335
 msgid ""
 "\n"
 "Birth Date: "
@@ -71,7 +71,7 @@ msgstr ""
 "\n"
 "誕生日: "
 
-#: addressbook/backend/ebook/e-card.c:3241
+#: addressbook/backend/ebook/e-card.c:3346
 msgid ""
 "\n"
 "Address:"
@@ -79,7 +79,7 @@ msgstr ""
 "\n"
 "住所:"
 
-#: addressbook/backend/ebook/e-card.c:3243
+#: addressbook/backend/ebook/e-card.c:3348
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -87,7 +87,7 @@ msgstr ""
 "\n"
 "郵便番号:  "
 
-#: addressbook/backend/ebook/e-card.c:3244
+#: addressbook/backend/ebook/e-card.c:3349
 msgid ""
 "\n"
 "  Ext:         "
@@ -95,25 +95,25 @@ msgstr ""
 "\n"
 "  "
 
-#: addressbook/backend/ebook/e-card.c:3245
+#: addressbook/backend/ebook/e-card.c:3350
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3246
+#: addressbook/backend/ebook/e-card.c:3351
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3247
+#: addressbook/backend/ebook/e-card.c:3352
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3248
+#: addressbook/backend/ebook/e-card.c:3353
 msgid ""
 "\n"
 "  Postal Code: "
@@ -121,7 +121,7 @@ msgstr ""
 "\n"
 "  郵便番号: "
 
-#: addressbook/backend/ebook/e-card.c:3249
+#: addressbook/backend/ebook/e-card.c:3354
 msgid ""
 "\n"
 "  Country:     "
@@ -129,13 +129,13 @@ msgstr ""
 "\n"
 "  国:       "
 
-#: addressbook/backend/ebook/e-card.c:3262
+#: addressbook/backend/ebook/e-card.c:3367
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3379
 msgid ""
 "\n"
 "Telephones:\n"
@@ -143,7 +143,7 @@ msgstr ""
 "\n"
 "電話番号:\n"
 
-#: addressbook/backend/ebook/e-card.c:3277
+#: addressbook/backend/ebook/e-card.c:3382
 msgid ""
 "\n"
 "Telephone:"
@@ -151,7 +151,7 @@ msgstr ""
 "\n"
 "電話番号:"
 
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3406
 msgid ""
 "\n"
 "E-mail:\n"
@@ -159,7 +159,7 @@ msgstr ""
 "\n"
 "メール:\n"
 
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3409
 msgid ""
 "\n"
 "E-mail:"
@@ -167,7 +167,7 @@ msgstr ""
 "\n"
 "メール:"
 
-#: addressbook/backend/ebook/e-card.c:3323
+#: addressbook/backend/ebook/e-card.c:3428
 msgid ""
 "\n"
 "Mailer: "
@@ -175,7 +175,7 @@ msgstr ""
 "\n"
 "メーラ: "
 
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3434
 msgid ""
 "\n"
 "Time Zone: "
@@ -183,7 +183,7 @@ msgstr ""
 "\n"
 "タイムゾーン: "
 
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3442
 msgid ""
 "\n"
 "Geo Location: "
@@ -191,7 +191,7 @@ msgstr ""
 "\n"
 "経緯: "
 
-#: addressbook/backend/ebook/e-card.c:3341
+#: addressbook/backend/ebook/e-card.c:3446
 msgid ""
 "\n"
 "Business Role: "
@@ -199,7 +199,7 @@ msgstr ""
 "\n"
 "仕事の職務: "
 
-#: addressbook/backend/ebook/e-card.c:3353
+#: addressbook/backend/ebook/e-card.c:3458
 msgid ""
 "\n"
 "Org: "
@@ -207,7 +207,7 @@ msgstr ""
 "\n"
 "組織: "
 
-#: addressbook/backend/ebook/e-card.c:3354
+#: addressbook/backend/ebook/e-card.c:3459
 msgid ""
 "\n"
 "  Name:  "
@@ -215,7 +215,7 @@ msgstr ""
 "\n"
 "  社名:  "
 
-#: addressbook/backend/ebook/e-card.c:3355
+#: addressbook/backend/ebook/e-card.c:3460
 msgid ""
 "\n"
 "  Unit:  "
@@ -223,7 +223,7 @@ msgstr ""
 "\n"
 "  部署:  "
 
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3461
 msgid ""
 "\n"
 "  Unit2: "
@@ -231,7 +231,7 @@ msgstr ""
 "\n"
 "  部署2: "
 
-#: addressbook/backend/ebook/e-card.c:3357
+#: addressbook/backend/ebook/e-card.c:3462
 msgid ""
 "\n"
 "  Unit3: "
@@ -239,7 +239,7 @@ msgstr ""
 "\n"
 "  部署3: "
 
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3463
 msgid ""
 "\n"
 "  Unit4: "
@@ -247,7 +247,7 @@ msgstr ""
 "\n"
 "  部署4: "
 
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3467
 msgid ""
 "\n"
 "Categories: "
@@ -255,7 +255,7 @@ msgstr ""
 "\n"
 "業務分野: "
 
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3468
 msgid ""
 "\n"
 "Comment: "
@@ -273,7 +273,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3376
+#: addressbook/backend/ebook/e-card.c:3481
 msgid ""
 "\n"
 "Unique String: "
@@ -281,7 +281,7 @@ msgstr ""
 "\n"
 "任意の文字列: "
 
-#: addressbook/backend/ebook/e-card.c:3379
+#: addressbook/backend/ebook/e-card.c:3484
 msgid ""
 "\n"
 "Public Key: "
@@ -289,23 +289,36 @@ msgstr ""
 "\n"
 "公開鍵: "
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr "Evolution へ GnomeCard ファイルをインポートするファクトリ"
+#: addressbook/backend/ebook/e-card.c:3745
+msgid "Multiple VCards"
+msgstr "複数の VCard"
+
+#: addressbook/backend/ebook/e-card.c:3753
+#, c-format
+msgid "VCard for %s"
+msgstr "%s の VCard"
+
+#: addressbook/backend/ebook/e-destination.c:244
+msgid "???"
+msgstr "???"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+msgid "Factory to import VCard files into Evolution."
+msgstr "Evolution へ VCard ファイルをインポートするファクトリ"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr "Evolution へ GnomeCard ファイルをインポート"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr "Evolution へ VCard ファイルをインポート"
 
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:43
+#: addressbook/gui/component/addressbook-factory.c:42
 #: calendar/conduits/calendar/calendar-conduit.c:1151
 #: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:99 calendar/gui/main.c:57
+#: calendar/gui/alarm-notify/notify-main.c:98 calendar/gui/main.c:57
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo の初期化が出来ませんでした"
 
@@ -409,7 +422,7 @@ msgid "Web page address:"
 msgstr "ウェブページの URL:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:84
 msgid "_Add"
 msgstr "追加(_A)"
 
@@ -434,8 +447,9 @@ msgid "_Company:"
 msgstr "会社(_C):"
 
 #: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:75 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:93 ui/evolution-task-editor-dialog.xml.h:69
+#: mail/folder-browser.c:715 mail/mail-config.glade.h:85
+#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:103
+#: ui/evolution-task-editor-dialog.xml.h:69 ui/evolution.xml.h:46
 msgid "_Delete"
 msgstr "削除(_D)"
 
@@ -483,16 +497,12 @@ msgstr "配偶者(_S):"
 msgid "_This is the mailing address"
 msgstr "これは郵便物の住所です"
 
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "コンタクトを削除しますか?"
-
 #: addressbook/contact-editor/e-contact-editor.c:603
 msgid "This contact belongs to these categories:"
 msgstr "このコンタクトはこれらのカテゴリに所属しています:"
 
 #: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Assistant"
 msgstr "アシスタント"
 
@@ -506,7 +516,7 @@ msgid "Business 2"
 msgstr "仕事 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:656
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Business Fax"
 msgstr "仕事の FAX"
 
@@ -532,12 +542,12 @@ msgid "Home 2"
 msgstr "家 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:657
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Home Fax"
 msgstr "家の FAX"
 
 #: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:660
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "ISDN"
 msgstr "ISDN"
 
@@ -547,17 +557,16 @@ msgstr "モバイル"
 
 #: addressbook/contact-editor/e-contact-editor.c:1254
 #: addressbook/contact-editor/e-contact-editor.c:1312
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:40
 msgid "Other"
 msgstr "その他"
 
 #: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:662
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Other Fax"
 msgstr "その他の FAX"
 
 #: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:663
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "Pager"
 msgstr "ポケベル"
 
@@ -566,12 +575,12 @@ msgid "Primary"
 msgstr "プライマリ"
 
 #: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:664
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Radio"
 msgstr "ラジオ"
 
 #: addressbook/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:665
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Telex"
 msgstr "テレックス"
 
@@ -580,29 +589,33 @@ msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
 #: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:668
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Email 2"
 msgstr "メール2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:669
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "Email 3"
 msgstr "メール3"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:223
+#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "コンタクトを削除しますか?"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:233
 msgid "Contact Quick-Add"
 msgstr "コンタクトの簡易追加"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:225
+#: addressbook/contact-editor/e-contact-quick-add.c:235
 msgid "Edit Full"
 msgstr "すべて編集"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:262
-#: addressbook/gui/widgets/e-addressbook-view.c:643
+#: addressbook/contact-editor/e-contact-quick-add.c:276
+#: addressbook/gui/widgets/e-addressbook-view.c:700
 msgid "Full Name"
 msgstr "フルネーム"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:268
+#: addressbook/contact-editor/e-contact-quick-add.c:282
 msgid "E-mail"
 msgstr "メール"
 
@@ -718,73 +731,70 @@ msgstr "敬称(後つけ)(_S):"
 msgid "_Title:"
 msgstr "敬称(前つけ)(_T):"
 
-#: addressbook/gui/component/addressbook.c:241
+#: addressbook/gui/component/addressbook.c:244
 msgid "As _Minicards"
 msgstr "ミニカード"
 
-#: addressbook/gui/component/addressbook.c:247
+#: addressbook/gui/component/addressbook.c:250
 #: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr "テーブル(_T)"
 
-#: addressbook/gui/component/addressbook.c:399
+#: addressbook/gui/component/addressbook.c:410
 #, c-format
 msgid "Enter password for %s"
 msgstr "%s のパスワードを入力してください"
 
-#: addressbook/gui/component/addressbook.c:427
+#: addressbook/gui/component/addressbook.c:438
 msgid "Unable to open addressbook"
 msgstr "アドレス帳を開くことが出来ません"
 
-#: addressbook/gui/component/addressbook.c:432
+#: addressbook/gui/component/addressbook.c:445
 msgid ""
 "We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"このアドレス帳を開くことが出来ません. これはあなたが\n"
-"間違った URI を入力したか, LDAP サポートを無効にして\n"
-"コンパイルし, LDAPサーバへアクセスしようとしているこ\n"
-"とを意味します．もし URI を入力したなら, 正確な URI \n"
-"をチェックして再度入力してください. そうでなければ, \n"
-"たぶん LDAP サーバにアクセスを試みるでしょう. あなた\n"
-"が LDAP を使うことが出来ることを望むなら, OpenLDAP を\n"
-"ダウンロード，そしてインストールして, コンパイル仕直し\n"
-"て Evolution をインストールする必要があるでしょう.\n"
-
-#: addressbook/gui/component/addressbook.c:555
-msgid "Show All"
-msgstr "すべて表示"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is down"
+msgstr ""
+"このアドレス帳を開くことが出来ません. これは誤ったURI\n"
+"を入力したか, あるいは LDAP サーバが落ちているかのどちらか\n"
+"を意味します"
 
-#: addressbook/gui/component/addressbook.c:557
-msgid "Advanced..."
-msgstr "詳細..."
+#: addressbook/gui/component/addressbook.c:450
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+"この Evolution のバージョンは LDAP サポートをせずにコンパイル\n"
+"されています. Evolution で LDAP を使いたいならば, 下記リンク\n"
+"から OpenLDAP を取得した後 CVS ソースからプログラムを\n"
+"コンパイルしなければなりません\n"
 
-#: addressbook/gui/component/addressbook.c:587 calendar/gui/gnome-cal.c:236
+#: addressbook/gui/component/addressbook.c:458
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+"このアドレス帳を開くことが出来ませんでした. パスが存在し, アクセス権\n"
+"を持っているかどうかチェックしてください"
+
+#: addressbook/gui/component/addressbook.c:618 calendar/gui/gnome-cal.c:233
 msgid "Any field contains"
 msgstr "フィールドが次のものを含む"
 
-#: addressbook/gui/component/addressbook.c:588
+#: addressbook/gui/component/addressbook.c:619
 msgid "Name contains"
 msgstr "名前が次のものを含む"
 
-#: addressbook/gui/component/addressbook.c:589
+#: addressbook/gui/component/addressbook.c:620
 msgid "Email contains"
 msgstr "メールが次のものを含む"
 
-#: addressbook/gui/component/addressbook.c:732
+#: addressbook/gui/component/addressbook.c:763
 msgid "The URI that the Folder Browser will display"
 msgstr "フォルダブラウザが表示する URI"
 
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
-msgstr "その他のコンタクト"
-
 #: addressbook/gui/component/addressbook-config.c:148
 msgid "LDAP Server"
 msgstr "LDAP サーバ"
@@ -804,56 +814,60 @@ msgstr "なし (匿名モード)"
 #: addressbook/gui/component/addressbook-config.c:165
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 msgid "Password"
 msgstr "パスワード"
 
-#: addressbook/gui/component/addressbook-config.c:167
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:170
+#: addressbook/gui/component/addressbook-config.c:168
 msgid "Unknown auth type"
 msgstr "未知の認証種別"
 
-#: addressbook/gui/component/addressbook-config.c:179
+#: addressbook/gui/component/addressbook-config.c:177
 msgid "Base"
 msgstr "ベースエントリ"
 
-#: addressbook/gui/component/addressbook-config.c:181
+#: addressbook/gui/component/addressbook-config.c:179
 msgid "One"
 msgstr "サブエントリ"
 
-#: addressbook/gui/component/addressbook-config.c:183
+#: addressbook/gui/component/addressbook-config.c:181
 msgid "Subtree"
 msgstr "すべてのエントリ"
 
-#: addressbook/gui/component/addressbook-config.c:186
+#: addressbook/gui/component/addressbook-config.c:184
 msgid "Unknown scope type"
 msgstr "未知のスコープ種別"
 
-#: addressbook/gui/component/addressbook-config.c:353
+#: addressbook/gui/component/addressbook-config.c:349
 msgid "Bind DN:"
 msgstr "バインドDN:"
 
-#: addressbook/gui/component/addressbook-config.c:354
+#: addressbook/gui/component/addressbook-config.c:350
 msgid "FIXME Bind DN Help text here"
 msgstr "FIXME バインド DN のヘルプテキストです"
 
-#: addressbook/gui/component/addressbook-config.c:356
-#: mail/mail-config.glade.h:50
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:60
 msgid "Remember this password"
 msgstr "このパスワードを記憶"
 
-#: addressbook/gui/component/addressbook-config.c:406
-#: mail/mail-config.glade.h:28
+#: addressbook/gui/component/addressbook-config.c:401
+#: mail/mail-config.glade.h:33
 msgid "Host:"
 msgstr "ホスト:"
 
-#: addressbook/gui/component/addressbook-config.c:407
+#: addressbook/gui/component/addressbook-config.c:402
 msgid "FIXME Host help text here."
 msgstr "FIXME ホストヘルプテキストです"
 
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "Root DN:"
+msgstr "ルート DN:"
+
+#: addressbook/gui/component/addressbook-config.c:405
+msgid "FIXME Root DN help text here."
+msgstr "FIXME ルート DN ヘルプテキストです"
+
 #: addressbook/gui/component/addressbook-config.c:409
 msgid "Port:"
 msgstr "ポート:"
@@ -862,66 +876,62 @@ msgstr "ポート:"
 msgid "FIXME Port help text here."
 msgstr "FIXME ポートヘルプテキストです"
 
-#: addressbook/gui/component/addressbook-config.c:414
-msgid "Root DN:"
-msgstr "ルート DN:"
-
-#: addressbook/gui/component/addressbook-config.c:415
-msgid "FIXME Root DN help text here."
-msgstr "FIXME ルート DN ヘルプテキストです"
-
-#: addressbook/gui/component/addressbook-config.c:435
+#: addressbook/gui/component/addressbook-config.c:430
 msgid "Search Scope:"
 msgstr "検索範囲:"
 
-#: addressbook/gui/component/addressbook-config.c:489
+#: addressbook/gui/component/addressbook-config.c:477
 msgid "Authentication:"
 msgstr "認証方式:"
 
-#: addressbook/gui/component/addressbook-config.c:507
-#: mail/mail-config.glade.h:44
+#: addressbook/gui/component/addressbook-config.c:499
+msgid "Advanced LDAP Options"
+msgstr "上級 LDAP オプション"
+
+#: addressbook/gui/component/addressbook-config.c:520
+#: mail/mail-config.glade.h:53
 msgid "Path:"
 msgstr "パス:"
 
-#: addressbook/gui/component/addressbook-config.c:508
+#: addressbook/gui/component/addressbook-config.c:521
 msgid "FIXME Path Help text here"
 msgstr "FIXME パスヘルプテキストです"
 
-#: addressbook/gui/component/addressbook-config.c:513
+#: addressbook/gui/component/addressbook-config.c:526
 msgid "Create path if it doesn't exist."
 msgstr "存在しない場合パスを作成する"
 
-#: addressbook/gui/component/addressbook-config.c:647
+#: addressbook/gui/component/addressbook-config.c:660
 msgid "Edit Addressbook"
 msgstr "アドレス帳を編集"
 
-#: addressbook/gui/component/addressbook-config.c:649
+#: addressbook/gui/component/addressbook-config.c:662
 msgid "Add Addressbook"
 msgstr "アドレス帳に追加"
 
-#: addressbook/gui/component/addressbook-config.c:665
+#: addressbook/gui/component/addressbook-config.c:680
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
 msgstr ""
 "あなたの持つアドレス帳を選択し, それについての関連した情報を入力してください"
 
-#: addressbook/gui/component/addressbook-config.c:671
-#: mail/mail-config.glade.h:35
+#: addressbook/gui/component/addressbook-config.c:686
+#: mail/mail-config.glade.h:43
 msgid "Name:"
 msgstr "名前:"
 
-#: addressbook/gui/component/addressbook-config.c:672
+#: addressbook/gui/component/addressbook-config.c:687
 msgid "FIXME Name help text here"
 msgstr "FIXME 名前ヘルプテキストです"
 
-#: addressbook/gui/component/addressbook-config.c:674
+#: addressbook/gui/component/addressbook-config.c:689
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3
 msgid "Description:"
 msgstr "説明:"
 
-#: addressbook/gui/component/addressbook-config.c:675
+#: addressbook/gui/component/addressbook-config.c:690
 msgid "FIXME Description help text here"
 msgstr "FIXME 説明ヘルプテキストです"
 
@@ -930,20 +940,20 @@ msgid "Addressbook Sources"
 msgstr "アドレス帳のソース"
 
 #: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-#: addressbook/gui/widgets/e-minicard.c:673
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:616
 #: calendar/gui/e-meeting-dialog.glade.h:8
 #: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/folder-browser.c:597
-#: mail/mail-config.glade.h:19 mail/mail-view.c:156
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:11 ui/evolution-task-editor-dialog.xml.h:18
+#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:23
+#: mail/message-browser.c:202 ui/evolution-addressbook.xml.h:3
+#: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:22
+#: ui/evolution-task-editor-dialog.xml.h:18
 msgid "Delete"
 msgstr "削除"
 
 #: addressbook/gui/component/addressbook-config.glade.h:4
 #: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:28
 msgid "Edit"
 msgstr "編集"
 
@@ -955,6 +965,10 @@ msgstr "名前"
 msgid "URI"
 msgstr "URI"
 
+#: addressbook/gui/component/addressbook-storage.c:99
+msgid "Other Contacts"
+msgstr "その他のコンタクト"
+
 #: addressbook/gui/component/e-address-widget.c:365
 msgid "Disable Queries"
 msgstr "クエリを無効"
@@ -964,12 +978,12 @@ msgid "Enable Queries (Dangerous!)"
 msgstr "クエリを有効 (危険です!)"
 
 #: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:210
+#: addressbook/gui/component/select-names/e-select-names-popup.c:281
 msgid "Edit Contact Info"
 msgstr "コンタクト情報の編集"
 
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:269
+#: addressbook/gui/component/select-names/e-select-names-popup.c:347
 msgid "Add to Contacts"
 msgstr "コンタクトへ追加"
 
@@ -1017,25 +1031,29 @@ msgstr "Evolution アドレス帳コンポーネントのためのファクトリ"
 msgid "Factory for the sample Addressbook control"
 msgstr "サンプルアドレス帳コントロールのためのファクトリ"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Evolution のアドレス帳の名前選択インターフェース"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "アドレス帳の名前選択インターフェースのためのファクトリ"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:131
+#: addressbook/gui/component/select-names/e-select-names-popup.c:161
 #: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:401
-#: filter/filter-rule.c:550 filter/filter.glade.h:9
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
 #: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
 msgid "Remove"
 msgstr "削除"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:146
+#: addressbook/gui/component/select-names/e-select-names-popup.c:176
 msgid "Remove All"
 msgstr "すべて削除"
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:200
+msgid "Send HTML Mail?"
+msgstr "HTML メールを送信しますか?"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr "Evolution のアドレス帳の名前選択インターフェース"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr "アドレス帳の名前選択インターフェースのためのファクトリ"
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Find..."
 msgstr "検索..."
@@ -1053,6 +1071,7 @@ msgid "Select name from:"
 msgstr "次から名前を選択:"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:242
 msgid "Search"
 msgstr "検索"
 
@@ -1164,149 +1183,148 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:513
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-#: addressbook/gui/widgets/e-minicard.c:466
-#: addressbook/gui/widgets/e-minicard.c:668
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:551
+#: addressbook/gui/widgets/e-addressbook-view.c:611
 msgid "Save as VCard"
 msgstr "VCard で保存"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-#: addressbook/gui/widgets/e-minicard.c:669
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:612
 msgid "Send contact to other"
 msgstr "他へコンタクトを送信"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-#: addressbook/gui/widgets/e-minicard.c:670
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:613
 msgid "Send message to contact"
 msgstr "コンタクト先へメッセージを送信"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-#: addressbook/gui/widgets/e-minicard.c:671 mail/folder-browser.c:572
-#: mail/mail-view.c:154 ui/evolution-addressbook.xml.h:9
-#: ui/evolution-calendar.xml.h:23 ui/evolution-mail.xml.h:51
-#: ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:614 mail/message-browser.c:199
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
+#: ui/evolution-mail.xml.h:65 ui/evolution-tasks.xml.h:4
 msgid "Print"
 msgstr "印刷"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-#: addressbook/gui/widgets/e-minicard.c:672
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:615
 msgid "Print Envelope"
 msgstr "表紙を印刷"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:641
+#: addressbook/gui/widgets/e-addressbook-view.c:698
 msgid "* Click here to add a contact *"
 msgstr "* コンタクトを追加するためにここをクリック *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:699
 msgid "File As"
 msgstr "別名"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:644
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "Email"
 msgstr "メール"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:645
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "Primary Phone"
 msgstr "主な電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:646
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Assistant Phone"
 msgstr "補助の電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:647
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Business Phone"
 msgstr "仕事の電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:648
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Callback Phone"
 msgstr "呼び戻しの電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:649
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Company Phone"
 msgstr "会社の電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:650
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Home Phone"
 msgstr "家の電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:651
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Organization"
 msgstr "組織"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:652
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Business Address"
 msgstr "仕事の住所"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:653
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Address"
 msgstr "家の住所"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:654
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Mobile Phone"
 msgstr "携帯電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Car Phone"
 msgstr "車載電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:658
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Business Phone 2"
 msgstr "仕事の電話 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:659
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Home Phone 2"
 msgstr "家の電話 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Other Phone"
 msgstr "その他の電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:666
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:667
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Other Address"
 msgstr "その他の住所"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:670
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Web Site"
 msgstr "ウェブサイト"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:728
 msgid "Department"
 msgstr "担当部署"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-view.c:729
 msgid "Office"
 msgstr "事務所"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Title"
 msgstr "敬称(前つけ)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Profession"
 msgstr "専門職"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Manager"
 msgstr "マネージャ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Nickname"
 msgstr "ニックネーム"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:678
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Spouse"
 msgstr "配偶者"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:679
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Note"
 msgstr "ノート"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Free-busy URL"
 msgstr ""
 
@@ -1314,7 +1332,7 @@ msgstr ""
 msgid "Save in addressbook"
 msgstr "アドレス帳に保存"
 
-#: addressbook/gui/widgets/e-minicard-view.c:166
+#: addressbook/gui/widgets/e-minicard-view.c:216
 msgid ""
 "\n"
 "\n"
@@ -1514,6 +1532,46 @@ msgid "Could not read pilot's ToDo application block"
 msgstr ""
 "パイロットの ToDo アプリケーションブロックを読み込むことが出来ませんでした"
 
+#: calendar/gui/alarm-notify/alarm-queue.c:586
+#: calendar/gui/alarm-notify/alarm-queue.c:885
+#: calendar/gui/alarm-notify/alarm-queue.c:941
+msgid "Reminder of your appointment at "
+msgstr "約束の催促"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/dialogs/alarm-notify.glade.h:3
+msgid "Snooze"
+msgstr "アラーム停止"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:890
+#: calendar/gui/alarm-notify/alarm-queue.c:945
+msgid "Ok"
+msgstr "Ok"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr "アラーム通知サービス"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr "アラーム通知サービスのためのファクトリ"
+
+#: calendar/gui/alarm-notify/notify-main.c:56
+#, c-format
+msgid ""
+"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
+"know."
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:93 calendar/gui/main.c:52
+msgid "Could not initialize GNOME"
+msgstr "GNOME の初期化が出来ませんでした"
+
+#: calendar/gui/alarm-notify/notify-main.c:108
+msgid "Could not create the alarm notify service factory"
+msgstr "アラーム通知サービスファクトリを作成出来ませんでした"
+
 #: calendar/gui/calendar-commands.c:266
 msgid "File not found"
 msgstr "ファイルが見つかりません"
@@ -1532,24 +1590,24 @@ msgid ""
 msgstr ""
 "カレンダビューを作成出来ませんでした. ORBitとOAFの設定をチェックしてください"
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:895
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:898
+#: calendar/gui/e-calendar-table.c:323
 msgid "Public"
 msgstr "一般"
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:900
+#: calendar/gui/e-calendar-table.c:324
 msgid "Private"
 msgstr "私的"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:902
+#: calendar/gui/e-calendar-table.c:325
 msgid "Confidential"
 msgstr "極秘"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1606
-#: calendar/gui/event-editor.c:1633
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1601
+#: calendar/gui/event-editor.c:1628
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Unknown"
 msgstr "未知"
 
@@ -1569,71 +1627,71 @@ msgstr "東"
 msgid "W"
 msgstr "西"
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1063
+#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1066
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:662
+#: calendar/gui/e-calendar-table.c:345 mail/message-list.c:689
 msgid "High"
 msgstr "高い"
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1065
-#: calendar/gui/calendar-model.c:1569
+#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1068
+#: calendar/gui/calendar-model.c:1574
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:661
+#: calendar/gui/e-calendar-table.c:346 mail/message-list.c:688
 msgid "Normal"
 msgstr "普通"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1067
+#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1070
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:660
+#: calendar/gui/e-calendar-table.c:347 mail/message-list.c:687
 msgid "Low"
 msgstr "低い"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1122
+#: calendar/gui/e-calendar-table.c:399
 msgid "Transparent"
 msgstr "透明"
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1124
+#: calendar/gui/e-calendar-table.c:398
 msgid "Opaque"
 msgstr "不透明"
 
-#: calendar/gui/calendar-model.c:635 calendar/gui/calendar-model.c:1173
+#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1176
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:419
 msgid "Not Started"
 msgstr "開始していない"
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1175
+#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1178
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:420
 msgid "In Progress"
 msgstr "処理中"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1177
+#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1180
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:421
 msgid "Completed"
 msgstr "完了しました"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1179
+#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1182
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:550
-#: camel/camel-service.c:586
+#: calendar/gui/e-calendar-table.c:422 camel/camel-service.c:544
+#: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "キャンセルしました"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:791 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:278
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:287
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 
-#: calendar/gui/calendar-model.c:799
+#: calendar/gui/calendar-model.c:802
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1644,24 +1702,24 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:879
+#: calendar/gui/calendar-model.c:882
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
 "分類を '一般', '私的', '極秘' あるいは 'なし' を選択しなければなりません"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:893 calendar/gui/calendar-model.c:1117
-#: calendar/gui/calendar-model.c:1171 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
+#: calendar/gui/calendar-model.c:896 calendar/gui/calendar-model.c:1120
+#: calendar/gui/calendar-model.c:1174 calendar/gui/e-calendar-table.c:322
+#: calendar/gui/e-calendar-table.c:397 mail/mail-account-gui.c:976
 #: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1179
-#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:430
-#: widgets/misc/e-dateedit.c:1339 widgets/misc/e-dateedit.c:1454
+#: mail/mail-config.glade.h:46 shell/e-shell-view.c:1198
+#: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
+#: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
 msgid "None"
 msgstr "ノート"
 
-#: calendar/gui/calendar-model.c:967
+#: calendar/gui/calendar-model.c:970
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1671,71 +1729,84 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1007
+#: calendar/gui/calendar-model.c:1010
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "パーセント値は 0 と 100 の間で含んでいなければなりません"
 
-#: calendar/gui/calendar-model.c:1048
+#: calendar/gui/calendar-model.c:1051
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 "優先度を '高い', '普通', '低い' あるいは '未定義' を選択しなければなりません"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1061
+#: calendar/gui/calendar-model.c:1064
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:348
 msgid "Undefined"
 msgstr "未定義"
 
-#: calendar/gui/calendar-model.c:1102
+#: calendar/gui/calendar-model.c:1105
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr "透明度は '透明', '不透明', あるいは 'なし' でなければなりません"
 
-#: calendar/gui/calendar-model.c:1571
+#: calendar/gui/calendar-model.c:1576
 msgid "Recurring"
 msgstr "再発"
 
-#: calendar/gui/calendar-model.c:1573
+#: calendar/gui/calendar-model.c:1578
 msgid "Assigned"
 msgstr "割当て済み"
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1584
 msgid "Yes"
 msgstr "はい"
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1584
 msgid "No"
 msgstr "いいえ"
 
-#: calendar/gui/calendar-summary.c:196
+#: calendar/gui/calendar-summary.c:198
 msgid "%A, %e %B %Y"
 msgstr "%Y/%B/%e %A"
 
-#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
+#: calendar/gui/calendar-summary.c:207
+msgid "Appointments"
+msgstr "約束"
+
+#: calendar/gui/calendar-summary.c:245 calendar/gui/calendar-summary.c:251
 msgid "%I:%M%p"
 msgstr "%p %I:%M"
 
-#: calendar/gui/calendar-summary.c:437
+#: calendar/gui/calendar-summary.c:275 calendar/gui/print.c:948
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "タスク"
+
+#: calendar/gui/calendar-summary.c:443
 msgid "<b>Error loading calendar</b>"
 msgstr "<b>カレンダをロード中にエラー</b>"
 
-#: calendar/gui/calendar-summary.c:449
+#: calendar/gui/calendar-summary.c:455
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr "<b>カレンダをロード中にエラー:<br>メソッドはサポートしていません"
 
-#: calendar/gui/calendar-summary.c:616
+#: calendar/gui/calendar-summary.c:622 mail/mail-config.glade.h:24
 msgid "Display"
 msgstr "表示"
 
-#: calendar/gui/calendar-summary.c:621
+#: calendar/gui/calendar-summary.c:627
 msgid "Show appointments"
 msgstr "約束の表示"
 
-#: calendar/gui/calendar-summary.c:629
+#: calendar/gui/calendar-summary.c:635
 msgid "Show tasks"
 msgstr "タスクの表示"
 
-#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
+#: calendar/gui/calendar-summary.c:690
+msgid "Things to do"
+msgstr ""
+
+#: calendar/gui/calendar-summary.c:721 calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "カレンダをロード中"
 
@@ -1743,46 +1814,6 @@ msgstr "カレンダをロード中"
 msgid "The URI that the calendar will display"
 msgstr "カレンダが表示する URI"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
-msgstr "約束の催促"
-
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "アラーム停止"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
-msgstr "Ok"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
-msgstr "アラーム通知サービス"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-msgid "Factory for the alarm notification service"
-msgstr "アラーム通知サービスのためのファクトリ"
-
-#: calendar/gui/alarm-notify/notify-main.c:56
-#, c-format
-msgid ""
-"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
-"know."
-msgstr ""
-
-#: calendar/gui/alarm-notify/notify-main.c:94 calendar/gui/main.c:52
-msgid "Could not initialize GNOME"
-msgstr "GNOME の初期化が出来ませんでした"
-
-#: calendar/gui/alarm-notify/notify-main.c:109
-msgid "Could not create the alarm notify service factory"
-msgstr "アラーム通知サービスファクトリを作成出来ませんでした"
-
 #: calendar/gui/dialogs/alarm-notify-dialog.c:189
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "%Y/%b/%d %A %H:%M にアラーム"
@@ -1798,7 +1829,7 @@ msgstr "利用できるサマリーはありません"
 #: calendar/gui/dialogs/alarm-notify.glade.h:1
 #: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
+#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:5
 msgid "Close"
 msgstr "閉じる"
 
@@ -1880,7 +1911,7 @@ msgid "Display options"
 msgstr "表示オプション"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
+#: calendar/gui/e-calendar-table.c:155
 msgid "Due Date"
 msgstr "期日"
 
@@ -1901,7 +1932,7 @@ msgid "Fri"
 msgstr "金"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:484
+#: calendar/gui/event-editor.c:479
 msgid "Friday"
 msgstr "金曜日"
 
@@ -1930,7 +1961,7 @@ msgid "Mon"
 msgstr "月"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/event-editor.c:475
 msgid "Monday"
 msgstr "月曜日"
 
@@ -1943,12 +1974,12 @@ msgid "Overdue Items:"
 msgstr "期限を過ぎたアイテム:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:54
 msgid "Pick a color"
 msgstr "カラーを選択"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:158
 msgid "Priority"
 msgstr "優先度"
 
@@ -1966,7 +1997,7 @@ msgid "Sat"
 msgstr "土"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:485
+#: calendar/gui/event-editor.c:480
 msgid "Saturday"
 msgstr "土曜日"
 
@@ -1991,7 +2022,7 @@ msgid "Sun"
 msgstr "日"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:486
+#: calendar/gui/event-editor.c:481
 msgid "Sunday"
 msgstr "日曜日"
 
@@ -2004,7 +2035,7 @@ msgid "Thu"
 msgstr "木"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:483
+#: calendar/gui/event-editor.c:478
 msgid "Thursday"
 msgstr "木曜日"
 
@@ -2025,7 +2056,7 @@ msgid "Tue"
 msgstr "火"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/event-editor.c:476
 msgid "Tuesday"
 msgstr "火曜日"
 
@@ -2038,7 +2069,7 @@ msgid "Wed"
 msgstr "水"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:482
+#: calendar/gui/event-editor.c:477
 msgid "Wednesday"
 msgstr "水曜日"
 
@@ -2051,48 +2082,86 @@ msgid "minutes before they occur."
 msgstr "分前"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:88
 msgid "seconds."
 msgstr " 秒"
 
-#: calendar/gui/dialogs/delete-comp.c:70
+#: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "本当に約束 `%s' を削除したいですか?"
+msgstr "本当に約束 `%s' を削除してもよろしいですか?"
 
-#: calendar/gui/dialogs/delete-comp.c:73
+#: calendar/gui/dialogs/delete-comp.c:87
 msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "本当に無タイトルの約束を削除したいですか?"
+msgstr "本当にタイトルなしの約束を削除してもよろしいですか?"
 
-#: calendar/gui/dialogs/delete-comp.c:79
+#: calendar/gui/dialogs/delete-comp.c:93
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
-msgstr "本当にタスク `%s' を削除したいですか?"
+msgstr "本当にタスク `%s' を削除してもよろしいですか?"
 
-#: calendar/gui/dialogs/delete-comp.c:82
+#: calendar/gui/dialogs/delete-comp.c:96
 msgid "Are you sure you want to delete this untitled task?"
-msgstr "本当に無タイトルのタスクを削除したいですか?"
+msgstr "本当にタイトルなしのタスクを削除してもよろしいですか?"
 
-#: calendar/gui/dialogs/delete-comp.c:88
+#: calendar/gui/dialogs/delete-comp.c:102
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "本当に仕訳記入 `%s' を削除したいですか?"
+msgstr "本当に仕訳記入 `%s' を削除してもよろしいですか?"
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:105
 msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "本当に無タイトルの仕訳記入を削除したいですか?"
+msgstr "本当にタイトルなしの仕訳記入を削除してもよろしいですか?"
+
+#: calendar/gui/dialogs/delete-comp.c:120
+#, c-format
+msgid "Are you sure you want to delete %d appointments?"
+msgstr "本当に %d 個の約束を削除してもよろしいですか?"
+
+#: calendar/gui/dialogs/delete-comp.c:125
+#, c-format
+msgid "Are you sure you want to delete %d tasks?"
+msgstr "本当に %d 個のタスクを削除してもよろしいですか?"
+
+#: calendar/gui/dialogs/delete-comp.c:130
+#, c-format
+msgid "Are you sure you want to delete %d journal entries?"
+msgstr "本当に %d 個の仕訳記入を削除してもよろしいですか?"
 
 #: calendar/gui/dialogs/save-comp.c:51
 msgid "Do you want to save changes?"
 msgstr "変更を保存したいですか?"
 
+#: calendar/gui/dialogs/task-editor.c:709
+msgid "Edit Task"
+msgstr "タスクの編集"
+
+#: calendar/gui/dialogs/task-editor.c:714 calendar/gui/event-editor.c:382
+#, c-format
+msgid "Appointment - %s"
+msgstr "約束 - %s"
+
+#: calendar/gui/dialogs/task-editor.c:717 calendar/gui/event-editor.c:385
+#, c-format
+msgid "Task - %s"
+msgstr "タスク - %s"
+
+#: calendar/gui/dialogs/task-editor.c:720 calendar/gui/event-editor.c:388
+#, c-format
+msgid "Journal entry - %s"
+msgstr "仕訳記入 - %s"
+
+#: calendar/gui/dialogs/task-editor.c:734 calendar/gui/event-editor.c:402
+msgid "No summary"
+msgstr "サマリーなし"
+
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:2
 #, no-c-format
 msgid "% Comp_lete:"
 msgstr "% 完了(_l):"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:151
 #: calendar/gui/event-editor-dialog.glade.h:6
 msgid "Classification"
 msgstr "分類"
@@ -2159,157 +2228,137 @@ msgstr "優先度(_P):"
 msgid "_Status:"
 msgstr "ステータス(_S):"
 
-#: calendar/gui/dialogs/task-editor.c:707
-msgid "Edit Task"
-msgstr "タスクの編集"
-
-#: calendar/gui/dialogs/task-editor.c:713 calendar/gui/event-editor.c:382
-msgid "No summary"
-msgstr "サマリーなし"
-
-#: calendar/gui/dialogs/task-editor.c:719 calendar/gui/event-editor.c:388
-#, c-format
-msgid "Appointment - %s"
-msgstr "約束 - %s"
-
-#: calendar/gui/dialogs/task-editor.c:722 calendar/gui/event-editor.c:391
-#, c-format
-msgid "Task - %s"
-msgstr "タスク - %s"
-
-#: calendar/gui/dialogs/task-editor.c:725 calendar/gui/event-editor.c:394
-#, c-format
-msgid "Journal entry - %s"
-msgstr "仕訳記入 - %s"
-
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:150
 msgid "Categories"
 msgstr "カテゴリ"
 
-#: calendar/gui/e-calendar-table.c:159
+#: calendar/gui/e-calendar-table.c:152
 msgid "Completion Date"
 msgstr "完了日"
 
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:153
 msgid "End Date"
 msgstr "終了日"
 
-#: calendar/gui/e-calendar-table.c:161
+#: calendar/gui/e-calendar-table.c:154
 msgid "Start Date"
 msgstr "開始日"
 
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-calendar-table.c:156
 msgid "Geographical Position"
 msgstr "緯度経度"
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:157
 msgid "Percent complete"
 msgstr "パーセント完了"
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:159
 msgid "Summary"
 msgstr "サマリー"
 
-#: calendar/gui/e-calendar-table.c:167
+#: calendar/gui/e-calendar-table.c:160
 msgid "Transparency"
 msgstr "透明度"
 
-#: calendar/gui/e-calendar-table.c:168
+#: calendar/gui/e-calendar-table.c:161
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-calendar-table.c:169
+#: calendar/gui/e-calendar-table.c:162
 msgid "Alarms"
 msgstr "アラーム"
 
-#: calendar/gui/e-calendar-table.c:170
+#: calendar/gui/e-calendar-table.c:163
 msgid "Click here to add a task"
 msgstr "タスクを追加するためにここをクリック"
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/e-calendar-table.c:367
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:368
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:369
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:370
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:371
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:372
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:373
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:374
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:375
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:376
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:384
+#: calendar/gui/e-calendar-table.c:377
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
-msgstr "完了をマーク"
+#: calendar/gui/e-calendar-table.c:705
+msgid "Edit this task"
+msgstr "このタスクを編集します"
 
-#: calendar/gui/e-calendar-table.c:552
-msgid "Mark the task complete"
-msgstr "完了したタスクをマークします"
+#: calendar/gui/e-calendar-table.c:707
+msgid "Mark as complete"
+msgstr "完了をマークします"
 
-#: calendar/gui/e-calendar-table.c:557
-msgid "Edit this task..."
-msgstr "このタスクを編集..."
-
-#: calendar/gui/e-calendar-table.c:558
-msgid "Edit the task"
-msgstr "タスクを編集します"
-
-#: calendar/gui/e-calendar-table.c:560
+#: calendar/gui/e-calendar-table.c:708
 #: ui/evolution-task-editor-dialog.xml.h:19
 msgid "Delete this task"
 msgstr "このタスクを削除します"
 
-#: calendar/gui/e-calendar-table.c:561
-msgid "Delete the task"
-msgstr "タスクを削除します"
+#: calendar/gui/e-calendar-table.c:713
+msgid "Mark tasks as complete"
+msgstr "完了したタスクをマークします"
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i 分分割"
+#: calendar/gui/e-calendar-table.c:714
+msgid "Delete selected tasks"
+msgstr "選択したタスクを削除します"
+
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
+#: calendar/gui/print.c:617
+msgid "am"
+msgstr "午前"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
+#: calendar/gui/print.c:616
+msgid "pm"
+msgstr "午後"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
@@ -2332,54 +2381,41 @@ msgstr "%b/%d (%a)"
 msgid "%d %b"
 msgstr "%b/%d"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
-msgid "am"
-msgstr "午前"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
-msgid "pm"
-msgstr "午後"
-
 #: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
 msgid "New Appointment"
 msgstr "新規約束"
 
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
+#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3279
 msgid "New All Day Event"
 msgstr "新規毎日のイベント"
 
-#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
+#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3284
 msgid "Go to Today"
 msgstr "今日へ移動"
 
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
+#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3286
 msgid "Go to Date..."
 msgstr "指定日へ移動..."
 
-#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: mail/folder-browser.c:566 ui/evolution-calendar.xml.h:19
-#: ui/evolution-message-composer.xml.h:10
+#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3292
+#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:11
 msgid "Open"
 msgstr "開く"
 
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
+#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3294
 msgid "Delete this Appointment"
 msgstr "この約束を削除"
 
-#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
+#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3296
 #: ui/evolution-event-editor.xml.h:45
 msgid "Schedule Meeting"
 msgstr "打合せのスケジュール"
 
-#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
+#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3309
 msgid "Make this Occurrence Movable"
 msgstr "この出来事を可動にする"
 
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
+#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3311
 msgid "Delete this Occurrence"
 msgstr "この出来事を削除"
 
@@ -2387,6 +2423,11 @@ msgstr "この出来事を削除"
 msgid "Delete all Occurrences"
 msgstr "すべての出来事を削除"
 
+#: calendar/gui/e-day-view-time-item.c:519
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i 分分割"
+
 #: calendar/gui/e-itip-control.c:161
 msgid "I couldn't update your calendar file!\n"
 msgstr "カレンダファイルを更新出来ませんでした!\n"
@@ -2468,7 +2509,7 @@ msgstr ""
 msgid "Calendar Message"
 msgstr "カレンダメッセージ"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:623
+#: calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "日付:"
 
@@ -2536,7 +2577,7 @@ msgstr "任意参加者"
 msgid "Organizer: "
 msgstr "主催者:"
 
-#: calendar/gui/e-meeting-dialog.glade.h:15
+#: calendar/gui/e-meeting-dialog.glade.h:14
 msgid ""
 "Publish\n"
 "Event"
@@ -2544,11 +2585,11 @@ msgstr ""
 "発表\n"
 "イベント"
 
-#: calendar/gui/e-meeting-dialog.glade.h:17
+#: calendar/gui/e-meeting-dialog.glade.h:16
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/e-meeting-dialog.glade.h:18
+#: calendar/gui/e-meeting-dialog.glade.h:17
 msgid ""
 "Request\n"
 "Meeting"
@@ -2556,15 +2597,15 @@ msgstr ""
 "要求\n"
 "打合せ"
 
-#: calendar/gui/e-meeting-dialog.glade.h:20
+#: calendar/gui/e-meeting-dialog.glade.h:19
 msgid "Required Participant"
 msgstr "参加者が必要"
 
-#: calendar/gui/e-meeting-dialog.glade.h:21
+#: calendar/gui/e-meeting-dialog.glade.h:20
 msgid "Role"
 msgstr "役割"
 
-#: calendar/gui/e-meeting-dialog.glade.h:22
+#: calendar/gui/e-meeting-dialog.glade.h:21
 msgid ""
 "Schedule\n"
 "Time"
@@ -2572,8 +2613,8 @@ msgstr ""
 "スケジュール\n"
 "時間"
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:49
-#: mail/message-list.c:1054
+#: calendar/gui/e-meeting-dialog.glade.h:23 filter/libfilter-i18n.h:49
+#: mail/message-list.c:1081
 msgid "Status"
 msgstr "ステータス"
 
@@ -2596,20 +2637,119 @@ msgstr "'%s' のタスクを読み込むことが出来ませんでした"
 msgid "The method required to load `%s' is not supported"
 msgstr "'%s' を読み込むことを要求されるメソッドはサポートしていません"
 
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342
-msgid "%d %B"
-msgstr "%B %d"
+#: calendar/gui/event-editor.c:377
+msgid "Edit Appointment"
+msgstr "約束の編集"
 
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
-msgid "New Appointment..."
-msgstr "新規約束..."
+#: calendar/gui/event-editor.c:449
+msgid "on"
+msgstr ""
 
-#: calendar/gui/e-week-view.c:3314
-msgid "Delete All Occurrences"
-msgstr "すべての出来事を削除"
+#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:81
+msgid "day"
+msgstr "日"
+
+#: calendar/gui/event-editor.c:601
+msgid "on the"
+msgstr ""
+
+#: calendar/gui/event-editor.c:608
+msgid "th"
+msgstr ""
+
+#: calendar/gui/event-editor.c:754
+msgid "occurrences"
+msgstr "出来事"
+
+#: calendar/gui/event-editor.c:871
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "この約束は Evolution が編集出来ない再発を含んでいます"
+
+#: calendar/gui/event-editor.c:1543
+#, c-format
+msgid " %d days"
+msgstr "%d 日"
+
+#: calendar/gui/event-editor.c:1545
+msgid " 1 day"
+msgstr "1 日"
+
+#: calendar/gui/event-editor.c:1548
+#, c-format
+msgid " %d weeks"
+msgstr "%d 週間"
+
+#: calendar/gui/event-editor.c:1550
+msgid " 1 week"
+msgstr "1 週間"
+
+#: calendar/gui/event-editor.c:1553
+#, c-format
+msgid " %d hours"
+msgstr "%d 時間"
+
+#: calendar/gui/event-editor.c:1555
+msgid " 1 hour"
+msgstr "1 時間"
+
+#: calendar/gui/event-editor.c:1558
+#, c-format
+msgid " %d minutes"
+msgstr "%d 分"
+
+#: calendar/gui/event-editor.c:1560
+msgid " 1 minute"
+msgstr "1 分"
+
+#: calendar/gui/event-editor.c:1563
+#, c-format
+msgid " %d seconds"
+msgstr "%d 秒"
+
+#: calendar/gui/event-editor.c:1565
+msgid " 1 second"
+msgstr "1 秒"
+
+#: calendar/gui/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor.c:1588
+msgid "Play a sound"
+msgstr "次の時に音楽を再生する:"
+
+#: calendar/gui/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor.c:1591
+msgid "Show a dialog"
+msgstr "次の時にダイアログを表示する:"
+
+#: calendar/gui/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor.c:1594
+msgid "Send an email"
+msgstr "次の時にメールを送信する:"
+
+#: calendar/gui/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor.c:1597
+msgid "Run a program"
+msgstr "次の時にプログラムを実行する:"
+
+#: calendar/gui/event-editor.c:1612
+msgid " before start of appointment"
+msgstr "最初の約束の前"
+
+#: calendar/gui/event-editor.c:1614
+msgid " after start of appointment"
+msgstr "最初の約束の後"
+
+#: calendar/gui/event-editor.c:1622
+msgid " before end of appointment"
+msgstr "最後の約束の前"
+
+#: calendar/gui/event-editor.c:1624
+msgid " after end of appointment"
+msgstr "最後の約束の後"
+
+#: calendar/gui/event-editor.c:3132 calendar/gui/print.c:1097
+#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
+msgid "%a %b %d %Y"
+msgstr "%Y/%b/%d (%a)"
 
 #: calendar/gui/event-editor-dialog.glade.h:1
 msgid "A_ll day event"
@@ -2628,9 +2768,8 @@ msgid "Custom recurrence"
 msgstr "再発のカスタマイズ"
 
 #: calendar/gui/event-editor-dialog.glade.h:10
-#, fuzzy
 msgid "Every"
-msgstr "毎回"
+msgstr ""
 
 #: calendar/gui/event-editor-dialog.glade.h:11
 msgid "Exceptions"
@@ -2644,11 +2783,6 @@ msgstr "修正"
 msgid "No recurrence"
 msgstr "再発なし"
 
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1593
-msgid "Play a sound"
-msgstr "次の時に音楽を再生する:"
-
 #: calendar/gui/event-editor-dialog.glade.h:15
 msgid "Preview"
 msgstr "プレビュー"
@@ -2665,25 +2799,10 @@ msgstr "再発ルール"
 msgid "Reminder"
 msgstr "催促状"
 
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1602
-msgid "Run a program"
-msgstr "次の時にプログラムを実行する:"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1599
-msgid "Send an email"
-msgstr "次の時にメールを送信する:"
-
 #: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
 msgid "Settings..."
 msgstr "設定..."
 
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1596
-msgid "Show a dialog"
-msgstr "次の時にダイアログを表示する:"
-
 #: calendar/gui/event-editor-dialog.glade.h:26
 msgid "Simple recurrence"
 msgstr "シンプルな再発"
@@ -2718,20 +2837,18 @@ msgid "end of appointment"
 msgstr "約束の最後が経過"
 
 #: calendar/gui/event-editor-dialog.glade.h:37
-#, fuzzy
 msgid "for"
-msgstr "毎に"
+msgstr ""
 
 #: calendar/gui/event-editor-dialog.glade.h:38
-#, fuzzy
 msgid "forever"
-msgstr "毎に永遠に繰り返す"
+msgstr ""
 
 #: calendar/gui/event-editor-dialog.glade.h:39
 msgid "hour(s)"
 msgstr "時"
 
-#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
+#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:87
 msgid "minute(s)"
 msgstr "分"
 
@@ -2759,101 +2876,46 @@ msgstr "週"
 msgid "year(s)"
 msgstr "年"
 
-#: calendar/gui/event-editor.c:376
-msgid "Edit Appointment"
-msgstr "約束の編集"
-
-#: calendar/gui/event-editor.c:454
-#, fuzzy
-msgid "on"
-msgstr "次の曜日"
-
-#: calendar/gui/event-editor.c:479 filter/filter-datespec.c:81
-msgid "day"
-msgstr "日"
-
-#: calendar/gui/event-editor.c:606
-msgid "on the"
-msgstr ""
-
-#: calendar/gui/event-editor.c:613
-msgid "th"
-msgstr ""
-
-#: calendar/gui/event-editor.c:759
-#, fuzzy
-msgid "occurrences"
-msgstr "発生"
-
-#: calendar/gui/event-editor.c:876
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "この約束は Evolution が編集出来ない再発を含んでいます"
+#: calendar/gui/e-week-view.c:3277 calendar/gui/e-week-view.c:3300
+msgid "New Appointment..."
+msgstr "新規約束..."
 
-#: calendar/gui/event-editor.c:1548
-#, c-format
-msgid " %d days"
-msgstr "%d 日"
+#: calendar/gui/e-week-view.c:3313
+msgid "Delete All Occurrences"
+msgstr "すべての出来事を削除"
 
-#: calendar/gui/event-editor.c:1550
-msgid " 1 day"
-msgstr "1 日"
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/e-week-view-main-item.c:342
+msgid "%d %B"
+msgstr "%B %d"
 
-#: calendar/gui/event-editor.c:1553
-#, c-format
-msgid " %d weeks"
-msgstr "%d 週間"
+#: calendar/gui/gnome-cal.c:234
+msgid "Summary contains"
+msgstr "サマリが次のものを含む"
 
-#: calendar/gui/event-editor.c:1555
-msgid " 1 week"
-msgstr "1 週間"
+#: calendar/gui/gnome-cal.c:235
+msgid "Description contains"
+msgstr "説明が次のものを含む"
 
-#: calendar/gui/event-editor.c:1558
-#, c-format
-msgid " %d hours"
-msgstr "%d 時間"
+#: calendar/gui/gnome-cal.c:236
+msgid "Comment contains"
+msgstr "コメントが次のものを含む"
 
-#: calendar/gui/event-editor.c:1560
-msgid " 1 hour"
-msgstr "1 時間"
+#: calendar/gui/gnome-cal.c:237
+msgid "Has category"
+msgstr "次のカテゴリを持つ"
 
-#: calendar/gui/event-editor.c:1563
+#: calendar/gui/gnome-cal.c:840
 #, c-format
-msgid " %d minutes"
-msgstr "%d 分"
-
-#: calendar/gui/event-editor.c:1565
-msgid " 1 minute"
-msgstr "1 分"
+msgid "Could not open the folder in `%s'"
+msgstr "`%s' のフォルダを開くことが出来ませんでした"
 
-#: calendar/gui/event-editor.c:1568
+#: calendar/gui/gnome-cal.c:851
 #, c-format
-msgid " %d seconds"
-msgstr "%d 秒"
-
-#: calendar/gui/event-editor.c:1570
-msgid " 1 second"
-msgstr "1 秒"
-
-#: calendar/gui/event-editor.c:1617
-msgid " before start of appointment"
-msgstr "最初の約束の前"
-
-#: calendar/gui/event-editor.c:1619
-msgid " after start of appointment"
-msgstr "最初の約束の後"
-
-#: calendar/gui/event-editor.c:1627
-msgid " before end of appointment"
-msgstr "最後の約束の前"
-
-#: calendar/gui/event-editor.c:1629
-msgid " after end of appointment"
-msgstr "最後の約束の後"
-
-#: calendar/gui/event-editor.c:3137 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
-msgstr "%Y/%b/%d (%a)"
+msgid "The method required to open `%s' is not supported"
+msgstr "'%s' を開くことを要求されるメソッドはサポートしていません"
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
 msgid "A sample Bonobo control which displays an calendar."
@@ -2887,36 +2949,6 @@ msgstr "カレンダ iTip ビューコントロールのためのファクトリ"
 msgid "Factory for the sample Calendar control"
 msgstr "サンプルカレンダコントロールのファクトリ"
 
-#: calendar/gui/gnome-cal.c:223
-msgid "Show all "
-msgstr "すべて表示"
-
-#: calendar/gui/gnome-cal.c:237
-msgid "Summary contains"
-msgstr "サマリが次のものを含む"
-
-#: calendar/gui/gnome-cal.c:238
-msgid "Description contains"
-msgstr "説明が次のものを含む"
-
-#: calendar/gui/gnome-cal.c:239
-msgid "Comment contains"
-msgstr "コメントが次のものを含む"
-
-#: calendar/gui/gnome-cal.c:240
-msgid "Has category"
-msgstr "次のカテゴリを持つ"
-
-#: calendar/gui/gnome-cal.c:843
-#, c-format
-msgid "Could not open the folder in `%s'"
-msgstr "`%s' のフォルダを開くことが出来ませんでした"
-
-#: calendar/gui/gnome-cal.c:854
-#, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr "'%s' を開くことを要求されるメソッドはサポートしていません"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "4 月"
@@ -3125,10 +3157,6 @@ msgstr "金"
 msgid "Sa"
 msgstr "土"
 
-#: calendar/gui/print.c:948 views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "タスク"
-
 #. Day
 #: calendar/gui/print.c:1078
 msgid "Current day (%a %b %d %Y)"
@@ -3161,9 +3189,8 @@ msgstr "今年 (%Y)"
 msgid "Print Calendar"
 msgstr "カレンダの印刷"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1465
+#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1447
 #: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:53
 msgid "Print Preview"
 msgstr "印刷プレビュー"
 
@@ -3213,26 +3240,120 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "SMTWTFS"
 
-#: camel/camel-cipher-context.c:169
+#: calendar/pcs/query.c:218
+msgid "time-now expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:242
+msgid "make-time expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:247
+msgid "make-time expects argument 1 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:255
+msgid "make-time argument 1 must be an ISO 8601 date/time string"
+msgstr ""
+
+#: calendar/pcs/query.c:281
+msgid "time-add-day expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:286
+msgid "time-add-day expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:293
+msgid "time-add-day expects argument 2 to be an integer"
+msgstr ""
+
+#: calendar/pcs/query.c:318
+msgid "time-day-begin expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:323
+msgid "time-day-begin expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:348
+msgid "time-day-end expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:353
+msgid "time-day-end expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:389
+msgid "get-vtype expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:472
+msgid "occur-in-time-range? expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:477
+msgid "occur-in-time-range? expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:484
+msgid "occur-in-time-range? expects argument 2 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:611
+msgid "contains? expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:616
+msgid "contains? expects argument 1 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:623
+msgid "contains? expects argument 2 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:640
+msgid ""
+"contains? expects argument 1 to be one of \"any\", \"summary\", "
+"\"description\""
+msgstr ""
+
+#: calendar/pcs/query.c:678
+msgid "has-categories? expects at least 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:684
+msgid "has-categories? expects all arguments to be strings"
+msgstr ""
+
+#: calendar/pcs/query.c:932
+msgid "Evaluation of the search expression did not yield a boolean value"
+msgstr ""
+
+#: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr "サインはこの暗号をサポートしていません"
 
-#: camel/camel-cipher-context.c:209
+#: camel/camel-cipher-context.c:211
 msgid "Clearsigning is not supported by this cipher"
 msgstr "クリアサインはこの暗号をサポートしていません"
 
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:251
 msgid "Verifying is not supported by this cipher"
 msgstr "ベリファイはこの暗号をサポートしていません"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:294
 msgid "Encryption is not supported by this cipher"
 msgstr "符号化はこの暗号をサポートしていません"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:336
 msgid "Decryption is not supported by this cipher"
 msgstr "復号化はこの暗号をサポートしていません"
 
+#: camel/camel-disco-store.c:271
+msgid "You must be working online to complete this operation"
+msgstr "この動作を完了するためにオンラインで作業しなければなりません"
+
 #: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
 msgid "Syncing folders"
 msgstr "フォルダを同期中"
@@ -3414,44 +3535,44 @@ msgstr "あなたの %s パスフレーズ ( %s 用) を入力してください"
 msgid "Please enter your %s passphrase"
 msgstr "あなたの %s パスフレーズを入力してください"
 
-#: camel/camel-pgp-context.c:513
+#: camel/camel-pgp-context.c:511
 msgid "No plaintext to sign."
 msgstr "サインするためのプレインテキストがありません"
 
-#: camel/camel-pgp-context.c:520 camel/camel-pgp-context.c:692
-#: camel/camel-pgp-context.c:1061 camel/camel-pgp-context.c:1273
+#: camel/camel-pgp-context.c:518 camel/camel-pgp-context.c:690
+#: camel/camel-pgp-context.c:1057 camel/camel-pgp-context.c:1269
 msgid "No password provided."
 msgstr "提供されたパスワードはありません"
 
-#: camel/camel-pgp-context.c:526 camel/camel-pgp-context.c:698
-#: camel/camel-pgp-context.c:881 camel/camel-pgp-context.c:1068
-#: camel/camel-pgp-context.c:1280
+#: camel/camel-pgp-context.c:524 camel/camel-pgp-context.c:696
+#: camel/camel-pgp-context.c:879 camel/camel-pgp-context.c:1064
+#: camel/camel-pgp-context.c:1276
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "GPG/PGP へのパイプが作成できませんでした: %s"
 
-#: camel/camel-pgp-context.c:685
+#: camel/camel-pgp-context.c:683
 msgid "No plaintext to clearsign."
 msgstr "クリアサインするためのプレインテキストがありません"
 
-#: camel/camel-pgp-context.c:875
+#: camel/camel-pgp-context.c:873
 msgid "No plaintext to verify."
 msgstr "ベリファイするためのプレインテキストがありません"
 
-#: camel/camel-pgp-context.c:892
+#: camel/camel-pgp-context.c:890
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "作業ファイルを作成することが出来ませんでした: %s"
 
-#: camel/camel-pgp-context.c:1051
+#: camel/camel-pgp-context.c:1047
 msgid "No plaintext to encrypt."
 msgstr "符号化するためのプレインテキストがありません"
 
-#: camel/camel-pgp-context.c:1077
+#: camel/camel-pgp-context.c:1073
 msgid "No recipients specified"
 msgstr "受信者が指定されていません"
 
-#: camel/camel-pgp-context.c:1265
+#: camel/camel-pgp-context.c:1261
 msgid "No ciphertext to decrypt."
 msgstr "復号化するための暗号テキストがありません"
 
@@ -3472,37 +3593,37 @@ msgstr "%s をロード出来ませんでした: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s をロード出来ませんでした: モジュールのコードが初期化されていません"
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr "%s サーバ %s"
 
-#: camel/camel-remote-store.c:190
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s サービス (ユーザ: %s ホスト %s)"
 
-#: camel/camel-remote-store.c:240
+#: camel/camel-remote-store.c:252
 msgid "Connection cancelled"
 msgstr "接続はキャンセルしました"
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:261
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:269
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "%s (ポート %d) へ接続出来ませんでした: %s"
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:256
 msgid "(unknown host)"
 msgstr "(未知のホスト)"
 
-#: camel/camel-remote-store.c:325 camel/camel-remote-store.c:387
-#: camel/camel-remote-store.c:458
-#: camel/providers/imap/camel-imap-command.c:264
+#: camel/camel-remote-store.c:337 camel/camel-remote-store.c:399
+#: camel/camel-remote-store.c:470
+#: camel/providers/imap/camel-imap-command.c:287
 msgid "Operation cancelled"
 msgstr "操作はキャンセルしました"
 
-#: camel/camel-remote-store.c:464
+#: camel/camel-remote-store.c:476
 msgid "Server unexpectedly disconnected"
 msgstr "サーバは突然切断しました"
 
@@ -3612,68 +3733,76 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:420
+#: camel/providers/imap/camel-imap-store.c:433
 msgid "Bad authentication response from server."
 msgstr "サーバから間違った認証応答がありました"
 
-#: camel/camel-sasl-plain.c:34
+#: camel/camel-sasl-login.c:32
+msgid "NT Login"
+msgstr "NT ログイン"
+
+#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
 msgstr "このオプションは簡単なパスワードを使ってサーバへ接続します"
 
-#: camel/camel-search-private.c:110
+#: camel/camel-sasl-login.c:127
+msgid "Unknown authentication state."
+msgstr ""
+
+#: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "正規表現の編集に失敗: %s: %s"
 
-#: camel/camel-service.c:152
+#: camel/camel-service.c:154
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' はユーザ名コンポーネントが必要です"
 
-#: camel/camel-service.c:160
+#: camel/camel-service.c:162
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' はホストコンポーネントが必要です"
 
-#: camel/camel-service.c:168
+#: camel/camel-service.c:170
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' はパスコンポーネントが必要です"
 
-#: camel/camel-service.c:554
+#: camel/camel-service.c:548
 #, c-format
 msgid "Resolving: %s"
 msgstr "解決中: %s"
 
-#: camel/camel-service.c:581
+#: camel/camel-service.c:575
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "名前の検索に失敗しました: %s"
 
-#: camel/camel-service.c:606
+#: camel/camel-service.c:600
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "ホストの検索に失敗しました: %s: ホストは見つかりません"
 
-#: camel/camel-service.c:608
+#: camel/camel-service.c:602
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "ホストの検索に失敗しました: %s: 未知の理由です"
 
-#: camel/camel-session.c:56
+#: camel/camel-session.c:68
 msgid "Virtual folder email provider"
 msgstr "仮想フォルダメールプロバイダ"
 
-#: camel/camel-session.c:58
+#: camel/camel-session.c:70
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:273 camel/camel-session.c:363
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "プロトコル `%s' を利用できるプロバイダはありません"
 
-#: camel/camel-session.c:462
+#: camel/camel-session.c:479
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3682,12 +3811,111 @@ msgstr ""
 "ディレクトリ %s を作成出来ません:\n"
 "%s"
 
+#: camel/camel-smime-context.c:194
+#, c-format
+msgid "Please enter your password for %s"
+msgstr "%s のためのあなたのパスワードを入力してください"
+
+#: camel/camel-smime-context.c:210
+msgid "Error hashing password."
+msgstr "パスワードのハッシュでエラーが発生しました"
+
+#: camel/camel-smime-context.c:219
+msgid "Invalid password."
+msgstr "無効なパスワードです"
+
+#: camel/camel-smime-context.c:327
+#, c-format
+msgid "Could not sign: certificate not found for \"%s\"."
+msgstr "署名出来ませんでした: \"%s\" のための証明書が見つかりません"
+
+#: camel/camel-smime-context.c:343
+msgid "Could not sign: failed to create content info."
+msgstr "署名出来ませんでした: コンテキスト情報の作成に失敗しました"
+
+#: camel/camel-smime-context.c:350
+msgid "Could not sign: failed to create signing context."
+msgstr "署名出来ませんでした: コンテキストの署名の作成に失敗しました"
+
+#: camel/camel-smime-context.c:356
+msgid "Could not sign: failed to create signature."
+msgstr "署名出来ませんでした: 署名の作成に失敗しました"
+
+#: camel/camel-smime-context.c:383
+msgid "'clearsign' is not supported by S/MIME."
+msgstr "'クリアサイン' は S/MIME をサポートしていません"
+
+#: camel/camel-smime-context.c:528
+msgid "Could not encrypt: failed to create enveloped data."
+msgstr "暗号化出来ませんでした: エンベロープデータの作成に失敗しました"
+
+#: camel/camel-smime-context.c:535
+msgid "Could not encrypt: failed to create encryption context."
+msgstr "暗号化出来ませんでした: 暗号コンテキストの作成に失敗しました"
+
+#: camel/camel-smime-context.c:570
+#, c-format
+msgid "Could not encrypt data: invalid user key: \"%s\"."
+msgstr "データを暗号化出来ませんでした: 無効なユーザキーです: \"%s\""
+
+#: camel/camel-smime-context.c:576
+msgid "Could not encrypt: encoding failed."
+msgstr "暗号化出来ませんでした: 符号化に失敗しました"
+
+#: camel/camel-smime-context.c:626
+msgid "Failed to decrypt: Unknown"
+msgstr "復号化に失敗しました: 未知のエラーです"
+
 #. Fill in the new fields
-#: camel/camel-store.c:380 mail/mail-ops.c:994 mail/mail-ops.c:1001
-#: mail/mail-ops.c:1019 mail/mail-ops.c:1020
+#: camel/camel-store.c:378 mail/mail-ops.c:1007 mail/mail-ops.c:1014
+#: mail/mail-ops.c:1032 mail/mail-ops.c:1033
 msgid "Trash"
 msgstr "ごみ箱"
 
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
+"メール: %s\n"
+"共通名: %s\n"
+"組織ユニット: %s\n"
+"組織: %s\n"
+"場所: %s\n"
+"州: %s\n"
+"国: %s"
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-openssl.c:428 camel/camel-tcp-stream-ssl.c:364
+#, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+"%s から偽の証明書です:\n"
+"\n"
+"%s\n"
+"\n"
+"承諾を望みますか?"
+
+#: camel/camel-tcp-stream-openssl.c:423
+#, c-format
+msgid ""
+"Issuer: %s\n"
+"Subject: %s"
+msgstr ""
+"発行: %s\n"
+"対象: %s"
+
 #: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
@@ -3698,59 +3926,73 @@ msgstr "URL `%s' を解析することが出来ませんでした"
 msgid "No such message %s in %s"
 msgstr "%s に %s のようなメッセージはありません"
 
-#: camel/camel-vee-folder.c:545
+#: camel/camel-vee-folder.c:546
 #, c-format
 msgid "No such message: %s"
 msgstr "そのようなメッセージはありません: %s"
 
-#: camel/providers/imap/camel-imap-command.c:209
+#: camel/camel-vtrash-folder.c:109
+msgid "You cannot copy messages from this trash folder."
+msgstr "このゴミ箱フォルダからメッセージをコピーすることが出来ません"
+
+#: camel/providers/imap/camel-imap-message-cache.c:150
+#, c-format
+msgid "Could not open cache directory: %s"
+msgstr "キャッシュディレクトリを開くことが出来ませんでした: %s"
+
+#: camel/providers/imap/camel-imap-command.c:232
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP サーバから予期しない応答がありました: %s"
 
-#: camel/providers/imap/camel-imap-command.c:217
+#: camel/providers/imap/camel-imap-command.c:240
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP コマンドは失敗しました: %s"
 
-#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
+#: camel/providers/imap/camel-imap-command.c:241 shell/e-storage.c:481
 msgid "Unknown error"
 msgstr "未知のエラー"
 
-#: camel/providers/imap/camel-imap-command.c:272
+#: camel/providers/imap/camel-imap-command.c:295
 msgid "Server response ended too soon."
 msgstr "サーバレスポンスはあっけなく終わりました"
 
-#: camel/providers/imap/camel-imap-command.c:456
+#: camel/providers/imap/camel-imap-command.c:487
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP サーバの応答は %s 情報を含んでいません"
 
-#: camel/providers/imap/camel-imap-command.c:490
+#: camel/providers/imap/camel-imap-command.c:524
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP サーバから予期しない OK 応答がありました: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:170
+#: camel/providers/imap/camel-imap-folder.c:172
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr "ディレクトリ %s を作成出来ませんでした: %s"
+
+#: camel/providers/imap/camel-imap-folder.c:191
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s のサマリーをロード出来ませんでした"
 
-#: camel/providers/imap/camel-imap-folder.c:349
+#: camel/providers/imap/camel-imap-folder.c:364
 msgid "Scanning IMAP folder"
 msgstr "IMAP フォルダを走査中"
 
-#: camel/providers/imap/camel-imap-folder.c:984
-#: camel/providers/imap/camel-imap-folder.c:1195
+#: camel/providers/imap/camel-imap-folder.c:1047
+#: camel/providers/imap/camel-imap-folder.c:1281
 msgid "This message is not currently available"
 msgstr "このメッセージは現在利用出来ません"
 
-#: camel/providers/imap/camel-imap-folder.c:1014
-#: camel/providers/imap/camel-imap-folder.c:1229
+#: camel/providers/imap/camel-imap-folder.c:1075
+#: camel/providers/imap/camel-imap-folder.c:1314
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH 応答にメッセージ本体を見付けることが出来ませんでした"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:13
 msgid "Checking for new mail"
 msgstr "新着メールのチェック"
 
@@ -3758,7 +4000,7 @@ msgstr "新着メールのチェック"
 msgid "Check for new messages in all folders"
 msgstr "すべてのフォルダの新着メールをチェックします"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:534
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:552
 msgid "Folders"
 msgstr "フォルダ"
 
@@ -3791,28 +4033,28 @@ msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "このオプションはプレインテキストパスワードを使って IMAP サーバに接続します"
 
-#: camel/providers/imap/camel-imap-store.c:443
+#: camel/providers/imap/camel-imap-store.c:456
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP サーバ %s は要求した認証タイプ %s をサポートしていません"
 
-#: camel/providers/imap/camel-imap-store.c:453
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/imap/camel-imap-store.c:466
+#: camel/providers/smtp/camel-smtp-transport.c:366
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "認証タイプ %s をサポートしていません"
 
-#: camel/providers/imap/camel-imap-store.c:478
+#: camel/providers/imap/camel-imap-store.c:490
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s %s@%s の IMAP パスワードを入力してください"
 
-#: camel/providers/imap/camel-imap-store.c:493
-#: camel/providers/smtp/camel-smtp-transport.c:403
+#: camel/providers/imap/camel-imap-store.c:505
+#: camel/providers/smtp/camel-smtp-transport.c:410
 msgid "You didn't enter a password."
 msgstr "パスワードを入力していません"
 
-#: camel/providers/imap/camel-imap-store.c:521
+#: camel/providers/imap/camel-imap-store.c:531
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3823,19 +4065,10 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:868
+#: camel/providers/imap/camel-imap-store.c:803 mail/mail-local.c:334
 #, c-format
-msgid "%s is not a selectable folder"
-msgstr "%s は選択可能なフォルダではありません"
-
-#: camel/providers/imap/camel-imap-store.c:882
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "ディレクトリ %s を作成出来ませんでした: %s"
-
-#: camel/providers/imap/camel-imap-store.c:1385
-msgid "You must be working online to complete this operation"
-msgstr "この動作を完了するためにオンラインで作業しなければなりません"
+msgid "No such folder %s"
+msgstr "そのようなフォルダ %s はありません"
 
 #: camel/providers/local/camel-local-provider.c:39
 msgid "MH-format mail directories"
@@ -3861,47 +4094,51 @@ msgstr "Qmail maildir型式のメールファイル"
 msgid "For storing local mail in qmail maildir directories"
 msgstr "qmail maildirディレクトリにローカルメールを保存します"
 
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-store.c:127
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "保存されたルート %s は絶対パスではありません"
 
-#: camel/providers/local/camel-local-store.c:136
+#: camel/providers/local/camel-local-store.c:134
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "保存されたルート %s は通常のディレクトリではありません"
 
-#: camel/providers/local/camel-local-store.c:144
-#: camel/providers/local/camel-local-store.c:160
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:158
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "フォルダを取得出来ません: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:175
+#: camel/providers/local/camel-local-store.c:173
 msgid "Local stores do not have an inbox"
 msgstr "ローカルへの保存は inbox を持てません"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Local mail file %s"
 msgstr "ローカルメールファイル %s"
 
-#: camel/providers/local/camel-local-store.c:241
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "フォルダを %s から %s へ名前変更することが出来ませんでした: %s"
 
-#: camel/providers/local/camel-local-store.c:283
+#: camel/providers/local/camel-local-store.c:279
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "フォルダからサマリーファイル `%s' を削除することが出来ませんでした: %s"
 
-#: camel/providers/local/camel-local-store.c:293
+#: camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 "フォルダからインデックスファイル `%s' を削除することが出来ませんでした: %s"
 
+#: camel/providers/local/camel-local-summary.c:404
+msgid "Unable to add message to summary: unknown reason"
+msgstr "サマリへメッセージを追加することが出来ません: 未知の理由です"
+
 #: camel/providers/local/camel-maildir-folder.c:150
 #: camel/providers/local/camel-maildir-folder.c:158
 #: camel/providers/local/camel-maildir-folder.c:169
@@ -3978,6 +4215,12 @@ msgstr "フォルダ `%s' を削除することが出来ませんでした: %s"
 msgid "not a maildir directory"
 msgstr "maildir 形式のディレクトリではありません"
 
+#: camel/providers/local/camel-maildir-summary.c:405
+#: camel/providers/local/camel-maildir-summary.c:526
+#, c-format
+msgid "Cannot open maildir directory path: %s: %s"
+msgstr "maildir ディレクトリパスを開くことが出来ません: %s: %s"
+
 #: camel/providers/local/camel-mbox-folder.c:152
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
@@ -4053,75 +4296,75 @@ msgstr "フォルダ `%s' は空ではありません. 削除しません"
 
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:249
 msgid "Summarising folder"
 msgstr "フォルダをサマライズ中"
 
-#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-mbox-summary.c:254
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr "フォルダを開けませんでした: %s: ポジション %ld からサマライズ中: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-mbox-summary.c:296
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "ポジション %ld 付近 フォルダ %s で致命的なメール構文解析エラーです"
 
-#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-mbox-summary.c:371
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "フォルダをサマライズすることが出来ません: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:501
-#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1382
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1397
 msgid "Synchronising folder"
 msgstr "フォルダを同期中"
 
-#: camel/providers/local/camel-mbox-summary.c:506
-#: camel/providers/local/camel-mbox-summary.c:707
+#: camel/providers/local/camel-mbox-summary.c:507
+#: camel/providers/local/camel-mbox-summary.c:708
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "フォルダをサマライズすることが出来ませんでした: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:523
+#: camel/providers/local/camel-mbox-summary.c:524
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "テンポラリ mailbox を開くことが出来ません: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:556
-#: camel/providers/local/camel-mbox-summary.c:745
-#: camel/providers/local/camel-mbox-summary.c:753
+#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:557
+#: camel/providers/local/camel-mbox-summary.c:746
+#: camel/providers/local/camel-mbox-summary.c:754
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "同期しましたが, サマリーとフォルダが不一致です"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "作業 mailbox へ書き出し中にエラー: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:616
+#: camel/providers/local/camel-mbox-summary.c:617
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "作業 mailbox へ書き出し中にエラー: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:634
-#: camel/providers/local/camel-mbox-summary.c:803
+#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:804
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "元のフォルダ %s を閉じることが出来ませんでした: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:643
+#: camel/providers/local/camel-mbox-summary.c:644
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "作業フォルダを閉じることが出来ませんでした: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:654
+#: camel/providers/local/camel-mbox-summary.c:655
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "フォルダをリネーム出来ませんでした: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-mbox-summary.c:879
 #, c-format
 msgid "Unknown error: %s"
 msgstr "未知のエラー: %s"
@@ -4137,6 +4380,11 @@ msgstr "mh フォルダへメッセージを追加出来ません: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "`%s' はディレクトリではありません"
 
+#: camel/providers/local/camel-mh-summary.c:218
+#, c-format
+msgid "Cannot open MH directory path: %s: %s"
+msgstr "MH ディレクトリパスを開くことが出来ません: %s: %s"
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
@@ -4251,7 +4499,7 @@ msgstr "サーバにメッセージを残す"
 msgid "Delete after %s day(s)"
 msgstr "%s 日後に削除する"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr "POP"
 
@@ -4287,27 +4535,27 @@ msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr "これは POP サーバへ接続し, Kerberos 4 認証を使います."
 
-#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:199
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "KPOP サーバへ認証出来ませんでした: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:225
+#: camel/providers/pop3/camel-pop3-store.c:215
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "サーバへ接続することが出来ませんでした: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:329
+#: camel/providers/pop3/camel-pop3-store.c:322
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "%s の POP サーバへ接続出来ませんでした"
 
-#: camel/providers/pop3/camel-pop3-store.c:368
+#: camel/providers/pop3/camel-pop3-store.c:361
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%s %s@%s の POP3 パスワードを入力してください"
 
-#: camel/providers/pop3/camel-pop3-store.c:387
+#: camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4316,12 +4564,12 @@ msgstr ""
 "POP サーバへ接続出来ません\n"
 "ユーザ名の送信中にエラー: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:390
-#: camel/providers/pop3/camel-pop3-store.c:427
+#: camel/providers/pop3/camel-pop3-store.c:382
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "(Unknown)"
 msgstr "(未知)"
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:409
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -4329,7 +4577,7 @@ msgstr ""
 "POP サーバへ接続出来ません\n"
 "要求した認証手段はサポートしていません"
 
-#: camel/providers/pop3/camel-pop3-store.c:425
+#: camel/providers/pop3/camel-pop3-store.c:417
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4338,13 +4586,13 @@ msgstr ""
 "POP サーバへ接続できません\n"
 "パスワードの送信中にエラー: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:493
+#: camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid "No such folder `%s'."
 msgstr "そのようなフォルダ `%s' はありません"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:67
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4398,7 +4646,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "sendmail 経由でメールを配信"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:62
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4406,122 +4654,122 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "SMTPを使ってリモートメールハブに接続することでメールを配信します\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:168
 msgid "Syntax error, command unrecognized"
 msgstr "構文解析エラー, コマンドではありません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error in parameters or arguments"
 msgstr "パラメータあるいは引数に構文解析エラー"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Command not implemented"
 msgstr "コマンドは実装されていません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command parameter not implemented"
 msgstr "コマンドパラメータは実装されていません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "System status, or system help reply"
 msgstr "システムステータスあるいはシステムヘルプ応答"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Help message"
 msgstr "ヘルプメッセージ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Service ready"
 msgstr "サービスは利用できます"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service closing transmission channel"
 msgstr "サービスは送信チャンネルを閉じています"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service not available, closing transmission channel"
 msgstr "サービスは利用できません, 送信チャンネルを閉じています"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Requested mail action okay, completed"
 msgstr "要求されたメールの動作はOK, 完了しました"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "User not local; will forward to <forward-path>"
 msgstr "ユーザはローカルではありません; <forward-path> へ転送します"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "要求されたメールの動作は完了しません: メールボックスは利用できません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "要求された動作は完了しません: メールボックスは利用できません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action aborted: error in processing"
 msgstr "要求された動作を中断しました: 処理中にエラー"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "User not local; please try <forward-path>"
 msgstr "ユーザはローカルではありません; <forward-path> を試してください"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: insufficient system storage"
 msgstr "要求された動作は完了しません: システムの保存領域が足りません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "要求されたメールの動作を中断しました: 領域割り当てを越えました"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "要求された動作は完了しません: メールボックス名は認められません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "メールの入力を開始します; <CRLF>.<CRLF> で終了します"
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Transaction failed"
 msgstr "処理は失敗しました"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "A password transition is needed"
 msgstr "パスワードの変更が必要です"
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Authentication mechanism is too weak"
 msgstr "認証メカニズムは不十分過ぎます"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Encryption required for requested authentication mechanism"
 msgstr "要求した認証メカニズムのために暗号化が必要です"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Temporary authentication failure"
 msgstr "一時的な認証に失敗しました"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication required"
 msgstr "認証を必要としています"
 
-#: camel/providers/smtp/camel-smtp-transport.c:305
+#: camel/providers/smtp/camel-smtp-transport.c:313
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "初期応答エラー: %s: たぶん致命的ではありません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:348
+#: camel/providers/smtp/camel-smtp-transport.c:356
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "SMTP サーバ %s は要求した認証タイプ %s をサポートしていません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/smtp/camel-smtp-transport.c:395
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%s %s@%s の SMTP パスワードを入力してください"
 
-#: camel/providers/smtp/camel-smtp-transport.c:411
+#: camel/providers/smtp/camel-smtp-transport.c:418
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4532,111 +4780,115 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:527
+#: camel/providers/smtp/camel-smtp-transport.c:534
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP サーバ %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s 経由で SMTP メールを配信します"
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:561
 msgid "Cannot send message: sender address not defined."
 msgstr "メッセージを送信出来ません: 送信者のアドレスが定義されていません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:568
 msgid "Cannot send message: sender address not valid."
 msgstr "メッセージを送信出来ません: 送信者のアドレスが正しくありません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:575
+#: camel/providers/smtp/camel-smtp-transport.c:582
 msgid "Cannot send message: no recipients defined."
 msgstr "メッセージを送信出来ません: 受信者が定義されていません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:669
+#: camel/providers/smtp/camel-smtp-transport.c:676
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "HELO 要求のタイムアウト: %s: 致命的ではありません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:695
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO レスポンスエラー: %s: 致命的ではありません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:721
+#: camel/providers/smtp/camel-smtp-transport.c:728
 msgid "Error creating SASL authentication object."
 msgstr "SASL 認証オブジェクトの生成中にエラーが発生しました"
 
-#: camel/providers/smtp/camel-smtp-transport.c:736
-#: camel/providers/smtp/camel-smtp-transport.c:748
+#: camel/providers/smtp/camel-smtp-transport.c:743
+#: camel/providers/smtp/camel-smtp-transport.c:755
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH 要求のタイムアウト: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:798
+#: camel/providers/smtp/camel-smtp-transport.c:764
+msgid "AUTH request failed."
+msgstr "AUTH 要求に失敗しました"
+
+#: camel/providers/smtp/camel-smtp-transport.c:809
 msgid "Bad authentication response from server.\n"
 msgstr "サーバから間違った認証応答がありました\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:824
+#: camel/providers/smtp/camel-smtp-transport.c:835
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM 要求のタイムアウト: %s: メールは送信しませんでした"
 
-#: camel/providers/smtp/camel-smtp-transport.c:843
+#: camel/providers/smtp/camel-smtp-transport.c:854
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "MAIL FROM レスポンスエラー: %s: メールは送信しませんでした"
 
-#: camel/providers/smtp/camel-smtp-transport.c:868
+#: camel/providers/smtp/camel-smtp-transport.c:879
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO 要求のタイムアウト: %s: メールは送信しませんでした"
 
-#: camel/providers/smtp/camel-smtp-transport.c:887
+#: camel/providers/smtp/camel-smtp-transport.c:898
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "RCPT TO レスポンスエラー: %s: メールは送信しませんでした"
 
-#: camel/providers/smtp/camel-smtp-transport.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:929
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA 要求のタイムアウト: %s: メールは送信しませんでした"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:948
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "DATA レスポンスエラー: %s: メールは送信しませんでした"
 
-#: camel/providers/smtp/camel-smtp-transport.c:952
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:981
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA 送信のタイムアウト: メッセージの終了: %s: メールは送信しませんでした"
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:1000
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 "DATA レスポンスエラー: メッセージの終了: %s: メールは送信しませんでした"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1013
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET 要求のタイムアウト: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1043
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET レスポンスエラー: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1055
+#: camel/providers/smtp/camel-smtp-transport.c:1066
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "QUIT 要求のタイムアウト: %s: 致命的ではありません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:1085
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUIT レスポンスエラー: %s: 致命的ではありません"
@@ -4666,7 +4918,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
+#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:122
 msgid "attachment"
 msgstr "添付"
 
@@ -4687,7 +4939,8 @@ msgstr "添付の追加..."
 msgid "Attach a file to the message"
 msgstr "メッセージへファイルを添付します"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1054
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:9
+#: mail/message-list.c:1081
 msgid "Attachment"
 msgstr "添付"
 
@@ -4711,60 +4964,26 @@ msgstr "MIME タイプ:"
 msgid "Send as:"
 msgstr "送信先:"
 
-#: composer/e-msg-composer-hdrs.c:321
-msgid "Click here for the address book"
-msgstr "アドレス帳のためにここでクリック"
-
-#.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:719
-msgid "From:"
-msgstr "差出人:"
-
-#.
-#. * Reply-To:
-#.
-#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:721
-msgid "Reply-To:"
-msgstr "返信先:"
-
-#.
-#. * Subject:
-#.
-#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:643
-msgid "Subject:"
-msgstr "件名:"
-
-#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:723
-msgid "To:"
-msgstr "宛先:"
+#: composer/e-msg-composer.c:546
+#, c-format
+msgid ""
+"This version of Evolution was not built with support for S/MIME.\n"
+"You may wish to instead use PGP to %s your document."
+msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:384
-msgid "Enter the recipients of the message"
-msgstr "メッセージの受取人を入力します"
+#: composer/e-msg-composer.c:548
+msgid "sign and encrypt"
+msgstr "署名と暗号化"
 
-#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:725
-msgid "Cc:"
-msgstr "Cc:"
+#: composer/e-msg-composer.c:549
+msgid "sign"
+msgstr "署名"
 
-#: composer/e-msg-composer-hdrs.c:388
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "メッセージのカーボンコピーを受信するアドレスを入力します"
+#: composer/e-msg-composer.c:549
+msgid "encrypt"
+msgstr "暗号化"
 
-#: composer/e-msg-composer-hdrs.c:391
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:392
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"メッセージの受取人リストの中に現れないで, "
-"メッセージのカーボンコピーを受信するアドレスを入力します"
-
-#: composer/e-msg-composer.c:528
+#: composer/e-msg-composer.c:601
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -4773,21 +4992,21 @@ msgstr ""
 "署名ファイル %s を開くことが出来ませんでした:\n"
 "%s"
 
-#: composer/e-msg-composer.c:716
+#: composer/e-msg-composer.c:774
 msgid "Save as..."
 msgstr "別名で保存..."
 
-#: composer/e-msg-composer.c:727
+#: composer/e-msg-composer.c:785
 #, c-format
 msgid "Error saving file: %s"
 msgstr "ファイルの保存中にエラー: %s"
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:805
 #, c-format
 msgid "Error loading file: %s"
 msgstr "ファイルのロード中にエラー: %s"
 
-#: composer/e-msg-composer.c:819
+#: composer/e-msg-composer.c:877
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -4795,12 +5014,12 @@ msgstr ""
 "このアカウントの草案フォルダを開くことが出来ません\n"
 "デフォルトの草案フォルダを使ってもよろしいですか?"
 
-#: composer/e-msg-composer.c:877 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:206
+#: composer/e-msg-composer.c:935 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:224
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:883
+#: composer/e-msg-composer.c:941
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4810,27 +5029,27 @@ msgstr ""
 "\n"
 "変更を保存しますか?"
 
-#: composer/e-msg-composer.c:908
+#: composer/e-msg-composer.c:966
 msgid "Open file"
 msgstr "ファイルを開く"
 
-#: composer/e-msg-composer.c:1034
+#: composer/e-msg-composer.c:1092
 msgid "That file does not exist."
 msgstr "そのファイルは存在しません"
 
-#: composer/e-msg-composer.c:1044
+#: composer/e-msg-composer.c:1102
 msgid "That is not a regular file."
 msgstr "それは通常のファイルではありません"
 
-#: composer/e-msg-composer.c:1054
+#: composer/e-msg-composer.c:1112
 msgid "That file exists but is not readable."
 msgstr "そのファイルは存在しますが，読み取り可能ではありません"
 
-#: composer/e-msg-composer.c:1064
+#: composer/e-msg-composer.c:1122
 msgid "That file appeared accesible but open(2) failed."
 msgstr "そのファイルはアクセス可能のように見えますが，open(2) は失敗しました"
 
-#: composer/e-msg-composer.c:1086
+#: composer/e-msg-composer.c:1144
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4838,18 +5057,71 @@ msgstr ""
 "ファイルはとても大きい (100K 以上) です\n"
 "本当にそれを挿入することを望みますか?"
 
-#: composer/e-msg-composer.c:1107
+#: composer/e-msg-composer.c:1165
 msgid "An error occurred while reading the file."
 msgstr "ファイル読込中の間にエラーは発生しました"
 
-#: composer/e-msg-composer.c:1408 composer/e-msg-composer.c:1740
+#: composer/e-msg-composer.c:1526 composer/e-msg-composer.c:1871
 msgid "Compose a message"
 msgstr "メッセージを作成します"
 
-#: composer/e-msg-composer.c:1829
+#: composer/e-msg-composer.c:1962
 msgid "Could not create composer window."
 msgstr "メール作成ウィンドウを作成出来ませんでした"
 
+#: composer/e-msg-composer-hdrs.c:324
+msgid "Click here for the address book"
+msgstr "アドレス帳のためにここでクリック"
+
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:355
+msgid "From:"
+msgstr "差出人:"
+
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:361
+msgid "Reply-To:"
+msgstr "返信先:"
+
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:372
+msgid "Subject:"
+msgstr "件名:"
+
+#: composer/e-msg-composer-hdrs.c:386
+msgid "To:"
+msgstr "宛先:"
+
+#: composer/e-msg-composer-hdrs.c:387
+msgid "Enter the recipients of the message"
+msgstr "メッセージの受信者を入力します"
+
+#: composer/e-msg-composer-hdrs.c:390
+msgid "Cc:"
+msgstr "Cc:"
+
+#: composer/e-msg-composer-hdrs.c:391
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "メッセージのカーボンコピーを受信するアドレスを入力します"
+
+#: composer/e-msg-composer-hdrs.c:394
+msgid "Bcc:"
+msgstr "Bcc:"
+
+#: composer/e-msg-composer-hdrs.c:395
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"メッセージの受信者リストの中に現れないで, "
+"メッセージのカーボンコピーを受信するアドレスを入力します"
+
 #: composer/evolution-composer.c:355
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -4877,7 +5149,7 @@ msgstr "カレンダ情報"
 #. strptime format for a date.
 #: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1282 widgets/misc/e-dateedit.c:1463
+#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
@@ -4906,7 +5178,7 @@ msgstr "%H:%M%n"
 #. strftime format of a weekday and a date.
 #: e-util/e-time-utils.c:269
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2503
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
 
@@ -4924,8 +5196,8 @@ msgstr "%Y/%m/%d (%a) %p %I:%M"
 
 #. strftime format of a time in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1257
-#: widgets/misc/e-dateedit.c:1316 widgets/misc/e-dateedit.c:1495
+#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1259
+#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -4936,8 +5208,8 @@ msgstr "%H:%M:%S"
 
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1260
-#: widgets/misc/e-dateedit.c:1319 widgets/misc/e-dateedit.c:1498
+#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1262
+#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
 msgid "%I:%M %p"
 msgstr "%p %I:%M"
 
@@ -4946,18 +5218,36 @@ msgstr "%p %I:%M"
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "実行サマリのための Evolution コンポーネント"
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "Evolution 実行サマリコンポーネントのためのファクトリ"
-
 #: executive-summary/component/component-factory.c:152
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Evolution 実行サマリーコンポーネントの初期化が出来ません"
 
+#: executive-summary/component/e-summary.c:926
+#, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"HTML ファイルを開くことが出来ません:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:940
+#, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr ""
+"データ詠み込み中にエラー:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:958
+msgid "File does not have a place for the services.\n"
+msgstr "ファイルはサービスの場所を持っていません\n"
+
+#: executive-summary/component/e-summary-callbacks.c:126
+msgid "Select a service"
+msgstr "サービスを選択"
+
 #: executive-summary/component/e-summary-callbacks.c:290
 msgid ""
 "You can select a different HTML page for the background of the Executive "
@@ -5026,28 +5316,6 @@ msgstr "次の列の中へ %s を移動"
 msgid "Configure %s"
 msgstr "%s の設定"
 
-#: executive-summary/component/e-summary.c:924
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"HTML ファイルを開くことが出来ません:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:938
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"データ詠み込み中にエラー:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:956
-msgid "File does not have a place for the services.\n"
-msgstr "ファイルはサービスの場所を持っていません\n"
-
 #: executive-summary/component/executive-summary-config.glade.h:1
 msgid "Appearance"
 msgstr "外観"
@@ -5066,6 +5334,14 @@ msgstr ""
 "もし RootPOA についての警告メッセージがあるなら，たぶん OAF の代わりに\n"
 "GOAD を使ってコンパイルしたことを意味します"
 
+#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr "実行サマリのための Evolution コンポーネント"
+
+#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
+msgid "Factory for the Evolution executive summary component."
+msgstr "Evolution 実行サマリコンポーネントのためのファクトリ"
+
 #: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
 msgid "Factory for the RDF summary."
 msgstr "RDF サマリのためのファクトリ"
@@ -5097,19 +5373,19 @@ msgstr "テストサービス"
 msgid "Error"
 msgstr "エラー"
 
-#: executive-summary/test-service/rdf-summary.c:768
+#: executive-summary/test-service/rdf-summary.c:775
 msgid "Update automatically"
 msgstr "自動的に更新"
 
-#: executive-summary/test-service/rdf-summary.c:778
+#: executive-summary/test-service/rdf-summary.c:785
 msgid "Update now"
 msgstr "今すぐ更新"
 
-#: executive-summary/test-service/rdf-summary.c:788
+#: executive-summary/test-service/rdf-summary.c:795
 msgid "Update every "
 msgstr "すべて更新 "
 
-#: executive-summary/test-service/rdf-summary.c:796
+#: executive-summary/test-service/rdf-summary.c:806
 #: filter/filter-datespec.c:83
 msgid "minutes"
 msgstr "分"
@@ -5258,47 +5534,6 @@ msgstr "フォルダ URI の入力"
 msgid "<click here to select a folder>"
 msgstr "<フォルダを選択するためにここをクリックしてください>"
 
-#: filter/filter-input.c:193
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"正規表現 '%s' でエラーです:\n"
-"%s"
-
-#: filter/filter-part.c:474
-msgid "Test"
-msgstr "テスト"
-
-#: filter/filter-rule.c:627
-msgid "Rule name: "
-msgstr "ルール名: "
-
-#: filter/filter-rule.c:631
-msgid "Untitled"
-msgstr "タイトルなし"
-
-#: filter/filter-rule.c:647
-msgid "If"
-msgstr "もし"
-
-#: filter/filter-rule.c:665
-msgid "Execute actions"
-msgstr "次の条件で動作を実行:"
-
-#: filter/filter-rule.c:669
-msgid "if all criteria are met"
-msgstr "すべての基準が合った時"
-
-#: filter/filter-rule.c:674
-msgid "if any criteria are met"
-msgstr "いくつかの基準が合った時"
-
-#: filter/filter-rule.c:685
-msgid "Add criterion"
-msgstr "基準を追加"
-
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "フィルタを編集"
@@ -5339,6 +5574,55 @@ msgstr "すべてのローカルと有効なリモートフォルダ"
 msgid "with all local folders"
 msgstr "すべてのローカルフォルダ"
 
+#: filter/filter-input.c:193
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"正規表現 '%s' でエラーです:\n"
+"%s"
+
+#: filter/filter-part.c:488
+msgid "Test"
+msgstr "テスト"
+
+#: filter/filter-rule.c:626
+msgid "Rule name: "
+msgstr "ルール名: "
+
+#: filter/filter-rule.c:630
+msgid "Untitled"
+msgstr "タイトルなし"
+
+#: filter/filter-rule.c:646
+msgid "If"
+msgstr "もし"
+
+#: filter/filter-rule.c:664
+msgid "Execute actions"
+msgstr "次の条件で動作を実行:"
+
+#: filter/filter-rule.c:668
+msgid "if all criteria are met"
+msgstr "すべての基準が合った時"
+
+#: filter/filter-rule.c:673
+msgid "if any criteria are met"
+msgstr "いくつかの基準が合った時"
+
+#: filter/filter-rule.c:684
+msgid "Add criterion"
+msgstr "基準を追加"
+
+#: filter/filter-rule.c:770
+msgid "incoming"
+msgstr "入力"
+
+#: filter/filter-rule.c:770
+msgid "outgoing"
+msgstr "出力"
+
 #: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr ""
@@ -5488,7 +5772,7 @@ msgid "Replied to"
 msgstr ""
 
 #: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.c:1054
+#: mail/message-list.c:1081
 msgid "Score"
 msgstr "記録"
 
@@ -5520,7 +5804,7 @@ msgstr "が次のもので開始する"
 msgid "Stop Processing"
 msgstr "処理停止"
 
-#: filter/libfilter-i18n.h:51 mail/message-list.c:1055
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:767 mail/message-list.c:1082
 msgid "Subject"
 msgstr "件名"
 
@@ -5532,130 +5816,224 @@ msgstr "が次のものより後"
 msgid "was before"
 msgstr "が次のものより前"
 
+#: filter/rule-editor.c:147
+msgid "Rules"
+msgstr "ルール"
+
+#: filter/rule-editor.c:240
+msgid "Add Rule"
+msgstr "ルールを追加"
+
+#: filter/rule-editor.c:299
+msgid "Edit Rule"
+msgstr "ルールを編集"
+
 #: filter/score-editor.c:130
 msgid "Score Rules"
 msgstr "スコアルール"
 
-#: mail/component-factory.c:329
+#: importers/elm-importer.c:512 importers/netscape-importer.c:780
+#: importers/pine-importer.c:646 shell/e-shell-importer.c:655
+#: shell/importer/import.glade.h:4
+msgid "Import"
+msgstr "インポート"
+
+#: importers/elm-importer.c:517 importers/netscape-importer.c:785
+#: importers/pine-importer.c:651
+msgid "Mail"
+msgstr "メール"
+
+#: importers/elm-importer.c:521
+msgid "Elm Aliases"
+msgstr "Elm エイリアス"
+
+#: importers/elm-importer.c:528 importers/netscape-importer.c:807
+#: importers/pine-importer.c:668
+msgid "Don't ask me again"
+msgstr "このメッセージを二度と表示しない"
+
+#: importers/elm-importer.c:561
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution は Elm メールファイルを発見しました\n"
+"Evolution へインポートしてもよろしいですか?"
+
+#: importers/elm-importer.c:579
+msgid "Elm mail"
+msgstr "Elm メール"
+
+#: importers/netscape-importer.c:790 importers/pine-importer.c:656
+msgid "Settings"
+msgstr "設定"
+
+#: importers/netscape-importer.c:795 mail/mail-callbacks.c:1359
+msgid "Filters"
+msgstr "フィルタ"
+
+#: importers/netscape-importer.c:800
+msgid "Addressbooks"
+msgstr "アドレス帳"
+
+#: importers/netscape-importer.c:847
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution は Netscape メールファイルを発見しました\n"
+"Evolution へインポートしてもよろしいですか?"
+
+#: importers/pine-importer.c:661
+msgid "Addressbook"
+msgstr "アドレス帳"
+
+#: importers/pine-importer.c:705
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution は Pine メールファイルを発見しました\n"
+"Evolution へインポートしてもよろしいですか?"
+
+#: importers/pine-importer.c:723
+msgid "Pine mail"
+msgstr "Pine メール"
+
+#: mail/component-factory.c:337
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolution メールコンポーネントの初期化が出来ません"
 
-#: mail/component-factory.c:402
+#: mail/component-factory.c:410
 msgid "Cannot register storage with shell"
 msgstr "シェルでストレージを登録出来ません"
 
-#: mail/folder-browser-factory.c:211
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "\"%s\" のプロパティ"
-
-#: mail/folder-browser-factory.c:213 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "プロパティ"
-
-#: mail/folder-browser.c:225
+#: mail/folder-browser.c:329
 msgid "Store search as vFolder"
 msgstr ""
 
-#: mail/folder-browser.c:533
-msgid "VFolder on Subject"
-msgstr "件名の仮想フォルダ"
+#: mail/folder-browser.c:653
+msgid "VFolder on _Subject"
+msgstr "件名の仮想フォルダ(_S)"
 
-#: mail/folder-browser.c:536
-msgid "VFolder on Sender"
-msgstr "送信者の仮想フォルダ"
+#: mail/folder-browser.c:656
+msgid "VFolder on Se_nder"
+msgstr "送信者の仮想フォルダ(_n)"
 
-#: mail/folder-browser.c:539
-msgid "VFolder on Recipients"
-msgstr "受信者の仮想フォルダ"
+#: mail/folder-browser.c:659
+msgid "VFolder on _Recipients"
+msgstr "受信者の仮想フォルダ(_R)"
 
-#: mail/folder-browser.c:542 mail/folder-browser.c:733
-msgid "VFolder on Mailing List"
-msgstr "メーリングリストの仮想フォルダ"
+#: mail/folder-browser.c:662
+msgid "VFolder on Mailing _List"
+msgstr "メーリングリストの仮想フォルダ(_L)"
 
-#: mail/folder-browser.c:548
-msgid "Filter on Subject"
-msgstr "件名のフィルタ"
+#: mail/folder-browser.c:668
+msgid "Filter on Sub_ject"
+msgstr "件名のフィルタ(_j)"
 
-#: mail/folder-browser.c:551
-msgid "Filter on Sender"
-msgstr "送信者のフィルタ"
+#: mail/folder-browser.c:671
+msgid "Filter on Sen_der"
+msgstr "送信者のフィルタ(_d)"
 
-#: mail/folder-browser.c:554
-msgid "Filter on Recipients"
-msgstr "受信者のフィルタ"
+#: mail/folder-browser.c:674
+msgid "Filter on Re_cipients"
+msgstr "受信者のフィルタ(_c)"
 
-#: mail/folder-browser.c:557 mail/folder-browser.c:732
-msgid "Filter on Mailing List"
-msgstr "メーリングリストのフィルタ"
+#: mail/folder-browser.c:677
+msgid "Filter on _Mailing List"
+msgstr "メーリングリストのフィルタ(_M)"
+
+#: mail/folder-browser.c:686
+msgid "_Open"
+msgstr "開く(_O)"
 
-#: mail/folder-browser.c:568
+#: mail/folder-browser.c:688
 msgid "Resend"
 msgstr "再送信"
 
-#: mail/folder-browser.c:570
-msgid "Save As..."
-msgstr "別名で保存..."
+#: mail/folder-browser.c:690 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail.xml.h:118 ui/evolution-tasks.xml.h:8
+msgid "_Save As..."
+msgstr "別名で保存(_S)..."
 
-#: mail/folder-browser.c:577
-msgid "Reply to Sender"
-msgstr "送信者へ返信"
+#: mail/folder-browser.c:692 ui/evolution-event-editor.xml.h:69
+#: ui/evolution-task-editor-dialog.xml.h:82 ui/evolution-tasks.xml.h:7
+msgid "_Print"
+msgstr "印刷(_P)"
 
-#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:61
-msgid "Reply to All"
-msgstr "全員へ返信"
+#: mail/folder-browser.c:697 ui/evolution-mail.xml.h:117
+msgid "_Reply to Sender"
+msgstr "送信者へ返信(_R)"
 
-#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:25
-msgid "Forward"
-msgstr "転送"
+#: mail/folder-browser.c:699 ui/evolution-mail.xml.h:72
+msgid "Reply to _All"
+msgstr "全員へ返信(_A)"
 
-#: mail/folder-browser.c:583 ui/evolution-mail.xml.h:27
-msgid "Forward inline"
-msgstr "インラインで転送"
+#: mail/folder-browser.c:701
+msgid "_Forward"
+msgstr "転送(_F)"
 
-#: mail/folder-browser.c:586
-msgid "Mark as Read"
-msgstr "既読としてマーク"
+#: mail/folder-browser.c:704
+msgid "Mar_k as Read"
+msgstr "既読としてマーク(_k)"
 
-#: mail/folder-browser.c:588
-msgid "Mark as Unread"
-msgstr "未読としてマーク"
+#: mail/folder-browser.c:706
+msgid "Mark as U_nread"
+msgstr "未読としてマーク(_n)"
 
-#: mail/folder-browser.c:593
-msgid "Move to Folder..."
-msgstr "フォルダへ移動..."
+#: mail/folder-browser.c:711
+msgid "_Move to Folder..."
+msgstr "フォルダへ移動(_M)..."
 
-#: mail/folder-browser.c:595
-msgid "Copy to Folder..."
-msgstr "フォルダへコピー..."
+#: mail/folder-browser.c:713
+msgid "_Copy to Folder..."
+msgstr "フォルダへコピー(_C)..."
 
-#: mail/folder-browser.c:599 ui/evolution-mail.xml.h:82
-msgid "Undelete"
-msgstr "削除取消"
+#: mail/folder-browser.c:717 ui/evolution-mail.xml.h:121
+msgid "_Undelete"
+msgstr "削除取消(_U)"
 
 #. { _("Add Sender to Address Book"),  NULL,
 #. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
 #. { "",                               NULL,
 #. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:727
 msgid "Apply Filters"
 msgstr "フィルタ適用"
 
-#: mail/folder-browser.c:613
-msgid "Create Rule From Message"
-msgstr "メッセージからルールを作成"
+#: mail/folder-browser.c:731
+msgid "Create Ru_le From Message"
+msgstr "メッセージからルールを作成(_l)"
 
-#: mail/folder-browser.c:735
+#: mail/folder-browser.c:870
+msgid "Filter on Mailing List"
+msgstr "メーリングリストのフィルタ"
+
+#: mail/folder-browser.c:871
+msgid "VFolder on Mailing List"
+msgstr "メーリングリストの仮想フォルダ"
+
+#: mail/folder-browser.c:873
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "メーリングリストのフィルタ (%s)"
 
-#: mail/folder-browser.c:736
+#: mail/folder-browser.c:874
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "メーリングリストの仮想フォルダ (%s)"
 
+#: mail/folder-browser-factory.c:196
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "\"%s\" のプロパティ"
+
+#: mail/folder-browser-factory.c:198 ui/evolution-event-editor.xml.h:39
+#: ui/evolution-task-editor-dialog.xml.h:42
+msgid "Properties"
+msgstr "プロパティ"
+
 #: mail/GNOME_Evolution_Mail.oaf.in.h:1
 msgid "Evolution component for handling mail."
 msgstr "メールを扱うための Evolution コンポーネント"
@@ -5688,6 +6066,26 @@ msgstr "Evolution メールコンポーネントのためのファクトリ"
 msgid "Factory for the Mail Summary component."
 msgstr "メールサマリコンポーネントのためのファクトリ"
 
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+msgid "Mail configuration interface"
+msgstr "メール設定のインターフェース"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+msgid "Factory to import mbox into Evolution"
+msgstr "Evolution へ mbox をインポートするファクトリ"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+msgid "Imports mbox files into Evolution"
+msgstr "Evolution へ mbox ファイルをインポート"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+msgid "Factory to import Outlook Express 4 mails into Evolution"
+msgstr "Evolution へ Outlook Express 4 メールをインポートするファクトリ"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+msgid "Imports Outlook Express 4 files into Evolution"
+msgstr "Evolution へ Outlook Express 4 ファイルをインポート"
+
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "現在の保存形式:"
@@ -5722,6 +6120,15 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
+#: mail/mail-account-editor.c:105
+msgid "You have not filled in all of the required information."
+msgstr "必要な情報のすべてを埋めていません"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:173
+msgid "Evolution Account Editor"
+msgstr "Evolution アカウントエディタ"
+
 #: mail/mail-accounts.c:121 mail/mail-accounts.c:165
 msgid " (default)"
 msgstr " (デフォルト)"
@@ -5730,7 +6137,7 @@ msgstr " (デフォルト)"
 msgid "Disable"
 msgstr "無効"
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+#: mail/mail-accounts.c:199 mail/mail-config.glade.h:30
 msgid "Enable"
 msgstr "有効"
 
@@ -5743,19 +6150,10 @@ msgid "Are you sure you want to delete this news account?"
 msgstr "本当に news アカウントを削除してもよろしいですか?"
 
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:536
+#: mail/mail-accounts.c:568
 msgid "Evolution Account Manager"
 msgstr "Evolution アカウントマネージャ"
 
-#: mail/mail-account-editor.c:105
-msgid "You have not filled in all of the required information."
-msgstr "必要な情報のすべてを埋めていません"
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:173
-msgid "Evolution Account Editor"
-msgstr "Evolution アカウントエディタ"
-
 #: mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
@@ -5776,11 +6174,11 @@ msgstr "%s からメール"
 msgid "%s mailing list"
 msgstr "%s メーリングリスト"
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:357
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
 msgid "Add Filter Rule"
 msgstr "フィルタルールを追加"
 
-#: mail/mail-callbacks.c:94
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5792,7 +6190,7 @@ msgstr ""
 "必要があります\n"
 "今設定しますか?"
 
-#: mail/mail-callbacks.c:147
+#: mail/mail-callbacks.c:146
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5800,7 +6198,7 @@ msgstr ""
 "あなたはメールを作成する前に身元の\n"
 "設定をする必要があります"
 
-#: mail/mail-callbacks.c:159
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5808,11 +6206,11 @@ msgstr ""
 "あなたはメールを作成する前にメール\n"
 "配送の設定をする必要があります"
 
-#: mail/mail-callbacks.c:203
+#: mail/mail-callbacks.c:202
 msgid "You have not set a mail transport method"
 msgstr "メール転送メソッドの設定がありません"
 
-#: mail/mail-callbacks.c:236
+#: mail/mail-callbacks.c:235
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5820,32 +6218,37 @@ msgstr ""
 "このメッセージは件名がありません\n"
 "本当に送信しますか?"
 
-#: mail/mail-callbacks.c:309
+#: mail/mail-callbacks.c:308
 msgid "You must specify recipients in order to send this message."
 msgstr "このメッセージを送信する適切な受信者を指定しなければなりません"
 
-#: mail/mail-callbacks.c:352
+#: mail/mail-callbacks.c:351
 msgid "You must configure an account before you can send this email."
 msgstr "このメールを送信する前にアカウントを設定しなければなりません"
 
-#: mail/mail-callbacks.c:592
+#: mail/mail-callbacks.c:594
 #, c-format
-msgid "On %s, %s wrote:\n"
-msgstr "On %s, %s wrote:\n"
+msgid "On %s, %s wrote:"
+msgstr "On %s, %s wrote:"
 
-#: mail/mail-callbacks.c:774
+#: mail/mail-callbacks.c:756
 msgid "Forwarded message:\n"
 msgstr "メッセージを転送:\n"
 
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:850
 msgid "Move message(s) to"
 msgstr "メッセージを移動します: "
 
-#: mail/mail-callbacks.c:879
+#: mail/mail-callbacks.c:852
 msgid "Copy message(s) to"
 msgstr "メッセージをコピーします: "
 
-#: mail/mail-callbacks.c:1147
+#: mail/mail-callbacks.c:1017
+#, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr "本当に %d メッセージを編集してもよろしいですか?"
+
+#: mail/mail-callbacks.c:1039
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -5853,7 +6256,7 @@ msgstr ""
 "ドラフトフォルダ内に保存された\n"
 "メッセージだけを編集することが出来ます"
 
-#: mail/mail-callbacks.c:1179
+#: mail/mail-callbacks.c:1073
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -5861,11 +6264,20 @@ msgstr ""
 "送信フォルダのメッセージだけ\n"
 "再送信することが出来ます"
 
-#: mail/mail-callbacks.c:1212 mail/mail-display.c:90
+#: mail/mail-callbacks.c:1085
+#, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr "本当に %d メッセージを再送してもよろしいですか?"
+
+#: mail/mail-callbacks.c:1106
+msgid "No Message Selected"
+msgstr "選択されたメッセージはありません"
+
+#: mail/mail-callbacks.c:1140 mail/mail-display.c:92
 msgid "Overwrite file?"
 msgstr "ファイルを上書きしますか?"
 
-#: mail/mail-callbacks.c:1216 mail/mail-display.c:94
+#: mail/mail-callbacks.c:1144 mail/mail-display.c:96
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -5873,15 +6285,15 @@ msgstr ""
 "その名前のファイルはすでに存在します\n"
 "上書きしますか?"
 
-#: mail/mail-callbacks.c:1260
+#: mail/mail-callbacks.c:1188
 msgid "Save Message As..."
 msgstr "メッセージを別名で保存..."
 
-#: mail/mail-callbacks.c:1262
+#: mail/mail-callbacks.c:1190
 msgid "Save Messages As..."
 msgstr "メッセージを別名で保存..."
 
-#: mail/mail-callbacks.c:1376
+#: mail/mail-callbacks.c:1349
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5890,18 +6302,58 @@ msgstr ""
 "フィルタ情報のロード中にエラー:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1425 ui/evolution-mail.xml.h:52
+#: mail/mail-callbacks.c:1407
 msgid "Print Message"
 msgstr "メッセージを印刷"
 
-#: mail/mail-callbacks.c:1472
+#: mail/mail-callbacks.c:1454
 msgid "Printing of message failed"
 msgstr "メッセージの印刷に失敗しました"
 
-#: mail/mail-config.c:1043 mail/mail-config.c:1046
+#: mail/mail-callbacks.c:1549
+#, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr "本当に %d メッセージを別ウィンドウで開いてもよろしいですか?"
+
+#: mail/mail-config.c:1213 mail/mail-config.c:1216
 msgid "Connecting to server..."
 msgstr "サーバへ接続中..."
 
+#: mail/mail-config-druid.c:99
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+
+#: mail/mail-config-druid.c:101
+msgid ""
+"Please enter information about your incoming mail server below. If you don't "
+"know what kind of server you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:105
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know which protocol you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:107
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
+msgstr ""
+
+#. set window title
+#: mail/mail-config-druid.c:445
+msgid "Evolution Account Wizard"
+msgstr "Evolution アカウントウィザード"
+
 #: mail/mail-config.glade.h:1
 msgid " Check for supported types "
 msgstr "サポートされた種別をチェック"
@@ -5927,18 +6379,26 @@ msgid "Accounts"
 msgstr "アカウント"
 
 #: mail/mail-config.glade.h:8
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
 msgid "Authentication"
 msgstr "認証"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "Authentication Type: "
 msgstr "認証種別: "
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "Automatically check for new mail every"
 msgstr "新着メールを自動的にチェックする"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
+msgid "Composer"
+msgstr "メール作成"
+
+#: mail/mail-config.glade.h:15
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -5954,163 +6414,191 @@ msgstr ""
 "\n"
 "\"完了\" をクリックして設定を保存してください"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:21
 msgid "De_fault"
 msgstr "デフォルト(_f)"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
+msgid "Default \"Forward\" style is: "
+msgstr "デフォルトの \"転送\" 方法: "
+
+#: mail/mail-config.glade.h:25
 msgid "Done"
 msgstr "完了"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:26
 msgid "Drafts"
 msgstr "草案"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:27
 msgid "Drafts folder:"
 msgstr "草案フォルダ:"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:29
 msgid "Email Address:"
 msgstr "メールアドレス:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:31
 msgid "Full Name:"
 msgstr "フルネーム:"
 
-#: mail/mail-config.glade.h:27
-msgid "Highlight citations with "
+#: mail/mail-config.glade.h:32
+msgid "Highlight citations with"
 msgstr "引用を強調する"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:34
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:35
 msgid "Identity"
 msgstr "身元"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:36
+msgid "In HTML mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:37
+msgid "Inline"
+msgstr "インライン"
+
+#: mail/mail-config.glade.h:38
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:39
+msgid "Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:40
 msgid "Mail Configuration"
 msgstr "メールの設定"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:41
 msgid "Make this my default account"
 msgstr "デフォルトアカウントを作る"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:42
 msgid "Mark messages as \"Read\" after:"
+msgstr "指定時間後にメッセージを \"既読\" としてマーク:"
+
+#: mail/mail-config.glade.h:44
+msgid "Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:45
 msgid "News"
 msgstr "ニュース"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:47
 msgid "Optional Information"
 msgstr "付加情報"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:48
 msgid "Organization:"
 msgstr "組織:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:49
+msgid "PGP"
+msgstr "PGP"
+
+#: mail/mail-config.glade.h:50
 msgid "PGP binary path:"
 msgstr "PGP プログラムのパス:"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:55
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:56
+msgid "Quoted"
+msgstr "引用"
+
+#: mail/mail-config.glade.h:57
 msgid "Receiving Email"
 msgstr "メールの受信中"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:58
 msgid "Receiving Mail"
 msgstr "メールの受信"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:59
 msgid "Receiving Options"
 msgstr "受信オプション"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:61
 msgid "Required Information"
 msgstr "必須情報"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:63
 msgid "Select PGP binary"
 msgstr "PGP プログラムを選択"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:64
 msgid "Send mail in HTML format by default."
 msgstr "デフォルトで HTML 形式のメールを送信する"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:65
 msgid "Sending Email"
 msgstr "メールを送信中"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:66
 msgid "Sending Mail"
 msgstr "メールの送信"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:68
 msgid "Sent"
 msgstr "送信済"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:69
 msgid "Sent and Draft Messages"
 msgstr "送信済と草案メッセージ"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:70
 msgid "Sent messages folder:"
 msgstr "送信済メッセージフォルダ:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:71
 msgid "Server Configuration"
 msgstr "サーバの設定"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:72
 msgid "Server Type: "
 msgstr "サーバ種別:"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:73
 msgid "Server requires authentication"
 msgstr "サーバは認証が必要"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:74
 msgid "Signature file:"
 msgstr "署名ファイル:"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:75
 msgid "Sources"
 msgstr "ソース"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:76
 msgid "Special Folders"
 msgstr "特別なフォルダ"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:77
 msgid "Standard Unix mbox"
 msgstr "標準的な UNIX の mbox ファイル"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:78
 msgid "Type"
 msgstr "種別"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:79
 msgid "Use secure connection (SSL)"
 msgstr "セキュア接続 (SSL) を使う"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:80
 msgid "Username:"
 msgstr "ユーザ名:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:81
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6120,197 +6608,209 @@ msgstr ""
 "\n"
 "\"次\" をクリックして始めてください"
 
-#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:30
+#: mail/mail-config.glade.h:86 ui/evolution-event-editor.xml.h:58
+#: ui/evolution-message-composer.xml.h:45 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:48
 msgid "_Edit"
 msgstr "編集(_E)"
 
-#: mail/mail-config-druid.c:99
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
-msgstr ""
+#: mail/mail-crypto.c:59
+msgid "Could not create a PGP signature context."
+msgstr "PGP 署名コンテキストを作成出来ませんでした"
 
-#: mail/mail-config-druid.c:101
-msgid ""
-"Please enter information about your incoming mail server below. If you don't "
-"know what kind of server you use, contact your system administrator or "
-"Internet Service Provider."
+#: mail/mail-crypto.c:84
+msgid "Could not create a PGP verification context."
+msgstr "PGP 検証コンテキストを作成出来ませんでした"
+
+#: mail/mail-crypto.c:113
+msgid "Could not create a PGP encryption context."
+msgstr "PGP 暗号コンテキストを作成出来ませんでした"
+
+#: mail/mail-crypto.c:138
+msgid "Could not create a PGP decryption context."
+msgstr "PGP 復号コンテキストを作成出来ませんでした"
+
+#: mail/mail-crypto.c:169
+msgid "Could not create a S/MIME signature context."
 msgstr ""
 
-#: mail/mail-config-druid.c:105
-msgid ""
-"Please enter information about your outgoing mail protocol below. If you "
-"don't know which protocol you use, contact your system administrator or "
-"Internet Service Provider."
+#: mail/mail-crypto.c:195
+msgid "Could not create a S/MIME verification context."
 msgstr ""
 
-#: mail/mail-config-druid.c:107
-msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
+#: mail/mail-crypto.c:225
+msgid "Could not create a S/MIME encryption context."
 msgstr ""
 
-#. set window title
-#: mail/mail-config-druid.c:445
-msgid "Evolution Account Wizard"
-msgstr "Evolution アカウントウィザード"
+#: mail/mail-crypto.c:251
+msgid "Could not create a S/MIME decryption context."
+msgstr ""
 
-#: mail/mail-display.c:194
+#: mail/mail-display.c:196
 msgid "Save Attachment"
 msgstr "添付の保存"
 
-#: mail/mail-display.c:234
+#: mail/mail-display.c:236
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "作業ディレクトリを作成出来ませんでした: %s"
 
-#: mail/mail-display.c:295
+#: mail/mail-display.c:297
 msgid "Save to Disk..."
 msgstr "ディスクへ保存..."
 
-#: mail/mail-display.c:297
+#: mail/mail-display.c:299
 #, c-format
 msgid "Open in %s..."
 msgstr "%s に開く..."
 
-#: mail/mail-display.c:299
+#: mail/mail-display.c:301
 msgid "View Inline"
 msgstr "インライン表示"
 
-#: mail/mail-display.c:334
+#: mail/mail-display.c:336
 msgid "External Viewer"
 msgstr "外部ビューア"
 
-#: mail/mail-display.c:357
+#: mail/mail-display.c:359
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "インライン表示 (%s経由)"
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:363
 msgid "Hide"
 msgstr "隠す"
 
-#: mail/mail-display.c:1102
+#: mail/mail-display.c:962
+msgid "Loading message content"
+msgstr "メッセージの内容を読み込み中"
+
+#: mail/mail-display.c:1256
 msgid "Open link in browser"
 msgstr "ブラウザでリンクを開く"
 
-#: mail/mail-display.c:1104
+#: mail/mail-display.c:1258
 msgid "Save as (FIXME)"
 msgstr "別名で保存 (FIXME)"
 
-#: mail/mail-display.c:1106
+#: mail/mail-display.c:1260
 msgid "Copy location (FIXME)"
 msgstr "場所をコピー (FIXME)"
 
-#: mail/mail-format.c:522
+#: mail/mail-format.c:527
 #, c-format
 msgid "%s attachment"
 msgstr "%s を添付"
 
-#: mail/mail-format.c:564
+#: mail/mail-format.c:573
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME メッセージを解析出来ませんでした, ソースを表示します"
 
-#: mail/mail-format.c:746
-msgid "Loading message content"
-msgstr "メッセージの内容を読み込み中"
+#: mail/mail-format.c:640 mail/message-list.c:1082
+msgid "Date"
+msgstr "日付"
 
-#: mail/mail-format.c:1040
+#: mail/mail-format.c:756 mail/message-list.c:1082
+msgid "From"
+msgstr "差出人"
+
+#: mail/mail-format.c:759
+msgid "Reply-To"
+msgstr "返信先"
+
+#: mail/mail-format.c:762 mail/message-list.c:1083
+msgid "To"
+msgstr "宛先"
+
+#: mail/mail-format.c:765
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/mail-format.c:1075
 msgid "No GPG/PGP program configured."
 msgstr "GPG/PGP プログラムの設定がありません"
 
-#: mail/mail-format.c:1055
+#: mail/mail-format.c:1090
 msgid "Encrypted message not displayed"
 msgstr "暗号化されたメッセージは表示しません"
 
-#: mail/mail-format.c:1061
+#: mail/mail-format.c:1096
 msgid "Encrypted message"
 msgstr "暗号化されたメッセージ"
 
-#: mail/mail-format.c:1062
+#: mail/mail-format.c:1097
 msgid "Click icon to decrypt."
 msgstr "アイコンをクリックして復号化してください"
 
-#: mail/mail-format.c:1152 mail/mail-format.c:1540
+#: mail/mail-format.c:1153
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "このメッセージはデジタル署名され信頼できるものです"
 
-#: mail/mail-format.c:1160 mail/mail-format.c:1548
+#: mail/mail-format.c:1161
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "このメッセージはデジタル署名されたものですが, 信頼を証明出来ません"
 
-#: mail/mail-format.c:1761
+#: mail/mail-format.c:1787
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP サイト (%s) を指しています"
 
-#: mail/mail-format.c:1773
+#: mail/mail-format.c:1799
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1777
+#: mail/mail-format.c:1803
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "ローカルファイル (%s) を指しています"
 
-#: mail/mail-format.c:1811
+#: mail/mail-format.c:1837
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "未知の外部データ (\"%s\" タイプ) を指しています"
 
-#: mail/mail-format.c:1816
+#: mail/mail-format.c:1842
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:337
-#, c-format
-msgid "No such folder %s"
-msgstr "そのようなフォルダ %s はありません"
-
-#: mail/mail-local.c:509
+#: mail/mail-local.c:505
 #, c-format
 msgid "Opening '%s'"
 msgstr "'%s' をオープン中"
 
-#: mail/mail-local.c:787
+#: mail/mail-local.c:785
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "フォルダ \"%s\" を \"%s\" 形式へ変更しています"
 
-#: mail/mail-local.c:791
+#: mail/mail-local.c:789
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "フォルダ \"%s\" を \"%s\" 形式へ変更します"
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:812
 msgid "Reconfiguring folder"
 msgstr "フォルダの再構成中"
 
 #. first, 'close' the old folder
-#: mail/mail-local.c:843
+#: mail/mail-local.c:841
 msgid "Closing current folder"
 msgstr "現在のフォルダをクローズ中"
 
-#: mail/mail-local.c:875
+#: mail/mail-local.c:873
 msgid "Renaming old folder and opening"
 msgstr "古いフォルダをリネームしてオープン中"
 
-#: mail/mail-local.c:893
+#: mail/mail-local.c:891
 msgid "Creating new folder"
 msgstr "新規フォルダを作成中"
 
-#: mail/mail-local.c:907
+#: mail/mail-local.c:905
 msgid "Copying messages"
 msgstr "メッセージをコピー中"
 
-#: mail/mail-local.c:924
+#: mail/mail-local.c:922
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6319,7 +6819,7 @@ msgstr ""
 "フォルダのメタ情報を保存出来ません; もはやこのフォルダを開く\n"
 "ことが出来ないとたぶん気づいたのでしょう: %s"
 
-#: mail/mail-local.c:963
+#: mail/mail-local.c:961
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6345,105 +6845,101 @@ msgstr ""
 "操作の準備している間にエラーが発生しました:\n"
 "%s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:892
+#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:880
 msgid "Working"
 msgstr "作業中"
 
-#: mail/mail-mt.c:680 mail/session.c:98
-msgid "Do you accept?"
-msgstr "承認しますか?"
-
-#: mail/mail-mt.c:874
+#: mail/mail-mt.c:862
 msgid "Evolution progress"
 msgstr "Evolution 進行"
 
-#: mail/mail-ops.c:587
+#: mail/mail-ops.c:599
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" を送信中"
 
-#: mail/mail-ops.c:589
+#: mail/mail-ops.c:603
 msgid "Sending message"
 msgstr "メッセージを送信中"
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:718
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "メッセージ %d / %d を送信中"
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:737
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "メッセージ %d / %d は失敗しました"
 
-#: mail/mail-ops.c:725 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:739 mail/mail-send-recv.c:475
 msgid "Complete."
 msgstr "完了しました"
 
-#: mail/mail-ops.c:811
+#: mail/mail-ops.c:825
 msgid "Saving message to folder"
 msgstr "フォルダへメッセージを保存中"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:898
 #, c-format
 msgid "Moving messages to %s"
 msgstr "%s へメッセージを移動中"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:898
 #, c-format
 msgid "Copying messages to %s"
 msgstr "%s へメッセージをコピー中"
 
-#: mail/mail-ops.c:900
+#: mail/mail-ops.c:914
 msgid "Moving"
 msgstr "移動中"
 
-#: mail/mail-ops.c:903
+#: mail/mail-ops.c:917
 msgid "Copying"
 msgstr "コピー中"
 
-#: mail/mail-ops.c:978
+#: mail/mail-ops.c:992
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" の中のフォルダを走査中"
 
-#: mail/mail-ops.c:1139
+#: mail/mail-ops.c:1154
 msgid "Forwarded messages"
 msgstr "メッセージを転送"
 
-#: mail/mail-ops.c:1180 mail/mail-ops.c:1318
+#: mail/mail-ops.c:1195 mail/mail-ops.c:1333
 #, c-format
 msgid "Opening folder %s"
 msgstr "\"%s\" の中のフォルダをオープン中"
 
-#: mail/mail-ops.c:1247
+#: mail/mail-ops.c:1262
 #, c-format
 msgid "Opening store %s"
 msgstr "保存された %s をオープン中"
 
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1449
 msgid "Expunging folder"
 msgstr "フォルダを削除中"
 
-#: mail/mail-ops.c:1483
+#: mail/mail-ops.c:1498
 #, c-format
 msgid "Retrieving message %s"
 msgstr "メッセージ %s を取得中"
 
-#: mail/mail-ops.c:1550
+#: mail/mail-ops.c:1565
 msgid "Retrieving messages"
 msgstr "メッセージを取得中"
 
-#: mail/mail-ops.c:1560
+#: mail/mail-ops.c:1575
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "メッセージ番号 %d / %d (uid \"%s\") を取得中"
 
-#: mail/mail-ops.c:1634
+#: mail/mail-ops.c:1649
 msgid "Saving messages"
 msgstr "メッセージを保存中"
 
-#: mail/mail-ops.c:1713
+#: mail/mail-ops.c:1728
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6452,12 +6948,12 @@ msgstr ""
 "出力ファイルを作成出来ません: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1726
+#: mail/mail-ops.c:1741
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "メッセージ %d / %d (uid \"%s\") を保存中"
 
-#: mail/mail-ops.c:1740
+#: mail/mail-ops.c:1755
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6466,11 +6962,11 @@ msgstr ""
 "ファイルの保存中にエラー: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1814
+#: mail/mail-ops.c:1829
 msgid "Saving attachment"
 msgstr "添付を保存中"
 
-#: mail/mail-ops.c:1829
+#: mail/mail-ops.c:1844
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6479,18 +6975,47 @@ msgstr ""
 "出力ファイルを作成出来ません: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1857
+#: mail/mail-ops.c:1872
 #, c-format
 msgid "Could not write data: %s"
 msgstr "データを書き出すことが出来ませんでした: %s"
 
+#: mail/mail-ops.c:1939
+#, c-format
+msgid "Disconnecting from %s"
+msgstr "%s との接続を切っています"
+
+#: mail/mail-search.c:138
+msgid "(Untitled Message)"
+msgstr "(タイトルなしメッセージ)"
+
+#: mail/mail-search.c:268
+msgid "Find in Message"
+msgstr "メッセージを検索"
+
+#: mail/mail-search.c:298
+msgid "Case Sensitive"
+msgstr ""
+
+#: mail/mail-search.c:299
+msgid "Search Forward"
+msgstr "前方検索"
+
+#: mail/mail-search.c:316
+msgid "Find:"
+msgstr "検索:"
+
+#: mail/mail-search.c:319
+msgid "Matches:"
+msgstr ""
+
 #: mail/mail-search-dialogue.c:113
 msgid "_Search"
 msgstr "検索(_S)"
 
 #: mail/mail-send-recv.c:138
-msgid "Cancelling ..."
-msgstr "キャンセル中 ..."
+msgid "Cancelling..."
+msgstr "キャンセル中..."
 
 #: mail/mail-send-recv.c:233
 msgid "Send & Receive mail"
@@ -6501,12 +7026,12 @@ msgid "Receiving"
 msgstr "受信中"
 
 #: mail/mail-send-recv.c:285
-msgid "Updating ..."
-msgstr "更新中 ..."
+msgid "Updating..."
+msgstr "更新中..."
 
 #: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
-msgid "Waiting ..."
-msgstr "待機中 ..."
+msgid "Waiting..."
+msgstr "待機中..."
 
 #: mail/mail-send-recv.c:306
 msgid "Sending"
@@ -6516,34 +7041,38 @@ msgstr "送信中"
 msgid "Cancelled."
 msgstr "キャンセルしました"
 
-#: mail/mail-summary.c:109
+#: mail/mail-summary.c:110
 msgid "Incomplete message written on pipe!"
 msgstr "パイプ上に不完全なメッセージが書かれました!"
 
-#: mail/mail-tools.c:141
+#: mail/mail-summary.c:468
+msgid "Mail Summary"
+msgstr "メールサマリ"
+
+#: mail/mail-tools.c:145
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "テンポラリ mbox '%s' を作成できませんでした: %s"
 
-#: mail/mail-tools.c:188
+#: mail/mail-tools.c:192
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (メッセージを転送)"
 
-#: mail/mail-tools.c:198
+#: mail/mail-tools.c:202
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (件名なし)"
 
-#: mail/mail-tools.c:215
+#: mail/mail-tools.c:219
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "メッセージを転送しました - %s"
 
-#: mail/mail-tools.c:217
+#: mail/mail-tools.c:221
 msgid "Forwarded message (no subject)"
 msgstr "メッセージを転送しました (件名なし)"
 
-#: mail/mail-tools.c:414
+#: mail/mail-tools.c:428
 #, c-format
 msgid ""
 "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
@@ -6556,121 +7085,140 @@ msgstr ""
 msgid "VFolders"
 msgstr "仮想フォルダ"
 
-#: mail/mail-vfolder.c:427
+#: mail/mail-vfolder.c:438
 msgid "New VFolder"
 msgstr "新規仮想フォルダ"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:60
+#: mail/message-browser.c:188 ui/evolution-mail.xml.h:70
 msgid "Reply"
 msgstr "返信"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:66
+#: mail/message-browser.c:188
 msgid "Reply to the sender of this message"
-msgstr "メッセージの差出人へ返信します"
+msgstr "メッセージの送信者へ返信します"
 
-#: mail/mail-view.c:147 ui/evolution-mail.xml.h:64
+#: mail/message-browser.c:191 ui/evolution-mail.xml.h:71
+msgid "Reply to All"
+msgstr "全員へ返信"
+
+#: mail/message-browser.c:191
 msgid "Reply to all recipients of this message"
-msgstr "このメッセージの受取人全員へ返信します"
+msgstr "このメッセージの受信者全員へ返信します"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:29
+#: mail/message-browser.c:194 ui/evolution-mail.xml.h:33
+msgid "Forward"
+msgstr "転送"
+
+#: mail/message-browser.c:194
 msgid "Forward this message"
 msgstr "このメッセージを転送します"
 
-#: mail/mail-view.c:154 ui/evolution-mail.xml.h:57
+#: mail/message-browser.c:199
 msgid "Print the selected message"
 msgstr "選択されたメッセージを印刷します"
 
-#: mail/mail-view.c:156 ui/evolution-mail.xml.h:13
+#: mail/message-browser.c:202
 msgid "Delete this message"
 msgstr "このメッセージを削除します"
 
-#: mail/message-list.c:650
+#: mail/message-browser.c:207 ui/evolution-event-editor.xml.h:33
+#: ui/evolution-mail.xml.h:64 ui/evolution-task-editor-dialog.xml.h:36
+msgid "Previous"
+msgstr "前"
+
+#: mail/message-browser.c:207
+msgid "Previous message"
+msgstr "前のメッセージへ移動します"
+
+#: mail/message-browser.c:210 ui/evolution-calendar.xml.h:18
+#: ui/evolution-event-editor.xml.h:29 ui/evolution-mail.xml.h:57
+#: ui/evolution-task-editor-dialog.xml.h:32
+msgid "Next"
+msgstr "次"
+
+#: mail/message-browser.c:210
+msgid "Next message"
+msgstr "次のメッセージへ移動します"
+
+#: mail/message-list.c:677
 msgid "Unseen"
 msgstr "未読"
 
-#: mail/message-list.c:651
+#: mail/message-list.c:678
 msgid "Seen"
 msgstr "既読"
 
-#: mail/message-list.c:652
+#: mail/message-list.c:679
 msgid "Answered"
 msgstr "返答済み"
 
-#: mail/message-list.c:653
+#: mail/message-list.c:680
 msgid "Multiple Unseen Messages"
 msgstr "複数の未読メッセージ"
 
-#: mail/message-list.c:654
+#: mail/message-list.c:681
 msgid "Multiple Messages"
 msgstr "複数のメッセージ"
 
-#: mail/message-list.c:658
+#: mail/message-list.c:685
 msgid "Lowest"
 msgstr "最も低い"
 
-#: mail/message-list.c:659
+#: mail/message-list.c:686
 msgid "Lower"
 msgstr "低い"
 
-#: mail/message-list.c:663
+#: mail/message-list.c:690
 msgid "Higher"
 msgstr "高い"
 
-#: mail/message-list.c:664
+#: mail/message-list.c:691
 msgid "Highest"
 msgstr "最も高い"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:941
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:921
+#: mail/message-list.c:948
 msgid "Today %l:%M %p"
 msgstr "今日の %p %l:%M"
 
-#: mail/message-list.c:930
+#: mail/message-list.c:957
 msgid "Yesterday %l:%M %p"
 msgstr "昨日の %p %l:%M"
 
-#: mail/message-list.c:942
+#: mail/message-list.c:969
 msgid "%a %l:%M %p"
 msgstr "%p %l:%M (%a)"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:977
 msgid "%b %d %l:%M %p"
 msgstr "%m月 %d日 %p %l:%M"
 
-#: mail/message-list.c:952
+#: mail/message-list.c:979
 msgid "%b %d %Y"
 msgstr "%Y年 %m月 %d日"
 
-#: mail/message-list.c:1054
+#: mail/message-list.c:1081
 msgid "Flagged"
 msgstr "フラグ"
 
-#: mail/message-list.c:1055
-msgid "From"
-msgstr "差出人"
-
-#: mail/message-list.c:1055
-msgid "Date"
-msgstr "日付"
-
-#: mail/message-list.c:1055
+#: mail/message-list.c:1082
 msgid "Received"
 msgstr ""
 
-#: mail/message-list.c:1056
-msgid "To"
-msgstr "宛先"
-
-#: mail/message-list.c:1056
+#: mail/message-list.c:1083
 msgid "Size"
 msgstr "サイズ"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
+#: mail/mail-session.c:161
+msgid "User canceled operation."
+msgstr ""
+
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:48
 msgid "Folder"
 msgstr "フォルダ"
 
@@ -6702,134 +7250,6 @@ msgstr "フォルダ \"%s\" の購読解除中"
 msgid "Manage Subscriptions"
 msgstr "購読管理"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "フォルダ名:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder type:"
-msgstr "フォルダ種別:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Specify where to create the folder:"
-msgstr "フォルダを作成する場所を指定してください:"
-
-#: shell/importer/importer.c:87
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:182
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"%s をインポート中\n"
-"インポータの準備が出来ていません\n"
-"5秒待って再度試してください"
-
-#: shell/importer/importer.c:202 shell/importer/importer.c:233
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"%s をインポート中\n"
-"アイテム %d をインポート中"
-
-#: shell/importer/importer.c:341
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"扱うことが出来るインポートがありません\n"
-"%s"
-
-#: shell/importer/importer.c:351
-msgid "Importing"
-msgstr "インポート中"
-
-#: shell/importer/importer.c:359
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"%s をインポート中\n"
-"%s を開始します"
-
-#: shell/importer/importer.c:372
-#, c-format
-msgid "Error starting %s"
-msgstr "%s の開始中にエラーが発生しました"
-
-#: shell/importer/importer.c:387
-#, c-format
-msgid "Error loading %s"
-msgstr "%s のロード中にエラーが発生しました"
-
-#: shell/importer/importer.c:402
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"%s をインポート中\n"
-"アイテム 1 をインポート中"
-
-#: shell/importer/importer.c:473
-msgid "Automatic"
-msgstr "自働"
-
-#: shell/importer/importer.c:523
-msgid "Filename:"
-msgstr "ファイル名:"
-
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
-msgid "Select a file"
-msgstr "ファイルを選択"
-
-#: shell/importer/importer.c:538
-msgid "File type:"
-msgstr "ファイル種別:"
-
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
-msgid "Import"
-msgstr "インポート"
-
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr ""
-"\"インポート\" をクリックして Evolution "
-"へファイルのインポートを開始してください"
-
-#: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
-msgstr "Evolution インポートユーティリティ"
-
-#: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
-msgstr "Evolution インポートユーティリティ"
-
-#: shell/importer/import.glade.h:6
-msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
-"importing external files into Evolution."
-msgstr ""
-"ようこそ, Evolution インポートユーティリティへ\n"
-"このウィザードでは Evolution の中に外部ファイルをインポート\n"
-"する処理を通して案内します"
-
 #: shell/e-setup.c:118 shell/e-setup.c:191
 msgid "Evolution installation"
 msgstr "Evolution のインストール"
@@ -6905,6 +7325,20 @@ msgstr ""
 "ディレクトリではありません．Evolution ユーザ\n"
 "ファイルのインストールを許容するために移動して下さい"
 
+#: shell/e-shell.c:388
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "局部記憶装置のセットアップが出来ません -- %s"
+
+#: shell/e-shell.c:1268
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+"`%s' ビューは突然死亡しました :-(\n"
+"これはたぶん %s コンポーネントがクラッシュしたことを意味します"
+
 #: shell/e-shell-folder-creation-dialog.c:99
 #, c-format
 msgid ""
@@ -6938,19 +7372,129 @@ msgstr "新規..."
 msgid "(Untitled)"
 msgstr "(タイトルなし)"
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+"%s をインポート中\n"
+"インポータの準備が出来ていません\n"
+"5秒待って再度試してください"
+
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+"%s をインポート中\n"
+"アイテム %d をインポート中"
+
+#: shell/e-shell-importer.c:353
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+"扱うことが出来るインポートがありません\n"
+"%s"
+
+#: shell/e-shell-importer.c:363
+msgid "Importing"
+msgstr "インポート中"
+
+#: shell/e-shell-importer.c:371
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+"%s をインポート中\n"
+"%s を開始します"
+
+#: shell/e-shell-importer.c:384
+#, c-format
+msgid "Error starting %s"
+msgstr "%s の開始中にエラーが発生しました"
+
+#: shell/e-shell-importer.c:404
+#, c-format
+msgid "Error loading %s"
+msgstr "%s のロード中にエラーが発生しました"
+
+#: shell/e-shell-importer.c:419
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+"%s をインポート中\n"
+"アイテム 1 をインポート中"
+
+#: shell/e-shell-importer.c:490
+msgid "Automatic"
+msgstr "自働"
+
+#: shell/e-shell-importer.c:540
+msgid "Filename:"
+msgstr "ファイル名:"
+
+#: shell/e-shell-importer.c:545 shell/importer/import.glade.h:5
+msgid "Select a file"
+msgstr "ファイルを選択"
+
+#: shell/e-shell-importer.c:555
+msgid "File type:"
+msgstr "ファイル種別:"
+
+#: shell/e-shell-importer.c:601
+msgid "Select folder"
+msgstr "フォルダを選択"
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr "接続を閉じています..."
+
+#: shell/e-shell-view.c:149
+msgid "(No folder displayed)"
+msgstr "(表示したフォルダはありません)"
+
+#: shell/e-shell-view.c:1203
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolution - %s"
+
+#: shell/e-shell-view.c:1205
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolution %s [%s]"
+
+#: shell/e-shell-view-menu.c:175
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy はあなたの $PATH には見つかりません"
 
-#: shell/e-shell-view-menu.c:179
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy は実行できませんでした"
 
-#: shell/e-shell-view-menu.c:208
+#: shell/e-shell-view-menu.c:226
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:210
+#: shell/e-shell-view-menu.c:228
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -6962,37 +7506,21 @@ msgstr ""
 "グループウェアアプリケーションの\n"
 "パッケージソフトです"
 
-#: shell/e-shell-view-menu.c:374
+#: shell/e-shell-view-menu.c:392
 msgid "Go to folder..."
 msgstr "フォルダへ移動..."
 
-#: shell/e-shell-view.c:148
-msgid "(No folder displayed)"
-msgstr "(表示したフォルダはありません)"
+#: shell/e-shell-view-menu.c:576
+msgid "Work online"
+msgstr "オンライン作業"
 
-#: shell/e-shell-view.c:1184
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution - %s"
-
-#: shell/e-shell-view.c:1186
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
-
-#: shell/e-shell.c:378
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "局部記憶装置のセットアップが出来ません -- %s"
+#: shell/e-shell-view-menu.c:588 shell/e-shell-view-menu.c:600
+msgid "Work offline"
+msgstr "オフライン作業"
 
-#: shell/e-shell.c:1248
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
-msgstr ""
-"`%s' ビューは突然死亡しました :-(\n"
-"これはたぶん %s コンポーネントがクラッシュしたことを意味します"
+#: shell/e-shortcuts.c:381
+msgid "Error saving shortcuts."
+msgstr "ショートカットの保存中にエラーが発生しました"
 
 #: shell/e-shortcuts-view.c:134
 msgid "Create new shortcut group"
@@ -7067,20 +7595,6 @@ msgstr "このショートカットをアクティブにします"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "ショートカットバーからこのショートカットを削除します"
 
-#: shell/e-shortcuts.c:379
-msgid "Error saving shortcuts."
-msgstr "ショートカットの保存中にエラーが発生しました"
-
-#: shell/e-storage-set-view.c:649 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:44
-msgid "_View"
-msgstr "表示(_V)"
-
-#: shell/e-storage-set-view.c:649
-msgid "View the selected folder"
-msgstr "選択されたフォルダを表示します"
-
 #: shell/e-storage.c:178
 msgid "(No name)"
 msgstr "(名前なし)"
@@ -7129,11 +7643,51 @@ msgstr "操作はサポートされていません"
 msgid "The specified type is not supported in this storage"
 msgstr "指定された種別はこの記憶装置ではサポートされていません"
 
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "フォルダ名:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder type:"
+msgstr "フォルダ種別:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Specify where to create the folder:"
+msgstr "フォルダを作成する場所を指定してください:"
+
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
 msgid "The Evolution shell."
 msgstr "Evolution シェル"
 
-#: shell/main.c:83
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr ""
+"\"インポート\" をクリックして Evolution "
+"へファイルのインポートを開始してください"
+
+#: shell/importer/import.glade.h:2
+msgid "Evolution Import Utility"
+msgstr "Evolution インポートユーティリティ"
+
+#: shell/importer/import.glade.h:3
+msgid "Evolution Importer Utility"
+msgstr "Evolution インポートユーティリティ"
+
+#: shell/importer/import.glade.h:6
+msgid ""
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
+"ようこそ, Evolution インポートユーティリティへ\n"
+"このウィザードでは Evolution の中に外部ファイルをインポート\n"
+"する処理を通して案内します"
+
+#: shell/importer/intelligent.c:186
+msgid "Importers"
+msgstr "インポート"
+
+#: shell/main.c:82
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
@@ -7169,7 +7723,7 @@ msgstr ""
 "我々はあなたが我々の成果を楽しむことを望んでいます．そして我々は\n"
 "熱心にあなたの貢献を待ち受けています!\n"
 
-#: shell/main.c:108
+#: shell/main.c:107
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7177,19 +7731,19 @@ msgstr ""
 "ありがとう\n"
 "Evolution チーム\n"
 
-#: shell/main.c:139
+#: shell/main.c:138
 msgid "Cannot initialize the Evolution shell."
 msgstr "Evolution シェルの初期化が出来ません"
 
-#: shell/main.c:185
+#: shell/main.c:184
 msgid "Disable splash screen"
 msgstr "スプラッシュ画面を無効にする"
 
-#: shell/main.c:186
+#: shell/main.c:185
 msgid "Send the debugging output of all components to a file."
 msgstr "すべてのコンポーネントのデバッグ出力をファイルへ送る"
 
-#: shell/main.c:219
+#: shell/main.c:217
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo コンポーネントシステムを初期化出来ません"
 
@@ -7213,7 +7767,7 @@ msgstr "コンタクトを検索します"
 msgid "New contact"
 msgstr "新規コンタクト"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:50
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:63
 msgid "Previews the message to be printed"
 msgstr "印刷されるメッセージのプレビューを表示します"
 
@@ -7221,7 +7775,7 @@ msgstr "印刷されるメッセージのプレビューを表示します"
 msgid "Print contacts"
 msgstr "コンタクトを印刷します"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:79
+#: ui/evolution-addressbook.xml.h:12
 msgid "Stop"
 msgstr "停止"
 
@@ -7255,8 +7809,8 @@ msgid "_Search for contacts"
 msgstr "コンタクトの検索(_S)"
 
 #: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:112
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:43
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-task-editor-dialog.xml.h:88
+#: ui/evolution.xml.h:64
 msgid "_Tools"
 msgstr "ツール(_T)"
 
@@ -7320,11 +7874,6 @@ msgstr "月"
 msgid "New _Event"
 msgstr "新規イベント(_E)"
 
-#: ui/evolution-calendar.xml.h:18 ui/evolution-event-editor.xml.h:29
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "次"
-
 #: ui/evolution-calendar.xml.h:20
 msgid "Open Calendar"
 msgstr "カレンダを開く"
@@ -7345,7 +7894,7 @@ msgstr "カレンダの印刷"
 msgid "Print this Calendar"
 msgstr "このカレンダの印刷します"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
+#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:18
 msgid "Save As"
 msgstr "別名で保存"
 
@@ -7369,8 +7918,8 @@ msgstr "1 週間を表示します"
 msgid "Show the working week"
 msgstr "週間労働時間を表示します"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:226
-#: widgets/misc/e-dateedit.c:422
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:229
+#: widgets/misc/e-dateedit.c:424
 msgid "Today"
 msgstr "今日"
 
@@ -7395,7 +7944,7 @@ msgid "_Month"
 msgstr "月(_M)"
 
 #: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:39
+#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:58
 msgid "_New"
 msgstr "新規(_N)"
 
@@ -7403,11 +7952,6 @@ msgstr "新規(_N)"
 msgid "_Open Calendar"
 msgstr "カレンダを開く(_O)"
 
-#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:108
-#: ui/evolution-tasks.xml.h:8
-msgid "_Save As..."
-msgstr "別名で保存(_S)..."
-
 #: ui/evolution-calendar.xml.h:45
 msgid "_Week"
 msgstr "週(_W)"
@@ -7434,12 +7978,12 @@ msgid "Print this item"
 msgstr "このアイテムを印刷"
 
 #: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:58 ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "印刷..."
 
 #: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:19
 #: ui/evolution-task-editor-dialog.xml.h:51
 msgid "Save _As..."
 msgstr "別名で保存(_A)..."
@@ -7466,13 +8010,13 @@ msgid "Send _message to contact..."
 msgstr "コンタクトへメッセージを送信(_m)..."
 
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
+#: ui/evolution-message-composer.xml.h:46 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:49
 msgid "_File"
 msgstr "ファイル(_F)"
 
 #: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:53
 #: ui/evolution-task-editor-dialog.xml.h:85
 msgid "_Save"
 msgstr "保存(_S)"
@@ -7521,7 +8065,7 @@ msgstr "この約束を閉じます"
 msgid "Cop_y to Folder... (FIXME)"
 msgstr "フォルダへコピー(_y)... (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
+#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:8
 #: ui/evolution-task-editor-dialog.xml.h:14
 msgid "Copy"
 msgstr "コピー"
@@ -7594,10 +8138,6 @@ msgstr "クリップボードへ貼り付けます"
 msgid "Pre_vious"
 msgstr "前(_v)"
 
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "前"
-
 #: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
 msgid "Print Pre_view"
 msgstr "印刷プレビュー(_v)"
@@ -7610,8 +8150,8 @@ msgstr "プリンタの設定(_e)..."
 msgid "Print Setup"
 msgstr "プリンタの設定"
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
+#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:17
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:241
 msgid "Save"
 msgstr "保存"
 
@@ -7619,7 +8159,7 @@ msgstr "保存"
 msgid "Save the appointment and close the dialog box"
 msgstr "約束を保存してダイアログボックスを閉じます"
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
+#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:23
 #: ui/evolution-task-editor-dialog.xml.h:53
 msgid "Save the current file"
 msgstr "現在のファイルを保存します"
@@ -7632,8 +8172,7 @@ msgstr "打合せのスケジュール(_M)"
 msgid "Schedule some sort of a meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:69
-#: ui/evolution-task-editor-dialog.xml.h:57
+#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
 msgid "Select All"
 msgstr "すべて選択"
 
@@ -7649,18 +8188,17 @@ msgstr "現在のプリンタのページ設定を行います"
 msgid "Task _Request (FIXME)"
 msgstr "タスク要求(_R) (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:63
+#: ui/evolution-event-editor.xml.h:52 ui/evolution-task-editor-dialog.xml.h:63
 msgid "_About..."
 msgstr "情報(_A)..."
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
+#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:43
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "閉じる(_C)"
 
 #: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:44
 msgid "_Contact (FIXME)"
 msgstr "コンタクト(_C) (FIXME)"
 
@@ -7668,13 +8206,13 @@ msgstr "コンタクト(_C) (FIXME)"
 msgid "_Copy"
 msgstr "コピー(_C)"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
+#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:44
 #: ui/evolution-task-editor-dialog.xml.h:68
 msgid "_Debug"
 msgstr "デバッグ(_D)"
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:35
+#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:48
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:53
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
@@ -7706,13 +8244,8 @@ msgstr "ノート(_N) (FIXME)"
 msgid "_Paste"
 msgstr "貼り付け(_P)"
 
-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
-msgid "_Print"
-msgstr "印刷(_P)"
-
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:104
-#: ui/evolution-task-editor-dialog.xml.h:83
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:115
+#: ui/evolution-task-editor-dialog.xml.h:83 ui/evolution.xml.h:60
 msgid "_Properties..."
 msgstr "プロパティ(_P)..."
 
@@ -7721,7 +8254,7 @@ msgid "_Select All"
 msgstr "すべて選択(_A)"
 
 #: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:63
 msgid "_Task (FIXME)"
 msgstr "タスク(_T) (FIXME)"
 
@@ -7729,6 +8262,11 @@ msgstr "タスク(_T) (FIXME)"
 msgid "_Unread Item (FIXME)"
 msgstr "未読アイテム(_U) (FIXME)"
 
+#: ui/evolution-event-editor.xml.h:76 ui/evolution-message-composer.xml.h:55
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:65
+msgid "_View"
+msgstr "表示(_V)"
+
 #: ui/evolution-executive-summary.xml.h:1
 msgid "Add Service"
 msgstr "サービスの追加"
@@ -7749,29 +8287,33 @@ msgstr "実行サマリーの設定..."
 msgid "New Mail"
 msgstr "新規メール"
 
+#: ui/evolution-mail.xml.h:1
+msgid "Apply filter rules to the selected messages"
+msgstr "選択されたメッセージへフィルタルールを適用します"
+
 #: ui/evolution-mail.xml.h:2
-msgid "Apply any new filters to the mail in this box"
-msgstr "このボックスのメールに新しいフィルタを適用する"
+msgid "Cancel"
+msgstr "キャンセルしました"
 
 #: ui/evolution-mail.xml.h:3
+msgid "Cancel the current mail operation"
+msgstr "現在のメール操作をキャンセルします"
+
+#: ui/evolution-mail.xml.h:4
 msgid "Change the properties of this folder"
 msgstr "このフォルダの設定を変更する"
 
-#: ui/evolution-mail.xml.h:4
+#: ui/evolution-mail.xml.h:5
 msgid "Compose"
 msgstr "作成"
 
-#: ui/evolution-mail.xml.h:5
-msgid "Compose a new message"
-msgstr "新規メッセージを作成します"
-
 #: ui/evolution-mail.xml.h:6
-msgid "Configure Folder..."
-msgstr "フォルダの設定..."
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "選択されたメッセージの受信者全員への返信を作成します"
 
-#: ui/evolution-mail.xml.h:8
-msgid "Copy message to a new folder"
-msgstr "メッセージを新規フォルダへコピーします"
+#: ui/evolution-mail.xml.h:7
+msgid "Compose a reply to the sender of the selected message"
+msgstr "選択されたメッセージの送信者への返信を作成します"
 
 #: ui/evolution-mail.xml.h:9
 msgid "Copy selected messages to another folder"
@@ -7781,329 +8323,397 @@ msgstr "別のフォルダへ選択されたメッセージをコピーします"
 msgid "Create _Virtual Folder From Message"
 msgstr "メッセージから仮想フォルダを作成(_V)"
 
+#: ui/evolution-mail.xml.h:11
+msgid "Create a rule to filter messages from this sender"
+msgstr "この送信者からのメッセージをフィルタするルールを作成します"
+
 #: ui/evolution-mail.xml.h:12
-msgid "Delete the selected messages"
-msgstr "選択されたメッセージを削除します"
+msgid "Create a rule to filter messages to these recipients"
+msgstr "これらの受信者へのメッセージをフィルタするルールを作成します"
+
+#: ui/evolution-mail.xml.h:13
+msgid "Create a rule to filter messages to this mailing list"
+msgstr "このメーリングリストへのメッセージをフィルタするルールを作成します"
 
 #: ui/evolution-mail.xml.h:14
-msgid "Display all of the message headers"
-msgstr "すべてのメッセージヘッダを表示します"
+msgid "Create a rule to filter messages with this subject"
+msgstr "この件名のメッセージをフィルタするルールを作成します"
 
 #: ui/evolution-mail.xml.h:15
-msgid "Edit Message"
-msgstr "メッセージを編集"
+msgid "Create a virtual folder for these recipients"
+msgstr "これらの受信者のための仮想フォルダを作成します"
 
 #: ui/evolution-mail.xml.h:16
-msgid "Edit the current message"
-msgstr "現在のメッセージを編集"
+msgid "Create a virtual folder for this mailing list"
+msgstr "このメーリングリストのための仮想フォルダを作成します"
 
 #: ui/evolution-mail.xml.h:17
-msgid "Empty _Trash"
-msgstr "ゴミ箱を空にする(_T)"
+msgid "Create a virtual folder for this sender"
+msgstr "この送信者のための仮想フォルダを作成します"
 
 #: ui/evolution-mail.xml.h:18
-msgid "Expunge"
-msgstr "抹消"
+msgid "Create a virtual folder for this subject"
+msgstr "この件名のための仮想フォルダを作成します"
 
 #: ui/evolution-mail.xml.h:19
+msgid "Create or edit mail accounts and other preferences"
+msgstr "メールアカウントと他の設定を作成/編集します"
+
+#: ui/evolution-mail.xml.h:20
+msgid "Create or edit rules for filtering new mail"
+msgstr "新規メールをフィルタするルールの作成/編集をします"
+
+#: ui/evolution-mail.xml.h:21
+msgid "Create or edit virtual folder definitions"
+msgstr "仮想フォルダの定義を作成/編集します"
+
+#: ui/evolution-mail.xml.h:23
+msgid "Display the next message"
+msgstr "次のメッセージを表示します"
+
+#: ui/evolution-mail.xml.h:24
+msgid "Display the previous message"
+msgstr "前のメッセージを表示します"
+
+#: ui/evolution-mail.xml.h:25
+msgid "Empty _Trash"
+msgstr "ゴミ箱を空にする(_T)"
+
+#: ui/evolution-mail.xml.h:26
 msgid "Filter on Mailing _List"
 msgstr "メーリングリストのフィルタ(_L)"
 
-#: ui/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:27
 msgid "Filter on Se_nder"
 msgstr "送信者のフィルタ(_n)"
 
-#: ui/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:28
 msgid "Filter on _Recipients"
 msgstr "受信者のフィルタ(_R)"
 
-#: ui/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:29
 msgid "Filter on _Subject"
 msgstr "件名のフィルタ(_S)"
 
-#: ui/evolution-mail.xml.h:23
-msgid "Finaly remove all mails tagged for deletion"
-msgstr ""
+#: ui/evolution-mail.xml.h:30
+msgid "Force images in HTML mail to be loaded"
+msgstr "強制的に HTML メールの画像を読み込む"
 
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:31
 msgid "Forget _Passwords"
 msgstr "パスワードの紛失(_P)"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:32
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:34
 msgid "Forward As"
 msgstr "転送"
 
-#: ui/evolution-mail.xml.h:28
-msgid "Forward the selected mail to someone"
-msgstr "選択されたメールを転送します"
+#: ui/evolution-mail.xml.h:35
+msgid "Forward _Attached"
+msgstr "添付して転送(_A)"
 
-#: ui/evolution-mail.xml.h:30
-msgid "Forward this message in-line with your mail, so you can edit it"
-msgstr ""
+#: ui/evolution-mail.xml.h:36
+msgid "Forward _Inline"
+msgstr "インラインで転送(_I)"
 
-#: ui/evolution-mail.xml.h:31
-msgid "Full _Headers"
-msgstr "すべてのヘッダ(_H)"
+#: ui/evolution-mail.xml.h:37
+msgid "Forward _Quoted"
+msgstr "引用して転送(_Q)"
 
-#: ui/evolution-mail.xml.h:32
-msgid "Hide Deleted Messages"
-msgstr "削除されたメッセージを隠す"
+#: ui/evolution-mail.xml.h:38
+msgid "Forward the selected message in the body of a new message"
+msgstr "新規メッセージの本文の中に選択されたメッセージを転送します"
+
+#: ui/evolution-mail.xml.h:39
+msgid "Forward the selected message quoted like a reply"
+msgstr "引用して選択されたメッセージを転送します"
+
+#: ui/evolution-mail.xml.h:40
+msgid "Forward the selected message to someone"
+msgstr "誰かへ選択されたメッセージを転送します"
+
+#: ui/evolution-mail.xml.h:41
+msgid "Forward the selected message to someone as an attachment"
+msgstr "添付として誰かへ選択されたメッセージを転送します"
 
-#: ui/evolution-mail.xml.h:33
+#: ui/evolution-mail.xml.h:42
 msgid "Hide S_elected Messages"
 msgstr "選択されたメッセージを隠す(_e)"
 
-#: ui/evolution-mail.xml.h:34
+#: ui/evolution-mail.xml.h:43
 msgid "Hide _Deleted Messages"
 msgstr "削除されたメッセージを隠す(_D)"
 
-#: ui/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:44
 msgid "Hide _Read messages"
 msgstr "既読メッセージを隠す(_R)"
 
-#: ui/evolution-mail.xml.h:36
-msgid "Invert Selection"
-msgstr "選択を反転"
+#: ui/evolution-mail.xml.h:45
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:37
+#: ui/evolution-mail.xml.h:46
+msgid "Load _Images"
+msgstr "画像を読み込む(_I)"
+
+#: ui/evolution-mail.xml.h:47
 msgid "Manage _Subscriptions..."
 msgstr "定期購読管理(_S)..."
 
-#: ui/evolution-mail.xml.h:38
-msgid "Mar_k as Read"
+#: ui/evolution-mail.xml.h:48
+msgid "Mar_k As Read"
 msgstr "既読としてマーク(_k)"
 
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:49
 msgid "Mark All as R_ead"
 msgstr "既読としてすべてマーク(_e)"
 
-#: ui/evolution-mail.xml.h:40
-msgid "Mark As Read"
-msgstr "既読としてマーク"
-
-#: ui/evolution-mail.xml.h:41
+#: ui/evolution-mail.xml.h:50
 msgid "Mark As U_nread"
 msgstr "未読としてマーク(_n)"
 
-#: ui/evolution-mail.xml.h:42
-msgid "Mark as U_nread"
-msgstr "未読としてマーク(_n)"
+#: ui/evolution-mail.xml.h:51
+msgid "Mark all visible messages as read"
+msgstr "既読としてすべてのメッセージをマークします"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:52
 msgid "Mark the selected messages as having been read"
 msgstr "既読として選択されたメッセージをマークします"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:53
 msgid "Mark the selected messages as not having been read"
 msgstr "未読として選択されたメッセージをマークします"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:54
+msgid "Mark the selected messages for deletion"
+msgstr "選択されたメッセージに削除マークをします"
+
+#: ui/evolution-mail.xml.h:55
 msgid "Move"
 msgstr "移動"
 
-#: ui/evolution-mail.xml.h:46
-msgid "Move message to a new folder"
-msgstr "メッセージを新規フォルダへ移動します"
-
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:56
 msgid "Move selected messages to another folder"
 msgstr "別のフォルダへ選択されたメッセージを移動します"
 
-#: ui/evolution-mail.xml.h:48
-msgid "Open in New Window"
-msgstr "新規ウィンドウで開く"
-
-#: ui/evolution-mail.xml.h:49
-msgid "Open the current message in a new window"
-msgstr "新規ウィンドウで現在のメッセージを開きます"
-
-#: ui/evolution-mail.xml.h:54
-msgid "Print Preview of message..."
-msgstr "メッセージの印刷プレビュー..."
+#: ui/evolution-mail.xml.h:58
+msgid "Open a window for composing a mail message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:55
-msgid "Print message to the printer"
-msgstr "メッセージをプリンタへ印刷します"
+#: ui/evolution-mail.xml.h:59
+msgid "Open the selected message in a new window"
+msgstr "新規ウィンドウで選択されたメッセージを開きます"
 
-#: ui/evolution-mail.xml.h:56
-msgid "Print message..."
-msgstr "メッセージを印刷..."
+#: ui/evolution-mail.xml.h:60
+#, fuzzy
+msgid "Open the selected message in the composer to re-send it"
+msgstr "既読として選択されたメッセージをマークします"
 
-#: ui/evolution-mail.xml.h:59
-msgid "Redirect (FIXME: implement me)"
-msgstr "宛名を書き換える (FIXME: 実装してください)"
+#: ui/evolution-mail.xml.h:61
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "すべてのフォルダから削除マークされたメッセージを永久的に削除します"
 
 #: ui/evolution-mail.xml.h:62
-msgid "Reply to _All"
-msgstr "全員へ返信(_A)"
-
-#: ui/evolution-mail.xml.h:63
-msgid "Reply to all"
-msgstr "全員へ返信"
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "個のフォルダから削除マークされたメッセージを永久的に削除します"
 
-#: ui/evolution-mail.xml.h:65
-msgid "Reply to sender"
-msgstr "送信者へ返信"
+#: ui/evolution-mail.xml.h:66
+msgid "Print Message..."
+msgstr "メッセージを印刷..."
 
 #: ui/evolution-mail.xml.h:67
-msgid "S_ource"
-msgstr "ソース(_o)"
+msgid "Print Preview..."
+msgstr "印刷プレビュー..."
 
 #: ui/evolution-mail.xml.h:68
-msgid "Save the message into a new file"
-msgstr "新規ファイルへメッセージを保存します"
-
-#: ui/evolution-mail.xml.h:70 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "すべて選択(_A)"
-
-#: ui/evolution-mail.xml.h:71
-msgid "Select _Thread"
-msgstr "スレッドを選択(_T)"
+msgid "Print message to the printer"
+msgstr "メッセージをプリンタへ印刷します"
 
-#: ui/evolution-mail.xml.h:72
-msgid "Send / Receive"
-msgstr "送受信"
+#: ui/evolution-mail.xml.h:69
+msgid "Redirect (FIXME: implement me)"
+msgstr "宛名を書き換える (FIXME: 実装してください)"
 
 #: ui/evolution-mail.xml.h:73
-msgid "Send a reply to the person who sent you this mail"
-msgstr "このメールを送った人へ返信します"
+msgid "S_earch Message"
+msgstr "メッセージを検索(_e)"
 
 #: ui/evolution-mail.xml.h:74
-msgid "Send a single mail in reply to all the selected mail"
-msgstr "選択されたメールのすべての人へひとつのメールで返信します"
+msgid "Save the message as a text file"
+msgstr "テキストファイルへメッセージを保存します"
 
 #: ui/evolution-mail.xml.h:75
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
+msgid "Search for text in the body of the displayed message"
 msgstr ""
-"キューにあるメールを送信して\n"
-"    新規メールを取得します"
+
+#: ui/evolution-mail.xml.h:76 ui/evolution-subscribe.xml.h:7
+msgid "Select _All"
+msgstr "すべて選択(_A)"
 
 #: ui/evolution-mail.xml.h:77
-msgid "Send queued mail and retrieve new mail"
-msgstr "キューにあるメールを送信して新規メールを取得します"
+msgid "Select _Thread"
+msgstr "スレッドを選択(_T)"
 
 #: ui/evolution-mail.xml.h:78
-msgid "Show _All"
-msgstr "すべて表示(_A)"
+msgid "Select all and only the messages that are not currently selected"
+msgstr "現在選択されていないメッセージだけをすべて選択します"
+
+#: ui/evolution-mail.xml.h:79
+msgid "Select all messages in the same thread as the selected message"
+msgstr "選択されたメッセージと同じスレッドのメッセージをすべて選択します"
 
 #: ui/evolution-mail.xml.h:80
-msgid "Threaded Message list"
-msgstr "メッセージリストをスレッド化します"
+msgid "Select all visible messages"
+msgstr "すべてのメッセージを選択します"
 
 #: ui/evolution-mail.xml.h:81
-msgid "Un-delete the selected messages"
-msgstr "選択されたメッセージ削除を取り消します"
+msgid "Send / Receive"
+msgstr "送受信"
+
+#: ui/evolution-mail.xml.h:82
+msgid "Send queued mail and retrieve new mail"
+msgstr "キューにあるメールを送信して新規メールを取得します"
 
 #: ui/evolution-mail.xml.h:83
-msgid "VFolder on Mailing _List"
-msgstr "メーリングリストの仮想フォルダ(_L)"
+msgid "Show Email _Source"
+msgstr "メールのソースを表示(_S)"
 
 #: ui/evolution-mail.xml.h:84
-msgid "VFolder on Se_nder"
-msgstr "送信者の仮想フォルダ(_n)"
+msgid "Show Full _Headers"
+msgstr "すべてのヘッダを表示(_H)"
 
 #: ui/evolution-mail.xml.h:85
-msgid "VFolder on _Recipients"
-msgstr "受信者の仮想フォルダ(_R)"
+msgid "Show _All"
+msgstr "すべて表示(_A)"
 
 #: ui/evolution-mail.xml.h:86
-msgid "VFolder on _Subject"
-msgstr "件名の仮想フォルダ(_S)"
+msgid "Show message in the normal style"
+msgstr "通常のメッセージを表示します"
 
 #: ui/evolution-mail.xml.h:87
-msgid "View Raw Message Source"
-msgstr "未加工メッセージのソースを表示します"
+msgid "Show message with all email headers"
+msgstr "すべてのメールヘッダも含めてメッセージを表示します"
 
 #: ui/evolution-mail.xml.h:88
-msgid "Virtual Folder _Editor..."
-msgstr "仮想フォルダエディタ(_E)..."
+msgid "Show messages that have been temporarily hidden"
+msgstr ""
 
 #: ui/evolution-mail.xml.h:89
-msgid "_Apply Filters"
-msgstr "フィルタ適用(_A)"
+msgid "Show the raw email source of the message"
+msgstr ""
 
 #: ui/evolution-mail.xml.h:90
-msgid "_Attachment"
-msgstr "添付(_A)"
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
 
 #: ui/evolution-mail.xml.h:91
-msgid "_Copy to Folder..."
-msgstr "フォルダへコピー(_C)..."
+#, fuzzy
+msgid "Temporarily hide all messages that have already been read"
+msgstr "既読として選択されたメッセージをマークします"
 
 #: ui/evolution-mail.xml.h:92
+#, fuzzy
+msgid "Temporarily hide the selected messages"
+msgstr "選択されたメッセージを削除します"
+
+#: ui/evolution-mail.xml.h:93
+msgid "Threaded Message list"
+msgstr "メッセージリストをスレッド化します"
+
+#: ui/evolution-mail.xml.h:94
+msgid "Un-delete the selected messages"
+msgstr "選択されたメッセージ削除を取り消します"
+
+#: ui/evolution-mail.xml.h:95
+msgid "VFolder on Mailing _List..."
+msgstr "メーリングリストの仮想フォルダ(_L)..."
+
+#: ui/evolution-mail.xml.h:96
+msgid "VFolder on Se_nder..."
+msgstr "送信者の仮想フォルダ(_n)..."
+
+#: ui/evolution-mail.xml.h:97
+msgid "VFolder on _Recipients..."
+msgstr "受信者の仮想フォルダ(_R)..."
+
+#: ui/evolution-mail.xml.h:98
+msgid "VFolder on _Subject..."
+msgstr "件名の仮想フォルダ(_S)..."
+
+#: ui/evolution-mail.xml.h:99
+msgid "Virtual Folder _Editor..."
+msgstr "仮想フォルダエディタ(_E)..."
+
+#: ui/evolution-mail.xml.h:100
+msgid "_Apply Filters"
+msgstr "フィルタ適用(_A)"
+
+#: ui/evolution-mail.xml.h:101
+msgid "_Copy to Folder"
+msgstr "フォルダへコピー(_C)"
+
+#: ui/evolution-mail.xml.h:102
 msgid "_Create Filter From Message"
 msgstr "メッセージからフィルタを作成(_C)"
 
-#: ui/evolution-mail.xml.h:94
+#: ui/evolution-mail.xml.h:104
 msgid "_Expunge"
 msgstr "抹消(_E)"
 
-#: ui/evolution-mail.xml.h:95
+#: ui/evolution-mail.xml.h:105
 msgid "_Filters..."
 msgstr "フィルタ(_F)..."
 
-#: ui/evolution-mail.xml.h:96 ui/evolution.xml.h:32
+#: ui/evolution-mail.xml.h:106 ui/evolution.xml.h:50
 msgid "_Folder"
 msgstr "フォルダ(_F)"
 
-#: ui/evolution-mail.xml.h:97
-msgid "_Forward"
-msgstr "転送(_F)"
-
-#: ui/evolution-mail.xml.h:98
-msgid "_Inline"
-msgstr "インライン(_I)"
+#: ui/evolution-mail.xml.h:107
+msgid "_Forward Message"
+msgstr "メッセージを転送(_F)"
 
-#: ui/evolution-mail.xml.h:99 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:108 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "選択を反転(_I)"
 
-#: ui/evolution-mail.xml.h:100
+#: ui/evolution-mail.xml.h:109
 msgid "_Mail Message"
 msgstr "メッセージをメール(_M)"
 
-#: ui/evolution-mail.xml.h:101
+#: ui/evolution-mail.xml.h:110
 msgid "_Mail Settings..."
 msgstr "メール設定(_M)..."
 
-#: ui/evolution-mail.xml.h:102
-msgid "_Move to Folder..."
-msgstr "フォルダへ移動(_M)..."
+#: ui/evolution-mail.xml.h:111
+msgid "_Message Display"
+msgstr "メッセージ表示(_M)"
 
-#: ui/evolution-mail.xml.h:103
-msgid "_Open Selected Items"
-msgstr "選択されたアイテムを開く(_O)"
+#: ui/evolution-mail.xml.h:112
+msgid "_Move to Folder"
+msgstr "フォルダへ移動(_M)"
 
-#: ui/evolution-mail.xml.h:105
-msgid "_Quoted"
-msgstr "引用(_Q)"
+#: ui/evolution-mail.xml.h:113
+msgid "_Normal Display"
+msgstr "通常表示(_N)"
 
-#: ui/evolution-mail.xml.h:106
-msgid "_Reply"
-msgstr "返信(_R)"
+#: ui/evolution-mail.xml.h:114
+msgid "_Open Message"
+msgstr "メッセージを開く(_O)"
 
-#: ui/evolution-mail.xml.h:107
-msgid "_Resend Messages"
+#: ui/evolution-mail.xml.h:116
+msgid "_Re-send Message"
 msgstr "メッセージを再送信(_R)"
 
-#: ui/evolution-mail.xml.h:109
-msgid "_Save Message As..."
-msgstr "メッセージを別名で保存(_S)..."
-
-#: ui/evolution-mail.xml.h:110
+#: ui/evolution-mail.xml.h:119
 msgid "_Send / Receive"
 msgstr "送受信(_S)"
 
-#: ui/evolution-mail.xml.h:111
-msgid "_Threaded"
-msgstr "スレッド(_T)"
-
-#: ui/evolution-mail.xml.h:113
-msgid "_Undelete"
-msgstr "削除取消(_U)"
+#: ui/evolution-mail.xml.h:120
+msgid "_Threaded Message List"
+msgstr "メッセージリストをスレッド化(_T)"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
@@ -8119,142 +8729,154 @@ msgid "Encrypt this message with PGP"
 msgstr "PGP でこのメッセージを暗号化します"
 
 #: ui/evolution-message-composer.xml.h:6
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:7
 msgid "F_ormat"
 msgstr "フォーマット(_o)"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:8
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:9
 msgid "Insert a file as text into the message"
 msgstr "メッセージへテキストとしてファイルを挿入します"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:10
 msgid "Insert text file..."
 msgstr "テキストファイルの挿入..."
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:12
 msgid "Open a file"
 msgstr "ファイルを開く"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Encrypt"
 msgstr "PGP による暗号化"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 msgid "PGP Sign"
 msgstr "PGP サイン"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:15
+msgid "S/MIME Encrypt"
+msgstr "S/MIME による暗号化"
+
+#: ui/evolution-message-composer.xml.h:16
+msgid "S/MIME Sign"
+msgstr "S/MIME 署名"
+
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save _Draft"
 msgstr "草案を保存(_D)"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save in _folder... (FIXME)"
 msgstr "フォルダへ保存... (FIXME)"
 
-#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save in folder..."
 msgstr "フォルダへ保存..."
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:24
 msgid "Save the current file with a different name"
 msgstr "現在のファイルを別名で保存します"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the message in a specified folder"
 msgstr "指定のフォルダへメッセージを保存します"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:26
 msgid "Send"
 msgstr "送信"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send _Later"
 msgstr "後で送信(_L)"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _later"
 msgstr "後で送信(_l)"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send the mail in HTML format"
 msgstr "HTML形式でメールを送信します"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the message later"
 msgstr "後でメッセージを送信します"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "今すぐメッセージを送信します"
-
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send this message now"
 msgstr "今すぐこのメッセージを送信します"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:32
 msgid "Show / hide attachments"
 msgstr "添付の表示/非表示"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show _attachments"
 msgstr "添付を表示(_a)"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show attachments"
 msgstr "添付を表示"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:35
 msgid "Sign this message with your PGP key"
 msgstr "PGP鍵でこのメッセージにサインします"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:36
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "S/MIME 署名証明書でこのメッセージにサインします"
+
+#: ui/evolution-message-composer.xml.h:37
 msgid "Toggles whether the BCC field is displayed"
 msgstr "BCC フィールドを表示するかどうか切替えます"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the CC field is displayed"
 msgstr "CC フィールドを表示するかどうか切替えます"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the From chooser is displayed"
 msgstr "差出人の選択を表示するかどうか切替えます"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "返信先フィールドを表示するかどうか切替えます"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:41
 msgid "_Bcc Field"
 msgstr "Bcc フィールド(_B)"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:42
 msgid "_Cc Field"
 msgstr "Cc フィールド(_C)"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:47
 msgid "_From Field"
 msgstr "差出人フィールド(_F)"
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:49
 msgid "_Insert"
 msgstr "挿入(_I)"
 
-#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-message-composer.xml.h:50
 msgid "_Insert text file... (FIXME)"
 msgstr "テキストファイルの挿入(_I)... (FIXME)"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:51
 msgid "_Open..."
 msgstr "開く(_O)..."
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Reply-To Field"
 msgstr "返信先フィールド(_R)"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:54
 msgid "_Security"
 msgstr "セキュリティ(_S)"
 
@@ -8346,7 +8968,7 @@ msgstr "元に戻す"
 msgid "Undo the last action"
 msgstr "最後の動作を元に戻します"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:42
 msgid "_Appointment (FIXME)"
 msgstr "約束(_A) (FIXME)"
 
@@ -8382,260 +9004,384 @@ msgstr "タスク(_T)"
 msgid "About Evolution..."
 msgstr "Evolution について..."
 
+#: ui/evolution.xml.h:2
+msgid "Add to _Shortcut Bar"
+msgstr "ショートカットバーに追加(_S)"
+
 #: ui/evolution.xml.h:3
+msgid "Change the name of this folder"
+msgstr "このフォルダの名前を変更します"
+
+#: ui/evolution.xml.h:4
+msgid "Change the properties for this folder"
+msgstr "このフォルダの設定を変更します"
+
+#: ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr "このウィンドウを閉じます"
 
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:7
+msgid "Copy this folder"
+msgstr "フォルダをコピーします"
+
+#: ui/evolution.xml.h:8
+msgid "Create _New Folder..."
+msgstr "新規フォルダを作成(_N)..."
+
+#: ui/evolution.xml.h:9
+msgid "Create a link to this folder in the shortcut bar"
+msgstr "ショートカットバーにこのフォルダのリンクを作成します"
+
+#: ui/evolution.xml.h:10
+msgid "Create a new folder"
+msgstr "新規フォルダを作成します"
+
+#: ui/evolution.xml.h:11
 msgid "Customi_ze Toolbars..."
 msgstr "ツールバーのカスタマイズ(_z)..."
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:12
 msgid "Customize"
 msgstr "カスタマイズ"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:13
 msgid "Customize toolbars"
 msgstr "ツールバーをカスタマイズします"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "別のフォルダを表示します"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "終了(_x)"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:16
+msgid "Evolution _FAQ"
+msgstr "Evolution FAQ(_F)"
+
+#: ui/evolution.xml.h:17
 msgid "Evolution _Window"
 msgstr "Evolution ウィンドウ(_W)"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:18
 msgid "Evolution bar _shortcut"
 msgstr "Evolution バーショートカット(_s)"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:19
 msgid "Exit the program"
 msgstr "プログラムを終了します"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:20
 msgid "Getting _Started"
 msgstr "始めに(_S)"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:21
 msgid "Import an external file format"
 msgstr "外部ファイル形式をインポートします"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:22
 msgid "Main toolbar"
 msgstr "メインツールバー"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:23
+msgid "Move this folder to another place"
+msgstr "別の場所へこのフォルダを移動します"
+
+#: ui/evolution.xml.h:24
+msgid "Open in New Window"
+msgstr "新規ウィンドウで開く"
+
+#: ui/evolution.xml.h:25
+msgid "Open in New _Window"
+msgstr "新規ウィンドウで開く(_W)"
+
+#: ui/evolution.xml.h:26
+msgid "Open this folder in an other window"
+msgstr "別のウィンドウでこのフォルダを開きます"
+
+#: ui/evolution.xml.h:27
 msgid "Show information about Evolution"
 msgstr "Evolution についての情報を表示します"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:28
 msgid "Submit Bug Report"
 msgstr "不具合報告の提出"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:29
 msgid "Submit _Bug Report"
 msgstr "不具合報告の提出(_B)"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:30
 msgid "Submit bug report using Bug Buddy."
 msgstr "Bug Buddyを使って不具合報告を提出します"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:31
+msgid "Toggle"
+msgstr "切替え"
+
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the folder bar"
 msgstr "フォルダバーを表示するかどうか切替えます"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:33
 msgid "Toggle whether to show the shortcut bar"
 msgstr "ショートカットバーを表示するかどうか切替えます"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:34
+msgid "Toggle whether we are working offline."
+msgstr "オフライン作業かどうかを切替えます"
+
+#: ui/evolution.xml.h:35
 msgid "Using the C_ontact Manager"
 msgstr "コンタクトマネージャを使う(_o)"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:36
 msgid "Using the _Calendar"
 msgstr "カレンダを使う(_C)"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:37
 msgid "Using the _Mailer"
 msgstr "メーラを使う(_M)"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:38
+msgid "View the selected folder"
+msgstr "選択されたフォルダを表示します"
+
+#: ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "オフライン作業"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:40
 msgid "_About Evolution..."
 msgstr "Evolution について(_A)..."
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:41
 msgid "_Actions"
 msgstr "動作(_A)"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:45
+msgid "_Copy..."
+msgstr "コピー(_C)..."
+
+#: ui/evolution.xml.h:47
+msgid "_Delete this folder"
+msgstr "このフォルダを削除(_D)"
+
+#: ui/evolution.xml.h:51
 msgid "_Folder Bar"
 msgstr "フォルダバー(_F)"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:52
 msgid "_Go to Folder..."
 msgstr "フォルダへ移動(_G)..."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:54
 msgid "_Import file..."
 msgstr "ファイルをインポート(_I)..."
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:55
 msgid "_Index"
 msgstr "インデックス(_I)"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:56
 msgid "_Mail message"
 msgstr "メッセージをメール(_M)"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:57
+msgid "_Move..."
+msgstr "移動(_M)..."
+
+#: ui/evolution.xml.h:59
 msgid "_New Folder"
 msgstr "新規フォルダ(_N)"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:61
+msgid "_Rename..."
+msgstr "リネーム(_R)..."
+
+#: ui/evolution.xml.h:62
 msgid "_Shortcut Bar"
 msgstr "ショートカットバー(_S)"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2475
-msgid "%A, %B %d, %Y"
-msgstr "%Y年 %m月 %d日 %A"
+#: ui/evolution.xml.h:66
+msgid "_Work Offline"
+msgstr "オフライン作業(_W)"
+
+#: views/addressbook/galview.xml.h:1
+msgid "Adress Cards"
+msgstr "アドレスカード"
+
+#: views/addressbook/galview.xml.h:2
+msgid "By Company"
+msgstr "会社"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
+#: views/addressbook/galview.xml.h:3
+msgid "Phone List"
+msgstr "電話リスト"
+
+#: views/mail/galview.xml.h:1
+msgid "By Sender"
+msgstr "送信者"
+
+#: views/mail/galview.xml.h:2
+msgid "By Status"
+msgstr "ステータス"
+
+#: views/mail/galview.xml.h:3
+msgid "By Subject"
+msgstr "件名"
+
+#: views/mail/galview.xml.h:4
+msgid "Messages"
+msgstr "メッセージ"
+
+#: views/tasks/galview.xml.h:2
+msgid "With Category"
+msgstr "カテゴリ"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "暫定"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:391
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "ビジー"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "オフィスの外"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
 msgid "No Information"
 msgstr "情報なし"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:409
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr "他の招待(_I)..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:429
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
 msgid "_Options"
 msgstr "オプション(_O)"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:446
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
 msgid "Show _Only Working Hours"
 msgstr "仕事中の時間だけ表示(_O)"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:459
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
 msgstr "縮小して表示(_Z)"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:477
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
 msgid "_Update Free/Busy"
 msgstr "フリー/ビジー の更新(_U)"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
 msgid "_<<"
 msgstr "<<(_<)"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:512
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
 msgid "_Autopick"
 msgstr "自動ピックアップ(_A)"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:526
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
 msgid ">_>"
 msgstr ">>(_>)"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:543
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
 msgid "_All People and Resources"
 msgstr "すべての人々とリソース(_A)"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:556
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
 msgid "All _People and One Resource"
 msgstr "すべての人々とひとつのリソース(_P)"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:569
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
 msgid "_Required People"
 msgstr "人々が必要(_R)"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:582
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
 msgid "Required People and _One Resource"
 msgstr "人々とひとつのリソースが必要(_O)"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:605
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
 msgid "Meeting _start time:"
 msgstr "会議開始時間(_s):"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:629
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
 msgid "Meeting _end time:"
 msgstr "会議終了時間(_e):"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:742
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
 msgid "All Attendees"
 msgstr "すべての付き添い"
 
-#: widgets/menus/gal-view-menus.c:177
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+msgid "%A, %B %d, %Y"
+msgstr "%Y年 %m月 %d日 %A"
+
+#: widgets/menus/gal-view-menus.c:176
 msgid "_Current View"
 msgstr "現在の表示(_C)"
 
-#: widgets/menus/gal-view-menus.c:196
+#: widgets/menus/gal-view-menus.c:202
 msgid "Define Views"
 msgstr "表示を定義"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
+#: widgets/misc/e-calendar-item.c:422
 msgid "MTWTFSS"
 msgstr "MTWTFSS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
+#: widgets/misc/e-calendar-item.c:1061 widgets/misc/e-calendar-item.c:2756
 msgid "%B %Y"
 msgstr "%Y %B"
 
-#: widgets/misc/e-cell-date-edit.c:218 widgets/misc/e-dateedit.c:416
+#: widgets/misc/e-cell-date-edit.c:221 widgets/misc/e-dateedit.c:418
 msgid "Now"
 msgstr "今"
 
-#: widgets/misc/e-cell-date-edit.c:242
+#: widgets/misc/e-cell-date-edit.c:245
 msgid "OK"
 msgstr "OK"
 
-#: widgets/misc/e-cell-date-edit.c:723
+#: widgets/misc/e-cell-date-edit.c:726
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "時間はフォーマットに入れなければなりません: %s"
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:166
+#: widgets/misc/e-filter-bar.c:168
 msgid "Save Search"
 msgstr "検索を保存"
 
-#: widgets/misc/e-filter-bar.c:237
+#: widgets/misc/e-filter-bar.c:239
 msgid "Advanced Search"
 msgstr "上級検索"
 
-#: widgets/misc/e-filter-bar.c:317
-msgid "Advanced ..."
-msgstr "上級 ..."
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "別名で保存..."
+
+#: widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr "すべて表示"
+
+#: widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr "編集..."
+
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
+msgstr "詳細..."
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
@@ -8658,42 +9404,10 @@ msgstr "メッセージ"
 msgid "Don't show this message again."
 msgstr "このメッセージを二度と表示しない"
 
-#: widgets/misc/e-search-bar.c:148
+#: widgets/misc/e-search-bar.c:155
 msgid "Sear_ch"
 msgstr "検索(_c)"
 
-#: views/addressbook/galview.xml.h:1
-msgid "Adress Cards"
-msgstr "アドレスカード"
-
-#: views/addressbook/galview.xml.h:2
-msgid "By Company"
-msgstr "会社"
-
-#: views/addressbook/galview.xml.h:3
-msgid "Phone List"
-msgstr "電話リスト"
-
-#: views/mail/galview.xml.h:1
-msgid "By Sender"
-msgstr "送信者"
-
-#: views/mail/galview.xml.h:2
-msgid "By Status"
-msgstr "ステータス"
-
-#: views/mail/galview.xml.h:3
-msgid "By Subject"
-msgstr "件名"
-
-#: views/mail/galview.xml.h:4
-msgid "Messages"
-msgstr "メッセージ"
-
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
-msgstr "カテゴリ"
-
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 msgid "The Personal Addressbook Server"
 msgstr "パーソナルアドレス帳サーバ"
author	Akira TAGOH <tagoh@gnome.gr.jp>	2001-05-19 18:06:35 +0800
committer	Akira Tagoh <tagoh@src.gnome.org>	2001-05-19 18:06:35 +0800
commit	040905c9a295fee00e98260175559f54bc6c6110 (patch)
tree	370a84272accee16117a2a2c1d43e6dddacfbddb /po/ja.po
parent	98c32c5c1150085a7073ba258ad2cd362abf53fb (diff)
download	gsoc2013-evolution-040905c9a295fee00e98260175559f54bc6c6110.tar gsoc2013-evolution-040905c9a295fee00e98260175559f54bc6c6110.tar.gz gsoc2013-evolution-040905c9a295fee00e98260175559f54bc6c6110.tar.bz2 gsoc2013-evolution-040905c9a295fee00e98260175559f54bc6c6110.tar.lz gsoc2013-evolution-040905c9a295fee00e98260175559f54bc6c6110.tar.xz gsoc2013-evolution-040905c9a295fee00e98260175559f54bc6c6110.tar.zst gsoc2013-evolution-040905c9a295fee00e98260175559f54bc6c6110.zip