Sync for the release.

svn path=/trunk/; revision=11530
author: Ettore Perazzoli <ettore@src.gnome.org> 2001-08-01 03:28:49 +0800
committer: Ettore Perazzoli <ettore@src.gnome.org> 2001-08-01 03:28:49 +0800
commit: d74bff323fe6704cee8a72ac72fd5a1cdadcc6df (patch)
tree: e19ef426a9d3e9704916bfea49a4751b1d32df72 /po/ja.po
parent: c36ab4adbc03458d629b2fb155c192ecdae5a05d (diff)
download: gsoc2013-evolution-d74bff323fe6704cee8a72ac72fd5a1cdadcc6df.tar.gz
gsoc2013-evolution-d74bff323fe6704cee8a72ac72fd5a1cdadcc6df.tar.zst
gsoc2013-evolution-d74bff323fe6704cee8a72ac72fd5a1cdadcc6df.zip
1 files changed, 6301 insertions, 3473 deletions
diff --git a/po/ja.po b/po/ja.po
index e4ac4170ea..545858278b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution CVS-20010612\n"
-"POT-Creation-Date: 2001-06-12 17:40+0900\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-06-12 19:52+0900\n"
 "Last-Translator: Akira TAGOH <tagoh@gnome.gr.jp>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -13,11 +13,19 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3324
+#: 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_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr "Evolution へ VCard ファイルをインポート"
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "名刺: "
 
-#: addressbook/backend/ebook/e-card.c:3326
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -25,7 +33,7 @@ msgstr ""
 "\n"
 "名前: "
 
-#: addressbook/backend/ebook/e-card.c:3327
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -33,7 +41,7 @@ msgstr ""
 "\n"
 "  敬称(前つけ):     "
 
-#: addressbook/backend/ebook/e-card.c:3328
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -41,13 +49,13 @@ msgstr ""
 "\n"
 "  姓:      "
 
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3330
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -55,7 +63,7 @@ msgstr ""
 "\n"
 "  ファミリー名:     "
 
-#: addressbook/backend/ebook/e-card.c:3331
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
@@ -63,7 +71,7 @@ msgstr ""
 "\n"
 "  敬称(後つけ):     "
 
-#: addressbook/backend/ebook/e-card.c:3345
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -71,7 +79,7 @@ msgstr ""
 "\n"
 "誕生日: "
 
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -79,7 +87,7 @@ msgstr ""
 "\n"
 "住所:"
 
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -87,7 +95,7 @@ msgstr ""
 "\n"
 "郵便番号:  "
 
-#: addressbook/backend/ebook/e-card.c:3359
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
@@ -95,25 +103,25 @@ msgstr ""
 "\n"
 "  "
 
-#: addressbook/backend/ebook/e-card.c:3360
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3361
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -121,7 +129,7 @@ msgstr ""
 "\n"
 "  郵便番号: "
 
-#: addressbook/backend/ebook/e-card.c:3364
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -129,13 +137,13 @@ msgstr ""
 "\n"
 "  国:       "
 
-#: addressbook/backend/ebook/e-card.c:3377
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3389
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -143,7 +151,7 @@ msgstr ""
 "\n"
 "電話番号:\n"
 
-#: addressbook/backend/ebook/e-card.c:3392
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -151,7 +159,7 @@ msgstr ""
 "\n"
 "電話番号:"
 
-#: addressbook/backend/ebook/e-card.c:3416
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -159,7 +167,7 @@ msgstr ""
 "\n"
 "メール:\n"
 
-#: addressbook/backend/ebook/e-card.c:3419
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -167,7 +175,7 @@ msgstr ""
 "\n"
 "メール:"
 
-#: addressbook/backend/ebook/e-card.c:3438
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
@@ -175,7 +183,7 @@ msgstr ""
 "\n"
 "メーラ: "
 
-#: addressbook/backend/ebook/e-card.c:3444
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -183,7 +191,7 @@ msgstr ""
 "\n"
 "タイムゾーン: "
 
-#: addressbook/backend/ebook/e-card.c:3452
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -191,7 +199,7 @@ msgstr ""
 "\n"
 "経緯: "
 
-#: addressbook/backend/ebook/e-card.c:3456
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -199,7 +207,7 @@ msgstr ""
 "\n"
 "仕事の職務: "
 
-#: addressbook/backend/ebook/e-card.c:3468
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -207,7 +215,7 @@ msgstr ""
 "\n"
 "組織: "
 
-#: addressbook/backend/ebook/e-card.c:3469
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -215,7 +223,7 @@ msgstr ""
 "\n"
 "  社名:  "
 
-#: addressbook/backend/ebook/e-card.c:3470
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
@@ -223,7 +231,7 @@ msgstr ""
 "\n"
 "  部署:  "
 
-#: addressbook/backend/ebook/e-card.c:3471
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
@@ -231,7 +239,7 @@ msgstr ""
 "\n"
 "  部署2: "
 
-#: addressbook/backend/ebook/e-card.c:3472
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
@@ -239,7 +247,7 @@ msgstr ""
 "\n"
 "  部署3: "
 
-#: addressbook/backend/ebook/e-card.c:3473
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
@@ -247,7 +255,7 @@ msgstr ""
 "\n"
 "  部署4: "
 
-#: addressbook/backend/ebook/e-card.c:3477
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -255,7 +263,7 @@ msgstr ""
 "\n"
 "業務分野: "
 
-#: addressbook/backend/ebook/e-card.c:3478
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -273,7 +281,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3491
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
@@ -281,7 +289,7 @@ msgstr ""
 "\n"
 "任意の文字列: "
 
-#: addressbook/backend/ebook/e-card.c:3494
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -289,36 +297,24 @@ msgstr ""
 "\n"
 "公開鍵: "
 
-#: addressbook/backend/ebook/e-card.c:3755
+#: addressbook/backend/ebook/e-card.c:4037
 msgid "Multiple VCards"
 msgstr "複数の VCard"
 
-#: addressbook/backend/ebook/e-card.c:3763
+#: addressbook/backend/ebook/e-card.c:4045
 #, 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_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:42
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:98 calendar/gui/main.c:57
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo の初期化が出来ませんでした"
 
@@ -331,14 +327,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook はロードされていません\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "wombat サーバを開始することが出来ませんでした"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "wombat を開始することが出来ませんでした"
 
@@ -348,729 +344,812 @@ msgid "Could not read pilot's Address application block"
 msgstr ""
 "パイロットのアドレスアプリケーションブロックを読み込むことが出来ませんでした"
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr "アドレスをポップアップするための Bonobo コントロール"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr "アドレスを表示するための Bonobo コントロール"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr "アドレス帳を表示する Bonobo コントロールのサンプルです"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "Evolution アドレス帳ミニカードを表示するコントロール"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Evolution アドレス帳ミニカードビューア"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr "コンタクトを扱うための Evolution コンポーネント"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
+msgstr "アドレス帳ミニカードコントロールのためのファクトリ"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr "アドレス帳のアドレス表示のためのファクトリ"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
+msgstr "アドレス帳のアドレスをポップアップするためのファクトリ"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Factory for the Evolution addressbook component."
+msgstr "Evolution アドレス帳コンポーネントのためのファクトリ"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the sample Addressbook control"
+msgstr "サンプルアドレス帳コントロールのためのファクトリ"
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "LDAP サーバ"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "ファイル"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "未知のアドレス帳種別"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+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:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "パスワード"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr "未知の認証種別"
+
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
+msgstr "ベースエントリ"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr "サブエントリ"
+
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
+msgstr "すべてのエントリ"
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr "未知のスコープ種別"
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr "バインドDN:"
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr "FIXME バインド DN のヘルプテキストです"
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "このパスワードを記憶"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr "ホスト:"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr "FIXME ホストヘルプテキストです"
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr "ルート DN:"
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr "FIXME ルート DN ヘルプテキストです"
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "ポート:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr "FIXME ポートヘルプテキストです"
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr "検索範囲:"
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "認証方式:"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr "上級 LDAP オプション"
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "パス:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr "FIXME パスヘルプテキストです"
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "存在しない場合パスを作成する"
+
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr "アドレス帳を編集"
+
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
+msgstr "アドレス帳に追加"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+"あなたの持つアドレス帳を選択し, それについての関連した情報を入力してください"
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "名前:"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr "FIXME 名前ヘルプテキストです"
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "説明:"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr "FIXME 説明ヘルプテキストです"
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
-msgstr "追加"
+msgid "Addressbook Sources"
+msgstr "アドレス帳のソース"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "削除"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "名前"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
+msgstr "追加(_A)"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "編集(_E)"
+
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
+msgstr "その他のコンタクト"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr "%s のパスワードを入力してください"
+
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "アドレス帳を開くことが出来ません"
+
+#: addressbook/gui/component/addressbook.c:380
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is down"
+msgstr ""
+"このアドレス帳を開くことが出来ません. これは誤ったURI\n"
+"を入力したか, あるいは LDAP サーバが落ちているかのどちらか\n"
+"を意味します"
+
+#: addressbook/gui/component/addressbook.c:385
+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:393
+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:554
+msgid "Any field contains"
+msgstr "フィールドが次のものを含む"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr "名前が次のものを含む"
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr "メールが次のものを含む"
+
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "名前が次のものを含む"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "フォルダブラウザが表示する URI"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "主要なメール"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "メール2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "メール3"
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "ファイルを選択"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "新規コンタクトを作成します"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:859
+#, fuzzy
+msgid "Querying Addressbook..."
+msgstr "アドレス帳を編集"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr "コンタクト情報の編集"
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
+msgstr "コンタクトへ追加"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "メールアドレス:"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr "クエリを無効"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+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:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "削除"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
+msgstr "すべて削除"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+msgid "Send HTML Mail?"
+msgstr "HTML メールを送信しますか?"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "変更後のコンタクト:"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "メッセージの受信者"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "名前を選択"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "次から名前を選択:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "カテゴリ:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "検索(_S)"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "記念日(_v):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "仕事(_u)"
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "仕事の FAX(_F)"
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "コンタクト(_o)..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 #: calendar/gui/dialogs/event-page.glade.h:2
 #: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "カテゴリ(_t)..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "コンタクトエディタ"
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor.c:115
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "詳細"
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr "別名:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "一般"
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "新規電話種別"
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "ノート(_t):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "組織:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "電話種別"
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1283
-msgid "Primary Email"
-msgstr "主要なメール"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr "HTML メールを受信許可(_H)"
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "ウェブページの URL:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:94
-msgid "_Add"
-msgstr "追加(_A)"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr "住所(_A)..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "アシスタントの名前(_A):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "誕生日(_B):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "仕事(_B)"
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "会社(_C):"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "コンタクト(_C)..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:725 mail/mail-config.glade.h:95
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:108
-#: ui/evolution-task-editor-dialog.xml.h:69 ui/evolution-tasks.xml.h:9
-#: ui/evolution.xml.h:47
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "削除(_D)"
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "担当部署(_D):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "フルネーム(_F)..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "家(_H)"
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "職種(_J):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "マネージャの名前(_M):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "モバイル(_M)"
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "ニックネーム(_N):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "事務所(_O):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "専門職(_P):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "配偶者(_S):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "これは郵便物の住所です"
 
-#: addressbook/contact-editor/e-contact-editor.c:603
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "コンタクトを削除しますか?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr "このコンタクトはこれらのカテゴリに所属しています:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1241
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "アシスタント"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/contact-editor/e-contact-editor.c:1309
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "仕事"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "仕事 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "仕事の FAX"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "呼び戻し"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "車"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "会社"
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
-#: addressbook/contact-editor/e-contact-editor.c:1310
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "家"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "家 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "家の FAX"
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "モバイル"
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
-#: addressbook/contact-editor/e-contact-editor.c:1311
-#: mail/mail-config.glade.h:55
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "その他"
 
-#: addressbook/contact-editor/e-contact-editor.c:1254
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "その他の FAX"
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "ポケベル"
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "プライマリ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1257
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "ラジオ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "テレックス"
 
-#: addressbook/contact-editor/e-contact-editor.c:1259
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:724
-msgid "Email 2"
-msgstr "メール2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:725
-msgid "Email 3"
-msgstr "メール3"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "コンタクトを削除しますか?"
-
-#: addressbook/contact-editor/e-contact-quick-add.c:234
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "コンタクトの簡易追加"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:236
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 msgid "Edit Full"
 msgstr "すべて編集"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:277
-#: addressbook/gui/widgets/e-addressbook-view.c:699
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Full Name"
 msgstr "フルネーム"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:283
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "E-mail"
 msgstr "メール"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "住所 2(_2):"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "カナダ"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "住所チェック"
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "国(_y):"
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "フィンランド"
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "アメリカ"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "住所(_A):"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "市(_C):"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "私書箱(_P):"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "郵便番号(_Z):"
 
-#: addressbook/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "フルネームのチェック"
 
-#: addressbook/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dr."
 
-#: addressbook/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "Esq."
 
-#: addressbook/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-#: addressbook/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-#: addressbook/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "III"
 
-#: addressbook/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr "Jr."
 
-#: addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr "Miss"
 
-#: addressbook/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr "Mr."
 
-#: addressbook/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr "Mrs."
 
-#: addressbook/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr "Ms."
 
-#: addressbook/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr "Sr."
 
-#: addressbook/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "名(_F):"
 
-#: addressbook/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "姓(_L):"
 
-#: addressbook/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "ミドルネーム(_M):"
 
-#: addressbook/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "敬称(後つけ)(_S):"
 
-#: addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "敬称(前つけ)(_T):"
 
-#: addressbook/gui/component/addressbook.c:341
-#, c-format
-msgid "Enter password for %s"
-msgstr "%s のパスワードを入力してください"
-
-#: addressbook/gui/component/addressbook.c:369
-msgid "Unable to open addressbook"
-msgstr "アドレス帳を開くことが出来ません"
-
-#: addressbook/gui/component/addressbook.c:376
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or the LDAP server\n"
-"is down"
-msgstr ""
-"このアドレス帳を開くことが出来ません. これは誤ったURI\n"
-"を入力したか, あるいは LDAP サーバが落ちているかのどちらか\n"
-"を意味します"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#, fuzzy
+msgid "List _name:"
+msgstr "ファイル名:"
 
-#: addressbook/gui/component/addressbook.c:381
-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/contact-list-editor/contact-list-editor.glade.h:2
+#, fuzzy
+msgid "Members"
+msgstr "12 月"
 
-#: addressbook/gui/component/addressbook.c:389
-msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Type an email address or drag a contact into the list below:"
 msgstr ""
-"このアドレス帳を開くことが出来ませんでした. パスが存在し, アクセス権\n"
-"を持っているかどうかチェックしてください"
-
-#: addressbook/gui/component/addressbook.c:549 calendar/gui/gnome-cal.c:233
-msgid "Any field contains"
-msgstr "フィールドが次のものを含む"
-
-#: addressbook/gui/component/addressbook.c:550
-msgid "Name contains"
-msgstr "名前が次のものを含む"
-
-#: addressbook/gui/component/addressbook.c:551
-msgid "Email contains"
-msgstr "メールが次のものを含む"
 
-#: addressbook/gui/component/addressbook.c:697
-msgid "The URI that the Folder Browser will display"
-msgstr "フォルダブラウザが表示する URI"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "LDAP サーバ"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "ファイル"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "未知のアドレス帳種別"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-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:59
-msgid "Password"
-msgstr "パスワード"
-
-#: addressbook/gui/component/addressbook-config.c:168
-msgid "Unknown auth type"
-msgstr "未知の認証種別"
-
-#: addressbook/gui/component/addressbook-config.c:177
-msgid "Base"
-msgstr "ベースエントリ"
-
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
-msgstr "サブエントリ"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Subtree"
-msgstr "すべてのエントリ"
-
-#: addressbook/gui/component/addressbook-config.c:184
-msgid "Unknown scope type"
-msgstr "未知のスコープ種別"
-
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
-msgstr "バインドDN:"
-
-#: addressbook/gui/component/addressbook-config.c:350
-msgid "FIXME Bind DN Help text here"
-msgstr "FIXME バインド DN のヘルプテキストです"
-
-#: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:68
-msgid "Remember this password"
-msgstr "このパスワードを記憶"
-
-#: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:39
-msgid "Host:"
-msgstr "ホスト:"
-
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "FIXME Host help text here."
-msgstr "FIXME ホストヘルプテキストです"
-
-#: addressbook/gui/component/addressbook-config.c:406
-msgid "Root DN:"
-msgstr "ルート DN:"
-
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Root DN help text here."
-msgstr "FIXME ルート DN ヘルプテキストです"
-
-#: addressbook/gui/component/addressbook-config.c:411
-msgid "Port:"
-msgstr "ポート:"
-
-#: addressbook/gui/component/addressbook-config.c:412
-msgid "FIXME Port help text here."
-msgstr "FIXME ポートヘルプテキストです"
-
-#: addressbook/gui/component/addressbook-config.c:432
-msgid "Search Scope:"
-msgstr "検索範囲:"
-
-#: addressbook/gui/component/addressbook-config.c:479
-msgid "Authentication:"
-msgstr "認証方式:"
-
-#: addressbook/gui/component/addressbook-config.c:501
-msgid "Advanced LDAP Options"
-msgstr "上級 LDAP オプション"
-
-#: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:60
-msgid "Path:"
-msgstr "パス:"
-
-#: addressbook/gui/component/addressbook-config.c:523
-msgid "FIXME Path Help text here"
-msgstr "FIXME パスヘルプテキストです"
-
-#: addressbook/gui/component/addressbook-config.c:528
-msgid "Create path if it doesn't exist."
-msgstr "存在しない場合パスを作成する"
-
-#: addressbook/gui/component/addressbook-config.c:662
-msgid "Edit Addressbook"
-msgstr "アドレス帳を編集"
-
-#: addressbook/gui/component/addressbook-config.c:664
-msgid "Add Addressbook"
-msgstr "アドレス帳に追加"
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
 msgstr ""
-"あなたの持つアドレス帳を選択し, それについての関連した情報を入力してください"
-
-#: addressbook/gui/component/addressbook-config.c:688
-#: mail/mail-config.glade.h:49
-msgid "Name:"
-msgstr "名前:"
-
-#: addressbook/gui/component/addressbook-config.c:689
-msgid "FIXME Name help text here"
-msgstr "FIXME 名前ヘルプテキストです"
-
-#: addressbook/gui/component/addressbook-config.c:691
-#: 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:692
-msgid "FIXME Description help text here"
-msgstr "FIXME 説明ヘルプテキストです"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "アドレス帳のソース"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-#: addressbook/gui/widgets/e-addressbook-view.c:603
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
-#: calendar/gui/e-meeting-dialog.glade.h:8 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:27
-#: mail/message-browser.c:211 ui/evolution-addressbook.xml.h:7
-#: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:22
-#: ui/evolution-task-editor-dialog.xml.h:18 ui/evolution-tasks.xml.h:3
-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:33
-msgid "Edit"
-msgstr "編集"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "名前"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-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 "クエリを無効"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr "クエリを有効 (危険です!)"
-
-#: addressbook/gui/component/e-address-widget.c:388
-#: 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:347
-msgid "Add to Contacts"
-msgstr "コンタクトへ追加"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "アドレスをポップアップするための Bonobo コントロール"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "アドレスを表示するための Bonobo コントロール"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "アドレス帳を表示する Bonobo コントロールのサンプルです"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Evolution アドレス帳ミニカードを表示するコントロール"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution アドレス帳ミニカードビューア"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
-msgstr "コンタクトを扱うための Evolution コンポーネント"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
-msgstr "アドレス帳ミニカードコントロールのためのファクトリ"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
-msgstr "アドレス帳のアドレス表示のためのファクトリ"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
-msgstr "アドレス帳のアドレスをポップアップするためのファクトリ"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Evolution addressbook component."
-msgstr "Evolution アドレス帳コンポーネントのためのファクトリ"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the sample Addressbook control"
-msgstr "サンプルアドレス帳コントロールのためのファクトリ"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:161
-#: composer/e-msg-composer-attachment-bar.c:473 filter/filter-filter.c:401
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
-msgid "Remove"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#, fuzzy
+msgid "_Remove"
 msgstr "削除"
 
-#: 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 "検索..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "メッセージの受信者"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "名前を選択"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "contact-list-editor"
+msgstr "コンタクトエディタ"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "次から名前を選択:"
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#, fuzzy
+msgid "Contact List Editor"
+msgstr "コンタクトエディタ"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "とにかく追加"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Duplicate Contact Detected"
 msgstr "重複したコンタクトを検出しました"
 
@@ -1091,18 +1170,14 @@ msgstr ""
 "すでに存在しています．追加してもよろしいですか?"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
-msgid "Change Anyway"
-msgstr "とにかく変更"
-
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 msgid "Changed Contact:"
 msgstr "変更後のコンタクト:"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 msgid "Conflicting Contact:"
 msgstr "衝突しているコンタクト:"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:5
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
@@ -1110,8 +1185,13 @@ msgstr ""
 "変更したこのコンタクトの名前あるいはメールアドレスは\n"
 "このフォルダにすでに存在しています．追加してもよろしいですか?"
 
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+#, fuzzy
+msgid "_Change Anyway"
+msgstr "とにかく変更"
+
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:242
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "検索"
 
@@ -1225,165 +1305,241 @@ msgstr "z"
 
 #: 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:538
-#: addressbook/gui/widgets/e-addressbook-view.c:598
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "VCard で保存"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
-#: addressbook/gui/widgets/e-addressbook-view.c:599
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Send contact to other"
 msgstr "他へコンタクトを送信"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:600
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 msgid "Send message to contact"
 msgstr "コンタクト先へメッセージを送信"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
-#: addressbook/gui/widgets/e-addressbook-view.c:601 mail/message-browser.c:208
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:70 ui/evolution-tasks.xml.h:6
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "印刷"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:602
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Print Envelope"
 msgstr "表紙を印刷"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:697
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "削除"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-minicard.c:451
+msgid "Error modifying card"
+msgstr "カードを修正中にエラーが発生しました"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "ソース"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "未知のエラー"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#, fuzzy
+msgid "Repository offline"
+msgstr "オフライン作業"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr "許可がありません"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "ファイルが見つかりません"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "操作はサポートされていません"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "キャンセルしました"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "I/O エラー"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "%s のロード中にエラーが発生しました"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "カードを修正中にエラーが発生しました"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "カードを修正中にエラーが発生しました"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, fuzzy
+msgid "Error removing list"
+msgstr "カードの削除中にエラーが発生しました"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+msgid "Error removing card"
+msgstr "カードの削除中にエラーが発生しました"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* コンタクトを追加するためにここをクリック *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:698
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "File As"
 msgstr "別名"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:700
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "メール"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Primary Phone"
 msgstr "主な電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Assistant Phone"
 msgstr "補助の電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr "仕事の電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Callback Phone"
 msgstr "呼び戻しの電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Company Phone"
 msgstr "会社の電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr "家の電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "組織"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr "仕事の住所"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr "家の住所"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr "携帯電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr "車載電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr "仕事の電話 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr "家の電話 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr "その他の電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr "その他の住所"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "ウェブサイト"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "担当部署"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:728
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "事務所"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:729
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr "敬称(前つけ)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "専門職"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "マネージャ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "ニックネーム"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr "配偶者"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "ノート"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
 msgid "Done."
 msgstr "完了"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
-msgid "Error removing card"
-msgstr "カードの削除中にエラーが発生しました"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1111
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
 msgid "Removing cards..."
 msgstr "カードを削除中..."
 
-#: addressbook/gui/widgets/e-minicard.c:436
-msgid "Error modifying card"
-msgstr "カードを修正中にエラーが発生しました"
-
 #: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "アドレス帳に保存"
@@ -1431,7 +1587,8 @@ msgid "Dimensions:"
 msgstr "寸法:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "フォント..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1491,7 +1648,6 @@ msgid "Margins"
 msgstr "マージン"
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "列数:"
 
@@ -1571,39 +1727,64 @@ msgstr "種別:"
 msgid "Width:"
 msgstr "幅:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "フォント..."
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "カレンダサーバで通信中にエラーが発生しました"
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 "パイロットのカレンダアプリケーションブロックを読み込むことが出来ませんでした"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 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/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "カレンダを表示する Bonobo コントロールのサンプル"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "アラーム停止"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "Evolution calendar executive summary component."
+msgstr "Evolution カレンダ実行サマリコンポーネント"
 
-#. 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/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Evolution カレンダ iTip/iMip ビューア"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr "カレンダを扱うための Evolution コンポーネント"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Calendar Summary component."
+msgstr "カレンダサマリーコンポーネントのためのファクトリ"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the Evolution calendar component."
+msgstr "Evolution カレンダコンポーネントのためのファクトリ"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
+msgstr "カレンダ iTip ビューコントロールのためのファクトリ"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr "サンプルカレンダコントロールのファクトリ"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Evolution カレンダコンポーネントのためのファクトリ"
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
@@ -1613,141 +1794,255 @@ msgstr "アラーム通知サービス"
 msgid "Factory for the alarm notification service"
 msgstr "アラーム通知サービスのためのファクトリ"
 
-#: calendar/gui/alarm-notify/notify-main.c:56
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr "%Y/%b/%d %A %H:%M のあなたの約束について通知"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr "%Y/%b/%d %A %H:%M のあなたの約束について通知"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, fuzzy, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr "%Y/%b/%d %A %H:%M のあなたの約束について通知"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#, fuzzy
+msgid "Notification about your appointment"
+msgstr "%Y/%b/%d %A %H:%M のあなたの約束について通知"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr "%Y/%b/%d %A %H:%M のあなたの約束について通知"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s"
+msgstr "%Y/%b/%d %A %H:%M のあなたの約束について通知"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, fuzzy, c-format
+msgid "Notification about your task ending on %s"
+msgstr "%Y/%b/%d %A %H:%M のあなたの約束について通知"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#, fuzzy
+msgid "Notification about your task"
+msgstr "Evolution についての情報を表示します"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr "%Y/%b/%d %A %H:%M にアラーム"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "閉じる"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "アラーム停止"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr "アラーム停止時間 (分)"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "約束の編集"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+#, fuzzy
+msgid "No description available."
+msgstr "利用できるサマリーはありません"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr "約束の催促"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr "アラーム停止"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "Ok"
+
+#: calendar/gui/alarm-notify/notify-main.c:58
 #, 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
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
 msgid "Could not initialize GNOME"
 msgstr "GNOME の初期化が出来ませんでした"
 
-#: calendar/gui/alarm-notify/notify-main.c:108
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Bonobo の初期化が出来ませんでした"
+
+#: calendar/gui/alarm-notify/notify-main.c:115
 msgid "Could not create the alarm notify service factory"
 msgstr "アラーム通知サービスファクトリを作成出来ませんでした"
 
-#: calendar/gui/calendar-commands.c:266
-msgid "File not found"
-msgstr "ファイルが見つかりません"
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%Y/%B/%e %A"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%b/%d (%a)"
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%b/%d (%a)"
 
-#: calendar/gui/calendar-commands.c:290
-msgid "Open calendar"
-msgstr "カレンダを開く"
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:332
-msgid "Save calendar"
-msgstr "カレンダを保存"
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%Y %B"
 
-#: calendar/gui/calendar-commands.c:468
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "カレンダビューを作成出来ませんでした. ORBitとOAFの設定をチェックしてください"
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:898
-#: calendar/gui/e-calendar-table.c:323
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "一般"
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:900
-#: calendar/gui/e-calendar-table.c:324
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "私的"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:902
-#: calendar/gui/e-calendar-table.c:325
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "極秘"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/dialogs/alarm-page.c:320
-#: calendar/gui/dialogs/alarm-page.c:356
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "未知"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "北"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "南"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "東"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "西"
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1066
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
 #: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:345 mail/message-list.c:696
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "高い"
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1068
-#: calendar/gui/calendar-model.c:1574
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
 #: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:346 mail/message-list.c:695
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "普通"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1070
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:347 mail/message-list.c:694
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "低い"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1122
-#: calendar/gui/e-calendar-table.c:399
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "透明"
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1124
-#: calendar/gui/e-calendar-table.c:398
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "不透明"
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1176
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
 #: calendar/gui/dialogs/task-page.glade.h:12
-#: calendar/gui/e-calendar-table.c:419
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "開始していない"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1178
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
 #: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:420
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "処理中"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1180
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
 #: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "完了しました"
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1182
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
 #: calendar/gui/dialogs/task-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:422 camel/camel-service.c:544
+#: calendar/gui/e-calendar-table.c:406 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:794 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 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:797 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 
-#: calendar/gui/calendar-model.c:802
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1758,24 +2053,28 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:882
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
 "分類を '一般', '私的', '極秘' あるいは 'なし' を選択しなければなりません"
 
 #. An empty string is the same as 'None'.
-#: 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:997
-#: mail/mail-accounts.c:123 mail/mail-accounts.c:174
-#: mail/mail-config.glade.h:52 shell/e-shell-view.c:1394
-#: 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
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "ノート"
 
-#: calendar/gui/calendar-model.c:970
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1785,227 +2084,257 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1010
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "パーセント値は 0 と 100 の間で含んでいなければなりません"
 
-#: calendar/gui/calendar-model.c:1051
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 "優先度を '高い', '普通', '低い' あるいは '未定義' を選択しなければなりません"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1064
+#: calendar/gui/calendar-model.c:1181
 #: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:348
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "未定義"
 
-#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr "透明度は '透明', '不透明', あるいは 'なし' でなければなりません"
 
-#: calendar/gui/calendar-model.c:1576
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr "再発"
 
-#: calendar/gui/calendar-model.c:1578
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "割当て済み"
 
-#: calendar/gui/calendar-model.c:1584
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "はい"
 
-#: calendar/gui/calendar-model.c:1584
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "いいえ"
 
-#: calendar/gui/calendar-summary.c:198
-msgid "%A, %e %B %Y"
-msgstr "%Y/%B/%e %A"
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "Day View"
+msgstr "名刺表示"
 
-#: calendar/gui/calendar-summary.c:207
-msgid "Appointments"
-msgstr "約束"
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "Work Week View"
+msgstr "週間労働時間(_o)"
 
-#: calendar/gui/calendar-summary.c:245 calendar/gui/calendar-summary.c:251
-msgid "%I:%M%p"
-msgstr "%p %I:%M"
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "Week View"
+msgstr "表示を定義"
 
-#: calendar/gui/calendar-summary.c:275 calendar/gui/print.c:1844
-#: views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "タスク"
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "月"
 
-#: calendar/gui/calendar-summary.c:443
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>カレンダをロード中にエラー</b>"
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
+msgstr "カレンダが表示する URI"
 
-#: calendar/gui/calendar-summary.c:455
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>カレンダをロード中にエラー:<br>メソッドはサポートしていません"
+#: calendar/gui/dialogs/alarm-options.c:354
+#, fuzzy
+msgid "Audio Alarm Options"
+msgstr "オーディオアラーム"
 
-#: calendar/gui/calendar-summary.c:622 mail/mail-config.glade.h:29
-msgid "Display"
-msgstr "表示"
+#: calendar/gui/dialogs/alarm-options.c:363
+#, fuzzy
+msgid "Message Alarm Options"
+msgstr "メッセージの受信者"
 
-#: calendar/gui/calendar-summary.c:627
-msgid "Show appointments"
-msgstr "約束の表示"
+#: calendar/gui/dialogs/alarm-options.c:372
+#, fuzzy
+msgid "Mail Alarm Options"
+msgstr "表示オプション"
 
-#: calendar/gui/calendar-summary.c:635
-msgid "Show tasks"
-msgstr "タスクの表示"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:690
-msgid "Things to do"
-msgstr "TODOの状況"
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:721 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "カレンダをロード中"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr ""
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "カレンダが表示する URI"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+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 にアラーム"
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "メッセージ表示(_M)"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "%Y/%b/%d %A %H:%M のあなたの約束について通知"
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Play sound:"
+msgstr "次の時に音楽を再生する:"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
-msgstr "利用できるサマリーはありません"
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+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:5
-msgid "Close"
-msgstr "閉じる"
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "Run program:"
+msgstr "次の時にプログラムを実行する:"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "約束の編集"
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "アラーム停止時間 (分)"
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
+msgstr "日"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+#, fuzzy
+msgid "extra times every"
+msgstr "すべて更新 "
+
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr "時"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr "分"
 
-#: calendar/gui/dialogs/alarm-page.c:255
+#: calendar/gui/dialogs/alarm-page.c:284
 #, c-format
 msgid "%d days"
 msgstr "%d 日"
 
-#: calendar/gui/dialogs/alarm-page.c:257
+#: calendar/gui/dialogs/alarm-page.c:286
 msgid "1 day"
 msgstr "1 日"
 
-#: calendar/gui/dialogs/alarm-page.c:260
+#: calendar/gui/dialogs/alarm-page.c:289
 #, c-format
 msgid "%d weeks"
 msgstr "%d 週間"
 
-#: calendar/gui/dialogs/alarm-page.c:262
+#: calendar/gui/dialogs/alarm-page.c:291
 msgid "1 week"
 msgstr "1 週間"
 
-#: calendar/gui/dialogs/alarm-page.c:265
+#: calendar/gui/dialogs/alarm-page.c:294
 #, c-format
 msgid "%d hours"
 msgstr "%d 時間"
 
-#: calendar/gui/dialogs/alarm-page.c:267
+#: calendar/gui/dialogs/alarm-page.c:296
 msgid "1 hour"
 msgstr "1 時間"
 
-#: calendar/gui/dialogs/alarm-page.c:270
+#: calendar/gui/dialogs/alarm-page.c:299
 #, c-format
 msgid "%d minutes"
 msgstr "%d 分"
 
-#: calendar/gui/dialogs/alarm-page.c:272
+#: calendar/gui/dialogs/alarm-page.c:301
 msgid "1 minute"
 msgstr "1 分"
 
-#: calendar/gui/dialogs/alarm-page.c:275
+#: calendar/gui/dialogs/alarm-page.c:304
 #, c-format
 msgid "%d seconds"
 msgstr "%d 秒"
 
-#: calendar/gui/dialogs/alarm-page.c:277
+#: calendar/gui/dialogs/alarm-page.c:306
 msgid "1 second"
 msgstr "1 秒"
 
-#: calendar/gui/dialogs/alarm-page.c:302
-#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "次の時に音楽を再生する:"
 
-#: calendar/gui/dialogs/alarm-page.c:306
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "Show a dialog"
-msgstr "次の時にダイアログを表示する:"
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "次のメッセージを表示します"
 
-#: calendar/gui/dialogs/alarm-page.c:310
-#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
 msgid "Send an email"
 msgstr "次の時にメールを送信する:"
 
-#: calendar/gui/dialogs/alarm-page.c:314
-#: calendar/gui/dialogs/alarm-page.glade.h:7
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "次の時にプログラムを実行する:"
 
-#: calendar/gui/dialogs/alarm-page.c:332
-msgid " before start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
 msgstr "最初の約束の前"
 
-#: calendar/gui/dialogs/alarm-page.c:335
-msgid " after start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
 msgstr "最初の約束の後"
 
-#: calendar/gui/dialogs/alarm-page.c:345
-msgid " before end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
 msgstr "最後の約束の前"
 
-#: calendar/gui/dialogs/alarm-page.c:348
-msgid " after end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
 msgstr "最後の約束の後"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
 #: calendar/gui/dialogs/task-details-page.glade.h:1
 msgid "Basics"
 msgstr "基本"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
 #: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
 msgid "Date/Time:"
 msgstr "日付/時間:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Reminders"
 msgstr "催促状"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
-msgstr "設定..."
-
-#: calendar/gui/dialogs/alarm-page.glade.h:11
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "サマリ:"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "オプション(_O)"
+
 #. Automatically generated. Do not edit.
 #: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
 msgid "after"
@@ -2028,7 +2357,7 @@ msgstr "約束の最後が経過"
 msgid "hour(s)"
 msgstr "時"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:97
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
 msgid "minute(s)"
 msgstr "分"
 
@@ -2065,36 +2394,38 @@ msgid "60 minutes"
 msgstr "60 分"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "指定時間後にアラームがタイムアウト"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "オーディオアラーム"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Beep when alarm windows appear."
 msgstr "アラームウィンドウが現れた時 BEEP 音を鳴らす"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 msgid "Calendar"
 msgstr "カレンダ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Calendar Preferences"
 msgstr "カレンダの設定"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "Color for overdue tasks"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Color for tasks due today"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "カラー"
+msgid "Colors for Tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+#, fuzzy
+msgid "Compress weekends in month view"
 msgstr "週末を表示しない"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+#, fuzzy
+msgid "Date Navigator"
 msgstr "日付操作オプション"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -2102,179 +2433,284 @@ msgid "Defaults"
 msgstr "デフォルト"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "表示オプション"
+#: mail/mail-config.glade.h:30
+msgid "Display"
+msgstr "表示"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:155
-msgid "Due Date"
-msgstr "期日"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "アラーム停止を有効"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "一日の終わり:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "週の始め:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "金"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:918
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "金曜日"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "強調"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "今日が期限のアイテム"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "今日が期限のアイテム:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "まだ期限ではないアイテム"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "まだ期限ではないアイテム:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "月"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:914
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "月曜日"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "期限を過ぎたアイテム"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "期限を過ぎたアイテム:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:61
-msgid "Pick a color"
-msgstr "カラーを選択"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:158
-msgid "Priority"
-msgstr "優先度"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#, fuzzy
+msgid "Overdue tasks"
+msgstr "期限を過ぎたアイテム"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "すべての約束を催促する"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "土"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/dialogs/recurrence-page.c:919
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "土曜日"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "表示"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#, fuzzy
+msgid "Show appointment end times in week and month views"
 msgstr "約束の終了時間を表示"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr "週番号を表示"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "一日の始まり:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr "日"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/dialogs/recurrence-page.c:920
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "日曜日"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "タスクパッド"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "Task List"
+msgstr "タスク"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "Tasks due today"
+msgstr "今日が期限のアイテム"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "木"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:917
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "木曜日"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "期限までの時間"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "Time"
+msgstr "敬称(前つけ)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr "時分割:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr "時間の書式:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Time zone:"
+msgstr ""
+"\n"
+"タイムゾーン: "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "火"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/dialogs/recurrence-page.c:915
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "火曜日"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "視覚アラーム"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "水"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/dialogs/recurrence-page.c:916
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "水曜日"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "週間労働時間"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Work Week"
+msgstr "週間労働時間(_o)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr "分前"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:99
-msgid "seconds."
-msgstr " 秒"
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:58
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "本当にこのアカウントを削除してもよろしいですか?"
+
+#: calendar/gui/dialogs/cancel-comp.c:63
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "本当に %d 個のタスクを削除してもよろしいですか?"
+
+#: calendar/gui/dialogs/cancel-comp.c:68
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "本当に仕訳記入 `%s' を削除してもよろしいですか?"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#, fuzzy
+msgid " (Completed "
+msgstr "完了しました"
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#, fuzzy
+msgid "Completed "
+msgstr "完了しました"
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+#, fuzzy
+msgid "Due "
+msgstr "期日"
+
+#: calendar/gui/dialogs/comp-editor.c:449
+#, fuzzy
+msgid "Edit Appointment"
+msgstr "約束の編集"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, fuzzy, c-format
+msgid "Appointment - %s"
+msgstr "約束"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, fuzzy, c-format
+msgid "Task - %s"
+msgstr "タスク"
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, fuzzy, c-format
+msgid "Journal entry - %s"
+msgstr "仕訳記入(_J) (FIXME)"
+
+#: calendar/gui/dialogs/comp-editor.c:474
+#, fuzzy
+msgid "No summary"
+msgstr "サマリー"
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "ファイルを上書きしますか?"
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"その名前のファイルはすでに存在します\n"
+"上書きしますか?"
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "別名で保存..."
+
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
 
 #: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
@@ -2318,25 +2754,55 @@ msgstr "本当に %d 個のタスクを削除してもよろしいですか?"
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "本当に %d 個の仕訳記入を削除してもよろしいですか?"
 
-#: calendar/gui/dialogs/event-editor.c:112
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "ファイルを選択"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "セクション:"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"タイムゾーン: "
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
+#: calendar/gui/dialogs/event-editor.c:154
 msgid "Appointment"
 msgstr "約束"
 
-#: calendar/gui/dialogs/event-editor.c:117
+#: calendar/gui/dialogs/event-editor.c:159
 msgid "Reminder"
 msgstr "催促状"
 
-#: calendar/gui/dialogs/event-editor.c:122
+#: calendar/gui/dialogs/event-editor.c:164
 msgid "Recurrence"
 msgstr "再発"
 
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+#, fuzzy
+msgid "Meeting"
+msgstr "打合せをキャンセル"
+
 #: calendar/gui/dialogs/event-page.glade.h:1
 msgid "A_ll day event"
 msgstr "毎日のイベント(_l)"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
 #: calendar/gui/dialogs/task-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:151
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "分類"
 
@@ -2365,11 +2831,6 @@ msgstr "サマリー(_m):"
 msgid "_Confidential"
 msgstr "機密(_C)"
 
-#: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:20
-msgid "_Contacts..."
-msgstr "コンタクト(_C)..."
-
 #: calendar/gui/dialogs/event-page.glade.h:10
 msgid "_End time:"
 msgstr "終了時間(_E):"
@@ -2378,38 +2839,271 @@ msgstr "終了時間(_E):"
 msgid "_Start time:"
 msgstr "開始時間(_S):"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "グループ名:"
+
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "再発"
+
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+msgid "Chair"
+msgstr "議長"
+
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+msgid "Required Participant"
+msgstr "参加者が必要"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
+msgstr "任意参加者"
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr "不参加者"
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "動作を追加"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+#, fuzzy
+msgid "Accepted"
+msgstr " 受諾 "
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr " 辞退 "
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "暫定"
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "削除"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "処理中"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "車載電話"
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "参加者が必要"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "任意参加者"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Non-Participants"
+msgstr "不参加者"
+
+#: calendar/gui/dialogs/meeting-page.c:891
+#, fuzzy
+msgid "Sent By:"
+msgstr "送信済"
+
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "削除..."
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+msgid "Attendee"
+msgstr "出席者"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#, fuzzy
+msgid "Common Name"
+msgstr "完了日"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "削除"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "削除"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "マネージャ"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#, fuzzy
+msgid "Member"
+msgstr "12 月"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+msgid "Role"
+msgstr "役割"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "ステータス"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "種別"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "主催者:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "主催者:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "他の招待(_I)..."
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "主催者:"
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr "%Y/%b/%d (%a)"
+
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "この約束は Evolution が編集出来ない再発を含んでいます"
+
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr "日"
+
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
+msgstr "出来事"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Custom recurrence"
 msgstr "再発のカスタマイズ"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "Exceptions"
 msgstr "例外"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-msgid "Modify"
-msgstr "修正"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
 msgid "No recurrence"
 msgstr "再発なし"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Preview"
 msgstr "プレビュー"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "Recurrence Rule"
 msgstr "再発ルール"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "Simple recurrence"
 msgstr "シンプルな再発"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "修正"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr ""
@@ -2438,48 +3132,47 @@ msgstr "週"
 msgid "year(s)"
 msgstr "年"
 
-#: calendar/gui/dialogs/recurrence-page.c:398 calendar/gui/print.c:1975
-#: calendar/gui/print.c:1977 calendar/gui/print.c:1978
-msgid "%a %b %d %Y"
-msgstr "%Y/%b/%d (%a)"
-
-#: calendar/gui/dialogs/recurrence-page.c:544
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "この約束は Evolution が編集出来ない再発を含んでいます"
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr "変更を保存したいですか?"
 
-#: calendar/gui/dialogs/recurrence-page.c:887
-msgid "on"
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:913 filter/filter-datespec.c:81
-msgid "day"
-msgstr "日"
-
-#: calendar/gui/dialogs/recurrence-page.c:1043
-msgid "on the"
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1051
-msgid "th"
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1215
-msgid "occurrences"
-msgstr "出来事"
-
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "変更を保存したいですか?"
-
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 msgid "Date Completed:"
 msgstr "完了日:"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "削除"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
+msgstr "削除"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "ノート"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor.c:110
+#: calendar/gui/dialogs/task-editor.c:130
 msgid "Task"
 msgstr "タスク"
 
@@ -2508,273 +3201,323 @@ msgstr "優先度(_P):"
 msgid "_Status:"
 msgstr "ステータス(_S):"
 
-#: calendar/gui/e-calendar-table.c:150
-msgid "Categories"
-msgstr "カテゴリ"
-
-#: calendar/gui/e-calendar-table.c:152
-msgid "Completion Date"
-msgstr "完了日"
-
-#: calendar/gui/e-calendar-table.c:153
-msgid "End Date"
-msgstr "終了日"
-
-#: calendar/gui/e-calendar-table.c:154
-msgid "Start Date"
-msgstr "開始日"
-
-#: calendar/gui/e-calendar-table.c:156
-msgid "Geographical Position"
-msgstr "緯度経度"
-
-#: calendar/gui/e-calendar-table.c:157
-msgid "Percent complete"
-msgstr "パーセント完了"
-
-#: calendar/gui/e-calendar-table.c:159
-msgid "Summary"
-msgstr "サマリー"
-
-#: calendar/gui/e-calendar-table.c:160
-msgid "Transparency"
-msgstr "透明度"
-
-#: calendar/gui/e-calendar-table.c:161
-msgid "URL"
-msgstr "URL"
-
-#: calendar/gui/e-calendar-table.c:162
-msgid "Alarms"
-msgstr "アラーム"
-
-#: calendar/gui/e-calendar-table.c:163
-msgid "Click here to add a task"
-msgstr "タスクを追加するためにここをクリック"
-
-#: calendar/gui/e-calendar-table.c:367
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:368
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:369
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:370
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:371
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:372
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:373
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:737
-msgid "Edit this task"
-msgstr "このタスクを編集します"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "開く(_O)"
 
-#: calendar/gui/e-calendar-table.c:739
-msgid "Mark as complete"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "切り取り(_u)"
+
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "コピー(_C)"
+
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "貼り付け(_P)"
+
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
 msgstr "完了をマークします"
 
-#: calendar/gui/e-calendar-table.c:740
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "このタスクを削除します"
 
-#: calendar/gui/e-calendar-table.c:745
-msgid "Mark tasks as complete"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
 msgstr "完了したタスクをマークします"
 
-#: calendar/gui/e-calendar-table.c:746 ui/evolution-tasks.xml.h:4
-msgid "Delete selected tasks"
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "選択したタスクを削除します"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:284
-#: calendar/gui/print.c:782
-msgid "am"
-msgstr "午前"
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
+msgstr "タスクを追加するためにここをクリック"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:287
-#: calendar/gui/print.c:784
-msgid "pm"
-msgstr "午後"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% 完了(_l):"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "アラーム"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "カテゴリ"
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+msgid "Complete"
+msgstr "完了しました"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr "完了日"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr "期日"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "終了日"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "緯度経度"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "優先度"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "開始日"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "サマリー"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "タスク"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
+msgstr "透明度"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
+
+#: calendar/gui/e-day-view-time-item.c:519
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i 分分割"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1275
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1599
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%B %d %A"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1289
-#: calendar/gui/e-week-view-main-item.c:334
-msgid "%a %d %b"
-msgstr "%b/%d (%a)"
-
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1302
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%b/%d"
 
-#: calendar/gui/e-day-view.c:3129 ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
+msgstr "午前"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
+msgstr "午後"
+
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "新規約束"
 
-#: calendar/gui/e-day-view.c:3131 calendar/gui/e-week-view.c:2968
-msgid "New All Day Event"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
 msgstr "新規毎日のイベント"
 
-#: calendar/gui/e-day-view.c:3136 calendar/gui/e-week-view.c:2973
-msgid "Go to Today"
-msgstr "今日へ移動"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "今日へ移動(_T)"
 
-#: calendar/gui/e-day-view.c:3138 calendar/gui/e-week-view.c:2975
-msgid "Go to Date..."
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
 msgstr "指定日へ移動..."
 
-#: calendar/gui/e-day-view.c:3145 calendar/gui/e-week-view.c:2981
-#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:12
-msgid "Open"
-msgstr "開く"
-
-#: calendar/gui/e-day-view.c:3147 calendar/gui/e-week-view.c:2983
-msgid "Delete this Appointment"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "この約束を削除"
 
-#: calendar/gui/e-day-view.c:3149 calendar/gui/e-week-view.c:2985
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "打合せのスケジュール"
-
-#: calendar/gui/e-day-view.c:3158 calendar/gui/e-week-view.c:2998
-msgid "Make this Occurrence Movable"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
 msgstr "この出来事を可動にする"
 
-#: calendar/gui/e-day-view.c:3160 calendar/gui/e-week-view.c:3000
-msgid "Delete this Occurrence"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
 msgstr "この出来事を削除"
 
-#: calendar/gui/e-day-view.c:3162
-msgid "Delete all Occurrences"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+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:694
+msgid "This is an event that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:163
-msgid "I couldn't update your calendar file!\n"
-msgstr "カレンダファイルを更新出来ませんでした!\n"
+#: calendar/gui/e-itip-control.c:697
+#, fuzzy
+msgid "This is a meeting request."
+msgstr "これは郵便物の住所です"
 
-#: calendar/gui/e-itip-control.c:169 calendar/gui/e-itip-control.c:512
-msgid "Component successfully updated."
-msgstr "コンポーネントは正しく更新されました"
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:175
-msgid "There was an error loading the calendar file."
-msgstr "カレンダファイルを読み込み中にエラーが発生しました"
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:199
-msgid "I couldn't open your calendar file!\n"
-msgstr "カレンダファイルを開くことが出来ませんでした!\n"
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
+#, fuzzy
+msgid "The message is not understandable."
+msgstr "このメッセージは現在利用出来ません"
 
-#: calendar/gui/e-itip-control.c:460 calendar/gui/e-itip-control.c:531
-msgid "I couldn't load your calendar file!\n"
-msgstr "カレンダファイルをロードすることが出来ませんでした!\n"
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:472
-msgid "I couldn't read your calendar file!\n"
-msgstr "カレンダファイルを読み込むことが出来ませんでした!\n"
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:485
-msgid "This is a reply from someone who was uninvited!"
-msgstr "これは招かざる誰かからの返事です!"
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:501
-msgid "I couldn't update your calendar store."
-msgstr "保存したカレンダを更新出来ませんでした"
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:542
-msgid "I couldn't delete the calendar component!\n"
-msgstr "カレンダコンポーネントを削除出来ませんでした!\n"
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:552
-msgid "Component successfully deleted."
-msgstr "コンポーネントは正しく削除されました"
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:696
-msgid "I don't recognize this type of calendar component."
-msgstr "このカレンダコンポーネントの種別は認識しません"
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:782
-msgid "Add to Calendar"
-msgstr "カレンダの追加"
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:816
-msgid " Accept "
-msgstr " 受諾 "
+#: calendar/gui/e-itip-control.c:834
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "フォルダで回復不能なエラーが発生したようです"
 
-#: calendar/gui/e-itip-control.c:817
-msgid " Decline "
-msgstr " 辞退 "
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:818
-msgid " Tentative "
-msgstr " 暫定 "
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:862
-msgid "Update Calendar"
-msgstr "カレンダを更新"
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr "カレンダファイルを更新出来ませんでした!\n"
 
-#: calendar/gui/e-itip-control.c:885
-msgid "Cancel Meeting"
-msgstr "打合せをキャンセル"
+#: calendar/gui/e-itip-control.c:1015
+#, fuzzy
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr "カレンダファイルを開くことが出来ませんでした!\n"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -2793,14 +3536,14 @@ msgstr "カレンダメッセージ"
 msgid "Date:"
 msgstr "日付:"
 
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr "カレンダをロード中"
+
 #: calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "カレンダをロード中..."
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "主催者:"
-
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "サーバメッセージ:"
@@ -2813,178 +3556,48 @@ msgstr "終了日"
 msgid "date-start"
 msgstr "開始日"
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
-msgstr "出席者"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
-msgstr "出席者の住所"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
-msgstr "出席者: "
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr ""
-"キャンセル\n"
-"打合せ"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
-msgstr "議長"
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
-msgstr "打合せの案内"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr "不参加者"
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr "任意参加者"
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
-msgstr "主催者:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:14
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-"発表\n"
-"イベント"
-
-#: calendar/gui/e-meeting-dialog.glade.h:16
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid ""
-"Request\n"
-"Meeting"
-msgstr ""
-"要求\n"
-"打合せ"
-
-#: calendar/gui/e-meeting-dialog.glade.h:19
-msgid "Required Participant"
-msgstr "参加者が必要"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Role"
-msgstr "役割"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid ""
-"Schedule\n"
-"Time"
-msgstr ""
-"スケジュール\n"
-"時間"
-
-#: calendar/gui/e-meeting-dialog.glade.h:23 filter/libfilter-i18n.h:49
-msgid "Status"
-msgstr "ステータス"
-
-#: calendar/gui/e-tasks.c:181 calendar/gui/e-tasks.c:525
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr "すべて"
 
-#: calendar/gui/e-tasks.c:187
+#: calendar/gui/e-tasks.c:252
 msgid "Category:"
 msgstr "カテゴリ:"
 
-#: calendar/gui/e-tasks.c:333
+#: calendar/gui/e-tasks.c:403
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "'%s' のタスクを読み込むことが出来ませんでした"
 
-#: calendar/gui/e-tasks.c:345
+#: calendar/gui/e-tasks.c:415
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "'%s' を読み込むことを要求されるメソッドはサポートしていません"
 
-#: calendar/gui/e-week-view.c:2966 calendar/gui/e-week-view.c:2989
-msgid "New Appointment..."
-msgstr "新規約束..."
-
-#: calendar/gui/e-week-view.c:3002
-msgid "Delete All Occurrences"
-msgstr "すべての出来事を削除"
-
 #. 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 calendar/gui/print.c:1583
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%B %d"
 
-#: calendar/gui/gnome-cal.c:234
-msgid "Summary contains"
-msgstr "サマリが次のものを含む"
-
-#: calendar/gui/gnome-cal.c:235
-msgid "Description contains"
-msgstr "説明が次のものを含む"
-
-#: calendar/gui/gnome-cal.c:236
-msgid "Comment contains"
-msgstr "コメントが次のものを含む"
-
-#: calendar/gui/gnome-cal.c:237
-msgid "Has category"
-msgstr "次のカテゴリを持つ"
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
+msgstr "新規約束..."
 
-#: calendar/gui/gnome-cal.c:840
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s' のフォルダを開くことが出来ませんでした"
 
-#: calendar/gui/gnome-cal.c:851
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 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."
-msgstr "カレンダを表示する Bonobo コントロールのサンプル"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
-msgstr "Evolution カレンダ実行サマリコンポーネント"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolution カレンダ iTip/iMip ビューア"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr "カレンダを扱うための Evolution コンポーネント"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
-msgstr "カレンダサマリーコンポーネントのためのファクトリ"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
-msgstr "Evolution カレンダコンポーネントのためのファクトリ"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
-msgstr "カレンダ iTip ビューコントロールのためのファクトリ"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
-msgstr "サンプルカレンダコントロールのファクトリ"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "4 月"
@@ -3006,231 +3619,256 @@ msgid "Go To Date"
 msgstr "日にちに移動"
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "今日へ移動"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "1 月"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "7 月"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "6 月"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "3 月"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "5 月"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "11 月"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "10 月"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "9 月"
 
-#: calendar/gui/print.c:448
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "今日へ移動"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1 日"
 
-#: calendar/gui/print.c:448
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2 日"
 
-#: calendar/gui/print.c:448
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3 日"
 
-#: calendar/gui/print.c:448
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4 日"
 
-#: calendar/gui/print.c:448
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5 日"
 
-#: calendar/gui/print.c:449
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6 日"
 
-#: calendar/gui/print.c:449
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7 日"
 
-#: calendar/gui/print.c:449
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8 日"
 
-#: calendar/gui/print.c:449
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9 日"
 
-#: calendar/gui/print.c:449
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10 日"
 
-#: calendar/gui/print.c:450
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11 日"
 
-#: calendar/gui/print.c:450
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12 日"
 
-#: calendar/gui/print.c:450
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13 日"
 
-#: calendar/gui/print.c:450
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14 日"
 
-#: calendar/gui/print.c:450
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15 日"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16 日"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17 日"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18 日"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19 日"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20 日"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21 日"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22 日"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23 日"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24 日"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25 日"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26 日"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27 日"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28 日"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29 日"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30 日"
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31 日"
 
-#: calendar/gui/print.c:513
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "日"
 
-#: calendar/gui/print.c:513
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "月"
 
-#: calendar/gui/print.c:513
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "火"
 
-#: calendar/gui/print.c:513
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "水"
 
-#: calendar/gui/print.c:514
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "木"
 
-#: calendar/gui/print.c:514
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "金"
 
-#: calendar/gui/print.c:514
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "土"
 
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "タスク"
+
 #. Day
-#: calendar/gui/print.c:1951
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "今日の日付 [%Y/%b/%d (%a)]"
 
-#: calendar/gui/print.c:1970 calendar/gui/print.c:1974
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%b/%d (%a)"
 
-#: calendar/gui/print.c:1971
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%Y/%d (%a)"
 
-#: calendar/gui/print.c:1982
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "今週 (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1990
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "今月 (%Y/%b)"
 
 #. Year
-#: calendar/gui/print.c:1997
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "今年 (%Y)"
 
-#: calendar/gui/print.c:2212
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "カレンダの印刷"
 
-#: calendar/gui/print.c:2299 mail/mail-callbacks.c:1487
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:24
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "印刷プレビュー"
 
-#: calendar/gui/tasks-control.c:112
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "このアイテムを印刷"
+
+#: calendar/gui/print.c:2398
+msgid "Print Setup"
+msgstr "プリンタの設定"
+
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "タスクフォルダが表示する URI"
 
@@ -3239,8 +3877,8 @@ msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
 msgstr ""
-"Evolution はカレンダフォルダのタスクを取得し, 自動的に新しいタスクフォルダへ"
-"移動します"
+"Evolution はカレンダフォルダのタスクを取得し, "
+"自動的に新しいタスクフォルダへ移動します"
 
 #: calendar/gui/tasks-migrate.c:109
 msgid ""
@@ -3249,10 +3887,10 @@ msgid ""
 "Some of the tasks could not be migrated, so this process may be attempted "
 "again in the future."
 msgstr ""
-"Evolution はカレンダフォルダのタスクを取得し, 新しいタスクフォルダへ移動しよ"
-"うとしました\n"
-"しかし, いくつかのタスクは移動することが出来ませんでした, ですのでこのプロセ"
-"スはこの後再び試されるでしょう"
+"Evolution はカレンダフォルダのタスクを取得し, "
+"新しいタスクフォルダへ移動しようとしました\n"
+"しかし, いくつかのタスクは移動することが出来ませんでした, "
+"ですのでこのプロセスはこの後再び試されるでしょう"
 
 #: calendar/gui/tasks-migrate.c:121
 #, c-format
@@ -3260,8 +3898,8 @@ msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
 msgstr ""
-"`%s' を開くことが出来ませんでした; カレンダフォルダからタスクフォルダへ移動す"
-"るアイテムがありません"
+"`%s' を開くことが出来ませんでした; "
+"カレンダフォルダからタスクフォルダへ移動するアイテムがありません"
 
 #: calendar/gui/tasks-migrate.c:134
 #, c-format
@@ -3269,103 +3907,13 @@ msgid ""
 "The method required to load `%s' is not supported; no items from the "
 "calendar folder will be migrated to the tasks folder."
 msgstr ""
-"`%s' を読み込む要求を上げたメソッドはサポートしていません; カレンダフォルダか"
-"らタスクフォルダへ移動するアイテムがありません"
+"`%s' を読み込む要求を上げたメソッドはサポートしていません; "
+"カレンダフォルダからタスクフォルダへ移動するアイテムがありません"
 
 #: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
 msgid "SMTWTFS"
 msgstr "SMTWTFS"
 
-#: 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 "サインはこの暗号をサポートしていません"
@@ -3386,65 +3934,80 @@ msgstr "符号化はこの暗号をサポートしていません"
 msgid "Decryption is not supported by this cipher"
 msgstr "復号化はこの暗号をサポートしていません"
 
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
 #: camel/camel-disco-store.c:305
 msgid "You must be working online to complete this operation"
 msgstr "この動作を完了するためにオンラインで作業しなければなりません"
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 msgid "Syncing folders"
 msgstr "フォルダを同期中"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:644
 msgid "Unable to open spool folder"
 msgstr "スプールフォルダを開くことが出来ません"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:653
 msgid "Unable to process spool folder"
 msgstr "スプールフォルダを処理することが出来ません"
 
-#: camel/camel-filter-driver.c:666
-#, c-format
+#: camel/camel-filter-driver.c:667
 msgid "Getting message %d (%d%%)"
 msgstr "メッセージ %d を取得中 (%d%%)"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:680
-#, c-format
-msgid "Failed message %d"
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#, fuzzy, c-format
+msgid "Failed on message %d"
 msgstr "メッセージ %d は失敗しました"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:672
 msgid "Cannot open message"
 msgstr "メッセージを開くことが出来ません"
 
-#: camel/camel-filter-driver.c:691 camel/camel-filter-driver.c:801
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 msgid "Syncing folder"
 msgstr "フォルダを同期中"
 
-#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:806
-msgid "Complete"
-msgstr "完了しました"
-
-#: camel/camel-filter-driver.c:761
+#: camel/camel-filter-driver.c:766
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "メッセージ %d / %d を取得中"
 
-#: camel/camel-filter-driver.c:766 camel/camel-filter-driver.c:784
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "メッセージ %d / %d は失敗しました"
 
-#: camel/camel-filter-driver.c:883
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "フィルタの構文解析中にエラー: %s: %s"
 
-#: camel/camel-filter-driver.c:888
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "フィルタ実行中にエラー: %s: %s"
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "フィルタ検索実行中にエラー: %s: %s"
@@ -3480,14 +4043,33 @@ msgstr "未知のヘッダでクエリを実行しています: %s"
 msgid "Invalid type in body-contains, expecting string"
 msgstr "無効な種別が本文に含まれています, 文字を期待しています"
 
+#: camel/camel-lock-client.c:110
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "パイプが作成できませんでした: %s"
+
+#: camel/camel-lock-client.c:123
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "%s のフォルダロックを作成することが出来ません: %s"
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "fork 出来ませんでした: %s"
+
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
-#: camel/camel-movemail.c:185
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "%s のロックファイルを作成できませんでした: %s"
 
-#: camel/camel-lock.c:151 camel/camel-movemail.c:219
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
@@ -3503,113 +4085,108 @@ msgstr "fcntl(2)を使ったロックに失敗しました: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2)を使ったロックに失敗しました: %s"
 
-#: camel/camel-movemail.c:101
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "メールファイル %s をチェックすることが出来ませんでした: %s"
 
-#: camel/camel-movemail.c:148
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "メールファイル %s を開くことが出来ませんでした: %s"
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "メールファイル %s のテンポラリを開くことが出来ませんでした: %s"
 
-#: camel/camel-movemail.c:199
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "%s のロックファイルをテスト出来ませんでした: %s"
-
-#: camel/camel-movemail.c:245
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "メールファイルの読み込み中にエラー: %s"
-
-#: camel/camel-movemail.c:256
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "メール作業ファイルの書き込み中にエラー: %s"
-
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "作業ファイル %s へメールの保存に失敗しました: %s"
 
-#: camel/camel-movemail.c:306
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "パイプが作成できませんでした: %s"
 
-#: camel/camel-movemail.c:318
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "fork 出来ませんでした: %s"
 
-#: camel/camel-movemail.c:356
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail プログラムは失敗しました: %s"
 
-#: camel/camel-movemail.c:357
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(未知のエラー)"
 
-#: camel/camel-movemail.c:587
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "メールファイルの読み込み中にエラー: %s"
+
+#: camel/camel-movemail.c:274
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "メール作業ファイルの書き込み中にエラー: %s"
+
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "メール作業ファイルのコピー中にエラー: %s"
 
-#: camel/camel-pgp-context.c:190
+#: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "あなたの %s パスフレーズ ( %s 用) を入力してください"
 
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "あなたの %s パスフレーズを入力してください"
 
-#: camel/camel-pgp-context.c:511
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr "サインするためのプレインテキストがありません"
 
-#: camel/camel-pgp-context.c:518 camel/camel-pgp-context.c:690
-#: camel/camel-pgp-context.c:1057 camel/camel-pgp-context.c:1269
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr "提供されたパスワードはありません"
 
-#: 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
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "GPG/PGP へのパイプが作成できませんでした: %s"
 
-#: camel/camel-pgp-context.c:683
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr "クリアサインするためのプレインテキストがありません"
 
-#: camel/camel-pgp-context.c:873
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr "ベリファイするためのプレインテキストがありません"
 
-#: camel/camel-pgp-context.c:890
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "作業ファイルを作成することが出来ませんでした: %s"
 
-#: camel/camel-pgp-context.c:1047
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr "符号化するためのプレインテキストがありません"
 
-#: camel/camel-pgp-context.c:1073
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr "受信者が指定されていません"
 
-#: camel/camel-pgp-context.c:1261
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr "復号化するための暗号テキストがありません"
 
@@ -3617,8 +4194,8 @@ msgstr "復号化するための暗号テキストがありません"
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
-"%s を読み込むことが出来ませんでした: このシステムではモジュールの読み込みをサ"
-"ポートしていません"
+"%s を読み込むことが出来ませんでした: "
+"このシステムではモジュールの読み込みをサポートしていません"
 
 #: camel/camel-provider.c:140
 #, c-format
@@ -3645,7 +4222,7 @@ msgid "Connection cancelled"
 msgstr "接続はキャンセルしました"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:269
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "%s (ポート %d) へ接続出来ませんでした: %s"
@@ -3654,13 +4231,13 @@ msgstr "%s (ポート %d) へ接続出来ませんでした: %s"
 msgid "(unknown host)"
 msgstr "(未知のホスト)"
 
-#: 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:289
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "操作はキャンセルしました"
 
-#: camel/camel-remote-store.c:476
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr "サーバは突然切断しました"
 
@@ -3712,8 +4289,8 @@ msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr ""
-"もしサーバがサポートしているなら, このオプションはセキュアな CRAM-MD5 認証を"
-"使ってサーバへ接続します"
+"もしサーバがサポートしているなら, このオプションはセキュアな CRAM-MD5 "
+"認証を使ってサーバへ接続します"
 
 #: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
@@ -3724,8 +4301,8 @@ msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 msgstr ""
-"もしサーバがサポートしているなら, このオプションはセキュアな DIGEST-MD5 を"
-"使ってサーバに接続します"
+"もしサーバがサポートしているなら, このオプションはセキュアな DIGEST-MD5 "
+"を使ってサーバに接続します"
 
 #: camel/camel-sasl-digest-md5.c:810
 msgid "Server challenge too long (>2048 octets)\n"
@@ -3770,7 +4347,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:442
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr "サーバから間違った認証応答がありました"
 
@@ -3839,7 +4416,7 @@ msgstr ""
 msgid "No provider available for protocol `%s'"
 msgstr "プロトコル `%s' を利用できるプロバイダはありません"
 
-#: camel/camel-session.c:479
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3885,33 +4462,17 @@ msgstr "メッセージのデコードに失敗しました"
 msgid "Failed to verify certificates."
 msgstr "認証の証明に失敗しました"
 
-#. Fill in the new fields
-#: camel/camel-store.c:378 mail/mail-ops.c:1017 mail/mail-ops.c:1024
-#: mail/mail-ops.c:1042 mail/mail-ops.c:1043
-msgid "Trash"
-msgstr "ごみ箱"
-
-#: camel/camel-tcp-stream-ssl.c:348
+#: camel/camel-tcp-stream-openssl.c:415
 #, 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"
+"Issuer: %s\n"
+"Subject: %s"
 msgstr ""
-"メール: %s\n"
-"共通名: %s\n"
-"組織ユニット: %s\n"
-"組織: %s\n"
-"場所: %s\n"
-"州: %s\n"
-"国: %s"
+"発行: %s\n"
+"対象: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:428 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -3926,26 +4487,36 @@ msgstr ""
 "\n"
 "承諾を望みますか?"
 
-#: camel/camel-tcp-stream-openssl.c:423
+#: camel/camel-tcp-stream-ssl.c:348
 #, c-format
 msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+"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"
+"メール: %s\n"
+"共通名: %s\n"
+"組織ユニット: %s\n"
+"組織: %s\n"
+"場所: %s\n"
+"州: %s\n"
+"国: %s"
 
 #: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "URL `%s' を解析することが出来ませんでした"
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%s に %s のようなメッセージはありません"
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
 msgstr "そのようなメッセージはありません: %s"
@@ -3954,68 +4525,75 @@ msgstr "そのようなメッセージはありません: %s"
 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:234
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP サーバから予期しない応答がありました: %s"
 
-#: camel/providers/imap/camel-imap-command.c:242
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP コマンドは失敗しました: %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "未知のエラー"
-
-#: camel/providers/imap/camel-imap-command.c:297
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr "サーバレスポンスはあっけなく終わりました"
 
-#: camel/providers/imap/camel-imap-command.c:489
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP サーバの応答は %s 情報を含んでいません"
 
-#: camel/providers/imap/camel-imap-command.c:526
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP サーバから予期しない OK 応答がありました: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:188
+#: camel/providers/imap/camel-imap-folder.c:192
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "ディレクトリ %s を作成出来ませんでした: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:207
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s のサマリーをロード出来ませんでした"
 
-#: camel/providers/imap/camel-imap-folder.c:267
+#: camel/providers/imap/camel-imap-folder.c:275
 msgid "Folder was destroyed and recreated on server."
 msgstr "フォルダは破壊され再作成されました"
 
-#: camel/providers/imap/camel-imap-folder.c:415
-msgid "Scanning IMAP folder"
-msgstr "IMAP フォルダを走査中"
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "メッセージを保存中"
 
-#: camel/providers/imap/camel-imap-folder.c:1437
-#: camel/providers/imap/camel-imap-folder.c:1673
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr "このメッセージは現在利用出来ません"
 
-#: camel/providers/imap/camel-imap-folder.c:1465
-#: camel/providers/imap/camel-imap-folder.c:1706
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "メッセージを保存中"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH 応答にメッセージ本体を見付けることが出来ませんでした"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:16
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, c-format
+msgid "Could not open cache directory: %s"
+msgstr "キャッシュディレクトリを開くことが出来ませんでした: %s"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr "新着メールのチェック"
 
@@ -4023,7 +4601,7 @@ msgstr "新着メールのチェック"
 msgid "Check for new messages in all folders"
 msgstr "すべてのフォルダの新着メールをチェックします"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:599
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "フォルダ"
 
@@ -4056,28 +4634,28 @@ msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "このオプションはプレインテキストパスワードを使って IMAP サーバに接続します"
 
-#: camel/providers/imap/camel-imap-store.c:465
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP サーバ %s は要求した認証タイプ %s をサポートしていません"
 
-#: camel/providers/imap/camel-imap-store.c:475
-#: camel/providers/smtp/camel-smtp-transport.c:366
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "認証タイプ %s をサポートしていません"
 
-#: camel/providers/imap/camel-imap-store.c:499
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s %s@%s の IMAP パスワードを入力してください"
 
-#: camel/providers/imap/camel-imap-store.c:514
-#: camel/providers/smtp/camel-smtp-transport.c:410
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr "パスワードを入力していません"
 
-#: camel/providers/imap/camel-imap-store.c:540
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -4088,36 +4666,51 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:829 mail/mail-local.c:333
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, c-format
 msgid "No such folder %s"
 msgstr "そのようなフォルダ %s はありません"
 
-#: camel/providers/local/camel-local-provider.c:39
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr "MH 形式のメールディレクトリ"
 
-#: camel/providers/local/camel-local-provider.c:40
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr "MHライクなメールディレクトリにローカルメールを保存します"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr "標準的な UNIX の mailbox ファイル"
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr "標準 mbox 型式でローカルメールを保存します"
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr "Qmail maildir型式のメールファイル"
 
-#: camel/providers/local/camel-local-provider.c:60
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr "qmail maildirディレクトリにローカルメールを保存します"
 
+#: camel/providers/local/camel-local-provider.c:70
+#, fuzzy
+msgid "Unix mbox spool-format mail files"
+msgstr "Qmail maildir型式のメールファイル"
+
+#: camel/providers/local/camel-local-provider.c:71
+#, fuzzy
+msgid "For storing local mail in standard Unix spool directories"
+msgstr "qmail maildirディレクトリにローカルメールを保存します"
+
 #: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "保存されたルート %s は絶対パスではありません"
@@ -4158,7 +4751,8 @@ msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 "フォルダからインデックスファイル `%s' を削除することが出来ませんでした: %s"
 
-#: camel/providers/local/camel-local-summary.c:404
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
 msgid "Unable to add message to summary: unknown reason"
 msgstr "サマリへメッセージを追加することが出来ません: 未知の理由です"
 
@@ -4174,6 +4768,7 @@ msgstr "maildir 形式のフォルダへメッセージを追加出来ません: %s: %s"
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -4185,6 +4780,7 @@ msgstr ""
 #: camel/providers/local/camel-maildir-folder.c:201
 #: camel/providers/local/camel-mbox-folder.c:322
 #: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr "そのようなメッセージはありません"
 
@@ -4193,7 +4789,7 @@ msgstr "そのようなメッセージはありません"
 msgid "Invalid message contents"
 msgstr "メッセージの内容は無効です"
 
-#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -4203,14 +4799,14 @@ msgstr ""
 "フォルダ `%s' を開くことが出来ませんでした:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "フォルダ `%s' は存在しません"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -4220,22 +4816,29 @@ msgstr ""
 "フォルダ `%s' を作成出来ませんでした:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' は maildir 形式のディレクトリではありません"
 
-#: camel/providers/local/camel-maildir-store.c:151
-#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "フォルダ `%s' を削除することが出来ませんでした: %s"
 
-#: camel/providers/local/camel-maildir-store.c:152
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "maildir 形式のディレクトリではありません"
 
+#: camel/providers/local/camel-maildir-store.c:276
+#, fuzzy, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr ""
+"フォルダ `%s' を作成出来ませんでした:\n"
+"%s"
+
 #: camel/providers/local/camel-maildir-summary.c:405
 #: camel/providers/local/camel-maildir-summary.c:526
 #, c-format
@@ -4243,11 +4846,13 @@ msgid "Cannot open maildir directory path: %s: %s"
 msgstr "maildir ディレクトリパスを開くことが出来ません: %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s のフォルダロックを作成することが出来ません: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "mailboxを開くことが出来ません: %s: %s\n"
@@ -4260,6 +4865,9 @@ msgstr "mbox ファイルにメッセージを追加出来ません: %s: %s"
 #: camel/providers/local/camel-mbox-folder.c:338
 #: camel/providers/local/camel-mbox-folder.c:370
 #: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4269,10 +4877,12 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "フォルダで回復不能なエラーが発生したようです"
 
 #: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "メッセージの解釈に失敗しました: 間違ったメールボックスですか?"
 
@@ -4318,36 +4928,45 @@ 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:249
+#: camel/providers/local/camel-spool-summary.c:379
 msgid "Summarising folder"
 msgstr "フォルダをサマライズ中"
 
 #: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr "フォルダを開けませんでした: %s: ポジション %ld からサマライズ中: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "ポジション %ld 付近 フォルダ %s で致命的なメール構文解析エラーです"
 
 #: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "フォルダをサマライズすることが出来ません: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1598
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr "フォルダを同期中"
 
 #: camel/providers/local/camel-mbox-summary.c:507
 #: camel/providers/local/camel-mbox-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "フォルダをサマライズすることが出来ませんでした: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "テンポラリ mailbox を開くことが出来ません: %s"
@@ -4356,21 +4975,28 @@ msgstr "テンポラリ mailbox を開くことが出来ません: %s"
 #: camel/providers/local/camel-mbox-summary.c:557
 #: camel/providers/local/camel-mbox-summary.c:746
 #: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "同期しましたが, サマリーとフォルダが不一致です"
 
 #: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "作業 mailbox へ書き出し中にエラー: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "作業 mailbox へ書き出し中にエラー: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:635
 #: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "元のフォルダ %s を閉じることが出来ませんでした: %s"
@@ -4385,7 +5011,9 @@ msgstr "作業フォルダを閉じることが出来ませんでした: %s"
 msgid "Could not rename folder: %s"
 msgstr "フォルダをリネーム出来ませんでした: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:879
+#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "未知のエラー: %s"
@@ -4405,39 +5033,93 @@ msgstr "`%s' はディレクトリではありません"
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH ディレクトリパスを開くことが出来ません: %s: %s"
 
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "mbox ファイルにメッセージを追加出来ません: %s: %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, fuzzy, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "`%s' は通常のファイルではありません"
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "フォルダ `%s' は存在しません"
+
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy
+msgid "Spool stores do not have an inbox"
+msgstr "ローカルへの保存は inbox を持てません"
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "ローカルメールファイル %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "メールファイル %s のテンポラリを開くことが出来ませんでした: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "元のフォルダ %s を閉じることが出来ませんでした: %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "%s@%s の NNTP パスワードを入力してください"
 
-#: camel/providers/nntp/camel-nntp-auth.c:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "サーバはユーザ名を拒否しました"
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "サーバへユーザ名の送信に失敗しました"
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "サーバはユーザ名/パスワードを拒否しました"
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "メッセージ %s は見付かりません"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr "サーバからグループリストを取得出来ませんでした"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "%s のグループリストファイルをロード出来ません: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "%s のグループリストファイルを保存出来ません: %s"
@@ -4450,25 +5132,25 @@ msgstr "USENET news"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "これは USENET のニュースグループへ送受信するためのプロバイダです"
 
-#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "ニュースサーバのディレクトリを開くことが出来ませんでした: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:286
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s 経由の USENET News"
 
-#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 "このオプションはプレインテキストパスワードを使って NNTP サーバで認証します"
 
-#: camel/providers/nntp/camel-nntp-store.c:325
-#: camel/providers/nntp/camel-nntp-store.c:488
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "%s の .newsrc ファイルを作成または開くことが出来ません: %s"
@@ -4519,7 +5201,7 @@ msgstr "サーバにメッセージを残す"
 msgid "Delete after %s day(s)"
 msgstr "%s 日後に削除する"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:58
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
@@ -4528,8 +5210,9 @@ msgid ""
 "For connecting to POP servers. The POP protocol can also be used to retrieve "
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
-"POP サーバへ接続するために, POP プロトコルは特定の web メールプロバイダや独自"
-"のメールシステムから E メールを受信するために使うことが出来ます"
+"POP サーバへ接続するために, POP プロトコルは特定の web "
+"メールプロバイダや独自のメールシステムから E "
+"メールを受信するために使うことが出来ます"
 
 #: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
@@ -4545,9 +5228,9 @@ msgid ""
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
-"このオプションは APOP プロトコル経由で暗号化されたパスワードを使って POP サー"
-"バへ接続します. これは公平なサポートを要求するサーバで, すべてのユーザが正常"
-"に動作するわけではありません."
+"このオプションは APOP プロトコル経由で暗号化されたパスワードを使って POP "
+"サーバへ接続します. これは公平なサポートを要求するサーバで, "
+"すべてのユーザが正常に動作するわけではありません."
 
 #: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
@@ -4611,7 +5294,7 @@ msgid "No such folder `%s'."
 msgstr "そのようなフォルダ `%s' はありません"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4625,8 +5308,7 @@ msgstr ""
 #: camel/providers/sendmail/camel-sendmail-transport.c:107
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr ""
-"sendmail へパイプを作成出来ませんでした: %s: メールは送信しませんでした"
+msgstr "sendmail へパイプを作成出来ませんでした: %s: メールは送信しませんでした"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:124
 #, c-format
@@ -4665,7 +5347,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:70
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4673,122 +5355,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:168
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr "構文解析エラー, コマンドではありません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr "パラメータあるいは引数に構文解析エラー"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr "コマンドは実装されていません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr "コマンドパラメータは実装されていません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr "システムステータスあるいはシステムヘルプ応答"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr "ヘルプメッセージ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr "サービスは利用できます"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr "サービスは送信チャンネルを閉じています"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr "サービスは利用できません, 送信チャンネルを閉じています"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr "要求されたメールの動作はOK, 完了しました"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr "ユーザはローカルではありません; <forward-path> へ転送します"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "要求されたメールの動作は完了しません: メールボックスは利用できません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "要求された動作は完了しません: メールボックスは利用できません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr "要求された動作を中断しました: 処理中にエラー"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr "ユーザはローカルではありません; <forward-path> を試してください"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr "要求された動作は完了しません: システムの保存領域が足りません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "要求されたメールの動作を中断しました: 領域割り当てを越えました"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "要求された動作は完了しません: メールボックス名は認められません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "メールの入力を開始します; <CRLF>.<CRLF> で終了します"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr "処理は失敗しました"
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr "パスワードの変更が必要です"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr "認証メカニズムは不十分過ぎます"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr "要求した認証メカニズムのために暗号化が必要です"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr "一時的な認証に失敗しました"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr "認証を必要としています"
 
-#: camel/providers/smtp/camel-smtp-transport.c:313
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "初期応答エラー: %s: たぶん致命的ではありません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:356
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "SMTP サーバ %s は要求した認証タイプ %s をサポートしていません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:395
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%s %s@%s の SMTP パスワードを入力してください"
 
-#: camel/providers/smtp/camel-smtp-transport.c:418
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4799,115 +5481,127 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:534
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP サーバ %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s 経由で SMTP メールを配信します"
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr "メッセージを送信出来ません: 送信者のアドレスが定義されていません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr "メッセージを送信出来ません: 送信者のアドレスが正しくありません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "メッセージを送信中"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr "メッセージを送信出来ません: 受信者が定義されていません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:676
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "HELO 要求のタイムアウト: %s: 致命的ではありません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:695
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO レスポンスエラー: %s: 致命的ではありません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:728
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr "SASL 認証オブジェクトの生成中にエラーが発生しました"
 
-#: camel/providers/smtp/camel-smtp-transport.c:743
-#: camel/providers/smtp/camel-smtp-transport.c:755
+#: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "認証"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH 要求のタイムアウト: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:782
 msgid "AUTH request failed."
 msgstr "AUTH 要求に失敗しました"
 
-#: camel/providers/smtp/camel-smtp-transport.c:809
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr "サーバから間違った認証応答がありました\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:835
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM 要求のタイムアウト: %s: メールは送信しませんでした"
 
-#: camel/providers/smtp/camel-smtp-transport.c:854
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "MAIL FROM レスポンスエラー: %s: メールは送信しませんでした"
 
-#: camel/providers/smtp/camel-smtp-transport.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO 要求のタイムアウト: %s: メールは送信しませんでした"
 
-#: camel/providers/smtp/camel-smtp-transport.c:898
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "RCPT TO レスポンスエラー: %s: メールは送信しませんでした"
 
-#: camel/providers/smtp/camel-smtp-transport.c:929
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA 要求のタイムアウト: %s: メールは送信しませんでした"
 
-#: camel/providers/smtp/camel-smtp-transport.c:948
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "DATA レスポンスエラー: %s: メールは送信しませんでした"
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA 送信のタイムアウト: メッセージの終了: %s: メールは送信しませんでした"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
-msgstr ""
-"DATA レスポンスエラー: メッセージの終了: %s: メールは送信しませんでした"
+msgstr "DATA レスポンスエラー: メッセージの終了: %s: メールは送信しませんでした"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET 要求のタイムアウト: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1043
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET レスポンスエラー: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "QUIT 要求のタイムアウト: %s: 致命的ではありません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUIT レスポンスエラー: %s: 致命的ではありません"
@@ -4937,75 +5631,137 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:336 mail/mail-display.c:123
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "添付"
 
-#: composer/e-msg-composer-attachment-bar.c:426
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "ファイルを添付します"
-
-#: composer/e-msg-composer-attachment-bar.c:474
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "添付物リストから選択したアイテムを削除します"
 
-#: composer/e-msg-composer-attachment-bar.c:505
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "添付の追加..."
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "メッセージへファイルを添付します"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:11
-msgid "Attachment"
-msgstr "添付"
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "添付のプロパティ"
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "ファイル名:"
 
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr "インラインで添付"
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "MIME タイプ:"
 
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr "送信先:"
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
+msgstr ""
 
-#: composer/e-msg-composer.c:621
-#, c-format
+#: composer/e-msg-composer-hdrs.c:328
+msgid "Click here for the address book"
+msgstr "アドレス帳のためにここでクリック"
+
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:359
+msgid "From:"
+msgstr "差出人:"
+
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:365
+msgid "Reply-To:"
+msgstr "返信先:"
+
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:376
+msgid "Subject:"
+msgstr "件名:"
+
+#: composer/e-msg-composer-hdrs.c:390
+msgid "To:"
+msgstr "宛先:"
+
+#: composer/e-msg-composer-hdrs.c:391
+msgid "Enter the recipients of the message"
+msgstr "メッセージの受信者を入力します"
+
+#: composer/e-msg-composer-hdrs.c:394
+msgid "Cc:"
+msgstr "Cc:"
+
+#: composer/e-msg-composer-hdrs.c:395
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "メッセージのカーボンコピーを受信するアドレスを入力します"
+
+#: composer/e-msg-composer-hdrs.c:398
+msgid "Bcc:"
+msgstr "Bcc:"
+
+#: composer/e-msg-composer-hdrs.c:399
+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-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "ファイルを添付します"
+
+#: composer/e-msg-composer.c:670
+#, fuzzy, c-format
 msgid ""
-"Could not open signature file %s:\n"
+"Could not open file %s:\n"
 "%s"
 msgstr ""
-"署名ファイル %s を開くことが出来ませんでした:\n"
+"ファイル `%s' を開くことが出来ませんでした:\n"
 "%s"
 
-#: composer/e-msg-composer.c:794
+#: composer/e-msg-composer.c:683
+#, fuzzy, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr "ファイルのロード中にエラー: %s"
+
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "別名で保存..."
 
-#: composer/e-msg-composer.c:805
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "警告"
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
 #, c-format
 msgid "Error saving file: %s"
 msgstr "ファイルの保存中にエラー: %s"
 
-#: composer/e-msg-composer.c:825
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr "ファイルのロード中にエラー: %s"
 
-#: composer/e-msg-composer.c:897
+#: composer/e-msg-composer.c:997
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -5013,12 +5769,53 @@ msgstr ""
 "このアカウントの草案フォルダを開くことが出来ません\n"
 "デフォルトの草案フォルダを使ってもよろしいですか?"
 
-#: composer/e-msg-composer.c:959 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:228
-msgid "Evolution"
-msgstr "Evolution"
+#: composer/e-msg-composer.c:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "ファイルの保存中にエラー: %s"
 
-#: composer/e-msg-composer.c:965
+#: composer/e-msg-composer.c:1055
+#, fuzzy
+msgid "Unable to retrieve message from editor"
+msgstr "POP サーバ %s からメッセージを取得出来ませんでした: %s"
+
+#: composer/e-msg-composer.c:1061
+#, fuzzy, c-format
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr ""
+"出力ファイルを作成出来ません: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1067
+#, fuzzy, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
+msgstr ""
+"出力ファイルを作成出来ません: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr ""
+"ファイルの保存中にエラー: %s:\n"
+" %s"
+
+#: composer/e-msg-composer.c:1173
+#, fuzzy
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
+msgstr ""
+"Evolution は Pine メールファイルを発見しました\n"
+"Evolution へインポートしてもよろしいですか?"
+
+#: composer/e-msg-composer.c:1321
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5028,100 +5825,29 @@ msgstr ""
 "\n"
 "変更を保存しますか?"
 
-#: composer/e-msg-composer.c:990
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
 msgid "Open file"
 msgstr "ファイルを開く"
 
-#: composer/e-msg-composer.c:1146
-msgid "That file does not exist."
-msgstr "そのファイルは存在しません"
-
-#: composer/e-msg-composer.c:1156
-msgid "That is not a regular file."
-msgstr "それは通常のファイルではありません"
-
-#: composer/e-msg-composer.c:1166
-msgid "That file exists but is not readable."
-msgstr "そのファイルは存在しますが，読み取り可能ではありません"
-
-#: composer/e-msg-composer.c:1176
-msgid "That file appeared accesible but open(2) failed."
-msgstr "そのファイルはアクセス可能のように見えますが，open(2) は失敗しました"
-
-#: composer/e-msg-composer.c:1198
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"ファイルはとても大きい (100K 以上) です\n"
-"本当にそれを挿入することを望みますか?"
-
-#: composer/e-msg-composer.c:1219
-msgid "An error occurred while reading the file."
-msgstr "ファイル読込中の間にエラーは発生しました"
+#: composer/e-msg-composer.c:1500
+#, fuzzy
+msgid "Insert File"
+msgstr "テキストファイルの挿入..."
 
-#: composer/e-msg-composer.c:1582 composer/e-msg-composer.c:1927
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr "メッセージを作成します"
 
-#: composer/e-msg-composer.c:2021
+#: composer/e-msg-composer.c:2351
 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
+#: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -5129,7 +5855,7 @@ msgstr ""
 "メールコンポーネントにまだ構成されていないため\n"
 "メッセージ作成ウィンドウを作成することが出来ませんでした"
 
-#: composer/evolution-composer.c:370
+#: composer/evolution-composer.c:374
 msgid "Cannot initialize Evolution's composer."
 msgstr "Evolution メール作成の初期化が出来ません"
 
@@ -5146,42 +5872,56 @@ msgid "calendar information"
 msgstr "カレンダ情報"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
 #. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
-#: e-util/e-time-utils.c:323
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:90 e-util/e-time-utils.c:201
-#: e-util/e-time-utils.c:315
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
-#: 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
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
 msgid "%I:%M %p"
 msgstr "%p %I:%M"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
-#: 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
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
 msgid "%H:%M"
 msgstr "%H:%M"
 
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%Y/%m/%d"
+
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%Y/%m/%d (%a)"
+
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
+
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:269
+#: e-util/e-time-utils.c:298
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
@@ -5189,249 +5929,65 @@ msgstr "%Y/%m/%d (%a)"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:303
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%Y/%m/%d (%a) %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:283
+#: e-util/e-time-utils.c:312
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M"
 
-#: 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 "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-"実行サマリーの背景毎に別々のHTMLページを選択することが出来ます\n"
-"\n"
-"デフォルトは空白です"
-
-#: executive-summary/component/e-summary-url.c:70
-#: executive-summary/component/e-summary-url.c:75
-#: executive-summary/component/e-summary-url.c:82
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "デフォルトのGNOMEアプリケーションで %s を開く"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "デフォルトのGNOMEウェブブラウザで %s を開く"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Send an email to %s"
-msgstr "%s からメールを送信"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Change the view to %s"
-msgstr "%s へビューを変更"
-
-#: executive-summary/component/e-summary-url.c:74
-#, c-format
-msgid "Run %s"
-msgstr "%s を実行"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Close %s"
-msgstr "%s を閉じる"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the left"
-msgstr "左へ %s を移動"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s to the right"
-msgstr "右へ %s を移動"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "前の列の中へ %s を移動"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Move %s into the next row"
-msgstr "次の列の中へ %s を移動"
-
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Configure %s"
-msgstr "%s の設定"
-
-#: executive-summary/component/e-summary-url.c:554
-msgid "page"
-msgstr "ページ"
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr "外観"
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr "背景:"
-
-#: executive-summary/component/main.c:62
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-"実行サマリーコンポーネントは Bonobo を初期化出来ませんでした\n"
-"もし 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 サマリのためのファクトリ"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "RDF サマリ"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr "テスト Bonobo コンポーネントのためのファクトリ"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr "テストコンポーネントのためのファクトリ"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "テスト Bonobo サービス"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "テストサービス"
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr "エラー"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr "自動的に更新"
-
-#: executive-summary/test-service/rdf-summary.c:785
-msgid "Update now"
-msgstr "今すぐ更新"
-
-#: executive-summary/test-service/rdf-summary.c:795
-msgid "Update every "
-msgstr "すべて更新 "
-
-#: executive-summary/test-service/rdf-summary.c:806
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr "分"
-
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "年"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "年"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "月"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "月"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "週"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "週"
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr "日"
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "時"
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr "時"
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "分"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr " 秒"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr " 秒"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr "日付の選択を忘れています"
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "無効な日付を選択しています"
 
-#: filter/filter-datespec.c:276
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -5441,7 +5997,7 @@ msgstr ""
 "開かれる時，メッセージの日付はどんな時間に\n"
 "対してでも比較されるでしょう"
 
-#: filter/filter-datespec.c:299
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -5449,7 +6005,7 @@ msgstr ""
 "メッセージの日付はここで指定する時間に対して\n"
 "比較されるでしょう"
 
-#: filter/filter-datespec.c:339
+#: filter/filter-datespec.c:334
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -5460,28 +6016,36 @@ msgstr ""
 "例えば，\"一週間前\""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "現在時刻"
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "指定する時間"
 
-#: filter/filter-datespec.c:375
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "現在時刻への相対時間"
 
 #. The label
-#: filter/filter-datespec.c:433
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "逆比較"
 
-#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "今"
 
-#: filter/filter-datespec.c:707
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<日付を選択するためにここをクリックしてください>"
 
@@ -5506,8 +6070,8 @@ msgstr ""
 "フォルダの選択を忘れています\n"
 "戻ってメールを配送する有効なフォルダを指定してください"
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:687
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "フォルダを選択"
 
@@ -5519,46 +6083,6 @@ msgstr "フォルダ URI の入力"
 msgid "<click here to select a folder>"
 msgstr "<フォルダを選択するためにここをクリックしてください>"
 
-#: filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "フィルタを編集"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "仮想フォルダの編集"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "入力"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "出力"
-
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
-msgid "Virtual Folders"
-msgstr "仮想フォルダ"
-
-#: filter/filter.glade.h:11
-msgid "specific folders only"
-msgstr "指定フォルダだけ"
-
-#: filter/filter.glade.h:12
-msgid "vFolder Sources"
-msgstr "仮想フォルダのソース"
-
-#: filter/filter.glade.h:13
-msgid "with all active remote folders"
-msgstr "すべての有効なリモートフォルダ"
-
-#: filter/filter.glade.h:14
-msgid "with all local and active remote folders"
-msgstr "すべてのローカルと有効なリモートフォルダ"
-
-#: filter/filter.glade.h:15
-msgid "with all local folders"
-msgstr "すべてのローカルフォルダ"
-
 #: filter/filter-input.c:193
 #, c-format
 msgid ""
@@ -5580,37 +6104,89 @@ msgstr "ルール名: "
 msgid "Untitled"
 msgstr "タイトルなし"
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "もし"
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "次の条件で動作を実行:"
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "すべての基準が合った時"
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "いくつかの基準が合った時"
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "基準を追加"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "incoming"
 msgstr "入力"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "outgoing"
 msgstr "出力"
 
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "追加"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "編集"
+
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "フィルタを編集"
+
+#: filter/filter.glade.h:5
+msgid "Edit VFolders"
+msgstr "仮想フォルダの編集"
+
+#: filter/filter.glade.h:7
+msgid "Incoming"
+msgstr "入力"
+
+#: filter/filter.glade.h:8
+msgid "Outgoing"
+msgstr "出力"
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+msgid "Virtual Folders"
+msgstr "仮想フォルダ"
+
+#: filter/filter.glade.h:11
+msgid "specific folders only"
+msgstr "指定フォルダだけ"
+
+#: filter/filter.glade.h:12
+msgid "vFolder Sources"
+msgstr "仮想フォルダのソース"
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr "すべての有効なリモートフォルダ"
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr "すべてのローカルと有効なリモートフォルダ"
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
+msgstr "すべてのローカルフォルダ"
+
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
-msgstr ""
+#, fuzzy
+msgid "Assign Color"
+msgstr "割当て済み"
 
 #: filter/libfilter-i18n.h:4
 msgid "Assign Score"
@@ -5685,89 +6261,90 @@ msgid "Expression"
 msgstr "表現"
 
 #: filter/libfilter-i18n.h:24
-msgid "Forward to Address"
-msgstr "アドレスへ転送"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr "重要"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr "が次のものと一致する"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr "が次のものより大きい"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr "が次のものより小さい"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr "が次のものではない"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "メーリングリスト"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "メッセージ本体"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "メッセージヘッダ"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "受信したメッセージ"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "送信したメッセージ"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "フォルダへ移動"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 msgid "on or after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "既読"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "受信者"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "正規表現と一致"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "返信先"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "記録"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "送信者"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "ステータス設定"
 
+#: filter/libfilter-i18n.h:44
+msgid "Size (kB)"
+msgstr ""
+
 #: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "が次のもののように見える"
@@ -5788,7 +6365,8 @@ msgstr "が次のもので開始する"
 msgid "Stop Processing"
 msgstr "処理停止"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:774
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "件名"
 
@@ -5816,29 +6394,23 @@ msgstr "ルールを編集"
 msgid "Score Rules"
 msgstr "スコアルール"
 
-#: importers/elm-importer.c:512 importers/evolution-gnomecard-importer.c:238
-#: importers/netscape-importer.c:780 importers/pine-importer.c:646
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
 #: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
-#: shell/importer/intelligent.c:190
+#: shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "インポート"
 
-#: importers/elm-importer.c:517 importers/netscape-importer.c:785
-#: importers/pine-importer.c:651
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
 msgid "Mail"
 msgstr "メール"
 
-#: importers/elm-importer.c:521
-msgid "Elm Aliases"
-msgstr "Elm エイリアス"
-
-#: importers/elm-importer.c:528 importers/evolution-gnomecard-importer.c:250
-#: importers/netscape-importer.c:807 importers/pine-importer.c:668
-#: shell/importer/intelligent.c:195
-msgid "Don't ask me again"
-msgstr "このメッセージを二度と表示しない"
-
-#: importers/elm-importer.c:561
+#: importers/elm-importer.c:498
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -5846,15 +6418,15 @@ msgstr ""
 "Evolution は Elm メールファイルを発見しました\n"
 "Evolution へインポートしてもよろしいですか?"
 
-#: importers/elm-importer.c:579
+#: importers/elm-importer.c:527
 msgid "Elm mail"
 msgstr "Elm メール"
 
-#: importers/evolution-gnomecard-importer.c:243 importers/pine-importer.c:661
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
 msgid "Addressbook"
 msgstr "アドレス帳"
 
-#: importers/evolution-gnomecard-importer.c:275
+#: importers/evolution-gnomecard-importer.c:253
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -5862,19 +6434,11 @@ msgstr ""
 "Evolution は GnomeCard ファイルを発見しました\n"
 "Evolution へインポートしてもよろしいですか?"
 
-#: importers/netscape-importer.c:790 importers/pine-importer.c:656
+#: importers/netscape-importer.c:824
 msgid "Settings"
 msgstr "設定"
 
-#: importers/netscape-importer.c:795 mail/mail-callbacks.c:1399
-msgid "Filters"
-msgstr "フィルタ"
-
-#: importers/netscape-importer.c:800
-msgid "Addressbooks"
-msgstr "アドレス帳"
-
-#: importers/netscape-importer.c:847
+#: importers/netscape-importer.c:849
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -5882,7 +6446,7 @@ msgstr ""
 "Evolution は Netscape メールファイルを発見しました\n"
 "Evolution へインポートしてもよろしいですか?"
 
-#: importers/pine-importer.c:705
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -5890,180 +6454,209 @@ msgstr ""
 "Evolution は Pine メールファイルを発見しました\n"
 "Evolution へインポートしてもよろしいですか?"
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
 msgid "Pine mail"
 msgstr "Pine メール"
 
-#: mail/component-factory.c:401
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr "メールを扱うための Evolution コンポーネント"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+msgid "Evolution mail composer."
+msgstr "Evolution メールコンポーザ"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Evolution mail executive summary component."
+msgstr "Evolution メール実行サマリコンポーネント"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
+msgstr "Evolution メールフォルダディスプレイコンポーネント"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
+msgstr "Evolutgion メールフォルダファクトリコンポーネント"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid "Factory for the Evolution composer."
+msgstr "Evolution コンポーザのためのファクトリ"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Factory for the Evolution mail component."
+msgstr "Evolution メールコンポーネントのためのファクトリ"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr "メールサマリコンポーネントのためのファクトリ"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+msgid "Mail configuration interface"
+msgstr "メール設定のインターフェース"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "プロパティ(_P)..."
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "ファイルのプロパティを修正します"
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolution メールコンポーネントの初期化が出来ません"
 
-#: mail/component-factory.c:527
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr "シェルでストレージを登録出来ません"
 
-#: mail/folder-browser.c:339
+#: mail/folder-browser-ui.c:254
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "\"%s\" のプロパティ"
+
+#: mail/folder-browser-ui.c:256
+msgid "Properties"
+msgstr "プロパティ"
+
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "作業ディレクトリを作成出来ませんでした: %s"
+
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr ""
 
-#: mail/folder-browser.c:663
+#: mail/folder-browser.c:1238
 msgid "VFolder on _Subject"
 msgstr "件名の仮想フォルダ(_S)"
 
-#: mail/folder-browser.c:666
+#: mail/folder-browser.c:1241
 msgid "VFolder on Se_nder"
 msgstr "送信者の仮想フォルダ(_n)"
 
-#: mail/folder-browser.c:669
+#: mail/folder-browser.c:1244
 msgid "VFolder on _Recipients"
 msgstr "受信者の仮想フォルダ(_R)"
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:1247
 msgid "VFolder on Mailing _List"
 msgstr "メーリングリストの仮想フォルダ(_L)"
 
-#: mail/folder-browser.c:678
+#: mail/folder-browser.c:1253
 msgid "Filter on Sub_ject"
 msgstr "件名のフィルタ(_j)"
 
-#: mail/folder-browser.c:681
+#: mail/folder-browser.c:1256
 msgid "Filter on Sen_der"
 msgstr "送信者のフィルタ(_d)"
 
-#: mail/folder-browser.c:684
+#: mail/folder-browser.c:1259
 msgid "Filter on Re_cipients"
 msgstr "受信者のフィルタ(_c)"
 
-#: mail/folder-browser.c:687
+#: mail/folder-browser.c:1262
 msgid "Filter on _Mailing List"
 msgstr "メーリングリストのフィルタ(_M)"
 
-#: mail/folder-browser.c:696
-msgid "_Open"
-msgstr "開く(_O)"
-
-#: mail/folder-browser.c:698
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "再送信"
 
-#: mail/folder-browser.c:700 ui/evolution-calendar.xml.h:43
-#: ui/evolution-mail.xml.h:123 ui/evolution-tasks.xml.h:11
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "別名で保存(_S)..."
 
-#: mail/folder-browser.c:702 ui/evolution-event-editor.xml.h:69
-#: ui/evolution-task-editor-dialog.xml.h:82 ui/evolution-tasks.xml.h:10
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "印刷(_P)"
 
-#: mail/folder-browser.c:707 ui/evolution-mail.xml.h:122
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 msgid "_Reply to Sender"
 msgstr "送信者へ返信(_R)"
 
-#: mail/folder-browser.c:709 ui/evolution-mail.xml.h:77
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
+msgstr "全員へ返信(_A)"
+
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "全員へ返信(_A)"
 
-#: mail/folder-browser.c:711
+#: mail/folder-browser.c:1288
 msgid "_Forward"
 msgstr "転送(_F)"
 
-#: mail/folder-browser.c:714
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "既読としてマーク(_k)"
 
-#: mail/folder-browser.c:716
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "未読としてマーク(_n)"
 
-#: mail/folder-browser.c:721
+#: mail/folder-browser.c:1295
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "重要"
+
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
+msgstr "未読としてマーク(_n)"
+
+#: mail/folder-browser.c:1302
 msgid "_Move to Folder..."
 msgstr "フォルダへ移動(_M)..."
 
-#: mail/folder-browser.c:723
+#: mail/folder-browser.c:1304
 msgid "_Copy to Folder..."
 msgstr "フォルダへコピー(_C)..."
 
-#: mail/folder-browser.c:727 ui/evolution-mail.xml.h:126
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 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:737
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "アドレス帳に追加"
+
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "フィルタ適用"
 
-#: mail/folder-browser.c:741
+#: mail/folder-browser.c:1322
 msgid "Create Ru_le From Message"
 msgstr "メッセージからルールを作成(_l)"
 
-#: mail/folder-browser.c:880
+#: mail/folder-browser.c:1479
 msgid "Filter on Mailing List"
 msgstr "メーリングリストのフィルタ"
 
-#: mail/folder-browser.c:881
+#: mail/folder-browser.c:1480
 msgid "VFolder on Mailing List"
 msgstr "メーリングリストの仮想フォルダ"
 
-#: mail/folder-browser.c:883
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "メーリングリストのフィルタ (%s)"
 
-#: mail/folder-browser.c:884
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "メーリングリストの仮想フォルダ (%s)"
 
-#: mail/folder-browser-factory.c:210
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "\"%s\" のプロパティ"
-
-#: mail/folder-browser-factory.c:212 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 コンポーネント"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr "Evolution メールコンポーザ"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr "Evolution メール実行サマリコンポーネント"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr "Evolution メールフォルダディスプレイコンポーネント"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr "Evolutgion メールフォルダファクトリコンポーネント"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr "Evolution コンポーザのためのファクトリ"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "Evolution メールコンポーネントのためのファクトリ"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-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 をインポートするファクトリ"
@@ -6114,37 +6707,69 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:105
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
 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:154
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Evolution アカウントエディタ"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
 msgid "Evolution Account Editor"
 msgstr "Evolution アカウントエディタ"
 
-#: mail/mail-accounts.c:124 mail/mail-accounts.c:175
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "署名ファイル:"
+
+#: mail/mail-account-gui.c:977
+#, fuzzy
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"このメッセージは送信していません\n"
+"\n"
+"変更を保存しますか?"
+
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr " (デフォルト)"
 
-#: mail/mail-accounts.c:207
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr "無効"
 
-#: mail/mail-accounts.c:209 mail/mail-config.glade.h:35
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr "有効"
 
-#: mail/mail-accounts.c:297 mail/mail-accounts.c:301
+#: mail/mail-accounts.c:264
 msgid "Are you sure you want to delete this account?"
 msgstr "本当にこのアカウントを削除してもよろしいですか?"
 
-#: mail/mail-accounts.c:435 mail/mail-accounts.c:439
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "削除"
+
+#: mail/mail-accounts.c:271
+#, fuzzy
+msgid "Really delete account?"
+msgstr "デフォルトアカウントを作る"
+
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 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:597
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr "Evolution アカウントマネージャ"
 
@@ -6172,7 +6797,7 @@ msgstr "%s メーリングリスト"
 msgid "Add Filter Rule"
 msgstr "フィルタルールを追加"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -6184,7 +6809,7 @@ msgstr ""
 "必要があります\n"
 "今設定しますか?"
 
-#: mail/mail-callbacks.c:146
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -6192,7 +6817,7 @@ msgstr ""
 "あなたはメールを作成する前に身元の\n"
 "設定をする必要があります"
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -6200,11 +6825,11 @@ msgstr ""
 "あなたはメールを作成する前にメール\n"
 "配送の設定をする必要があります"
 
-#: mail/mail-callbacks.c:202
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr "メール転送メソッドの設定がありません"
 
-#: mail/mail-callbacks.c:235
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6212,37 +6837,45 @@ msgstr ""
 "このメッセージは件名がありません\n"
 "本当に送信しますか?"
 
-#: mail/mail-callbacks.c:308
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+
+#: mail/mail-callbacks.c:359
 msgid "You must specify recipients in order to send this message."
 msgstr "このメッセージを送信する適切な受信者を指定しなければなりません"
 
-#: mail/mail-callbacks.c:351
+#: mail/mail-callbacks.c:410
 msgid "You must configure an account before you can send this email."
 msgstr "このメールを送信する前にアカウントを設定しなければなりません"
 
-#: mail/mail-callbacks.c:603
+#: mail/mail-callbacks.c:653
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "On %s, %s wrote:"
 
-#: mail/mail-callbacks.c:769
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "メッセージを転送:\n"
 
-#: mail/mail-callbacks.c:863
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "メッセージを移動します: "
 
-#: mail/mail-callbacks.c:865
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "メッセージをコピーします: "
 
-#: mail/mail-callbacks.c:1031
+#: mail/mail-callbacks.c:1374
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "本当に %d メッセージを編集してもよろしいですか?"
 
-#: mail/mail-callbacks.c:1053
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6250,7 +6883,7 @@ msgstr ""
 "ドラフトフォルダ内に保存された\n"
 "メッセージだけを編集することが出来ます"
 
-#: mail/mail-callbacks.c:1087
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6258,36 +6891,24 @@ msgstr ""
 "送信フォルダのメッセージだけ\n"
 "再送信することが出来ます"
 
-#: mail/mail-callbacks.c:1099
+#: mail/mail-callbacks.c:1442
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "本当に %d メッセージを再送してもよろしいですか?"
 
-#: mail/mail-callbacks.c:1120
+#: mail/mail-callbacks.c:1463
 msgid "No Message Selected"
 msgstr "選択されたメッセージはありません"
 
-#: mail/mail-callbacks.c:1154 mail/mail-display.c:93
-msgid "Overwrite file?"
-msgstr "ファイルを上書きしますか?"
-
-#: mail/mail-callbacks.c:1158 mail/mail-display.c:97
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"その名前のファイルはすでに存在します\n"
-"上書きしますか?"
-
-#: mail/mail-callbacks.c:1202
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "メッセージを別名で保存..."
 
-#: mail/mail-callbacks.c:1204
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "メッセージを別名で保存..."
 
-#: mail/mail-callbacks.c:1389
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6296,23 +6917,23 @@ msgstr ""
 "フィルタ情報のロード中にエラー:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1447
+#: mail/mail-callbacks.c:1776
+msgid "Filters"
+msgstr "フィルタ"
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "メッセージを印刷"
 
-#: mail/mail-callbacks.c:1494
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "メッセージの印刷に失敗しました"
 
-#: mail/mail-callbacks.c:1589
+#: mail/mail-callbacks.c:1966
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "本当に %d メッセージを別ウィンドウで開いてもよろしいですか?"
 
-#: mail/mail-config.c:1321 mail/mail-config.c:1324
-msgid "Connecting to server..."
-msgstr "サーバへ接続中..."
-
 #: mail/mail-config-druid.c:99
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -6351,19 +6972,23 @@ msgid ""
 "name for this account in the space below. This name will be used for display "
 "purposes only."
 msgstr ""
-"メール設定の処理はだいたい完了しました．あなたが提供した身元，メールサーバ"
-"や\n"
-"送信プロトコルは Evolution メールアカウントを作るために一纏めにされるでしょ"
-"う\n"
-"以下にこのアカウントの空間の名前を入力してください．この名前は表示目的だけ"
-"に\n"
+"メール設定の処理はだいたい完了しました．あなたが提供した身元，メールサーバや"
+"\n"
+"送信プロトコルは Evolution "
+"メールアカウントを作るために一纏めにされるでしょう\n"
+"以下にこのアカウントの空間の名前を入力してください．この名前は表示目的だけに"
+"\n"
 "使用されます．"
 
 #. set window title
-#: mail/mail-config-druid.c:445
+#: mail/mail-config-druid.c:466
 msgid "Evolution Account Wizard"
 msgstr "Evolution アカウントウィザード"
 
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
+msgid "Connecting to server..."
+msgstr "サーバへ接続中..."
+
 #: mail/mail-config.glade.h:1
 msgid " Check for supported types "
 msgstr "サポートされた種別をチェック"
@@ -6373,54 +6998,63 @@ msgid " color"
 msgstr " カラー"
 
 #: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "サインはこの暗号をサポートしていません"
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "アカウント"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "アカウント情報"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "アカウント管理"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "アカウント"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr "暗号化したメールを送信する時に常に自分自身に暗号化します"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr "暗号化したメールを送信する時に常に自分自身に暗号化します"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:11
 msgid "Always load images off the net"
 msgstr "常に画像を読み込まない"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "添付"
+
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "認証"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr "認証種別: "
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr "新着メールを自動的にチェックする"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 msgid "Certificate ID:"
 msgstr "認証 ID"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:18
 msgid "Composer"
 msgstr "メール作成"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6436,215 +7070,277 @@ msgstr ""
 "\n"
 "\"完了\" をクリックして設定を保存してください"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "デフォルト(_f)"
 
-#: mail/mail-config.glade.h:25
-msgid "Default \"Forward\" style is: "
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Default Forward style is: "
 msgstr "デフォルトの \"転送\" 方法: "
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:27
 msgid "Default character set: "
 msgstr "デフォルトのキャラクタセット: "
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
 msgid "Digital IDs..."
 msgstr "デジタル ID..."
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "完了"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "草案"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "草案フォルダ:"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr "編集..."
+
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "メールアドレス:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "有効"
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "フルネーム:"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:41
 msgid "Get Digital ID..."
 msgstr "デジタルID を取得..."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "HTML Signature:"
+msgstr "署名ファイル:"
+
+#: mail/mail-config.glade.h:43
 msgid "Highlight citations with"
 msgstr "引用を強調する"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "身元"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:47
 msgid "In HTML mail"
 msgstr "HTML メール"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:48
 msgid "Inline"
 msgstr "インライン"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:50
 msgid "Load images if sender is in addressbook"
 msgstr "送信者がアドレス帳にいれる場合画像を読み込む"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "メールの設定"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "メールボックスの形式"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "デフォルトアカウントを作る"
 
-#: mail/mail-config.glade.h:48
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
 msgstr "指定時間後にメッセージを \"既読\" としてマーク:"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "LDAP サーバ"
+
+#: mail/mail-config.glade.h:59
 msgid "Never load images off the net"
 msgstr "二度と画像を読み込まない"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr "ニュース"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:62
 msgid "Optional Information"
 msgstr "付加情報"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "組織:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:65
 msgid "PGP Key ID:"
 msgstr "PGPキー ID:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr "PGP プログラムのパス:"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr "カラーを選択"
+
+#: mail/mail-config.glade.h:71
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Prompt when sending messages with an empty subject"
+msgstr "この件名のメッセージをフィルタするルールを作成します"
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "メッセージを送信出来ません: 受信者が定義されていません"
+
+#: mail/mail-config.glade.h:74
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:75
 msgid "Quoted"
 msgstr "引用"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "メールの受信中"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr "メールの受信"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr "受信オプション"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr "必須情報"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:83
 msgid "Secure MIME"
 msgstr "セキュア MIME"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:84
 msgid "Security"
 msgstr "セキュリティ"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr "PGP プログラムを選択"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr "デフォルトで HTML 形式のメールを送信する"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "メールを送信中"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
 msgstr "メールの送信"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "送信済"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:91
 msgid "Sent and Draft Messages"
 msgstr "送信済と草案メッセージ"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:92
 msgid "Sent messages folder:"
 msgstr "送信済メッセージフォルダ:"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "サーバの設定"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "サーバ種別:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "サーバは認証が必要"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "署名ファイル:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Source"
+msgstr "ソース"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "情報なし"
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "ソース"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:100
 msgid "Special Folders"
 msgstr "特別なフォルダ"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr "標準的な UNIX の mbox ファイル"
 
-#: mail/mail-config.glade.h:88
-msgid "Type"
-msgstr "種別"
-
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr "セキュア接続 (SSL) を使う"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "ユーザ名:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6654,217 +7350,230 @@ msgstr ""
 "\n"
 "\"次\" をクリックして始めてください"
 
-#: mail/mail-config.glade.h:96 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:47 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.glade.h:112
+msgid "newswindow1"
+msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:113
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-crypto.c:59
+#: mail/mail-config.glade.h:114
+msgid "seconds."
+msgstr " 秒"
+
+#: mail/mail-crypto.c:60
 msgid "Could not create a PGP signature context."
 msgstr "PGP 署名コンテキストを作成出来ませんでした"
 
-#: mail/mail-crypto.c:84
+#: mail/mail-crypto.c:86
 msgid "Could not create a PGP verification context."
 msgstr "PGP 検証コンテキストを作成出来ませんでした"
 
-#: mail/mail-crypto.c:113
+#: mail/mail-crypto.c:116
 msgid "Could not create a PGP encryption context."
 msgstr "PGP 暗号コンテキストを作成出来ませんでした"
 
-#: mail/mail-crypto.c:138
+#: mail/mail-crypto.c:142
 msgid "Could not create a PGP decryption context."
 msgstr "PGP 復号コンテキストを作成出来ませんでした"
 
-#: mail/mail-crypto.c:173
+#: mail/mail-crypto.c:177
 msgid "Could not create a S/MIME signature context."
 msgstr "S/MIME 署名コンテキストを作成出来ませんでした"
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:209
 msgid "Could not create a S/MIME certsonly context."
 msgstr "S/MIME コンテキストを作成出来ませんでした"
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:240
 msgid "Could not create a S/MIME encryption context."
 msgstr "S/MIME 暗号コンテキストを作成出来ませんでした"
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:271
 msgid "Could not create a S/MIME envelope context."
 msgstr "S/MIME エンベロープコンテキストを作成出来ませんでした"
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:301
 msgid "Could not create a S/MIME decode context."
 msgstr "S/MIME デコードコンテキストを作成出来ませんでした"
 
-#: mail/mail-display.c:197
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "添付の保存"
 
-#: mail/mail-display.c:237
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "作業ディレクトリを作成出来ませんでした: %s"
-
-#: mail/mail-display.c:298
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "ディスクへ保存..."
 
-#: mail/mail-display.c:300
-#, c-format
-msgid "Open in %s..."
-msgstr "%s に開く..."
-
-#: mail/mail-display.c:302
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "インライン表示"
 
-#: mail/mail-display.c:337
-msgid "External Viewer"
-msgstr "外部ビューア"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
+msgstr "%s に開く..."
 
-#: mail/mail-display.c:360
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "インライン表示 (%s経由)"
 
-#: mail/mail-display.c:364
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "隠す"
 
-#: mail/mail-display.c:989
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr "外部ビューア"
+
+#: mail/mail-display.c:1048
 msgid "Loading message content"
 msgstr "メッセージの内容を読み込み中"
 
-#: mail/mail-display.c:1283
-msgid "Open link in browser"
+#: mail/mail-display.c:1404
+#, fuzzy
+msgid "Open Link in Browser"
 msgstr "ブラウザでリンクを開く"
 
-#: mail/mail-display.c:1285
-msgid "Save as (FIXME)"
+#: mail/mail-display.c:1406
+#, fuzzy
+msgid "Copy Link Location"
+msgstr "場所をコピー (FIXME)"
+
+#: mail/mail-display.c:1408
+#, fuzzy
+msgid "Save Link as (FIXME)"
 msgstr "別名で保存 (FIXME)"
 
-#: mail/mail-display.c:1287
-msgid "Copy location (FIXME)"
-msgstr "場所をコピー (FIXME)"
+#: mail/mail-display.c:1410
+#, fuzzy
+msgid "Save Image as..."
+msgstr "別名で保存..."
 
-#: mail/mail-format.c:532
+#: mail/mail-folder-cache.c:170
+#, fuzzy, c-format
+msgid "%d new"
+msgstr "%d 分"
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr "%d 秒"
+
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "%s を添付"
 
-#: mail/mail-format.c:580
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME メッセージを解析出来ませんでした, ソースを表示します"
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:746
 msgid "Date"
 msgstr "日付"
 
-#: mail/mail-format.c:763
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "メールアドレス:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "差出人"
 
-#: mail/mail-format.c:766
+#: mail/mail-format.c:867
 msgid "Reply-To"
 msgstr "返信先"
 
-#: mail/mail-format.c:769
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "宛先"
 
-#: mail/mail-format.c:772
+#: mail/mail-format.c:873
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1094
+#: mail/mail-format.c:1291
 msgid "No GPG/PGP program configured."
 msgstr "GPG/PGP プログラムの設定がありません"
 
-#: mail/mail-format.c:1109
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "暗号化されたメッセージは表示しません"
 
-#: mail/mail-format.c:1115
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "暗号化されたメッセージ"
 
-#: mail/mail-format.c:1116
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "アイコンをクリックして復号化してください"
 
-#: mail/mail-format.c:1172
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "このメッセージはデジタル署名され信頼できるものです"
 
-#: mail/mail-format.c:1180
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "このメッセージはデジタル署名されたものですが, 信頼を証明出来ません"
 
-#: mail/mail-format.c:1831
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP サイト (%s) を指しています"
 
-#: mail/mail-format.c:1843
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1847
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "ローカルファイル (%s) を指しています"
 
-#: mail/mail-format.c:1881
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "FTP サイト (%s) を指しています"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "未知の外部データ (\"%s\" タイプ) を指しています"
 
-#: mail/mail-format.c:1886
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:504
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr "'%s' をオープン中"
 
-#: mail/mail-local.c:784
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "フォルダ \"%s\" を \"%s\" 形式へ変更しています"
 
-#: mail/mail-local.c:788
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "フォルダ \"%s\" を \"%s\" 形式へ変更します"
-
-#: mail/mail-local.c:811
-msgid "Reconfiguring folder"
-msgstr "フォルダの再構成中"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:840
-msgid "Closing current folder"
-msgstr "現在のフォルダをクローズ中"
-
-#: mail/mail-local.c:872
-msgid "Renaming old folder and opening"
-msgstr "古いフォルダをリネームしてオープン中"
-
-#: mail/mail-local.c:890
-msgid "Creating new folder"
-msgstr "新規フォルダを作成中"
-
-#: mail/mail-local.c:904
-msgid "Copying messages"
-msgstr "メッセージをコピー中"
-
-#: mail/mail-local.c:921
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6873,7 +7582,7 @@ msgstr ""
 "フォルダのメタ情報を保存出来ません; もはやこのフォルダを開く\n"
 "ことが出来ないとたぶん気づいたのでしょう: %s"
 
-#: mail/mail-local.c:960
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6881,12 +7590,17 @@ msgstr ""
 "もしこのメールボックスを開くことはないなら\n"
 "手動で回復させる必要があるかもしれません"
 
-#: mail/mail-local.c:1046
+#: mail/mail-local.c:1000
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr "このゴミ箱フォルダからメッセージをコピーすることが出来ません"
+
+#: mail/mail-local.c:1011
 #, c-format
 msgid "Reconfigure %s"
 msgstr "%s の再設定"
 
-#: mail/mail-mt.c:190
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6895,7 +7609,7 @@ msgstr ""
 "'%s' の際にエラーが発生しました:\n"
 "%s"
 
-#: mail/mail-mt.c:193
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6904,120 +7618,104 @@ msgstr ""
 "操作の準備している間にエラーが発生しました:\n"
 "%s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:880
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "作業中"
 
-#: mail/mail-mt.c:862
-msgid "Evolution progress"
-msgstr "Evolution 進行"
-
-#: mail/mail-ops.c:607
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" を送信中"
 
-#: mail/mail-ops.c:611
-msgid "Sending message"
-msgstr "メッセージを送信中"
-
-#: mail/mail-ops.c:726
+#: mail/mail-ops.c:698
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "メッセージ %d / %d を送信中"
 
-#: mail/mail-ops.c:745
+#: mail/mail-ops.c:717
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "メッセージ %d / %d は失敗しました"
 
-#: mail/mail-ops.c:747 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "完了しました"
 
-#: mail/mail-ops.c:833
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "フォルダへメッセージを保存中"
 
-#: mail/mail-ops.c:907
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr "%s へメッセージを移動中"
 
-#: mail/mail-ops.c:907
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Copying messages to %s"
 msgstr "%s へメッセージをコピー中"
 
-#: mail/mail-ops.c:923
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "移動中"
 
-#: mail/mail-ops.c:926
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "コピー中"
 
-#: mail/mail-ops.c:1002
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" の中のフォルダを走査中"
 
-#: mail/mail-ops.c:1164
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+msgid "Trash"
+msgstr "ごみ箱"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "メッセージを転送"
 
-#: mail/mail-ops.c:1205 mail/mail-ops.c:1343
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "フォルダ %s をオープン中"
 
-#: mail/mail-ops.c:1272
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr "保存された %s をオープン中"
 
-#: mail/mail-ops.c:1411
+#: mail/mail-ops.c:1436
 #, c-format
 msgid "Removing folder %s"
 msgstr "フォルダ %s を削除中"
 
-#: mail/mail-ops.c:1495
-#, c-format
-msgid "Moving folder %s to %s"
-msgstr "%s から %s へフォルダを移動中"
-
-#: mail/mail-ops.c:1497
-#, c-format
-msgid "Copying folder %s to %s"
-msgstr "%s から %s へフォルダをコピー中"
-
-#: mail/mail-ops.c:1650
+#: mail/mail-ops.c:1568
 msgid "Refreshing folder"
 msgstr "フォルダを更新中"
 
-#: mail/mail-ops.c:1686
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "フォルダを削除中"
 
-#: mail/mail-ops.c:1735
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "メッセージ %s を取得中"
 
-#: mail/mail-ops.c:1802
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "メッセージを取得中"
 
-#: mail/mail-ops.c:1812
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "メッセージ番号 %d / %d (uid \"%s\") を取得中"
-
-#: mail/mail-ops.c:1886
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "メッセージを保存中"
 
-#: mail/mail-ops.c:1965
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -7026,12 +7724,7 @@ msgstr ""
 "出力ファイルを作成出来ません: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "メッセージ %d / %d (uid \"%s\") を保存中"
-
-#: mail/mail-ops.c:1992
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -7040,11 +7733,11 @@ msgstr ""
 "ファイルの保存中にエラー: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr "添付を保存中"
 
-#: mail/mail-ops.c:2081
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -7053,12 +7746,12 @@ msgstr ""
 "出力ファイルを作成出来ません: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2109
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "データを書き出すことが出来ませんでした: %s"
 
-#: mail/mail-ops.c:2176
+#: mail/mail-ops.c:2101
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s との接続を切っています"
@@ -7067,222 +7760,174 @@ msgstr "%s との接続を切っています"
 msgid "(Untitled Message)"
 msgstr "(タイトルなしメッセージ)"
 
-#: mail/mail-search.c:268
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(タイトルなしメッセージ)"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "メッセージ"
+
+#: mail/mail-search.c:284
 msgid "Find in Message"
 msgstr "メッセージを検索"
 
-#: mail/mail-search.c:298
+#: mail/mail-search.c:314
 msgid "Case Sensitive"
 msgstr "大文字/小文字を区別する"
 
-#: mail/mail-search.c:299
+#: mail/mail-search.c:315
 msgid "Search Forward"
 msgstr "前方検索"
 
-#: mail/mail-search.c:316
+#: mail/mail-search.c:332
 msgid "Find:"
 msgstr "検索:"
 
-#: mail/mail-search.c:319
+#: mail/mail-search.c:335
 msgid "Matches:"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "検索(_S)"
-
-#: mail/mail-send-recv.c:138
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "キャンセル中..."
 
-#: mail/mail-send-recv.c:233
+#: mail/mail-send-recv.c:250
 msgid "Send & Receive mail"
 msgstr "メールの送受信"
 
-#: mail/mail-send-recv.c:236
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr "受信中"
 
-#: mail/mail-send-recv.c:285
+#: mail/mail-send-recv.c:302
 msgid "Updating..."
 msgstr "更新中..."
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
 msgid "Waiting..."
 msgstr "待機中..."
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:323
 msgid "Sending"
 msgstr "送信中"
 
-#: mail/mail-send-recv.c:471
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "キャンセルしました"
 
-#: mail/mail-summary.c:110
-msgid "Incomplete message written on pipe!"
-msgstr "パイプ上に不完全なメッセージが書かれました!"
-
-#: mail/mail-summary.c:468
-msgid "Mail Summary"
-msgstr "メールサマリ"
+#: mail/mail-session.c:171
+msgid "User canceled operation."
+msgstr "ユーザによって操作をキャンセルされました"
 
-#: mail/mail-tools.c:156
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "テンポラリ mbox '%s' を作成できませんでした: %s"
 
-#: mail/mail-tools.c:203
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (メッセージを転送)"
-
-#: mail/mail-tools.c:213
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (件名なし)"
-
-#: mail/mail-tools.c:230
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "メッセージを転送しました - %s"
 
-#: mail/mail-tools.c:232
-msgid "Forwarded message (no subject)"
-msgstr "メッセージを転送しました (件名なし)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "メッセージを転送"
 
-#: mail/mail-tools.c:439
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
-"s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
-"s<br><b>Subject:</b> %s<br>"
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "メッセージを転送"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "仮想フォルダ"
 
-#: mail/mail-vfolder.c:438
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "新規仮想フォルダ"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/message-browser.c:197 ui/evolution-mail.xml.h:75
-msgid "Reply"
-msgstr "返信"
-
-#: mail/message-browser.c:197
-msgid "Reply to the sender of this message"
-msgstr "メッセージの送信者へ返信します"
-
-#: mail/message-browser.c:200 ui/evolution-mail.xml.h:76
-msgid "Reply to All"
-msgstr "全員へ返信"
-
-#: mail/message-browser.c:200
-msgid "Reply to all recipients of this message"
-msgstr "このメッセージの受信者全員へ返信します"
-
-#: mail/message-browser.c:203 ui/evolution-mail.xml.h:38
-msgid "Forward"
-msgstr "転送"
-
-#: mail/message-browser.c:203
-msgid "Forward this message"
-msgstr "このメッセージを転送します"
-
-#: mail/message-browser.c:208
-msgid "Print the selected message"
-msgstr "選択されたメッセージを印刷します"
-
-#: mail/message-browser.c:211
-msgid "Delete this message"
-msgstr "このメッセージを削除します"
-
-#: mail/message-browser.c:216 ui/evolution-event-editor.xml.h:33
-#: ui/evolution-mail.xml.h:69 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "前"
-
-#: mail/message-browser.c:216
-msgid "Previous message"
-msgstr "前のメッセージへ移動します"
-
-#: mail/message-browser.c:219 ui/evolution-calendar.xml.h:18
-#: ui/evolution-event-editor.xml.h:29 ui/evolution-mail.xml.h:62
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "次"
-
-#: mail/message-browser.c:219
-msgid "Next message"
-msgstr "次のメッセージへ移動します"
-
-#: mail/message-list.c:684
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "未読"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "既読"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr "返答済み"
 
-#: mail/message-list.c:687
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr "複数の未読メッセージ"
 
-#: mail/message-list.c:688
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr "複数のメッセージ"
 
-#: mail/message-list.c:692
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr "最も低い"
 
-#: mail/message-list.c:693
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr "低い"
 
-#: mail/message-list.c:697
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr "高い"
 
-#: mail/message-list.c:698
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr "最も高い"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:955
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "今日の %p %l:%M"
 
-#: mail/message-list.c:964
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "昨日の %p %l:%M"
 
-#: mail/message-list.c:976
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr "%p %l:%M (%a)"
 
-#: mail/message-list.c:984
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr "%m月 %d日 %p %l:%M"
 
-#: mail/message-list.c:986
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr "%Y年 %m月 %d日"
 
-#: mail/mail-session.c:161
-msgid "User canceled operation."
-msgstr "ユーザによって操作をキャンセルされました"
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "メッセージを保存中"
+
+#: mail/message-list.etspec.h:2
+msgid "Flagged"
+msgstr ""
+
+#: mail/message-list.etspec.h:4
+#, fuzzy
+msgid "Received"
+msgstr "受信中"
+
+#: mail/message-list.etspec.h:7
+#, fuzzy
+msgid "Size"
+msgstr "サイズ:"
 
 #: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
@@ -7312,15 +7957,1456 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "フォルダ \"%s\" の購読解除中"
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr "購読管理"
 
-#: shell/e-setup.c:124 shell/e-setup.c:197
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr "実行サマリのための Evolution コンポーネント"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+msgid "Factory for the Evolution executive summary component."
+msgstr "Evolution 実行サマリコンポーネントのためのファクトリ"
+
+#: my-evolution/component-factory.c:140
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Evolution 実行サマリーコンポーネントの初期化が出来ません"
+
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+msgid "Appointments"
+msgstr "約束"
+
+#: my-evolution/e-summary-calendar.c:177
+#, fuzzy
+msgid "No appointments"
+msgstr "約束の表示"
+
+#: my-evolution/e-summary-calendar.c:226
+#, fuzzy
+msgid "%l:%M%p"
+msgstr "%p %I:%M"
+
+#: my-evolution/e-summary-calendar.c:228
+#, fuzzy
+msgid "%a %l:%M%p"
+msgstr "%p %l:%M (%a)"
+
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "メールサマリ"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:869
+msgid "Add a news feed"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "My Evolution"
+
+#: my-evolution/e-summary-rdf.c:281
+#, fuzzy
+msgid "There was an error downloading news feed"
+msgstr "カレンダファイルを読み込み中にエラーが発生しました"
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#, fuzzy
+msgid "<b>Error downloading RDF</b>"
+msgstr "<b>カレンダをロード中にエラー</b>"
+
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "タスクの表示"
+
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:643
+#, fuzzy
+msgid "Regions"
+msgstr "セクション:"
+
+#: my-evolution/e-summary.c:145
+#, fuzzy
+msgid "%A, %d %B %Y"
+msgstr "%Y/%B/%e %A"
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#, fuzzy
+msgid "Print My Evolution"
+msgstr "My Evolution"
+
+#: my-evolution/e-summary.c:518
+#, fuzzy
+msgid "Printing of My Evolution failed"
+msgstr "メッセージの印刷に失敗しました"
+
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "init_bonobo(): Bonobo を初期化することが出来ませんでした"
+
+#: my-evolution/metar.c:44
+#, fuzzy
+msgid "Clear sky"
+msgstr "クリア"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr ""
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
+
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+#, fuzzy
+msgid "Invalid"
+msgstr "インライン"
+
+#: my-evolution/metar.c:63
+#, fuzzy
+msgid "Variable"
+msgstr "無効"
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "North"
+msgstr "ノート"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "Northeast"
+msgstr "ノート(_t):"
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "が存在する"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "Southeast"
+msgstr "ソース"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "月"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "Southwest"
+msgstr "最も低い"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "West"
+msgstr "テスト"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "最も低い"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Showers"
+msgstr "表示"
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Rain"
+msgstr "ラジオ"
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Drifting rain"
+msgstr "説明が次のものを含む"
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Freezing rain"
+msgstr "再検索"
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "今"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Moderate snow"
+msgstr "今すぐ更新"
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+#, fuzzy
+msgid "Drifting snow grains"
+msgstr "説明が次のものを含む"
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "メール"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Shallow hail"
+msgstr "次の時にダイアログを表示する:"
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Partial hail"
+msgstr "主要なメール"
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "メールの受信"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Shallow small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Showers of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown precipitation"
+msgstr "未知の認証状態です"
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Light precipitation"
+msgstr "引用を強調する"
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown thunderstorm"
+msgstr "未知のエラー"
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Freezing precipitation"
+msgstr "打合せの案内"
+
+#. MIST
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Mist"
+msgstr "Miss"
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "縦長"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Drifting mist"
+msgstr "メーリングリスト"
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Shallow fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Fog with wind"
+msgstr "このウィンドウを閉じます"
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke"
+msgstr "記録"
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Shallow smoke"
+msgstr "タスクの表示"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke with wind"
+msgstr "このウィンドウを閉じます"
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "送信"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "ヘッダ"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "日"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+#, fuzzy
+msgid "Dust"
+msgstr "8 月"
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+#, fuzzy
+msgid "Raging tornado"
+msgstr "TODOの状況"
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+#, fuzzy
+msgid "Thunderous tornado"
+msgstr "TODOの状況"
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add new feed"
+msgstr "返答済み"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "フォルダを選択"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "すべての付き添い"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "表示するフォルダを開始する:"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "表示オプション"
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "表示"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "金曜日"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+#, fuzzy
+msgid "News Feed Settings"
+msgstr "設定"
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "1 日"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "月"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr "1 週間"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+#, fuzzy
+msgid "Schedule"
+msgstr ""
+"スケジュール\n"
+"時間"
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "タスクの表示"
+
+#: my-evolution/my-evolution.glade.h:21
+#, fuzzy
+msgid "Show full path for folders"
+msgstr "すべてのヘッダを表示(_H)"
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "タスクの表示"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "タスク"
+
+#: my-evolution/my-evolution.glade.h:24
+#, fuzzy
+msgid "Units: "
+msgstr ""
+"\n"
+"  部署:  "
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "その他"
+
+#: my-evolution/my-evolution.glade.h:26
+#, fuzzy
+msgid "Weather settings"
+msgstr "選択されたものをクリアします"
+
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "imperial"
+msgstr "4 月"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr "Evolution シェル"
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "詳細"
+
+#: shell/e-activity-handler.c:200
+#, fuzzy
+msgid "Cancel Operation"
+msgstr "打合せをキャンセル"
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "特別なフォルダ"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Evolution のインストール"
 
-#: shell/e-setup.c:128
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -7328,28 +9414,24 @@ msgstr ""
 "この Evolution の新しいバージョンはあなたのパーソナル Evolution\n"
 "ディレクトリの中に付加ファイルをインストールする必要があります"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr "\"OK\" でファイルをインストール, または \"キャンセル\" で終了します"
 
-#: shell/e-setup.c:169
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "正しくファイルを更新出来ませんでした"
 
-#: shell/e-setup.c:172 shell/e-setup.c:240
-msgid "Evolution files successfully installed."
-msgstr "Evolution のファイルは正しくインストールされました"
-
-#: shell/e-setup.c:201
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr "これは Evolution を実行した最初のように思われます"
 
-#: shell/e-setup.c:202
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Evolution ユーザファイルをインストールしますので \"OK\" をクリックして下さい"
 
-#: shell/e-setup.c:221
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -7360,16 +9442,14 @@ msgstr ""
 "\n"
 "エラー: %s"
 
-#: shell/e-setup.c:236
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
-msgstr ""
-"'%s' の中にファイルを\n"
-"コピー出来ません"
+msgstr "ファイル読込中の間にエラーは発生しました"
 
-#: shell/e-setup.c:303
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -7380,7 +9460,7 @@ msgstr ""
 "Evolution ユーザファイルのインストールを\n"
 "許容するために移動して下さい"
 
-#: shell/e-setup.c:317
+#: shell/e-setup.c:322
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -7394,7 +9474,7 @@ msgstr ""
 "削除する必要があります\n"
 "このディレクトリを削除しますか?"
 
-#: shell/e-setup.c:342
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -7405,39 +9485,56 @@ msgstr ""
 "ディレクトリではありません．Evolution ユーザ\n"
 "ファイルのインストールを許容するために移動して下さい"
 
-#: shell/e-shell.c:391
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "局部記憶装置のセットアップが出来ません -- %s"
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "フォルダを取得出来ません: %s: %s"
 
-#: shell/e-shell.c:1256
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
+#: shell/e-shell-folder-commands.c:162
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"'%s' の中にファイルを\n"
+"コピー出来ません"
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
 msgstr ""
-"`%s' ビューは突然死亡しました :-(\n"
-"これはたぶん %s コンポーネントがクラッシュしたことを意味します"
 
-#: shell/e-shell-folder-commands.c:239
+#: shell/e-shell-folder-commands.c:270
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "フォルダ \"%s\" をコピーするフォルダを指定します:"
 
-#: shell/e-shell-folder-commands.c:244
+#: shell/e-shell-folder-commands.c:275
 msgid "Copy folder"
 msgstr "フォルダのコピー"
 
-#: shell/e-shell-folder-commands.c:281
+#: shell/e-shell-folder-commands.c:313
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "フォルダ \"%s\" を移動するフォルダを指定します:"
 
-#: shell/e-shell-folder-commands.c:286
+#: shell/e-shell-folder-commands.c:318
 msgid "Move folder"
 msgstr "フォルダの移動"
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "このフォルダを削除します"
+
+#: shell/e-shell-folder-commands.c:363
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr "本当にタスク `%s' を削除してもよろしいですか?"
+
+#: shell/e-shell-folder-commands.c:422
+#, fuzzy, c-format
+msgid "Rename folder '%s'"
+msgstr "フォルダ %s を削除中"
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -7446,15 +9543,15 @@ msgstr ""
 "指定されたフォルダを作成することが出来ません:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "指定されたフォルダ名は有効ではありません"
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolution - 新規フォルダの作成"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -7462,11 +9559,11 @@ msgstr ""
 "選択したフォルダの種別は要求された操作のために\n"
 "有効ではありません"
 
-#: shell/e-shell-folder-selection-dialog.c:328
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "新規..."
 
-#: shell/e-shell-folder-title-bar.c:468 shell/e-shell-folder-title-bar.c:469
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(タイトルなし)"
 
@@ -7478,11 +9575,12 @@ msgid ""
 "You can select \"Automatic\" if you do not know, and Evolution will attempt "
 "to work it out."
 msgstr ""
-"Evolution へインポートしたいファイルを選択して，リストからファイル種別を選択"
-"してください．\n"
+"Evolution "
+"へインポートしたいファイルを選択して，リストからファイル種別を選択してください"
+"．\n"
 "\n"
-"もし分からないなら \"自働\" を選択することが出来，Evolution は解決を試みるで"
-"しょう"
+"もし分からないなら \"自働\" を選択することが出来，Evolution "
+"は解決を試みるでしょう"
 
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
@@ -7575,54 +9673,19 @@ msgstr "このデータをインポートする送り先のフォルダを選択してください"
 msgid "Closing connections..."
 msgstr "接続を閉じています..."
 
-#: shell/e-shell-view.c:167
-msgid "(No folder displayed)"
-msgstr "(表示したフォルダはありません)"
-
-#. Special case for My Evolution
-#: shell/e-shell-view.c:1383
-msgid "My Evolution"
-msgstr "My Evolution"
-
-#: shell/e-shell-view.c:1400
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution - %s"
-
-#: shell/e-shell-view.c:1402
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
-
-#: shell/e-shell-view.c:1440
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Evolution は現在オンラインです．オフラインにするにはこのボタンをクリックして"
-"ください"
-
-#: shell/e-shell-view.c:1447
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution はオフライン処理中です"
-
-#: shell/e-shell-view.c:1453
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Evolution は現在オフラインです．オンラインにするにはこのボタンをクリックして"
-"ください"
-
-#: shell/e-shell-view-menu.c:179
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy はあなたの $PATH には見つかりません"
 
-#: shell/e-shell-view-menu.c:185
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy は実行できませんでした"
 
-#: shell/e-shell-view-menu.c:230
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:232
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -7634,35 +9697,92 @@ msgstr ""
 "グループウェアアプリケーションの\n"
 "パッケージソフトです"
 
-#: shell/e-shell-view-menu.c:465
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "フォルダへ移動..."
 
-#: shell/e-shell-view-menu.c:466
+#: shell/e-shell-view-menu.c:438
 msgid "Select the folder that you want to open"
 msgstr "開きたいフォルダを選択します"
 
-#: shell/e-shell-view-menu.c:653
-msgid "Work online"
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "新規ショートカットグループを作成します"
+
+#: shell/e-shell-view-menu.c:584
+#, fuzzy
+msgid "Select the folder you want the shortcut to point to:"
+msgstr "開きたいフォルダを選択します"
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
 msgstr "オンライン作業"
 
-#: shell/e-shell-view-menu.c:665 shell/e-shell-view-menu.c:677
-msgid "Work offline"
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
 msgstr "オフライン作業"
 
-#: shell/e-shortcuts.c:382
-msgid "Error saving shortcuts."
-msgstr "ショートカットの保存中にエラーが発生しました"
+#: shell/e-shell-view.c:175
+msgid "(No folder displayed)"
+msgstr "(表示したフォルダはありません)"
 
-#: shell/e-shortcuts-view.c:134
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+msgid "My Evolution"
+msgstr "My Evolution"
+
+#: shell/e-shell-view.c:1411
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolution - %s"
+
+#: shell/e-shell-view.c:1413
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolution %s [%s]"
+
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Evolution "
+"は現在オンラインです．オフラインにするにはこのボタンをクリックしてください"
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution はオフライン処理中です"
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Evolution "
+"は現在オフラインです．オンラインにするにはこのボタンをクリックしてください"
+
+#: shell/e-shell.c:446
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "局部記憶装置のセットアップが出来ません -- %s"
+
+#: shell/e-shell.c:1311
+#, 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-view.c:141
 msgid "Create new shortcut group"
 msgstr "新規ショートカットグループを作成します"
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "グループ名:"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -7671,110 +9791,204 @@ msgstr ""
 "本当にショートカットバーからグループ\n"
 "`%s' を削除したいですか?"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "削除しません"
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "このショートカットグループを削除します"
+
+#: shell/e-shortcuts-view.c:301
+#, fuzzy
+msgid "Rename selected shortcut group to:"
+msgstr "このショートカットグループを削除します"
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "小さいアイコン(_S)"
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "小さいアイコンでショートカットを表示します"
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "大きいアイコン(_L)"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "大きいアイコンでショートカットを表示します"
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "新規グループ(_N)..."
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "新規ショートカットグループを作成します"
 
-#: shell/e-shortcuts-view.c:294
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
 msgstr "このグループを削除(_R)..."
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "このショートカットグループを削除します"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "このグループを削除(_R)..."
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "このショートカットグループを削除します"
+
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "ショートカットバーを隠す(_H)"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "ショートカットバーを隠します"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
-msgstr "アクティブ"
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "このショートカットグループを削除します"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
-msgstr "このショートカットをアクティブにします"
+#: shell/e-shortcuts-view.c:462
+#, fuzzy
+msgid "Rename selected shortcut to:"
+msgstr "このショートカットグループを削除します"
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "開く"
+
+#: shell/e-shortcuts-view.c:474
+#, fuzzy
+msgid "Open the folder linked to this shortcut"
+msgstr "別のウィンドウでこのフォルダを開きます"
+
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+msgid "Open in New Window"
+msgstr "新規ウィンドウで開く"
+
+#: shell/e-shortcuts-view.c:476
+#, fuzzy
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "新規ウィンドウで選択されたメッセージを開きます"
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "リネーム(_R)..."
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
+msgstr "このショートカットグループを削除します"
+
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "ショートカットバーからこのショートカットを削除します"
 
-#: shell/e-storage.c:178
+#: shell/e-shortcuts.c:585
+msgid "Error saving shortcuts."
+msgstr "ショートカットの保存中にエラーが発生しました"
+
+#: shell/e-shortcuts.c:982
+#, fuzzy
+msgid "Shortcuts"
+msgstr "ショートカットバー(_S)"
+
+#: shell/e-shortcuts.c:984
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
+
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "コンタクト(_C)"
+
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(名前なし)"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "エラーはありません"
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "一般的なエラー"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "同じ名前のフォルダがすでに存在しています"
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "指定されたフォルダ種別は有効ではありません"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "I/O エラー"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "フォルダを作成する十分な空きがありません"
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "指定されたフォルダは見付かりませんでした"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr "機能はこの記憶装置では実装されていません"
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr "許可がありません"
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "操作はサポートされていません"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr "指定された種別はこの記憶装置ではサポートされていません"
 
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
+
+#: shell/e-task-widget.c:173
+#, fuzzy
+msgid "%s (%d%% complete)"
+msgstr "% 完了(_l):"
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "接続を閉じています..."
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "ホスト:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "フォルダ名:"
@@ -7787,15 +10001,11 @@ msgstr "フォルダ種別:"
 msgid "Specify where to create the folder:"
 msgstr "フォルダを作成する場所を指定してください:"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "Evolution シェル"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
-"\"インポート\" をクリックして Evolution へファイルのインポートを開始してくだ"
-"さい"
+"\"インポート\" をクリックして Evolution "
+"へファイルのインポートを開始してください"
 
 #: shell/importer/import.glade.h:2
 msgid "Evolution Import Utility"
@@ -7815,30 +10025,34 @@ msgstr ""
 "このウィザードでは Evolution の中に外部ファイルをインポート\n"
 "する処理を通して案内します"
 
-#: shell/importer/intelligent.c:187
+#: shell/importer/intelligent.c:191
 msgid "Importers"
 msgstr "インポート"
 
-#: shell/importer/intelligent.c:193
+#: shell/importer/intelligent.c:197
 msgid "Don't import"
 msgstr "インポートしません"
 
-#: shell/main.c:82
-#, no-c-format
+#: shell/importer/intelligent.c:199
+msgid "Don't ask me again"
+msgstr "このメッセージを二度と表示しない"
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
+#, fuzzy, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
 "\n"
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
@@ -7859,7 +10073,7 @@ msgstr ""
 "我々はあなたが我々の成果を楽しむことを望んでいます．そして我々は\n"
 "熱心にあなたの貢献を待ち受けています!\n"
 
-#: shell/main.c:107
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7867,34 +10081,29 @@ msgstr ""
 "ありがとう\n"
 "Evolution チーム\n"
 
-#: shell/main.c:138
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr "Evolution シェルの初期化が出来ません"
 
-#: shell/main.c:184
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr "スプラッシュ画面を無効にする"
 
-#: shell/main.c:185
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr "すべてのコンポーネントのデバッグ出力をファイルへ送る"
 
-#: shell/main.c:217
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo コンポーネントシステムを初期化出来ません"
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-event-editor.xml.h:6
-#: ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "切り取り(_u)"
-
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-event-editor.xml.h:13
-#: ui/evolution-mail.xml.h:8 ui/evolution-task-editor-dialog.xml.h:14
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
 msgid "Copy"
 msgstr "コピー"
 
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:15
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 msgid "Copy the selection"
 msgstr "選択されたものをコピーします"
 
@@ -7902,68 +10111,66 @@ msgstr "選択されたものをコピーします"
 msgid "Create new contact"
 msgstr "新規コンタクトを作成します"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-event-editor.xml.h:15
-#: ui/evolution-task-editor-dialog.xml.h:16
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Create new contact list"
+msgstr "新規コンタクトを作成します"
+
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
 msgid "Cut"
 msgstr "切り取り"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-event-editor.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:17
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
 msgid "Cut the selection"
 msgstr "選択されたものを切り取ります"
 
-#: ui/evolution-addressbook.xml.h:8
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "選択したコンタクトを削除します"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
 msgstr "新規コンタクト"
 
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-event-editor.xml.h:30
-#: ui/evolution-task-editor-dialog.xml.h:33
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New list"
+msgstr "ニュース"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
 msgid "Paste"
 msgstr "貼り付け"
 
-#: ui/evolution-addressbook.xml.h:11 ui/evolution-event-editor.xml.h:31
-#: ui/evolution-task-editor-dialog.xml.h:34
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "クリップボードへ貼り付けます"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:68
-msgid "Previews the message to be printed"
-msgstr "印刷されるメッセージのプレビューを表示します"
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Previews the contacts to be printed"
+msgstr "印刷されるカレンダのプレビューを表示します"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:17
 msgid "Print selected contacts"
 msgstr "選択したコンタクトを印刷します"
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-event-editor.xml.h:48
-#: ui/evolution-task-editor-dialog.xml.h:57
+#: ui/evolution-addressbook.xml.h:18
 msgid "Select All"
 msgstr "すべて選択"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:49
-#: ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "すべてのものを選択します"
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "すべてのコンタクトを表示します"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "停止"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "詠み込みを停止します"
 
-#: ui/evolution-addressbook.xml.h:20
-msgid "View All"
-msgstr "すべて表示"
-
-#: ui/evolution-addressbook.xml.h:21
-msgid "View all contacts"
-msgstr "すべてのコンタクトを表示します"
-
 #: ui/evolution-addressbook.xml.h:22
 msgid "_Addressbook Sources..."
 msgstr "アドレス帳のソース(_A)..."
@@ -7972,183 +10179,223 @@ msgstr "アドレス帳のソース(_A)..."
 msgid "_Contact"
 msgstr "コンタクト(_C)"
 
-#: ui/evolution-addressbook.xml.h:24 ui/evolution-event-editor.xml.h:55
-#: ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "コピー(_C)"
-
-#: ui/evolution-addressbook.xml.h:25 ui/evolution-event-editor.xml.h:68
-#: ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "貼り付け(_P)"
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
+msgstr "コンタクト(_C)"
 
-#: ui/evolution-addressbook.xml.h:26 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "印刷(_P)..."
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "コンタクトの検索(_S)"
 
-#: ui/evolution-addressbook.xml.h:28 ui/evolution-event-editor.xml.h:72
-#: ui/evolution-task-editor-dialog.xml.h:86
+#: ui/evolution-addressbook.xml.h:29
 msgid "_Select All"
 msgstr "すべて選択(_A)"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-task-editor-dialog.xml.h:88
-#: ui/evolution.xml.h:64
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "ツール(_T)"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 日"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a new all day Event"
+#, fuzzy
+msgid "Create a New All-Day _Event"
 msgstr "新規に毎日のイベントを作成します"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "新規約束を作成します"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "新規カレンダを作成します"
+msgid "Create a new appointment"
+msgstr "新規約束を作成します"
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
-msgstr "日"
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "移動"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "時間を戻します"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "時間を進めます"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to _Date"
 msgstr "指定日に移動(_D)"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Today"
-msgstr "今日へ移動(_T)"
-
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "指定日に移動します"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "現在の時間へ移動します"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "月"
-
-#: ui/evolution-calendar.xml.h:17
-msgid "New _Event"
-msgstr "新規イベント(_E)"
-
-#: ui/evolution-calendar.xml.h:20
-msgid "Open Calendar"
-msgstr "カレンダを開く"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Prev"
-msgstr "前"
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "新規約束"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "印刷されるカレンダのプレビューを表示します"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:20
 msgid "Print calendar"
 msgstr "カレンダの印刷"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "このカレンダの印刷します"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:19
-msgid "Save As"
-msgstr "別名で保存"
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Publish Free/Busy Information"
+msgstr "必須情報"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
-msgstr "別のものとしてカレンダを保存します"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "1 日を表示します"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "1 ヶ月を表示します"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "1 週間を表示します"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "週間労働時間を表示します"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:229
-#: widgets/misc/e-dateedit.c:424
-msgid "Today"
-msgstr "今日"
-
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr "週間労働時間(_o)"
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
-msgstr "週"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "約束(_A)"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "メール設定(_M)..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr "日(_D)"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:33
 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:58
-msgid "_New"
-msgstr "新規(_N)"
-
-#: ui/evolution-calendar.xml.h:41
-msgid "_Open Calendar"
-msgstr "カレンダを開く(_O)"
-
-#: ui/evolution-calendar.xml.h:45
+#: ui/evolution-calendar.xml.h:37
 msgid "_Week"
 msgstr "週(_W)"
 
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "閉じる"
+
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
+msgstr "この約束を閉じます"
+
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "この約束を削除"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
+msgstr "メインツールバー"
+
+#: ui/evolution-comp-editor.xml.h:7
+#, fuzzy
+msgid "Preview the printed item"
+msgstr "印刷されるメッセージのプレビューを表示します"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+msgid "Print Pre_view"
+msgstr "印刷プレビュー(_v)"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "プリンタの設定"
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
+msgstr "このアイテムを印刷"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
+msgstr "印刷..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr "保存と閉じる"
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr "約束を保存してダイアログボックスを閉じます"
+
+#: ui/evolution-comp-editor.xml.h:17
+#, fuzzy
+msgid "Save this item to disk"
+msgstr "%s へビューを変更"
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr "現在のプリンタのページ設定を行います"
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "動作(_A)"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
+msgstr "ファイル(_F)"
+
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "このアイテムを削除します"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr "削除..."
 
@@ -8160,27 +10407,12 @@ msgstr "ヘルプ"
 msgid "Print En_velope..."
 msgstr "表紙を印刷(_v)..."
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "このアイテムを印刷"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: 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:20
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "別名で保存(_A)..."
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "保存と閉じる"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "コンタクトを保存してこのダイアログボックスを閉じます"
@@ -8197,670 +10429,672 @@ msgstr "オンラインヘルプを参照してください"
 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:48 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:55
-#: ui/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "このアプリケーションについて"
+#: ui/evolution-contact-list-editor.xml.h:2
+#, fuzzy
+msgid "Delete this list"
+msgstr "このアイテムを削除します"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "情報..."
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "タスクを保存してダイアログボックスを閉じます"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "動作(_n)"
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "他へコンタクトを送信(_n)..."
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr "アドレス帳(_B)... (FIXME)"
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "コンタクトへメッセージを送信(_m)..."
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "クリア(_l)"
+#: ui/evolution-event-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Mee_ting"
+msgstr "打合せをキャンセル"
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
-msgstr "名前のチェック (_k) (FIXME)"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#, fuzzy
+msgid "Cancel the meeting for this item"
+msgstr "このフォルダの設定を変更します"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "クリア"
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#, fuzzy
+msgid "Forward as i_Calendar"
+msgstr "vCalenderとして転送(_C) (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "選択されたものをクリアします"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#, fuzzy
+msgid "Forward this item via email"
+msgstr "このメッセージを転送します"
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "この約束を閉じます"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "フォルダへコピー(_y)... (FIXME)"
+#: ui/evolution-event-editor.xml.h:6
+#, fuzzy
+msgid "Re_fresh Meeting"
+msgstr ""
+"要求\n"
+"打合せ"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "この約束を削除"
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
+msgstr "打合せのスケジュール(_M)"
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr "XMLのダンプ"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#, fuzzy
+msgid "Schedule a meeting for this item"
+msgstr "打合せのスケジュール"
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
-msgstr "UI XML の記述をダンプします"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
+msgstr "動作(_A)"
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "フォルダの最初のアイテム(_r) (FIXME)"
+#: ui/evolution-executive-summary.xml.h:1
+msgid "Customise My Evolution"
+msgstr "My Evolution のカスタマイズ"
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "転送(_w) (FIXME)"
+#: ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "キャンセル"
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
-msgstr "vCalenderとして転送(_C) (FIXME)"
+#: ui/evolution-mail-global.xml.h:2
+msgid "Cancel the current mail operation"
+msgstr "現在のメール操作をキャンセルします"
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "次のアイテムへ移動します"
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
+msgstr "作成"
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "前のアイテムへ移動します"
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "メッセージを作成します"
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr "未完了タスク(_c) (FIXME)"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
+msgstr "メールアカウントと他の設定を作成/編集します"
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
-msgstr "ファイルのプロパティを修正します"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
+msgstr "新規メールをフィルタするルールの作成/編集をします"
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "次(_e)"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
+msgstr "仮想フォルダの定義を作成/編集します"
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "前(_v)"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
+msgstr "ゴミ箱を空にする(_T)"
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "印刷プレビュー(_v)"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
+msgstr "パスワードの紛失(_P)"
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "プリンタの設定(_e)..."
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr "記憶したパスワードを忘れた場合に再び表示します"
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "プリンタの設定"
+#: ui/evolution-mail-global.xml.h:11
+msgid "Manage _Subscriptions..."
+msgstr "定期購読管理(_S)..."
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:18
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:241
-msgid "Save"
-msgstr "保存"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
+msgstr "メールを作成するためにウィンドウを開きます"
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
-msgstr "約束を保存してダイアログボックスを閉じます"
+#: ui/evolution-mail-global.xml.h:13
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "すべてのフォルダから削除マークされたメッセージを永久的に削除します"
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:24
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "現在のファイルを保存します"
+#: ui/evolution-mail-global.xml.h:14
+msgid "Send / Receive"
+msgstr "送受信"
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
-msgstr "打合せのスケジュール(_M)"
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
+msgstr "キューにあるメールを送信して新規メールを取得します"
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr ""
+#: ui/evolution-mail-global.xml.h:16
+#, fuzzy
+msgid "Show message preview window"
+msgstr "通常のメッセージを表示します"
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr "現在のプリンタのページ設定を行います"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "サーバ上のフォルダの購読/購読解除をします"
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
-msgstr "タスク要求(_R) (FIXME)"
+#: ui/evolution-mail-global.xml.h:18
+msgid "Virtual Folder _Editor..."
+msgstr "仮想フォルダエディタ(_E)..."
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "情報(_A)..."
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Filters..."
+msgstr "フィルタ(_F)..."
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:44
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:44
-msgid "_Close"
-msgstr "閉じる(_C)"
+#: ui/evolution-mail-global.xml.h:20
+msgid "_Mail Message"
+msgstr "メッセージをメール(_M)"
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:45
-msgid "_Contact (FIXME)"
-msgstr "コンタクト(_C) (FIXME)"
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Mail Settings..."
+msgstr "メール設定(_M)..."
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:45
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "デバッグ(_D)"
+#: ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Preview Pane"
+msgstr "プレビュー"
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:50
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:53
-msgid "_Help"
-msgstr "ヘルプ(_H)"
+#: ui/evolution-mail-global.xml.h:23
+msgid "_Send / Receive"
+msgstr "送受信(_S)"
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
-msgstr "アイテム(_I) (FIXME)"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
+msgstr "このフォルダの設定を変更します"
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
-msgstr "仕訳記入(_J) (FIXME)"
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Copy selected messages"
+msgstr "選択されたメッセージを隠す(_e)"
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr "フォルダの最後のアイテム(_L) (FIXME)"
+#: ui/evolution-mail-list.xml.h:5
+#, fuzzy
+msgid "Cut selected messages"
+msgstr "選択されたメッセージを印刷します"
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "メッセージをメール(_M) (FIXME)"
+#: ui/evolution-mail-list.xml.h:6
+msgid "Hide S_elected Messages"
+msgstr "選択されたメッセージを隠す(_e)"
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "フォルダへ移動(_M)... (FIXME)"
+#: ui/evolution-mail-list.xml.h:7
+msgid "Hide _Deleted Messages"
+msgstr "削除されたメッセージを隠す(_D)"
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
-msgstr "ノート(_N) (FIXME)"
+#: ui/evolution-mail-list.xml.h:8
+#, fuzzy
+msgid "Hide _Read Messages"
+msgstr "既読メッセージを隠す(_R)"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:120
-#: ui/evolution-task-editor-dialog.xml.h:83 ui/evolution.xml.h:60
-msgid "_Properties..."
-msgstr "プロパティ(_P)..."
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr "表示しているメッセージではなく削除されたメッセージを隠します"
 
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:63
-msgid "_Task (FIXME)"
-msgstr "タスク(_T) (FIXME)"
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
+msgstr "既読としてすべてマーク(_e)"
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
-msgstr "未読アイテム(_U) (FIXME)"
+#: ui/evolution-mail-list.xml.h:11
+msgid "Mark all visible messages as read"
+msgstr "既読としてすべてのメッセージをマークします"
 
-#: ui/evolution-event-editor.xml.h:76 ui/evolution-message-composer.xml.h:57
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:65
-msgid "_View"
-msgstr "表示(_V)"
+#: ui/evolution-mail-list.xml.h:13
+#, fuzzy
+msgid "Paste message in the clipboard"
+msgstr "クリップボードへ貼り付けます"
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Customise My Evolution"
-msgstr "My Evolution のカスタマイズ"
+#: ui/evolution-mail-list.xml.h:14
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "このフォルダから削除マークされたメッセージを永久的に削除します"
 
-#: ui/evolution-mail.xml.h:1
-msgid "Apply filter rules to the selected messages"
-msgstr "選択されたメッセージへフィルタルールを適用します"
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "すべて選択(_A)"
 
-#: ui/evolution-mail.xml.h:2
-msgid "Cancel"
-msgstr "キャンセル"
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select _Thread"
+msgstr "スレッドを選択(_T)"
 
-#: ui/evolution-mail.xml.h:3
-msgid "Cancel the current mail operation"
-msgstr "現在のメール操作をキャンセルします"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
+msgstr "現在選択されていないメッセージだけをすべて選択します"
 
-#: ui/evolution-mail.xml.h:4
-msgid "Change the properties of this folder"
-msgstr "このフォルダの設定を変更します"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr "選択されたメッセージと同じスレッドのメッセージをすべて選択します"
 
-#: ui/evolution-mail.xml.h:5
-msgid "Compose"
-msgstr "作成"
+#: ui/evolution-mail-list.xml.h:19
+msgid "Select all visible messages"
+msgstr "すべてのメッセージを選択します"
+
+#: ui/evolution-mail-list.xml.h:20
+msgid "Show _All"
+msgstr "すべて表示(_A)"
+
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr "一時的に隠したメッセージを表示します"
+
+#: ui/evolution-mail-list.xml.h:22
+msgid "Temporarily hide all messages that have already been read"
+msgstr "すべての既読メッセージを一時的に隠します"
+
+#: ui/evolution-mail-list.xml.h:23
+msgid "Temporarily hide the selected messages"
+msgstr "選択されたメッセージを一時的に隠します"
+
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
+msgstr "メッセージリストをスレッド化します"
+
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
+msgstr "抹消(_E)"
+
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "フォルダ(_F)"
+
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "選択を反転(_I)"
+
+#: ui/evolution-mail-list.xml.h:28
+msgid "_Properties..."
+msgstr "プロパティ(_P)..."
+
+#: ui/evolution-mail-list.xml.h:29
+msgid "_Threaded Message List"
+msgstr "メッセージリストをスレッド化(_T)"
 
-#: ui/evolution-mail.xml.h:6
+#: ui/evolution-mail-message.xml.h:1
+msgid "Apply filter rules to the selected messages"
+msgstr "選択されたメッセージへフィルタルールを適用します"
+
+#: ui/evolution-mail-message.xml.h:2
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "選択されたメッセージの受信者全員への返信を作成します"
 
-#: ui/evolution-mail.xml.h:7
+#: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr "選択されたメッセージの送信者への返信を作成します"
+
+#: ui/evolution-mail-message.xml.h:4
 msgid "Compose a reply to the sender of the selected message"
 msgstr "選択されたメッセージの送信者への返信を作成します"
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail-message.xml.h:6
 msgid "Copy selected messages to another folder"
 msgstr "別のフォルダへ選択されたメッセージをコピーします"
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail-message.xml.h:7
 msgid "Create _Virtual Folder From Message"
 msgstr "メッセージから仮想フォルダを作成(_V)"
 
-#: ui/evolution-mail.xml.h:11
+#: ui/evolution-mail-message.xml.h:8
 msgid "Create a rule to filter messages from this sender"
 msgstr "この送信者からのメッセージをフィルタするルールを作成します"
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail-message.xml.h:9
 msgid "Create a rule to filter messages to these recipients"
 msgstr "これらの受信者へのメッセージをフィルタするルールを作成します"
 
-#: ui/evolution-mail.xml.h:13
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "このメーリングリストへのメッセージをフィルタするルールを作成します"
 
-#: ui/evolution-mail.xml.h:14
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages with this subject"
 msgstr "この件名のメッセージをフィルタするルールを作成します"
 
-#: ui/evolution-mail.xml.h:15
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a virtual folder for these recipients"
 msgstr "これらの受信者のための仮想フォルダを作成します"
 
-#: ui/evolution-mail.xml.h:16
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a virtual folder for this mailing list"
 msgstr "このメーリングリストのための仮想フォルダを作成します"
 
-#: ui/evolution-mail.xml.h:17
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a virtual folder for this sender"
 msgstr "この送信者のための仮想フォルダを作成します"
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail-message.xml.h:15
 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
+#: ui/evolution-mail-message.xml.h:17
 msgid "Display the next important message"
 msgstr "次の重要なメッセージを表示します"
 
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail-message.xml.h:18
 msgid "Display the next message"
 msgstr "次のメッセージを表示します"
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail-message.xml.h:19
 msgid "Display the next unread message"
 msgstr "次の未読メッセージを表示します"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail-message.xml.h:20
 msgid "Display the next unread thread"
 msgstr "次の未読スレッドを表示します"
 
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the previous important message"
 msgstr "前の重要なメッセージを表示します"
 
-#: ui/evolution-mail.xml.h:28
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the previous message"
 msgstr "前のメッセージを表示します"
 
-#: ui/evolution-mail.xml.h:29
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the previous unread message"
 msgstr "前の未読メッセージを表示します"
 
-#: ui/evolution-mail.xml.h:30
-msgid "Empty _Trash"
-msgstr "ゴミ箱を空にする(_T)"
-
-#: ui/evolution-mail.xml.h:31
-msgid "Filter on Mailing _List"
+#: ui/evolution-mail-message.xml.h:24
+#, fuzzy
+msgid "Filter on Mailing _List..."
 msgstr "メーリングリストのフィルタ(_L)"
 
-#: ui/evolution-mail.xml.h:32
-msgid "Filter on Se_nder"
+#: ui/evolution-mail-message.xml.h:25
+#, fuzzy
+msgid "Filter on Se_nder..."
 msgstr "送信者のフィルタ(_n)"
 
-#: ui/evolution-mail.xml.h:33
-msgid "Filter on _Recipients"
+#: ui/evolution-mail-message.xml.h:26
+#, fuzzy
+msgid "Filter on _Recipients..."
 msgstr "受信者のフィルタ(_R)"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Filter on _Subject"
+#: ui/evolution-mail-message.xml.h:27
+#, fuzzy
+msgid "Filter on _Subject..."
 msgstr "件名のフィルタ(_S)"
 
-#: ui/evolution-mail.xml.h:35
+#: ui/evolution-mail-message.xml.h:28
 msgid "Force images in HTML mail to be loaded"
 msgstr "強制的に HTML メールの画像を読み込む"
 
-#: ui/evolution-mail.xml.h:36
-msgid "Forget _Passwords"
-msgstr "パスワードの紛失(_P)"
-
-#: ui/evolution-mail.xml.h:37
-msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr "記憶したパスワードを忘れた場合に再び表示します"
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "転送"
 
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward As"
 msgstr "転送"
 
-#: ui/evolution-mail.xml.h:40
+#: ui/evolution-mail-message.xml.h:31
 msgid "Forward _Attached"
 msgstr "添付して転送(_A)"
 
-#: ui/evolution-mail.xml.h:41
+#: ui/evolution-mail-message.xml.h:32
 msgid "Forward _Inline"
 msgstr "インラインで転送(_I)"
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail-message.xml.h:33
 msgid "Forward _Quoted"
 msgstr "引用して転送(_Q)"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail-message.xml.h:34
 msgid "Forward the selected message in the body of a new message"
 msgstr "新規メッセージの本文の中に選択されたメッセージを転送します"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail-message.xml.h:35
 msgid "Forward the selected message quoted like a reply"
 msgstr "引用して選択されたメッセージを転送します"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail-message.xml.h:36
 msgid "Forward the selected message to someone"
 msgstr "誰かへ選択されたメッセージを転送します"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message to someone as an attachment"
 msgstr "添付として誰かへ選択されたメッセージを転送します"
 
-#: ui/evolution-mail.xml.h:47
-msgid "Hide S_elected Messages"
-msgstr "選択されたメッセージを隠す(_e)"
-
-#: ui/evolution-mail.xml.h:48
-msgid "Hide _Deleted Messages"
-msgstr "削除されたメッセージを隠す(_D)"
-
-#: ui/evolution-mail.xml.h:49
-msgid "Hide _Read messages"
-msgstr "既読メッセージを隠す(_R)"
-
-#: ui/evolution-mail.xml.h:50
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr "表示しているメッセージではなく削除されたメッセージを隠します"
-
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail-message.xml.h:39
 msgid "Load _Images"
 msgstr "画像を読み込む(_I)"
 
-#: ui/evolution-mail.xml.h:52
-msgid "Manage _Subscriptions..."
-msgstr "定期購読管理(_S)..."
-
-#: ui/evolution-mail.xml.h:53
-msgid "Mar_k As Read"
-msgstr "既読としてマーク(_k)"
-
-#: ui/evolution-mail.xml.h:54
-msgid "Mark All as R_ead"
-msgstr "既読としてすべてマーク(_e)"
+#: ui/evolution-mail-message.xml.h:41
+#, fuzzy
+msgid "Mark as I_mportant"
+msgstr "重要"
 
-#: ui/evolution-mail.xml.h:55
-msgid "Mark As U_nread"
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
 msgstr "未読としてマーク(_n)"
 
-#: ui/evolution-mail.xml.h:56
-msgid "Mark all visible messages as read"
-msgstr "既読としてすべてのメッセージをマークします"
-
-#: ui/evolution-mail.xml.h:57
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr "既読として選択されたメッセージをマークします"
 
-#: ui/evolution-mail.xml.h:58
+#: ui/evolution-mail-message.xml.h:45
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "選択されたメッセージに削除マークをします"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr "未読として選択されたメッセージをマークします"
 
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "選択されたメッセージに削除マークをします"
+
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages for deletion"
 msgstr "選択されたメッセージに削除マークをします"
 
-#: ui/evolution-mail.xml.h:60
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "移動"
 
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail-message.xml.h:50
 msgid "Move selected messages to another folder"
 msgstr "別のフォルダへ選択されたメッセージを移動します"
 
-#: ui/evolution-mail.xml.h:63
-msgid "Open a window for composing a mail message"
-msgstr "メールを作成するためにウィンドウを開きます"
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "次"
+
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "次のメッセージへ移動します"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "次のメッセージへ移動します"
 
-#: ui/evolution-mail.xml.h:64
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "スレッドを選択(_T)"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "次のメッセージへ移動します"
+
+#: ui/evolution-mail-message.xml.h:56
 msgid "Open the selected message in a new window"
 msgstr "新規ウィンドウで選択されたメッセージを開きます"
 
-#: ui/evolution-mail.xml.h:65
+#: ui/evolution-mail-message.xml.h:57
 msgid "Open the selected message in the composer to re-send it"
 msgstr "選択されたメッセージをコンポーザで開き再送します"
 
-#: ui/evolution-mail.xml.h:66
-msgid "Permanently remove all deleted messages from all folders"
-msgstr "すべてのフォルダから削除マークされたメッセージを永久的に削除します"
+#: ui/evolution-mail-message.xml.h:58
+msgid "Previews the message to be printed"
+msgstr "印刷されるメッセージのプレビューを表示します"
 
-#: ui/evolution-mail.xml.h:67
-msgid "Permanently remove all deleted messages from this folder"
-msgstr "このフォルダから削除マークされたメッセージを永久的に削除します"
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
+msgstr "前"
 
-#: ui/evolution-mail.xml.h:71
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "前のメッセージへ移動します"
+
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "前のメッセージへ移動します"
+
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "前のメッセージへ移動します"
+
+#: ui/evolution-mail-message.xml.h:64
 msgid "Print Message..."
 msgstr "メッセージを印刷..."
 
-#: ui/evolution-mail.xml.h:72
+#: ui/evolution-mail-message.xml.h:65
 msgid "Print Preview..."
 msgstr "印刷プレビュー..."
 
-#: ui/evolution-mail.xml.h:73
-msgid "Print message to the printer"
-msgstr "メッセージをプリンタへ印刷します"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "メッセージを印刷"
 
-#: ui/evolution-mail.xml.h:74
-msgid "Redirect (FIXME: implement me)"
-msgstr "宛名を書き換える (FIXME: 実装してください)"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "返信"
 
-#: ui/evolution-mail.xml.h:78
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
+msgstr "全員へ返信"
+
+#: ui/evolution-mail-message.xml.h:71
 msgid "S_earch Message"
 msgstr "メッセージを検索(_e)"
 
-#: ui/evolution-mail.xml.h:79
+#: ui/evolution-mail-message.xml.h:72
 msgid "Save the message as a text file"
 msgstr "テキストファイルへメッセージを保存します"
 
-#: ui/evolution-mail.xml.h:80
+#: ui/evolution-mail-message.xml.h:73
 msgid "Search for text in the body of the displayed message"
 msgstr "表示されたメッセージ本体の含まれるテキストを検索します"
 
-#: ui/evolution-mail.xml.h:81 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "すべて選択(_A)"
-
-#: ui/evolution-mail.xml.h:82
-msgid "Select _Thread"
-msgstr "スレッドを選択(_T)"
-
-#: ui/evolution-mail.xml.h:83
-msgid "Select all and only the messages that are not currently selected"
-msgstr "現在選択されていないメッセージだけをすべて選択します"
-
-#: ui/evolution-mail.xml.h:84
-msgid "Select all messages in the same thread as the selected message"
-msgstr "選択されたメッセージと同じスレッドのメッセージをすべて選択します"
-
-#: ui/evolution-mail.xml.h:85
-msgid "Select all visible messages"
-msgstr "すべてのメッセージを選択します"
-
-#: ui/evolution-mail.xml.h:86
-msgid "Send / Receive"
-msgstr "送受信"
-
-#: ui/evolution-mail.xml.h:87
-msgid "Send queued mail and retrieve new mail"
-msgstr "キューにあるメールを送信して新規メールを取得します"
-
-#: ui/evolution-mail.xml.h:88
+#: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr "メールのソースを表示(_S)"
 
-#: ui/evolution-mail.xml.h:89
+#: ui/evolution-mail-message.xml.h:75
 msgid "Show Full _Headers"
 msgstr "すべてのヘッダを表示(_H)"
 
-#: ui/evolution-mail.xml.h:90
-msgid "Show _All"
-msgstr "すべて表示(_A)"
-
-#: ui/evolution-mail.xml.h:91
+#: ui/evolution-mail-message.xml.h:76
 msgid "Show message in the normal style"
 msgstr "通常のメッセージを表示します"
 
-#: ui/evolution-mail.xml.h:92
+#: ui/evolution-mail-message.xml.h:77
 msgid "Show message with all email headers"
 msgstr "すべてのメールヘッダも含めてメッセージを表示します"
 
-#: ui/evolution-mail.xml.h:93
-msgid "Show messages that have been temporarily hidden"
-msgstr "一時的に隠したメッセージを表示します"
-
-#: ui/evolution-mail.xml.h:94
+#: ui/evolution-mail-message.xml.h:78
 msgid "Show the raw email source of the message"
 msgstr "メッセージのソースを表示します"
 
-#: ui/evolution-mail.xml.h:95
-msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "サーバ上のフォルダの購読/購読解除をします"
-
-#: ui/evolution-mail.xml.h:96
-msgid "Temporarily hide all messages that have already been read"
-msgstr "すべての既読メッセージを一時的に隠します"
-
-#: ui/evolution-mail.xml.h:97
-msgid "Temporarily hide the selected messages"
-msgstr "選択されたメッセージを一時的に隠します"
-
-#: ui/evolution-mail.xml.h:98
-msgid "Threaded Message list"
-msgstr "メッセージリストをスレッド化します"
-
-#: ui/evolution-mail.xml.h:99
+#: ui/evolution-mail-message.xml.h:79
 msgid "Un-delete the selected messages"
 msgstr "選択されたメッセージ削除を取り消します"
 
-#: ui/evolution-mail.xml.h:100
+#: ui/evolution-mail-message.xml.h:80
 msgid "VFolder on Mailing _List..."
 msgstr "メーリングリストの仮想フォルダ(_L)..."
 
-#: ui/evolution-mail.xml.h:101
+#: ui/evolution-mail-message.xml.h:81
 msgid "VFolder on Se_nder..."
 msgstr "送信者の仮想フォルダ(_n)..."
 
-#: ui/evolution-mail.xml.h:102
+#: ui/evolution-mail-message.xml.h:82
 msgid "VFolder on _Recipients..."
 msgstr "受信者の仮想フォルダ(_R)..."
 
-#: ui/evolution-mail.xml.h:103
+#: ui/evolution-mail-message.xml.h:83
 msgid "VFolder on _Subject..."
 msgstr "件名の仮想フォルダ(_S)..."
 
-#: ui/evolution-mail.xml.h:104
-msgid "Virtual Folder _Editor..."
-msgstr "仮想フォルダエディタ(_E)..."
-
-#: ui/evolution-mail.xml.h:105
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "フィルタ適用(_A)"
 
-#: ui/evolution-mail.xml.h:106
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Copy to Folder"
 msgstr "フォルダへコピー(_C)"
 
-#: ui/evolution-mail.xml.h:107
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "メッセージからフィルタを作成(_C)"
 
-#: ui/evolution-mail.xml.h:109
-msgid "_Expunge"
-msgstr "抹消(_E)"
-
-#: ui/evolution-mail.xml.h:110
-msgid "_Filters..."
-msgstr "フィルタ(_F)..."
-
-#: ui/evolution-mail.xml.h:111 ui/evolution.xml.h:50
-msgid "_Folder"
-msgstr "フォルダ(_F)"
-
-#: ui/evolution-mail.xml.h:112
+#: ui/evolution-mail-message.xml.h:88
 msgid "_Forward Message"
 msgstr "メッセージを転送(_F)"
 
-#: ui/evolution-mail.xml.h:113 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "選択を反転(_I)"
-
-#: ui/evolution-mail.xml.h:114
-msgid "_Mail Message"
-msgstr "メッセージをメール(_M)"
-
-#: ui/evolution-mail.xml.h:115
-msgid "_Mail Settings..."
-msgstr "メール設定(_M)..."
-
-#: ui/evolution-mail.xml.h:116
+#: ui/evolution-mail-message.xml.h:89
 msgid "_Message Display"
 msgstr "メッセージ表示(_M)"
 
-#: ui/evolution-mail.xml.h:117
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Move to Folder"
 msgstr "フォルダへ移動(_M)"
 
-#: ui/evolution-mail.xml.h:118
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Normal Display"
 msgstr "通常表示(_N)"
 
-#: ui/evolution-mail.xml.h:119
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Open Message"
 msgstr "メッセージを開く(_O)"
 
-#: ui/evolution-mail.xml.h:121
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Re-send Message"
 msgstr "メッセージを再送信(_R)"
 
-#: ui/evolution-mail.xml.h:124
-msgid "_Send / Receive"
-msgstr "送受信(_S)"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "このウィンドウを閉じます"
 
-#: ui/evolution-mail.xml.h:125
-msgid "_Threaded Message List"
-msgstr "メッセージリストをスレッド化(_T)"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr "ツールバーのカスタマイズ(_z)..."
+
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr "カスタマイズ"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr "ツールバーをカスタマイズします"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
+msgstr "閉じる(_C)"
+
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "表示(_V)"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "添付"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "現在のファイルを閉じます"
 
@@ -8885,45 +11119,60 @@ msgid "HTML"
 msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "テキストファイルの挿入..."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "メッセージへテキストとしてファイルを挿入します"
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "テキストファイルの挿入..."
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "ファイルを開く"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "PGP による暗号化"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "PGP サイン"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Encrypt"
 msgstr "S/MIME による暗号化"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:18
 msgid "S/MIME Sign"
 msgstr "S/MIME 署名"
 
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save _Draft"
-msgstr "草案を保存(_D)"
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
+msgstr "保存"
+
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "別名で保存"
 
 #: ui/evolution-message-composer.xml.h:22
-msgid "Save in _folder... (FIXME)"
-msgstr "フォルダへ保存... (FIXME)"
+msgid "Save _Draft"
+msgstr "草案を保存(_D)"
 
 #: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "フォルダへ保存..."
 
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
+msgid "Save the current file"
+msgstr "現在のファイルを保存します"
+
 #: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "現在のファイルを別名で保存します"
@@ -8993,162 +11242,136 @@ msgid "Toggles whether the Reply-To field is displayed"
 msgstr "返信先フィールドを表示するかどうか切替えます"
 
 #: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "添付の追加..."
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "Bcc フィールド(_B)"
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr "Cc フィールド(_C)"
 
 #: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
+msgstr "デバッグ(_D)"
+
+#: ui/evolution-message-composer.xml.h:47
 msgid "_Delete all"
 msgstr "すべて削除(_D)"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr "差出人フィールド(_F)"
 
 #: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "挿入(_I)"
 
 #: ui/evolution-message-composer.xml.h:52
-msgid "_Insert text file... (FIXME)"
-msgstr "テキストファイルの挿入(_I)... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:53
 msgid "_Open..."
 msgstr "開く(_O)..."
 
-#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
 msgstr "返信先フィールド(_R)"
 
-#: ui/evolution-message-composer.xml.h:56
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "セキュリティ(_S)"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "ヘルプ(_H)"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "購読フォルダのリストへフォルダを追加"
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "フォルダ(_o)"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "リストを更新"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "フォルダリストを更新"
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "購読フォルダのリストからフォルダを削除"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "購読"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "購読解除"
 
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr "タスクの割当て(_n) (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "検索"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "再検索"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr "打合せ要求(_q) (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "やり直し"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "未完了の動作をやり直します"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "置換"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "文字を置換します"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "全員へ返信(_l) (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr "送信ステータスレポート(_e) (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr "出来事をスキップ(_k) (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr "タスクを保存してダイアログボックスを閉じます"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr "同じ文字列で再検索を行います"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "文字列で検索します"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "元に戻す"
+#: ui/evolution-task-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Task"
+msgstr "キャンセル"
 
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "最後の動作を元に戻します"
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
+msgid "Delegate Task"
+msgstr "このタスクを削除します"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:43
-msgid "_Appointment (FIXME)"
-msgstr "約束(_A) (FIXME)"
+#: ui/evolution-task-editor.xml.h:7
+#, fuzzy
+msgid "Re_fresh Task"
+msgstr "リストを更新"
 
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
-msgstr "完了をマーク (_M) (FIXME)"
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
+msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "返信(_R) (FIXME)"
+#: ui/evolution-tasks.xml.h:3
+#, fuzzy
+msgid "Copy selected task"
+msgstr "選択したタスクを削除します"
 
-#: ui/evolution-tasks.xml.h:2
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "新規タスクを作成します"
 
 #: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Cut selected task"
+msgstr "選択したタスクを削除します"
+
+#: ui/evolution-tasks.xml.h:7
+msgid "Delete selected tasks"
+msgstr "選択したタスクを削除します"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "新規タスク"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Paste task from the clipboard"
+msgstr "クリップボードへ貼り付けます"
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "別のものとしてタスクを保存します"
 
-#: ui/evolution-tasks.xml.h:8
-msgid "Tasks Preferences..."
-msgstr "タスクの設定..."
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "メール設定(_M)..."
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "タスク(_T)"
 
@@ -9164,202 +11387,193 @@ msgstr "ショートカットバーに追加(_S)"
 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:7
 msgid "Copy this folder"
 msgstr "フォルダをコピーします"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:7
 msgid "Create _New Folder..."
 msgstr "新規フォルダを作成(_N)..."
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:8
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "ショートカットバーにこのフォルダのリンクを作成します"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:9
 msgid "Create a new folder"
 msgstr "新規フォルダを作成します"
 
-#: ui/evolution.xml.h:11
-msgid "Customi_ze Toolbars..."
-msgstr "ツールバーのカスタマイズ(_z)..."
-
-#: ui/evolution.xml.h:12
-msgid "Customize"
-msgstr "カスタマイズ"
-
 #: ui/evolution.xml.h:13
-msgid "Customize toolbars"
-msgstr "ツールバーをカスタマイズします"
-
-#: ui/evolution.xml.h:14
 msgid "Delete this folder"
 msgstr "このフォルダを削除します"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "別のフォルダを表示します"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "終了(_x)"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:16
 msgid "Evolution _FAQ"
 msgstr "Evolution FAQ(_F)"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:17
 msgid "Evolution _Window"
 msgstr "Evolution ウィンドウ(_W)"
 
-#: ui/evolution.xml.h:19
-msgid "Evolution bar _shortcut"
-msgstr "Evolution バーショートカット(_s)"
-
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "プログラムを終了します"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "始めに(_S)"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr "外部ファイル形式をインポートします"
 
-#: ui/evolution.xml.h:23
-msgid "Main toolbar"
-msgstr "メインツールバー"
-
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:22
 msgid "Move this folder to another place"
 msgstr "別の場所へこのフォルダを移動します"
 
-#: ui/evolution.xml.h:25
-msgid "Open in New Window"
-msgstr "新規ウィンドウで開く"
-
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "新規ウィンドウで開く(_W)"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "別のウィンドウでこのフォルダを開きます"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Evolution についての情報を表示します"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "不具合報告の提出"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "不具合報告の提出(_B)"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "Bug Buddyを使って不具合報告を提出します"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 msgid "Toggle"
 msgstr "切替え"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "フォルダバーを表示するかどうか切替えます"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr "ショートカットバーを表示するかどうか切替えます"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "オフライン作業かどうかを切替えます"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr "コンタクトマネージャを使う(_o)"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "カレンダを使う(_C)"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "メーラを使う(_M)"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:37
 msgid "View the selected folder"
 msgstr "選択されたフォルダを表示します"
 
-#: ui/evolution.xml.h:40
-msgid "Work Offline"
-msgstr "オフライン作業"
-
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "Evolution について(_A)..."
 
-#: ui/evolution.xml.h:42
-msgid "_Actions"
-msgstr "動作(_A)"
+#: ui/evolution.xml.h:41
+msgid "_Appointment (FIXME)"
+msgstr "約束(_A) (FIXME)"
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:43
+msgid "_Contact (FIXME)"
+msgstr "コンタクト(_C) (FIXME)"
+
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "コピー(_C)..."
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "フォルダバー(_F)"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "フォルダへ移動(_G)..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "ファイルをインポート(_I)..."
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "インデックス(_I)"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "メッセージをメール(_M)"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:55
 msgid "_Move..."
 msgstr "移動(_M)..."
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "新規(_N)"
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "新規フォルダ(_N)"
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "リネーム(_R)..."
 
-#: ui/evolution.xml.h:62
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Shortcut"
+msgstr "ショートカットバー(_S)"
+
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "ショートカットバー(_S)"
 
-#: ui/evolution.xml.h:66
+#: ui/evolution.xml.h:61
+msgid "_Task (FIXME)"
+msgstr "タスク(_T) (FIXME)"
+
+#: ui/evolution.xml.h:64
 msgid "_Work Offline"
 msgstr "オフライン作業(_W)"
 
+#: ui/my-evolution.xml.h:1
+#, fuzzy
+msgid "Change the settings for My Evolution"
+msgstr "このフォルダの設定を変更します"
+
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "メール設定(_M)..."
+
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr "アドレスカード"
@@ -9392,9 +11606,12 @@ msgstr "メッセージ"
 msgid "With Category"
 msgstr "カテゴリ"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr "暫定"
+#. 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/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
@@ -9468,13 +11685,6 @@ msgstr "会議終了時間(_e):"
 msgid "All Attendees"
 msgstr "すべての付き添い"
 
-#. 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:218
 msgid "_Current View"
 msgstr "現在の表示(_C)"
@@ -9485,53 +11695,129 @@ 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:422
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "MTWTFSS"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: 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:221 widgets/misc/e-dateedit.c:418
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "今"
 
-#: widgets/misc/e-cell-date-edit.c:245
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "今日"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: widgets/misc/e-cell-date-edit.c:726
+#: widgets/misc/e-cell-date-edit.c:731
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "時間はフォーマットに入れなければなりません: %s"
 
+#: widgets/misc/e-charset-picker.c:59
+#, fuzzy
+msgid "Baltic"
+msgstr "基本"
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "週"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+#, fuzzy
+msgid "Turkish"
+msgstr "ごみ箱"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "処理は失敗しました"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+#, fuzzy
+msgid "New"
+msgstr "ニュース"
+
+#: widgets/misc/e-charset-picker.c:160
+#, fuzzy, c-format
+msgid "Unknown character set: %s"
+msgstr "未知のエラー: %s"
+
+#: widgets/misc/e-charset-picker.c:202
+#, fuzzy
+msgid "Enter the character set to use"
+msgstr "デフォルトのキャラクタセット: "
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "その他"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
 #: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:168
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "コンタクトエディタ"
+
+#: widgets/misc/e-filter-bar.c:173
 msgid "Save Search"
 msgstr "検索を保存"
 
-#: widgets/misc/e-filter-bar.c:239
+#: widgets/misc/e-filter-bar.c:241
 msgid "Advanced Search"
 msgstr "上級検索"
 
-#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
-msgstr "別名で保存..."
-
-#: widgets/misc/e-filter-bar.h:95 widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "すべて表示"
 
-#: widgets/misc/e-filter-bar.h:96 widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "編集..."
-
-#: widgets/misc/e-filter-bar.h:97 widgets/misc/e-filter-bar.h:104
+#: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "詳細..."
 
@@ -9543,6 +11829,10 @@ msgstr "情報"
 msgid "Warning"
 msgstr "警告"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "エラー"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "質問"
@@ -9579,3 +11869,541 @@ msgstr "init_corba(): GNOME を初期化することが出来ませんでした"
 #: wombat/wombat.c:198
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo を初期化することが出来ませんでした"
+
+#, fuzzy
+#~ msgid "Set task view preferences"
+#~ msgstr "タスクの設定..."
+
+#, fuzzy
+#~ msgid "TasksPreferences"
+#~ msgstr "タスクの設定..."
+
+#~ msgid "???"
+#~ msgstr "???"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "コンタクト(_o)..."
+
+#~ msgid "_Company:"
+#~ msgstr "会社(_C):"
+
+#~ msgid "Find..."
+#~ msgstr "検索..."
+
+#~ msgid "Open calendar"
+#~ msgstr "カレンダを開く"
+
+#~ msgid "Save calendar"
+#~ msgstr "カレンダを保存"
+
+#~ msgid "<b>Error loading calendar:<br>Method not supported"
+#~ msgstr "<b>カレンダをロード中にエラー:<br>メソッドはサポートしていません"
+
+#~ msgid "Settings..."
+#~ msgstr "設定..."
+
+#~ msgid "Alarms timeout after"
+#~ msgstr "指定時間後にアラームがタイムアウト"
+
+#~ msgid "Colors"
+#~ msgstr "カラー"
+
+#~ msgid "Enable snoozing for"
+#~ msgstr "アラーム停止を有効"
+
+#~ msgid "Highlight"
+#~ msgstr "強調"
+
+#~ msgid "Items Due Today:"
+#~ msgstr "今日が期限のアイテム:"
+
+#~ msgid "Items Not Yet Due"
+#~ msgstr "まだ期限ではないアイテム"
+
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "まだ期限ではないアイテム:"
+
+#~ msgid "Overdue Items:"
+#~ msgstr "期限を過ぎたアイテム:"
+
+#~ msgid "TaskPad"
+#~ msgstr "タスクパッド"
+
+#~ msgid "Time Until Due"
+#~ msgstr "期限までの時間"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "視覚アラーム"
+
+#~ msgid "Work week"
+#~ msgstr "週間労働時間"
+
+#~ msgid "Percent complete"
+#~ msgstr "パーセント完了"
+
+#~ msgid "Edit this task"
+#~ msgstr "このタスクを編集します"
+
+#~ msgid "Go to Today"
+#~ msgstr "今日へ移動"
+
+#~ msgid "Delete all Occurrences"
+#~ msgstr "すべての出来事を削除"
+
+#~ msgid "Component successfully updated."
+#~ msgstr "コンポーネントは正しく更新されました"
+
+#~ msgid "I couldn't load your calendar file!\n"
+#~ msgstr "カレンダファイルをロードすることが出来ませんでした!\n"
+
+#~ msgid "I couldn't read your calendar file!\n"
+#~ msgstr "カレンダファイルを読み込むことが出来ませんでした!\n"
+
+#~ msgid "This is a reply from someone who was uninvited!"
+#~ msgstr "これは招かざる誰かからの返事です!"
+
+#~ msgid "I couldn't update your calendar store."
+#~ msgstr "保存したカレンダを更新出来ませんでした"
+
+#~ msgid "I couldn't delete the calendar component!\n"
+#~ msgstr "カレンダコンポーネントを削除出来ませんでした!\n"
+
+#~ msgid "Component successfully deleted."
+#~ msgstr "コンポーネントは正しく削除されました"
+
+#~ msgid "I don't recognize this type of calendar component."
+#~ msgstr "このカレンダコンポーネントの種別は認識しません"
+
+#~ msgid "Add to Calendar"
+#~ msgstr "カレンダの追加"
+
+#~ msgid " Tentative "
+#~ msgstr " 暫定 "
+
+#~ msgid "Update Calendar"
+#~ msgstr "カレンダを更新"
+
+#~ msgid "Attendee address"
+#~ msgstr "出席者の住所"
+
+#~ msgid "Attendees: "
+#~ msgstr "出席者: "
+
+#~ msgid ""
+#~ "Cancel\n"
+#~ "Meeting"
+#~ msgstr ""
+#~ "キャンセル\n"
+#~ "打合せ"
+
+#~ msgid "Organizer: "
+#~ msgstr "主催者:"
+
+#~ msgid ""
+#~ "Publish\n"
+#~ "Event"
+#~ msgstr ""
+#~ "発表\n"
+#~ "イベント"
+
+#~ msgid "Summary contains"
+#~ msgstr "サマリが次のものを含む"
+
+#~ msgid "Comment contains"
+#~ msgstr "コメントが次のものを含む"
+
+#~ msgid "Has category"
+#~ msgstr "次のカテゴリを持つ"
+
+#~ msgid "Could not test lock file for %s: %s"
+#~ msgstr "%s のロックファイルをテスト出来ませんでした: %s"
+
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "IMAP フォルダを走査中"
+
+#~ msgid "Inline attachment"
+#~ msgstr "インラインで添付"
+
+#~ msgid "Send as:"
+#~ msgstr "送信先:"
+
+#~ msgid ""
+#~ "Could not open signature file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "署名ファイル %s を開くことが出来ませんでした:\n"
+#~ "%s"
+
+#~ msgid "That file does not exist."
+#~ msgstr "そのファイルは存在しません"
+
+#~ msgid "That is not a regular file."
+#~ msgstr "それは通常のファイルではありません"
+
+#~ msgid "That file exists but is not readable."
+#~ msgstr "そのファイルは存在しますが，読み取り可能ではありません"
+
+#~ msgid "That file appeared accesible but open(2) failed."
+#~ msgstr "そのファイルはアクセス可能のように見えますが，open(2) は失敗しました"
+
+#~ msgid ""
+#~ "The file is very large (more than 100K).\n"
+#~ "Are you sure you wish to insert it?"
+#~ msgstr ""
+#~ "ファイルはとても大きい (100K 以上) です\n"
+#~ "本当にそれを挿入することを望みますか?"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "HTML ファイルを開くことが出来ません:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Error reading data:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "データ詠み込み中にエラー:\n"
+#~ "%s"
+
+#~ msgid "File does not have a place for the services.\n"
+#~ msgstr "ファイルはサービスの場所を持っていません\n"
+
+#~ msgid "Select a service"
+#~ msgstr "サービスを選択"
+
+#~ msgid ""
+#~ "You can select a different HTML page for the background of the Executive "
+#~ "Summary.\n"
+#~ "\n"
+#~ "Just leave it blank for the default"
+#~ msgstr ""
+#~ "実行サマリーの背景毎に別々のHTMLページを選択することが出来ます\n"
+#~ "\n"
+#~ "デフォルトは空白です"
+
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "デフォルトのGNOMEアプリケーションで %s を開く"
+
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "デフォルトのGNOMEウェブブラウザで %s を開く"
+
+#~ msgid "Send an email to %s"
+#~ msgstr "%s からメールを送信"
+
+#~ msgid "Run %s"
+#~ msgstr "%s を実行"
+
+#~ msgid "Close %s"
+#~ msgstr "%s を閉じる"
+
+#~ msgid "Move %s to the left"
+#~ msgstr "左へ %s を移動"
+
+#~ msgid "Move %s to the right"
+#~ msgstr "右へ %s を移動"
+
+#~ msgid "Move %s into the previous row"
+#~ msgstr "前の列の中へ %s を移動"
+
+#~ msgid "Move %s into the next row"
+#~ msgstr "次の列の中へ %s を移動"
+
+#~ msgid "Configure %s"
+#~ msgstr "%s の設定"
+
+#~ msgid "page"
+#~ msgstr "ページ"
+
+#~ msgid "Appearance"
+#~ msgstr "外観"
+
+#~ msgid "Background:"
+#~ msgstr "背景:"
+
+#~ msgid ""
+#~ "Executive summary component could not initialize Bonobo.\n"
+#~ "If there was a warning message about the RootPOA, it probably means\n"
+#~ "you compiled Bonobo against GOAD instead of OAF."
+#~ msgstr ""
+#~ "実行サマリーコンポーネントは Bonobo を初期化出来ませんでした\n"
+#~ "もし RootPOA についての警告メッセージがあるなら，たぶん OAF の代わりに\n"
+#~ "GOAD を使ってコンパイルしたことを意味します"
+
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "RDF サマリのためのファクトリ"
+
+#~ msgid "RDF Summary"
+#~ msgstr "RDF サマリ"
+
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "テスト Bonobo コンポーネントのためのファクトリ"
+
+#~ msgid "Factory for the test component."
+#~ msgstr "テストコンポーネントのためのファクトリ"
+
+#~ msgid "Test bonobo service"
+#~ msgstr "テスト Bonobo サービス"
+
+#~ msgid "Test service"
+#~ msgstr "テストサービス"
+
+#~ msgid "Update automatically"
+#~ msgstr "自動的に更新"
+
+#~ msgid "Forward to Address"
+#~ msgstr "アドレスへ転送"
+
+#~ msgid "Elm Aliases"
+#~ msgstr "Elm エイリアス"
+
+#~ msgid "Addressbooks"
+#~ msgstr "アドレス帳"
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "フォルダ \"%s\" を \"%s\" 形式へ変更します"
+
+#~ msgid "Reconfiguring folder"
+#~ msgstr "フォルダの再構成中"
+
+#~ msgid "Closing current folder"
+#~ msgstr "現在のフォルダをクローズ中"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "古いフォルダをリネームしてオープン中"
+
+#~ msgid "Creating new folder"
+#~ msgstr "新規フォルダを作成中"
+
+#~ msgid "Copying messages"
+#~ msgstr "メッセージをコピー中"
+
+#~ msgid "Evolution progress"
+#~ msgstr "Evolution 進行"
+
+#~ msgid "Moving folder %s to %s"
+#~ msgstr "%s から %s へフォルダを移動中"
+
+#~ msgid "Copying folder %s to %s"
+#~ msgstr "%s から %s へフォルダをコピー中"
+
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "メッセージ番号 %d / %d (uid \"%s\") を取得中"
+
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "メッセージ %d / %d (uid \"%s\") を保存中"
+
+#~ msgid "Incomplete message written on pipe!"
+#~ msgstr "パイプ上に不完全なメッセージが書かれました!"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (メッセージを転送)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "Fwd: (件名なし)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "メッセージを転送しました (件名なし)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+
+#~ msgid "Reply to the sender of this message"
+#~ msgstr "メッセージの送信者へ返信します"
+
+#~ msgid "Reply to all recipients of this message"
+#~ msgstr "このメッセージの受信者全員へ返信します"
+
+#~ msgid "Delete this message"
+#~ msgstr "このメッセージを削除します"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "Evolution のファイルは正しくインストールされました"
+
+#~ msgid "Activate"
+#~ msgstr "アクティブ"
+
+#~ msgid "Activate this shortcut"
+#~ msgstr "このショートカットをアクティブにします"
+
+#~ msgid "Select everything"
+#~ msgstr "すべてのものを選択します"
+
+#~ msgid "View All"
+#~ msgstr "すべて表示"
+
+#~ msgid "5 Days"
+#~ msgstr "5 日"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "新規カレンダを作成します"
+
+#~ msgid "Day"
+#~ msgstr "日"
+
+#~ msgid "New _Event"
+#~ msgstr "新規イベント(_E)"
+
+#~ msgid "Open Calendar"
+#~ msgstr "カレンダを開く"
+
+#~ msgid "Prev"
+#~ msgstr "前"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "別のものとしてカレンダを保存します"
+
+#~ msgid "Week"
+#~ msgstr "週"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "カレンダを開く(_O)"
+
+#~ msgid "About this application"
+#~ msgstr "このアプリケーションについて"
+
+#~ msgid "About..."
+#~ msgstr "情報..."
+
+#~ msgid "Actio_ns"
+#~ msgstr "動作(_n)"
+
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "アドレス帳(_B)... (FIXME)"
+
+#~ msgid "C_lear"
+#~ msgstr "クリア(_l)"
+
+#~ msgid "Chec_k Names (FIXME)"
+#~ msgstr "名前のチェック (_k) (FIXME)"
+
+#~ msgid "Cop_y to Folder... (FIXME)"
+#~ msgstr "フォルダへコピー(_y)... (FIXME)"
+
+#~ msgid "Dump XML"
+#~ msgstr "XMLのダンプ"
+
+#~ msgid "Dump the UI Xml description"
+#~ msgstr "UI XML の記述をダンプします"
+
+#~ msgid "Fi_rst Item in Folder (FIXME)"
+#~ msgstr "フォルダの最初のアイテム(_r) (FIXME)"
+
+#~ msgid "For_ward (FIXME)"
+#~ msgstr "転送(_w) (FIXME)"
+
+#~ msgid "Go to the next item"
+#~ msgstr "次のアイテムへ移動します"
+
+#~ msgid "Go to the previous item"
+#~ msgstr "前のアイテムへ移動します"
+
+#~ msgid "In_complete Task (FIXME)"
+#~ msgstr "未完了タスク(_c) (FIXME)"
+
+#~ msgid "N_ext"
+#~ msgstr "次(_e)"
+
+#~ msgid "Pre_vious"
+#~ msgstr "前(_v)"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "プリンタの設定(_e)..."
+
+#~ msgid "Task _Request (FIXME)"
+#~ msgstr "タスク要求(_R) (FIXME)"
+
+#~ msgid "_About..."
+#~ msgstr "情報(_A)..."
+
+#~ msgid "_Item (FIXME)"
+#~ msgstr "アイテム(_I) (FIXME)"
+
+#~ msgid "_Last Item in Folder (FIXME)"
+#~ msgstr "フォルダの最後のアイテム(_L) (FIXME)"
+
+#~ msgid "_Mail Message (FIXME)"
+#~ msgstr "メッセージをメール(_M) (FIXME)"
+
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "フォルダへ移動(_M)... (FIXME)"
+
+#~ msgid "_Note (FIXME)"
+#~ msgstr "ノート(_N) (FIXME)"
+
+#~ msgid "_Unread Item (FIXME)"
+#~ msgstr "未読アイテム(_U) (FIXME)"
+
+#~ msgid "Mar_k As Read"
+#~ msgstr "既読としてマーク(_k)"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "未読としてマーク(_n)"
+
+#~ msgid "Print message to the printer"
+#~ msgstr "メッセージをプリンタへ印刷します"
+
+#~ msgid "Redirect (FIXME: implement me)"
+#~ msgstr "宛名を書き換える (FIXME: 実装してください)"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "フォルダへ保存... (FIXME)"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "テキストファイルの挿入(_I)... (FIXME)"
+
+#~ msgid "Assig_n Task (FIXME)"
+#~ msgstr "タスクの割当て(_n) (FIXME)"
+
+#~ msgid "Find"
+#~ msgstr "検索"
+
+#~ msgid "Meeting Re_quest (FIXME)"
+#~ msgstr "打合せ要求(_q) (FIXME)"
+
+#~ msgid "Redo"
+#~ msgstr "やり直し"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "未完了の動作をやり直します"
+
+#~ msgid "Replace"
+#~ msgstr "置換"
+
+#~ msgid "Replace a string"
+#~ msgstr "文字を置換します"
+
+#~ msgid "Reply to A_ll (FIXME)"
+#~ msgstr "全員へ返信(_l) (FIXME)"
+
+#~ msgid "S_end Status Report (FIXME)"
+#~ msgstr "送信ステータスレポート(_e) (FIXME)"
+
+#~ msgid "S_kip Occurrence (FIXME)"
+#~ msgstr "出来事をスキップ(_k) (FIXME)"
+
+#~ msgid "Search again for the same string"
+#~ msgstr "同じ文字列で再検索を行います"
+
+#~ msgid "Search for a string"
+#~ msgstr "文字列で検索します"
+
+#~ msgid "Undo"
+#~ msgstr "元に戻す"
+
+#~ msgid "Undo the last action"
+#~ msgstr "最後の動作を元に戻します"
+
+#~ msgid "_Mark Complete (FIXME)"
+#~ msgstr "完了をマーク (_M) (FIXME)"
+
+#~ msgid "_Reply (FIXME)"
+#~ msgstr "返信(_R) (FIXME)"
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Evolution バーショートカット(_s)"
author	Ettore Perazzoli <ettore@src.gnome.org>	2001-08-01 03:28:49 +0800
committer	Ettore Perazzoli <ettore@src.gnome.org>	2001-08-01 03:28:49 +0800
commit	d74bff323fe6704cee8a72ac72fd5a1cdadcc6df (patch)
tree	e19ef426a9d3e9704916bfea49a4751b1d32df72 /po/ja.po
parent	c36ab4adbc03458d629b2fb155c192ecdae5a05d (diff)
download	gsoc2013-evolution-d74bff323fe6704cee8a72ac72fd5a1cdadcc6df.tar.gz gsoc2013-evolution-d74bff323fe6704cee8a72ac72fd5a1cdadcc6df.tar.zst gsoc2013-evolution-d74bff323fe6704cee8a72ac72fd5a1cdadcc6df.zip