Sync for 0.13.

svn path=/trunk/; revision=12408
author: Ettore Perazzoli <ettore@src.gnome.org> 2001-08-23 07:18:14 +0800
committer: Ettore Perazzoli <ettore@src.gnome.org> 2001-08-23 07:18:14 +0800
commit: df73d86dcb9f2a9b2177d6694c68c0ebe432b364 (patch)
tree: badb87b38dc4b74df00899b45d774054672cc19a /po/ja.po
parent: d9e5feffa70559cb7ff8201c1493e0a0f2ca9af9 (diff)
download: gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.tar
gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.tar.gz
gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.tar.bz2
gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.tar.lz
gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.tar.xz
gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.tar.zst
gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.zip
1 files changed, 4358 insertions, 2305 deletions
diff --git a/po/ja.po b/po/ja.po
index 545858278b..4b23b30975 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -2,10 +2,11 @@
 # Copyright (C) 2000-2001 Free Software Foundation, Inc.
 # Akira TAGOH <tagoh@gnome.gr.jp>, 2000-2001.
 #
+#: mail/component-factory.c:97 mail/component-factory.c:98
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution CVS-20010612\n"
-"POT-Creation-Date: 2001-07-31 14:52-0400\n"
+"POT-Creation-Date: 2001-08-22 18:50-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"
@@ -21,11 +22,11 @@ msgstr "Evolution へ VCard ファイルをインポートするファクトリ"
 msgid "Imports VCard files into Evolution."
 msgstr "Evolution へ VCard ファイルをインポート"
 
-#: addressbook/backend/ebook/e-card.c:3605
+#: addressbook/backend/ebook/e-card.c:3595
 msgid "Card: "
 msgstr "名刺: "
 
-#: addressbook/backend/ebook/e-card.c:3607
+#: addressbook/backend/ebook/e-card.c:3597
 msgid ""
 "\n"
 "Name: "
@@ -33,7 +34,7 @@ msgstr ""
 "\n"
 "名前: "
 
-#: addressbook/backend/ebook/e-card.c:3608
+#: addressbook/backend/ebook/e-card.c:3598
 msgid ""
 "\n"
 "  Prefix:     "
@@ -41,7 +42,7 @@ msgstr ""
 "\n"
 "  敬称(前つけ):     "
 
-#: addressbook/backend/ebook/e-card.c:3609
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "  Given:      "
@@ -49,13 +50,13 @@ msgstr ""
 "\n"
 "  姓:      "
 
-#: addressbook/backend/ebook/e-card.c:3610
+#: addressbook/backend/ebook/e-card.c:3600
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3611
+#: addressbook/backend/ebook/e-card.c:3601
 msgid ""
 "\n"
 "  Family:     "
@@ -63,7 +64,7 @@ msgstr ""
 "\n"
 "  ファミリー名:     "
 
-#: addressbook/backend/ebook/e-card.c:3612
+#: addressbook/backend/ebook/e-card.c:3602
 msgid ""
 "\n"
 "  Suffix:     "
@@ -71,7 +72,7 @@ msgstr ""
 "\n"
 "  敬称(後つけ):     "
 
-#: addressbook/backend/ebook/e-card.c:3626
+#: addressbook/backend/ebook/e-card.c:3616
 msgid ""
 "\n"
 "Birth Date: "
@@ -79,7 +80,7 @@ msgstr ""
 "\n"
 "誕生日: "
 
-#: addressbook/backend/ebook/e-card.c:3637
+#: addressbook/backend/ebook/e-card.c:3627
 msgid ""
 "\n"
 "Address:"
@@ -87,7 +88,7 @@ msgstr ""
 "\n"
 "住所:"
 
-#: addressbook/backend/ebook/e-card.c:3639
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -95,7 +96,7 @@ msgstr ""
 "\n"
 "郵便番号:  "
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3630
 msgid ""
 "\n"
 "  Ext:         "
@@ -103,25 +104,25 @@ msgstr ""
 "\n"
 "  "
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3631
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3642
+#: addressbook/backend/ebook/e-card.c:3632
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3643
+#: addressbook/backend/ebook/e-card.c:3633
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3644
+#: addressbook/backend/ebook/e-card.c:3634
 msgid ""
 "\n"
 "  Postal Code: "
@@ -129,7 +130,7 @@ msgstr ""
 "\n"
 "  郵便番号: "
 
-#: addressbook/backend/ebook/e-card.c:3645
+#: addressbook/backend/ebook/e-card.c:3635
 msgid ""
 "\n"
 "  Country:     "
@@ -137,13 +138,13 @@ msgstr ""
 "\n"
 "  国:       "
 
-#: addressbook/backend/ebook/e-card.c:3658
+#: addressbook/backend/ebook/e-card.c:3648
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3670
+#: addressbook/backend/ebook/e-card.c:3660
 msgid ""
 "\n"
 "Telephones:\n"
@@ -151,7 +152,7 @@ msgstr ""
 "\n"
 "電話番号:\n"
 
-#: addressbook/backend/ebook/e-card.c:3673
+#: addressbook/backend/ebook/e-card.c:3663
 msgid ""
 "\n"
 "Telephone:"
@@ -159,7 +160,7 @@ msgstr ""
 "\n"
 "電話番号:"
 
-#: addressbook/backend/ebook/e-card.c:3697
+#: addressbook/backend/ebook/e-card.c:3687
 msgid ""
 "\n"
 "E-mail:\n"
@@ -167,7 +168,7 @@ msgstr ""
 "\n"
 "メール:\n"
 
-#: addressbook/backend/ebook/e-card.c:3700
+#: addressbook/backend/ebook/e-card.c:3690
 msgid ""
 "\n"
 "E-mail:"
@@ -175,7 +176,7 @@ msgstr ""
 "\n"
 "メール:"
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3709
 msgid ""
 "\n"
 "Mailer: "
@@ -183,7 +184,7 @@ msgstr ""
 "\n"
 "メーラ: "
 
-#: addressbook/backend/ebook/e-card.c:3725
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "Time Zone: "
@@ -191,7 +192,7 @@ msgstr ""
 "\n"
 "タイムゾーン: "
 
-#: addressbook/backend/ebook/e-card.c:3733
+#: addressbook/backend/ebook/e-card.c:3723
 msgid ""
 "\n"
 "Geo Location: "
@@ -199,7 +200,7 @@ msgstr ""
 "\n"
 "経緯: "
 
-#: addressbook/backend/ebook/e-card.c:3737
+#: addressbook/backend/ebook/e-card.c:3727
 msgid ""
 "\n"
 "Business Role: "
@@ -207,7 +208,7 @@ msgstr ""
 "\n"
 "仕事の職務: "
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3739
 msgid ""
 "\n"
 "Org: "
@@ -215,7 +216,7 @@ msgstr ""
 "\n"
 "組織: "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3740
 msgid ""
 "\n"
 "  Name:  "
@@ -223,7 +224,7 @@ msgstr ""
 "\n"
 "  社名:  "
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3741
 msgid ""
 "\n"
 "  Unit:  "
@@ -231,7 +232,7 @@ msgstr ""
 "\n"
 "  部署:  "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3742
 msgid ""
 "\n"
 "  Unit2: "
@@ -239,7 +240,7 @@ msgstr ""
 "\n"
 "  部署2: "
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3743
 msgid ""
 "\n"
 "  Unit3: "
@@ -247,7 +248,7 @@ msgstr ""
 "\n"
 "  部署3: "
 
-#: addressbook/backend/ebook/e-card.c:3754
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "  Unit4: "
@@ -255,7 +256,7 @@ msgstr ""
 "\n"
 "  部署4: "
 
-#: addressbook/backend/ebook/e-card.c:3758
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "Categories: "
@@ -263,7 +264,7 @@ msgstr ""
 "\n"
 "業務分野: "
 
-#: addressbook/backend/ebook/e-card.c:3759
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Comment: "
@@ -281,7 +282,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3772
+#: addressbook/backend/ebook/e-card.c:3762
 msgid ""
 "\n"
 "Unique String: "
@@ -289,7 +290,7 @@ msgstr ""
 "\n"
 "任意の文字列: "
 
-#: addressbook/backend/ebook/e-card.c:3775
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Public Key: "
@@ -310,8 +311,8 @@ msgstr "%s の VCard"
 #: 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:46
+#: addressbook/conduit/address-conduit.c:1100
+#: addressbook/gui/component/addressbook-factory.c:48
 #: 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
@@ -326,20 +327,20 @@ msgstr "カーソルは読み込まれることが出来ませんでした\n"
 msgid "EBook not loaded\n"
 msgstr "EBook はロードされていません\n"
 
-#: addressbook/conduit/address-conduit.c:654
+#: addressbook/conduit/address-conduit.c:662
 #: 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
+#: addressbook/conduit/address-conduit.c:663
 #: calendar/conduits/calendar/calendar-conduit.c:779
 #: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "wombat を開始することが出来ませんでした"
 
-#: addressbook/conduit/address-conduit.c:687
-#: addressbook/conduit/address-conduit.c:690
+#: addressbook/conduit/address-conduit.c:695
+#: addressbook/conduit/address-conduit.c:698
 msgid "Could not read pilot's Address application block"
 msgstr ""
 "パイロットのアドレスアプリケーションブロックを読み込むことが出来ませんでした"
@@ -388,195 +389,206 @@ msgstr "Evolution アドレス帳コンポーネントのためのファクトリ"
 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-component.c:68
+#: calendar/gui/dialogs/comp-editor-util.c:281
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
+#: shell/e-shortcuts.c:1048
+#, fuzzy
+msgid "Contacts"
+msgstr "コンタクト(_C)"
 
-#: 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-component.c:68
+#, fuzzy
+msgid "Folder containing contact information"
+msgstr ""
+"フィルタ情報のロード中にエラー:\n"
+"%s"
 
-#: addressbook/gui/component/addressbook-config.c:168
-msgid "Unknown auth type"
-msgstr "未知の認証種別"
+#: addressbook/gui/component/addressbook-component.c:386
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New Contact"
+msgstr "新規コンタクト:"
 
-#: addressbook/gui/component/addressbook-config.c:177
-msgid "Base"
-msgstr "ベースエントリ"
+#: addressbook/gui/component/addressbook-component.c:386
+#, fuzzy
+msgid "New _Contact"
+msgstr "新規コンタクト:"
 
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
-msgstr "サブエントリ"
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact List"
+msgstr "新規コンタクト:"
 
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Subtree"
-msgstr "すべてのエントリ"
+#: addressbook/gui/component/addressbook-component.c:387
+#, fuzzy
+msgid "New Contact _List"
+msgstr "新規コンタクト:"
 
-#: addressbook/gui/component/addressbook-config.c:184
-msgid "Unknown scope type"
-msgstr "未知のスコープ種別"
+#: addressbook/gui/component/addressbook-config.c:144
+msgid "Edit Addressbook"
+msgstr "アドレス帳を編集"
 
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
-msgstr "バインドDN:"
+#: addressbook/gui/component/addressbook-config.glade.h:1
+msgid "389"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:350
-msgid "FIXME Bind DN Help text here"
-msgstr "FIXME バインド DN のヘルプテキストです"
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "Account Name"
+msgstr "アカウント"
 
-#. 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.glade.h:3
+msgid "Add Addressbook"
+msgstr "アドレス帳に追加"
 
-#: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:44
-msgid "Host:"
-msgstr "ホスト:"
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "Addressbook Sources"
+msgstr "アドレス帳のソース"
 
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "FIXME Host help text here."
-msgstr "FIXME ホストヘルプテキストです"
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#, fuzzy
+msgid "Advanced"
+msgstr "詳細..."
 
-#: addressbook/gui/component/addressbook-config.c:406
-msgid "Root DN:"
-msgstr "ルート DN:"
+#: addressbook/gui/component/addressbook-config.glade.h:6
+msgid "Base"
+msgstr "ベースエントリ"
 
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Root DN help text here."
-msgstr "FIXME ルート DN ヘルプテキストです"
+#: addressbook/gui/component/addressbook-config.glade.h:7
+#: calendar/gui/dialogs/task-editor.c:151
+#, fuzzy
+msgid "Basic"
+msgstr "基本"
 
-#: addressbook/gui/component/addressbook-config.c:411
-msgid "Port:"
-msgstr "ポート:"
+#: addressbook/gui/component/addressbook-config.glade.h:8
+#, fuzzy
+msgid "De_lete"
+msgstr "削除"
 
-#: addressbook/gui/component/addressbook-config.c:412
-msgid "FIXME Port help text here."
-msgstr "FIXME ポートヘルプテキストです"
+#: addressbook/gui/component/addressbook-config.glade.h:9
+msgid "One"
+msgstr "サブエントリ"
 
-#: addressbook/gui/component/addressbook-config.c:432
-msgid "Search Scope:"
+#: addressbook/gui/component/addressbook-config.glade.h:10
+#, fuzzy
+msgid "Search _base:"
 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.glade.h:11
+#, fuzzy
+msgid "Search s_cope: "
+msgstr "検索範囲:"
 
-#: addressbook/gui/component/addressbook-config.c:523
-msgid "FIXME Path Help text here"
-msgstr "FIXME パスヘルプテキストです"
+#: addressbook/gui/component/addressbook-config.glade.h:12
+#, fuzzy
+msgid "Server Name"
+msgstr "名前を選択"
 
-#: addressbook/gui/component/addressbook-config.c:528
-msgid "Create path if it doesn't exist."
-msgstr "存在しない場合パスを作成する"
+#: addressbook/gui/component/addressbook-config.glade.h:13
+#, fuzzy
+msgid "Sub"
+msgstr "日"
 
-#: addressbook/gui/component/addressbook-config.c:663
-msgid "Edit Addressbook"
-msgstr "アドレス帳を編集"
+#: addressbook/gui/component/addressbook-config.glade.h:14
+msgid "The information below is required in order to add an addressbook.  "
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:665
-msgid "Add Addressbook"
-msgstr "アドレス帳に追加"
+#: addressbook/gui/component/addressbook-config.glade.h:15
+msgid "This information is not required for most ldap servers. "
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:683
+#: addressbook/gui/component/addressbook-config.glade.h:16
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+"This information is used by your ldap server to specify which nodes are used "
+"in a search. Contact your server administrator for more information."
 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.glade.h:17
+msgid ""
+"This is the base node for all your searches on the ldap server. Contact your "
+"server administrator for more information."
+msgstr ""
 
-#: 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.glade.h:18
+msgid "This is the name of the server where your addressbook is located."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:695
-msgid "FIXME Description help text here"
-msgstr "FIXME 説明ヘルプテキストです"
+#: addressbook/gui/component/addressbook-config.glade.h:19
+msgid "This is the port that your ldap server uses."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "Addressbook Sources"
-msgstr "アドレス帳のソース"
+#: addressbook/gui/component/addressbook-config.glade.h:20
+msgid ""
+"This name will be used to identify your account. It is for display purposes "
+"only."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
+#: addressbook/gui/component/addressbook-config.glade.h:21
 #, 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"
+msgid "_Account name:"
+msgstr "アカウント管理"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/component/addressbook-config.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #: 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
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
 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
+#: addressbook/gui/component/addressbook-config.glade.h:23
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: ui/evolution-mail-messagedisplay.xml.h:6
 #: 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
+#: ui/evolution.xml.h:36
 msgid "_Edit"
 msgstr "編集(_E)"
 
-#: addressbook/gui/component/addressbook-storage.c:118
+#: addressbook/gui/component/addressbook-config.glade.h:24
+#, fuzzy
+msgid "_My server requires authentication"
+msgstr "サーバは認証が必要"
+
+#: addressbook/gui/component/addressbook-config.glade.h:25
+#, fuzzy
+msgid "_Port:"
+msgstr "ポート:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:26
+#, fuzzy
+msgid "_Server name:"
+msgstr "サーバメッセージ:"
+
+#: addressbook/gui/component/addressbook-storage.c:138
 msgid "Other Contacts"
 msgstr "その他のコンタクト"
 
-#: addressbook/gui/component/addressbook.c:345
-#, c-format
-msgid "Enter password for %s"
-msgstr "%s のパスワードを入力してください"
+#: addressbook/gui/component/addressbook.c:386
+#, fuzzy, c-format
+msgid "Please enter your email address and password for access to %s"
+msgstr "%s のためのあなたのパスワードを入力してください"
+
+#: addressbook/gui/component/addressbook.c:394
+#, fuzzy
+msgid "LDAP Authentication"
+msgstr "認証"
 
-#: addressbook/gui/component/addressbook.c:373
+#: addressbook/gui/component/addressbook.c:405
+msgid "Email Address:"
+msgstr "メールアドレス:"
+
+#: addressbook/gui/component/addressbook.c:418
+#, fuzzy
+msgid "Password:"
+msgstr "パスワード"
+
+#: addressbook/gui/component/addressbook.c:481
 msgid "Unable to open addressbook"
 msgstr "アドレス帳を開くことが出来ません"
 
-#: addressbook/gui/component/addressbook.c:380
+#: addressbook/gui/component/addressbook.c:488
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -586,7 +598,7 @@ msgstr ""
 "を入力したか, あるいは LDAP サーバが落ちているかのどちらか\n"
 "を意味します"
 
-#: addressbook/gui/component/addressbook.c:385
+#: addressbook/gui/component/addressbook.c:493
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -598,7 +610,7 @@ msgstr ""
 "から OpenLDAP を取得した後 CVS ソースからプログラムを\n"
 "コンパイルしなければなりません\n"
 
-#: addressbook/gui/component/addressbook.c:393
+#: addressbook/gui/component/addressbook.c:501
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -606,42 +618,67 @@ msgstr ""
 "このアドレス帳を開くことが出来ませんでした. パスが存在し, アクセス権\n"
 "を持っているかどうかチェックしてください"
 
-#: addressbook/gui/component/addressbook.c:554
+#: addressbook/gui/component/addressbook.c:642
+#: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "フィールドが次のものを含む"
 
-#: addressbook/gui/component/addressbook.c:555
+#: addressbook/gui/component/addressbook.c:643
 msgid "Name contains"
 msgstr "名前が次のものを含む"
 
-#: addressbook/gui/component/addressbook.c:556
+#: addressbook/gui/component/addressbook.c:644
 msgid "Email contains"
 msgstr "メールが次のものを含む"
 
-#: addressbook/gui/component/addressbook.c:557
+#: addressbook/gui/component/addressbook.c:645
+#: calendar/gui/cal-search-bar.c:59
 #, fuzzy
-msgid "Category contains"
-msgstr "名前が次のものを含む"
+msgid "Category is"
+msgstr "カテゴリ"
+
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
+msgstr "詳細..."
+
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:874
+#: calendar/gui/cal-search-bar.c:412
+#, fuzzy
+msgid "Any Category"
+msgstr "カテゴリ:"
 
-#: addressbook/gui/component/addressbook.c:707
+#: addressbook/gui/component/addressbook.c:912
 msgid "The URI that the Folder Browser will display"
 msgstr "フォルダブラウザが表示する URI"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+#, fuzzy
+msgid "(none)"
+msgstr "(名前なし)"
+
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Email 3"
 msgstr "メール3"
 
@@ -665,19 +702,19 @@ msgstr ""
 msgid "Querying Addressbook..."
 msgstr "アドレス帳を編集"
 
-#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+#: addressbook/gui/component/select-names/e-select-names-popup.c:310
 msgid "Edit Contact Info"
 msgstr "コンタクト情報の編集"
 
-#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+#: addressbook/gui/component/select-names/e-select-names-popup.c:383
 msgid "Add to Contacts"
 msgstr "コンタクトへ追加"
 
-#: addressbook/gui/component/e-address-popup.c:989
+#: addressbook/gui/component/e-address-popup.c:1006
 #, fuzzy
 msgid "Merge E-Mail Address"
 msgstr "メールアドレス:"
@@ -699,13 +736,10 @@ 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
+#: addressbook/gui/component/select-names/e-select-names.c:729
 #: 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
+#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:385
 msgid "Remove"
 msgstr "削除"
 
@@ -717,37 +751,56 @@ msgstr "すべて削除"
 msgid "Send HTML Mail?"
 msgstr "HTML メールを送信しますか?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#: addressbook/gui/component/select-names/e-select-names-popup.c:368
 #, fuzzy
 msgid "Unnamed Contact"
 msgstr "変更後のコンタクト:"
 
-#: addressbook/gui/component/select-names/e-select-names.c:403
+#: addressbook/gui/component/select-names/e-select-names.c:487
 msgid "Unable to get local storage.  This should never happen."
 msgstr ""
 
+#: addressbook/gui/component/select-names/e-select-names.c:560
+msgid "Select Contacts from Addressbook"
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Message Recipients"
-msgstr "メッセージの受信者"
+#, fuzzy
+msgid "C_ontaining:"
+msgstr "が次のものを含む"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Select Names"
-msgstr "名前を選択"
+#, fuzzy
+msgid "Co_ntacts:"
+msgstr "コンタクト(_C)"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
 #, fuzzy
-msgid "Select name from _folder:"
-msgstr "次から名前を選択:"
+msgid "F_ind"
+msgstr "検索"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
+msgid "Select Names"
+msgstr "名前を選択"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+msgid "Show contacts matching the following criteria:"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 #, 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/component/select-names/select-names.glade.h:7
+#, fuzzy
+msgid "_Folder:"
+msgstr "フォルダ(_F)"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Message Recipients:"
+msgstr "メッセージの受信者"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
@@ -762,8 +815,8 @@ msgid "Business _Fax"
 msgstr "仕事の FAX(_F)"
 
 #: 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
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "カテゴリ(_t)..."
 
@@ -772,16 +825,16 @@ msgid "Contact Editor"
 msgstr "コンタクトエディタ"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor.c:135
+#: calendar/gui/dialogs/task-editor.c:156
 msgid "Details"
 msgstr "詳細"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "File As:"
+#, fuzzy
+msgid "File A_s:"
 msgstr "別名:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "一般"
 
@@ -806,239 +859,1239 @@ msgstr "電話種別"
 msgid "Wants to receive _HTML mail"
 msgstr "HTML メールを受信許可(_H)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
-msgid "Web page address:"
-msgstr "ウェブページの URL:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "_Address..."
 msgstr "住所(_A)..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Assistant's name:"
 msgstr "アシスタントの名前(_A):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Birthday:"
 msgstr "誕生日(_B):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Business"
 msgstr "仕事(_B)"
 
-#: 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
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "コンタクト(_C)..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: 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
+#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
+#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "削除(_D)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Department:"
 msgstr "担当部署(_D):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Full Name..."
 msgstr "フルネーム(_F)..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Home"
 msgstr "家(_H)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Job title:"
 msgstr "職種(_J):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Manager's Name:"
 msgstr "マネージャの名前(_M):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Mobile"
 msgstr "モバイル(_M)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Nickname:"
 msgstr "ニックネーム(_N):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Office:"
 msgstr "事務所(_O):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Profession:"
 msgstr "専門職(_P):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Spouse:"
 msgstr "配偶者(_S):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_This is the mailing address"
 msgstr "これは郵便物の住所です"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#, fuzzy
+msgid "_Web page address:"
+msgstr "ウェブページの URL:"
+
 #: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:730
 msgid "This contact belongs to these categories:"
 msgstr "このコンタクトはこれらのカテゴリに所属しています:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1561
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Assistant"
 msgstr "アシスタント"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1495
 #: addressbook/gui/contact-editor/e-contact-editor.c:1562
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
 msgid "Business"
 msgstr "仕事"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1496
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Business 2"
 msgstr "仕事 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1497
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "Business Fax"
 msgstr "仕事の FAX"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1565
 msgid "Callback"
 msgstr "呼び戻し"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1499
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
 msgid "Car"
 msgstr "車"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1500
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
 msgid "Company"
 msgstr "会社"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1501
-#: addressbook/gui/contact-editor/e-contact-editor.c:1563
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Home"
 msgstr "家"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
 msgid "Home 2"
 msgstr "家 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1503
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "Home Fax"
 msgstr "家の FAX"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1504
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1505
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
 msgid "Mobile"
 msgstr "モバイル"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1506
-#: addressbook/gui/contact-editor/e-contact-editor.c:1564
-#: mail/mail-config.glade.h:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: mail/mail-config.glade.h:51
 msgid "Other"
 msgstr "その他"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1507
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Other Fax"
 msgstr "その他の FAX"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1508
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Pager"
 msgstr "ポケベル"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1509
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
 msgid "Primary"
 msgstr "プライマリ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1510
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Radio"
 msgstr "ラジオ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1511
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Telex"
 msgstr "テレックス"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1512
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#, fuzzy, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "フォルダからサマリーファイル `%s' を削除することが出来ませんでした: %s"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:265
 msgid "Contact Quick-Add"
 msgstr "コンタクトの簡易追加"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:267
 msgid "Edit Full"
 msgstr "すべて編集"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/widgets/e-addressbook-view.c:835
 msgid "Full Name"
 msgstr "フルネーム"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
 msgid "E-mail"
 msgstr "メール"
 
+#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "住所 2(_2):"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#, fuzzy
+msgid "Afghanistan"
+msgstr "アシスタント"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Albania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Algeria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "American Samoa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "Andorra"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "Angola"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "Anguilla"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#, fuzzy
+msgid "Antarctica"
+msgstr "自働"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+msgid "Antigua And Barbuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#, fuzzy
+msgid "Argentina"
+msgstr "方向"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+msgid "Armenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+msgid "Aruba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:14
+msgid "Australia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:15
+#, fuzzy
+msgid "Austria"
+msgstr "8 月"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+msgid "Azerbaijan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:17
+msgid "Bahamas"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:18
+msgid "Bahrain"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+msgid "Bangladesh"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+msgid "Barbados"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+#, fuzzy
+msgid "Belarus"
+msgstr "年"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:22
+msgid "Belgium"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:23
+#, fuzzy
+msgid "Belize"
+msgstr "サイズ:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#, fuzzy
+msgid "Benin"
+msgstr "送信中"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+msgid "Bermuda"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+msgid "Bhutan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:27
+msgid "Bolivia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+msgid "Bosnia And Herzegowina"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+msgid "Botswana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+msgid "Bouvet Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+#, fuzzy
+msgid "Brazil"
+msgstr "メール"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:33
+msgid "British Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:35
+msgid "Bulgaria"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+msgid "Burkina Faso"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+msgid "Burundi"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+msgid "Cambodia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+msgid "Cameroon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:40
 msgid "Canada"
 msgstr "カナダ"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+msgid "Cape Verde"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:42
+msgid "Cayman Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+msgid "Central African Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#, fuzzy
+msgid "Chad"
+msgstr "議長"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:45
 msgid "Check Address"
 msgstr "住所チェック"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+#, fuzzy
+msgid "Chile"
+msgstr "ファイル"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#, fuzzy
+msgid "China"
+msgstr "議長"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:48
+msgid "Christmas Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:50
+msgid "Colombia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#, fuzzy
+msgid "Comoros"
+msgstr "カラー"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:52
+#, fuzzy
+msgid "Congo"
+msgstr "コピー中"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+msgid "Cook Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:54
+msgid "Costa Rica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:56
 msgid "Countr_y:"
 msgstr "国(_y):"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:57
+msgid "Croatia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:58
+msgid "Cuba"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:59
+msgid "Cyprus"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:60
+msgid "Czech Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:61
+msgid "Denmark"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+msgid "Djibouti"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+msgid "Dominica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:64
+msgid "Dominican Republic"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+msgid "East Timor"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:66
+msgid "Ecuador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:67
+msgid "Egypt"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:68
+msgid "El Salvador"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+msgid "Eritrea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:71
+msgid "Estonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+msgid "Ethiopia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+msgid "Falkland Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+msgid "Faroe Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+msgid "Fiji"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:76
 msgid "Finland"
 msgstr "フィンランド"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "USA"
-msgstr "アメリカ"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:77
+#, fuzzy
+msgid "France"
+msgstr "キャンセル"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+msgid "French Guiana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+msgid "French Polynesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+msgid "French Southern Territories"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+msgid "Gabon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+msgid "Gambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:83
+msgid "Georgia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:84
+msgid "Germany"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+msgid "Ghana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:86
+msgid "Gibraltar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:87
+#, fuzzy
+msgid "Greece"
+msgstr "週"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#, fuzzy
+msgid "Greenland"
+msgstr "フィンランド"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#, fuzzy
+msgid "Grenada"
+msgstr "カナダ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+msgid "Guadeloupe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:91
+#, fuzzy
+msgid "Guam"
+msgstr "午前"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:92
+msgid "Guatemala"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+#, fuzzy
+msgid "Guinea"
+msgstr "一般"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+msgid "Guinea-bissau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+msgid "Guyana"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:96
+#, fuzzy
+msgid "Haiti"
+msgstr "メール"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:97
+msgid "Heard And McDonald Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+msgid "Holy See"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:99
+#, fuzzy
+msgid "Honduras"
+msgstr "時"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:100
+msgid "Hong Kong"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:101
+#, fuzzy
+msgid "Hungary"
+msgstr "日曜日"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:102
+msgid "Iceland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:103
+msgid "India"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+msgid "Indonesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:105
+msgid "Ireland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+msgid "Israel"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:107
+msgid "Italy"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:108
+msgid "Jamaica"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:109
+msgid "Japan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:110
+msgid "Jordan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+msgid "Kazakhstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+msgid "Kenya"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+msgid "Kiribati"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:114
+msgid "Kuwait"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+#, fuzzy
+msgid "Laos"
+msgstr "最も低い"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+msgid "Latvia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+msgid "Lebanon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+#, fuzzy
+msgid "Lesotho"
+msgstr "最も低い"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+#, fuzzy
+msgid "Liberia"
+msgstr "4 月"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+msgid "Liechtenstein"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+msgid "Lithuania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+msgid "Luxembourg"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#, fuzzy
+msgid "Macau"
+msgstr "3 月"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+msgid "Macedonia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+msgid "Madagascar"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+#, fuzzy
+msgid "Malawi"
+msgstr "メール"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+msgid "Malaysia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+msgid "Maldives"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#, fuzzy
+msgid "Mali"
+msgstr "メール"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#, fuzzy
+msgid "Malta"
+msgstr "メール"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+msgid "Marshall Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+msgid "Martinique"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+msgid "Mauritania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+#, fuzzy
+msgid "Mauritius"
+msgstr "マージン"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#, fuzzy
+msgid "Mayotte"
+msgstr "5 月"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+msgid "Mexico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+msgid "Micronesia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+#, fuzzy
+msgid "Monaco"
+msgstr "月曜日"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+msgid "Mongolia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+msgid "Montserrat"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:142
+msgid "Morocco"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#, fuzzy
+msgid "Mozambique"
+msgstr "モバイル"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+#, fuzzy
+msgid "Myanmar"
+msgstr "マネージャ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+msgid "Namibia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+msgid "Nauru"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+#, fuzzy
+msgid "Nepal"
+msgstr "返信"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#, fuzzy
+msgid "Netherlands"
+msgstr "スレッドを選択(_T)"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+#, fuzzy
+msgid "New Caledonia"
+msgstr "新規コンタクト:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+msgid "New Zealand"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+msgid "Nicaragua"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#, fuzzy
+msgid "Niger"
+msgstr "高い"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#, fuzzy
+msgid "Nigeria"
+msgstr "4 月"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#, fuzzy
+msgid "Niue"
+msgstr "分"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+msgid "Norfolk Island"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#, fuzzy
+msgid "Norway"
+msgstr "今"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+msgid "Oman"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#, fuzzy
+msgid "Pakistan"
+msgstr "貼り付け"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:161
+msgid "Palau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+#, fuzzy
+msgid "Panama"
+msgstr "カナダ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+msgid "Papua New Guinea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:164
+msgid "Paraguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+#, fuzzy
+msgid "Peru"
+msgstr "用紙"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+msgid "Philippines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+msgid "Pitcairn"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#, fuzzy
+msgid "Poland"
+msgstr "フィンランド"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+#, fuzzy
+msgid "Portugal"
+msgstr "縦長"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+msgid "Puerto Rico"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+#, fuzzy
+msgid "Qatar"
+msgstr "後に"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+msgid "Republic Of Korea"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:173
+msgid "Republic Of Moldova"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:174
+#, fuzzy
+msgid "Reunion"
+msgstr "セクション:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+msgid "Romania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+msgid "Russian Federation"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#, fuzzy
+msgid "Rwanda"
+msgstr "カナダ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+msgid "Saint Kitts And Nevis"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+msgid "Saint Lucia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+msgid "Saint Vincent And The Grena-dines"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:181
+#, fuzzy
+msgid "Samoa"
+msgstr "記録"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+msgid "San Marino"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+msgid "Sao Tome And Principe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+msgid "Saudi Arabia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:185
+#, fuzzy
+msgid "Senegal"
+msgstr "一般"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#, fuzzy
+msgid "Seychelles"
+msgstr ""
+"スケジュール\n"
+"時間"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+msgid "Sierra Leone"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+msgid "Singapore"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+msgid "Slovakia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+msgid "Slovenia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+msgid "Solomon Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#, fuzzy
+msgid "Somalia"
+msgstr "普通"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+msgid "South Africa"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+msgid "South Georgia And The South Sandwich Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:195
+#, fuzzy
+msgid "Spain"
+msgstr "送信"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+msgid "Sri Lanka"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+msgid "St. Helena"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+msgid "St. Pierre And Miquelon"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+#, fuzzy
+msgid "Sudan"
+msgstr "日"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#, fuzzy
+msgid "Suriname"
+msgstr "ニックネーム"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+msgid "Svalbard And Jan Mayen Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:202
+#, fuzzy
+msgid "Swaziland"
+msgstr "フィンランド"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#, fuzzy
+msgid "Sweden"
+msgstr "既読"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+msgid "Switzerland"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+#, fuzzy
+msgid "Taiwan"
+msgstr "ラジオ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#, fuzzy
+msgid "Tajikistan"
+msgstr "タスク"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#, fuzzy
+msgid "Thailand"
+msgstr "フィンランド"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+#, fuzzy
+msgid "Togo"
+msgstr "宛先"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+msgid "Tokelau"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#, fuzzy
+msgid "Tonga"
+msgstr "今日"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+msgid "Trinidad And Tobago"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+msgid "Tunisia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#, fuzzy
+msgid "Turkey"
+msgstr "火"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+#, fuzzy
+msgid "Turkmenistan"
+msgstr "ごみ箱"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+msgid "Turks And Caicos Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+msgid "Tuvalu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+msgid "U.S. Virgin Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:218
+#, fuzzy
+msgid "Uganda"
+msgstr "カナダ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+msgid "Ukraine"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+msgid "United Arab Emirates"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+msgid "United Kingdom"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+msgid "United Republic Of Tanzania"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:223
+#, fuzzy
+msgid "United States"
+msgstr "(タイトルなしメッセージ)"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:224
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:225
+msgid "Uruguay"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:226
+msgid "Uzbekistan"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+msgid "Vanuatu"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+msgid "Venezuela"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+#, fuzzy
+msgid "Viet Nam"
+msgstr "名前を選択"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+msgid "Wallis And Futuna Islands"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+msgid "Western Sahara"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+#, fuzzy
+msgid "Yemen"
+msgstr "既読"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+msgid "Yugoslavia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+msgid "Zambia"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+msgid "Zimbabwe"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:236
 msgid "_Address:"
 msgstr "住所(_A):"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:237
 msgid "_City:"
 msgstr "市(_C):"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:238
 msgid "_PO Box:"
 msgstr "私書箱(_P):"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:239
 msgid "_State/Province:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:240
 msgid "_ZIP Code:"
 msgstr "郵便番号(_Z):"
 
@@ -1129,6 +2182,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 #, fuzzy
 msgid "_Remove"
 msgstr "削除"
@@ -1139,7 +2193,7 @@ msgid "contact-list-editor"
 msgstr "コンタクトエディタ"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
 #, fuzzy
 msgid "Contact List Editor"
 msgstr "コンタクトエディタ"
@@ -1149,7 +2203,7 @@ 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:3
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid "Duplicate Contact Detected"
 msgstr "重複したコンタクトを検出しました"
 
@@ -1170,14 +2224,19 @@ msgstr ""
 "すでに存在しています．追加してもよろしいですか?"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#, fuzzy
+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:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Conflicting Contact:"
 msgstr "衝突しているコンタクト:"
 
-#: 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:5
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
@@ -1185,13 +2244,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:146
+#: widgets/misc/e-filter-bar.c:243
+msgid "Advanced Search"
+msgstr "上級検索"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:258
+#: addressbook/gui/search/e-addressbook-search-dialog.c:152
+#: mail/mail-search.c:260
 msgid "Search"
 msgstr "検索"
 
@@ -1303,42 +2362,52 @@ msgstr "y"
 msgid "z"
 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:541
-#: addressbook/gui/widgets/e-addressbook-view.c:601
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "VCard で保存"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
-#: addressbook/gui/widgets/e-addressbook-view.c:602
-msgid "Send contact to other"
-msgstr "他へコンタクトを送信"
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:265
+#: shell/e-shortcuts-view.c:378 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "開く"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:603
-msgid "Send message to contact"
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: ui/evolution-addressbook.xml.h:10
+#, fuzzy
+msgid "Forward Contact"
+msgstr "添付して転送(_A)"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:719
+#, fuzzy
+msgid "Send Message to Contact"
 msgstr "コンタクト先へメッセージを送信"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
-#: 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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
 #: 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:605
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Print Envelope"
 msgstr "表紙を印刷"
 
-#: 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
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
+#: mail/mail-accounts.c:283 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "削除"
 
@@ -1354,7 +2423,8 @@ msgid "Success"
 msgstr "ソース"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: shell/e-storage.c:515
 msgid "Unknown error"
 msgstr "未知のエラー"
 
@@ -1363,7 +2433,7 @@ msgstr "未知のエラー"
 msgid "Repository offline"
 msgstr "オフライン作業"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
 msgid "Permission denied"
 msgstr "許可がありません"
 
@@ -1382,8 +2452,11 @@ msgid "Protocol not supported"
 msgstr "操作はサポートされていません"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#, fuzzy
-msgid "Canceled"
+#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:545
+#: camel/camel-service.c:581
+msgid "Cancelled"
 msgstr "キャンセルしました"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
@@ -1412,131 +2485,131 @@ msgid "Error removing list"
 msgstr "カードの削除中にエラーが発生しました"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1218
 msgid "Error removing card"
 msgstr "カードの削除中にエラーが発生しました"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:833
 msgid "* Click here to add a contact *"
 msgstr "* コンタクトを追加するためにここをクリック *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:834
 msgid "File As"
 msgstr "別名"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:836
 msgid "Email"
 msgstr "メール"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:837
 msgid "Primary Phone"
 msgstr "主な電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:838
 msgid "Assistant Phone"
 msgstr "補助の電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:839
 msgid "Business Phone"
 msgstr "仕事の電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:840
 msgid "Callback Phone"
 msgstr "呼び戻しの電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:841
 msgid "Company Phone"
 msgstr "会社の電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:842
 msgid "Home Phone"
 msgstr "家の電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:843
 msgid "Organization"
 msgstr "組織"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.c:844
 msgid "Business Address"
 msgstr "仕事の住所"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:845
 msgid "Home Address"
 msgstr "家の住所"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:846
 msgid "Mobile Phone"
 msgstr "携帯電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:847
 msgid "Car Phone"
 msgstr "車載電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Business Phone 2"
 msgstr "仕事の電話 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Home Phone 2"
 msgstr "家の電話 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Other Phone"
 msgstr "その他の電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Other Address"
 msgstr "その他の住所"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Web Site"
 msgstr "ウェブサイト"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Department"
 msgstr "担当部署"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Office"
 msgstr "事務所"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Title"
 msgstr "敬称(前つけ)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Profession"
 msgstr "専門職"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "Manager"
 msgstr "マネージャ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Nickname"
 msgstr "ニックネーム"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Spouse"
 msgstr "配偶者"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Note"
 msgstr "ノート"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:740
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1215
 msgid "Done."
 msgstr "完了"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#: addressbook/gui/widgets/e-addressbook-view.c:1247
 msgid "Removing cards..."
 msgstr "カードを削除中..."
 
@@ -1732,6 +2805,23 @@ msgstr "幅:"
 msgid "_Font..."
 msgstr "フォント..."
 
+#: addressbook/printing/e-contact-print.c:1091
+#, fuzzy
+msgid "Print cards"
+msgstr "カレンダの印刷"
+
+#: addressbook/printing/e-contact-print.c:1111
+#: addressbook/printing/e-contact-print.c:1133
+#, fuzzy
+msgid "Print card"
+msgstr "カレンダの印刷"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
+#, fuzzy
+msgid "Print envelope"
+msgstr "表紙を印刷"
+
 #: calendar/conduits/calendar/calendar-conduit.c:735
 #: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
@@ -1890,7 +2980,7 @@ msgstr ""
 msgid "Could not initialize GNOME"
 msgstr "GNOME の初期化が出来ませんでした"
 
-#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:72
 #, fuzzy
 msgid "Could not initialize gnome-vfs"
 msgstr "Bonobo の初期化が出来ませんでした"
@@ -1899,150 +2989,141 @@ msgstr "Bonobo の初期化が出来ませんでした"
 msgid "Could not create the alarm notify service factory"
 msgstr "アラーム通知サービスファクトリを作成出来ませんでした"
 
-#: calendar/gui/calendar-commands.c:402
+#: calendar/gui/calendar-commands.c:414
 #, 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
+#: calendar/gui/calendar-commands.c:417 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1368 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
+#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
+#: calendar/gui/calendar-commands.c:426
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%b/%d (%a)"
 
-#: calendar/gui/calendar-commands.c:425
-msgid "%B"
-msgstr ""
+#: calendar/gui/calendar-commands.c:435
+#, fuzzy, c-format
+msgid "%d"
+msgstr "d"
 
-#. 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:437 calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
+#, fuzzy
+msgid "%d %B %Y"
+msgstr "%Y/%B/%e %A"
 
-#: calendar/gui/calendar-commands.c:586
+#. 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/calendar-commands.c:442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:240
+msgid "%d %B"
+msgstr "%B %d"
+
+#: calendar/gui/calendar-commands.c:604
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "カレンダビューを作成出来ませんでした. ORBitとOAFの設定をチェックしてください"
 
-#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:925
 #: calendar/gui/e-calendar-table.c:307
-msgid "Public"
-msgstr "一般"
-
-#: 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:397 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:309
+#: calendar/gui/calendar-model.c:358 calendar/gui/calendar-model.c:927
+#: calendar/gui/e-calendar-table.c:308
 msgid "Confidential"
 msgstr "極秘"
 
-#: 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:361 calendar/gui/e-calendar-table.c:306
+msgid "Public"
+msgstr "一般"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "N"
 msgstr "北"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:454
 msgid "S"
 msgstr "南"
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "E"
 msgstr "東"
 
-#: calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:456
 msgid "W"
 msgstr "西"
 
-#: 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:329 mail/message-list.c:625
+#: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
 msgid "High"
 msgstr "高い"
 
-#: 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:330 mail/message-list.c:624
+#: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
+#: calendar/gui/calendar-model.c:1624
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
 msgid "Normal"
 msgstr "普通"
 
-#: 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:331 mail/message-list.c:623
+#: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
 msgid "Low"
 msgstr "低い"
 
-#: 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:529 calendar/gui/calendar-model.c:1144
+#: calendar/gui/e-calendar-table.c:380
+#, fuzzy
+msgid "Free"
+msgstr "週"
 
-#: 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:531 calendar/gui/e-calendar-table.c:381
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+msgid "Busy"
+msgstr "ビジー"
 
-#: 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:403
+#: calendar/gui/calendar-model.c:680 calendar/gui/calendar-model.c:1192
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:401
 msgid "Not Started"
 msgstr "開始していない"
 
-#: 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:404
+#: calendar/gui/calendar-model.c:683 calendar/gui/calendar-model.c:1194
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:402
 msgid "In Progress"
 msgstr "処理中"
 
-#: 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:405
+#: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:403
 msgid "Completed"
 msgstr "完了しました"
 
-#: 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: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:893 e-util/e-time-utils.c:307
+#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:317
 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:896 e-util/e-time-utils.c:316
+#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:326
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 
-#: calendar/gui/calendar-model.c:901
+#: calendar/gui/calendar-model.c:847
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -2053,28 +3134,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: 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: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:1087
+#: calendar/gui/calendar-model.c:1011
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2084,43 +3144,50 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1051
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "パーセント値は 0 と 100 の間で含んでいなければなりません"
 
-#: calendar/gui/calendar-model.c:1168
+#: calendar/gui/calendar-model.c:1092
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 "優先度を '高い', '普通', '低い' あるいは '未定義' を選択しなければなりません"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:331
 msgid "Undefined"
 msgstr "未定義"
 
-#: calendar/gui/calendar-model.c:1222
-msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
-msgstr "透明度は '透明', '不透明', あるいは 'なし' でなければなりません"
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
+#: mail/mail-accounts.c:144 mail/mail-accounts.c:392
+#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
+#: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
+msgid "None"
+msgstr "ノート"
 
-#: calendar/gui/calendar-model.c:1710
+#: calendar/gui/calendar-model.c:1626
 msgid "Recurring"
 msgstr "再発"
 
-#: calendar/gui/calendar-model.c:1712
+#: calendar/gui/calendar-model.c:1628
 msgid "Assigned"
 msgstr "割当て済み"
 
-#: 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
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:655
+#: calendar/gui/dialogs/meeting-page.c:1187
+#: calendar/gui/dialogs/meeting-page.c:1283
 msgid "Yes"
 msgstr "はい"
 
-#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
+#: calendar/gui/dialogs/meeting-page.c:1284
 msgid "No"
 msgstr "いいえ"
 
@@ -2144,30 +3211,87 @@ msgstr "表示を定義"
 msgid "Month View"
 msgstr "月"
 
+#: calendar/gui/cal-search-bar.c:56
+msgid "Summary contains"
+msgstr "サマリが次のものを含む"
+
+#: calendar/gui/cal-search-bar.c:57
+#, fuzzy
+msgid "Description contains"
+msgstr "説明:"
+
+#: calendar/gui/cal-search-bar.c:58
+msgid "Comment contains"
+msgstr "コメントが次のものを含む"
+
+#: calendar/gui/cal-search-bar.c:416
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1046
+msgid "Calendar"
+msgstr "カレンダ"
+
+#: calendar/gui/component-factory.c:55
+msgid "Folder containing appointments and events"
+msgstr ""
+
+#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
+#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
+#: shell/e-local-storage.c:180 shell/e-shortcuts.c:1047
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "タスク"
+
+#: calendar/gui/component-factory.c:56
+#, fuzzy
+msgid "Folder containing to-do items"
+msgstr "メーリングリストの仮想フォルダ"
+
+#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+msgid "Create a new appointment"
+msgstr "新規約束を作成します"
+
+#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+#, fuzzy
+msgid "New _Appointment"
+msgstr "新規約束"
+
+#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: ui/evolution-tasks.xml.h:5
+msgid "Create a new task"
+msgstr "新規タスクを作成します"
+
+#: calendar/gui/component-factory.c:409
+#, fuzzy
+msgid "New _Task"
+msgstr "新規タスク"
+
 #: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
 msgstr "カレンダが表示する URI"
 
-#: calendar/gui/dialogs/alarm-options.c:354
+#: calendar/gui/dialogs/alarm-options.c:357
 #, fuzzy
 msgid "Audio Alarm Options"
 msgstr "オーディオアラーム"
 
-#: calendar/gui/dialogs/alarm-options.c:363
+#: calendar/gui/dialogs/alarm-options.c:366
 #, fuzzy
 msgid "Message Alarm Options"
 msgstr "メッセージの受信者"
 
-#: calendar/gui/dialogs/alarm-options.c:372
+#: calendar/gui/dialogs/alarm-options.c:375
 #, fuzzy
 msgid "Mail Alarm Options"
 msgstr "表示オプション"
 
-#: calendar/gui/dialogs/alarm-options.c:381
+#: calendar/gui/dialogs/alarm-options.c:384
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:390
+#: calendar/gui/dialogs/alarm-options.c:393
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -2219,114 +3343,120 @@ msgstr "時"
 msgid "minutes"
 msgstr "分"
 
-#: calendar/gui/dialogs/alarm-page.c:284
+#: calendar/gui/dialogs/alarm-page.c:332
 #, c-format
 msgid "%d days"
 msgstr "%d 日"
 
-#: calendar/gui/dialogs/alarm-page.c:286
+#: calendar/gui/dialogs/alarm-page.c:334
 msgid "1 day"
 msgstr "1 日"
 
-#: calendar/gui/dialogs/alarm-page.c:289
+#: calendar/gui/dialogs/alarm-page.c:337
 #, c-format
 msgid "%d weeks"
 msgstr "%d 週間"
 
-#: calendar/gui/dialogs/alarm-page.c:291
+#: calendar/gui/dialogs/alarm-page.c:339
 msgid "1 week"
 msgstr "1 週間"
 
-#: calendar/gui/dialogs/alarm-page.c:294
+#: calendar/gui/dialogs/alarm-page.c:342
 #, c-format
 msgid "%d hours"
 msgstr "%d 時間"
 
-#: calendar/gui/dialogs/alarm-page.c:296
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 hour"
 msgstr "1 時間"
 
-#: calendar/gui/dialogs/alarm-page.c:299
+#: calendar/gui/dialogs/alarm-page.c:347
 #, c-format
 msgid "%d minutes"
 msgstr "%d 分"
 
-#: calendar/gui/dialogs/alarm-page.c:301
+#: calendar/gui/dialogs/alarm-page.c:349
 msgid "1 minute"
 msgstr "1 分"
 
-#: calendar/gui/dialogs/alarm-page.c:304
+#: calendar/gui/dialogs/alarm-page.c:352
 #, c-format
 msgid "%d seconds"
 msgstr "%d 秒"
 
-#: calendar/gui/dialogs/alarm-page.c:306
+#: calendar/gui/dialogs/alarm-page.c:354
 msgid "1 second"
 msgstr "1 秒"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:379
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "次の時に音楽を再生する:"
 
-#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.c:383
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 #, fuzzy
 msgid "Display a message"
 msgstr "次のメッセージを表示します"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:387
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 msgid "Send an email"
 msgstr "次の時にメールを送信する:"
 
-#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.c:391
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "次の時にプログラムを実行する:"
 
-#: calendar/gui/dialogs/alarm-page.c:361
+#: calendar/gui/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
+#: calendar/gui/dialogs/meeting-page.c:601
+#: calendar/gui/dialogs/meeting-page.c:636
+#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:1255
+#: calendar/gui/dialogs/meeting-page.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr "未知"
+
+#: calendar/gui/dialogs/alarm-page.c:409
 #, fuzzy
 msgid "before start of appointment"
 msgstr "最初の約束の前"
 
-#: calendar/gui/dialogs/alarm-page.c:364
+#: calendar/gui/dialogs/alarm-page.c:412
 #, fuzzy
 msgid "after start of appointment"
 msgstr "最初の約束の後"
 
-#: calendar/gui/dialogs/alarm-page.c:374
+#: calendar/gui/dialogs/alarm-page.c:422
 #, fuzzy
 msgid "before end of appointment"
 msgstr "最後の約束の前"
 
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:425
 #, fuzzy
 msgid "after end of appointment"
 msgstr "最後の約束の後"
 
 #: 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
 msgstr "基本"
 
 #: 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:5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Reminders"
 msgstr "催促状"
 
 #: 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
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "サマリ:"
 
@@ -2335,12 +3465,11 @@ msgstr "サマリ:"
 msgid "_Options..."
 msgstr "オプション(_O)"
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:34
 msgid "after"
 msgstr "後に"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:35
 msgid "before"
 msgstr "前に"
 
@@ -2357,7 +3486,7 @@ msgstr "約束の最後が経過"
 msgid "hour(s)"
 msgstr "時"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
 msgid "minute(s)"
 msgstr "分"
 
@@ -2374,204 +3503,230 @@ msgid "10 minutes"
 msgstr "10 分"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "12 hour (am/pm)"
-msgstr "12 時間 (午前/午後)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 分"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "24 hour"
-msgstr "24 時間"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "30 minutes"
 msgstr "30 分"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "60 minutes"
 msgstr "60 分"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#, fuzzy
+msgid "Calendar and Tasks Settings"
+msgstr "メール設定(_M)..."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+msgid "Color for overdue tasks"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Beep when alarm windows appear."
-msgstr "アラームウィンドウが現れた時 BEEP 音を鳴らす"
+msgid "Color for tasks due today"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
-msgid "Calendar"
-msgstr "カレンダ"
+#, fuzzy
+msgid "Create new appointments with a default _reminder"
+msgstr "新規約束を作成します"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Calendar Preferences"
-msgstr "カレンダの設定"
+#, fuzzy
+msgid "Days"
+msgstr "日"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "Color for overdue tasks"
-msgstr ""
+#, fuzzy
+msgid "First day of wee_k:"
+msgstr "週の始め:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Color for tasks due today"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.c:969
+msgid "Friday"
+msgstr "金曜日"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors for Tasks"
-msgstr ""
+#, fuzzy
+msgid "Hours"
+msgstr "時"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #, fuzzy
-msgid "Compress weekends in month view"
-msgstr "週末を表示しない"
+msgid "Minutes"
+msgstr "分"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#, fuzzy
-msgid "Date Navigator"
-msgstr "日付操作オプション"
+#: calendar/gui/dialogs/recurrence-page.c:965
+msgid "Monday"
+msgstr "月曜日"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Defaults"
-msgstr "デフォルト"
+#, fuzzy
+msgid "O_verdue tasks:"
+msgstr "期限を過ぎたアイテム"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:30
-msgid "Display"
-msgstr "表示"
+#: calendar/gui/dialogs/recurrence-page.c:970
+msgid "Saturday"
+msgstr "土曜日"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "End of day:"
-msgstr "一日の終わり:"
+#, fuzzy
+msgid "Show appointment _end times in week and month views"
+msgstr "約束の終了時間を表示"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "First day of week:"
-msgstr "週の始め:"
+#, fuzzy
+msgid "Show week _numbers in date navigator"
+msgstr "週番号を表示"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Fri"
-msgstr "金"
+#, fuzzy
+msgid "Sta_rt of day:"
+msgstr "一日の始まり:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:969
-msgid "Friday"
-msgstr "金曜日"
+#, fuzzy
+msgid "Su_n"
+msgstr "日"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/recurrence-page.c:971
+msgid "Sunday"
+msgstr "日曜日"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Mon"
-msgstr "月"
+#, fuzzy
+msgid "T_hu"
+msgstr "木"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:965
-msgid "Monday"
-msgstr "月曜日"
+#, fuzzy
+msgid "T_ue"
+msgstr "火"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Notification Options"
-msgstr ""
+#, fuzzy
+msgid "Tas_ks due today:"
+msgstr "今日が期限のアイテム"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#, fuzzy
-msgid "Overdue tasks"
-msgstr "期限を過ぎたアイテム"
+#: calendar/gui/dialogs/recurrence-page.c:968
+msgid "Thursday"
+msgstr "木曜日"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Remind me of all appointments"
-msgstr "すべての約束を催促する"
+#, fuzzy
+msgid "Time"
+msgstr "敬称(前つけ)"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#, fuzzy
+msgid "Time _zone:"
+msgstr ""
+"\n"
+"タイムゾーン: "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Sat"
-msgstr "土"
+#, fuzzy
+msgid "Time di_visions:"
+msgstr "時分割:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:970
-msgid "Saturday"
-msgstr "土曜日"
+msgid "Time format:"
+msgstr "時間の書式:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#, fuzzy
-msgid "Show appointment end times in week and month views"
-msgstr "約束の終了時間を表示"
+#: calendar/gui/dialogs/recurrence-page.c:966
+msgid "Tuesday"
+msgstr "火曜日"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Show week numbers"
-msgstr "週番号を表示"
+#: calendar/gui/dialogs/recurrence-page.c:967
+msgid "Wednesday"
+msgstr "水曜日"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Start of day:"
-msgstr "一日の始まり:"
+#: ui/evolution-calendar.xml.h:33
+#, fuzzy
+msgid "Work Week"
+msgstr "週間労働時間(_o)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "Sun"
-msgstr "日"
+#, fuzzy
+msgid "_12 hour (AM/PM)"
+msgstr "12 時間 (午前/午後)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:971
-msgid "Sunday"
-msgstr "日曜日"
+#, fuzzy
+msgid "_24 hour"
+msgstr "24 時間"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#, fuzzy
-msgid "Task List"
-msgstr "タスク"
+msgid "_Ask for confirmation when deleting items"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #, fuzzy
-msgid "Tasks due today"
-msgstr "今日が期限のアイテム"
+msgid "_Compress weekends in month view"
+msgstr "週末を表示しない"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Thu"
-msgstr "木"
+#, fuzzy
+msgid "_Display"
+msgstr "表示"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:968
-msgid "Thursday"
-msgstr "木曜日"
+#, fuzzy
+msgid "_End of day:"
+msgstr "一日の終わり:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
-msgid "Time"
-msgstr "敬称(前つけ)"
+msgid "_Fri"
+msgstr "金"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Time divisions:"
-msgstr "時分割:"
+#, fuzzy
+msgid "_General"
+msgstr "一般"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Time format:"
-msgstr "時間の書式:"
+#, fuzzy
+msgid "_Hide completed tasks after"
+msgstr "削除されたメッセージを隠す(_D)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
-msgid "Time zone:"
-msgstr ""
-"\n"
-"タイムゾーン: "
+msgid "_Mon"
+msgstr "月"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "Tue"
-msgstr "火"
+#, fuzzy
+msgid "_Other"
+msgstr "その他"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:966
-msgid "Tuesday"
-msgstr "火曜日"
+#, fuzzy
+msgid "_Sat"
+msgstr "土"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Wed"
-msgstr "水"
+#, fuzzy
+msgid "_Task List"
+msgstr "タスク"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:967
-msgid "Wednesday"
-msgstr "水曜日"
+#, fuzzy
+msgid "_Wed"
+msgstr "水"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 #, fuzzy
-msgid "Work Week"
-msgstr "週間労働時間(_o)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "minutes before they occur."
-msgstr "分前"
+msgid "before the start of the appointment"
+msgstr "最初の約束の前"
 
 #: calendar/gui/dialogs/cancel-comp.c:52
 msgid "The meeting status has changed. Send an updated version?"
@@ -2636,66 +3791,61 @@ msgstr ""
 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
+#: calendar/gui/dialogs/comp-editor-util.c:159 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
+#: calendar/gui/dialogs/comp-editor-util.c:163 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
+#: calendar/gui/dialogs/comp-editor-util.c:165 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
+#: calendar/gui/dialogs/comp-editor-util.c:170 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
+#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
 #, fuzzy
 msgid "Due "
 msgstr "期日"
 
-#: calendar/gui/dialogs/comp-editor.c:449
+#: calendar/gui/dialogs/comp-editor.c:462
 #, fuzzy
 msgid "Edit Appointment"
 msgstr "約束の編集"
 
-#: calendar/gui/dialogs/comp-editor.c:454
+#: calendar/gui/dialogs/comp-editor.c:467
 #, fuzzy, c-format
 msgid "Appointment - %s"
 msgstr "約束"
 
-#: calendar/gui/dialogs/comp-editor.c:457
+#: calendar/gui/dialogs/comp-editor.c:470
 #, fuzzy, c-format
 msgid "Task - %s"
 msgstr "タスク"
 
-#: calendar/gui/dialogs/comp-editor.c:460
+#: calendar/gui/dialogs/comp-editor.c:473
 #, fuzzy, c-format
 msgid "Journal entry - %s"
 msgstr "仕訳記入(_J) (FIXME)"
 
-#: calendar/gui/dialogs/comp-editor.c:474
+#: calendar/gui/dialogs/comp-editor.c:487
 #, fuzzy
 msgid "No summary"
 msgstr "サマリー"
 
-#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
-#: mail/mail-display.c:98
+#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1490
+#: mail/mail-display.c:99
 msgid "Overwrite file?"
 msgstr "ファイルを上書きしますか?"
 
-#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
-#: mail/mail-display.c:102
+#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1496
+#: mail/mail-display.c:103
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -2703,12 +3853,12 @@ msgstr ""
 "その名前のファイルはすでに存在します\n"
 "上書きしますか?"
 
-#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "別名で保存..."
 
-#: calendar/gui/dialogs/comp-editor.c:1026
+#: calendar/gui/dialogs/comp-editor.c:1077
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -2754,44 +3904,35 @@ msgstr "本当に %d 個のタスクを削除してもよろしいですか?"
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "本当に %d 個の仕訳記入を削除してもよろしいですか?"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 #, fuzzy
-msgid "Select a Time Zone"
-msgstr "ファイルを選択"
+msgid "Addressbook..."
+msgstr "アドレス帳"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 #, fuzzy
-msgid "Selection:"
-msgstr "セクション:"
+msgid "Delegate To:"
+msgstr "削除"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#: calendar/gui/dialogs/e-delegate-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 ""
+msgid "Enter Delegate"
+msgstr "削除"
 
-#: calendar/gui/dialogs/event-editor.c:154
+#: calendar/gui/dialogs/event-editor.c:156
 msgid "Appointment"
 msgstr "約束"
 
-#: calendar/gui/dialogs/event-editor.c:159
+#: calendar/gui/dialogs/event-editor.c:161
 msgid "Reminder"
 msgstr "催促状"
 
-#: calendar/gui/dialogs/event-editor.c:164
+#: calendar/gui/dialogs/event-editor.c:166
 msgid "Recurrence"
 msgstr "再発"
 
-#: calendar/gui/dialogs/event-editor.c:169
-#: calendar/gui/dialogs/event-editor.c:248
+#: calendar/gui/dialogs/event-editor.c:171
+#: calendar/gui/dialogs/event-editor.c:273
 #, fuzzy
 msgid "Meeting"
 msgstr "打合せをキャンセル"
@@ -2800,174 +3941,190 @@ msgstr "打合せをキャンセル"
 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/dialogs/event-page.glade.h:2
+#, fuzzy
+msgid "B_usy"
+msgstr "ビジー"
+
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "分類"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "Con_fidential"
+msgstr "極秘"
+
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Date & Time"
 msgstr "日付と時間"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: calendar/gui/dialogs/event-page.glade.h:7
+#, fuzzy
+msgid "F_ree"
+msgstr "週"
+
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:5
 msgid "Pri_vate"
 msgstr "私的(_v)"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pu_blic"
 msgstr "公的(_b)"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
-#: calendar/gui/dialogs/task-page.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/e-calendar-table.etspec.h:12
+#, fuzzy
+msgid "Show Time As"
+msgstr "表示"
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Su_mmary:"
 msgstr "サマリー(_m):"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:19
-msgid "_Confidential"
-msgstr "機密(_C)"
-
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:13
 msgid "_End time:"
 msgstr "終了時間(_E):"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Start time:"
 msgstr "開始時間(_S):"
 
-#: 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
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:1183
+#: calendar/gui/dialogs/meeting-page.c:1251
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:553
-#: calendar/gui/dialogs/meeting-page.c:570
-#: calendar/gui/dialogs/meeting-page.c:1223
+#: calendar/gui/dialogs/meeting-page.c:578
+#: calendar/gui/dialogs/meeting-page.c:595
+#: calendar/gui/dialogs/meeting-page.c:1252
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:580
+#: calendar/gui/dialogs/meeting-page.c:597
+#: calendar/gui/dialogs/meeting-page.c:1253
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:582
+#: calendar/gui/dialogs/meeting-page.c:599
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:586
-#: calendar/gui/dialogs/meeting-page.c:603
-#: calendar/gui/dialogs/meeting-page.c:1238
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:628
+#: calendar/gui/dialogs/meeting-page.c:1267
 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
+#: calendar/gui/dialogs/meeting-page.c:613
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1185
+#: calendar/gui/dialogs/meeting-page.c:1268
 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
+#: calendar/gui/dialogs/meeting-page.c:615
+#: calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1269
 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
+#: calendar/gui/dialogs/meeting-page.c:617
+#: calendar/gui/dialogs/meeting-page.c:634
+#: calendar/gui/dialogs/meeting-page.c:1270
 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
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:686
+#: calendar/gui/dialogs/meeting-page.c:1193
+#: calendar/gui/dialogs/meeting-page.c:1296
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:688
+#: calendar/gui/dialogs/meeting-page.c:1297
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:690
+#: calendar/gui/dialogs/meeting-page.c:1298
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:692
+#: calendar/gui/dialogs/meeting-page.c:1299
 #: 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
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/meeting-page.c:694
+#: calendar/gui/dialogs/meeting-page.c:1300
 #, fuzzy
 msgid "Delegated"
 msgstr "削除"
 
-#: calendar/gui/dialogs/meeting-page.c:650
-#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/dialogs/meeting-page.c:675
+#: calendar/gui/dialogs/meeting-page.c:698
 #, fuzzy
 msgid "In Process"
 msgstr "処理中"
 
-#: calendar/gui/dialogs/meeting-page.c:712
+#: calendar/gui/dialogs/meeting-page.c:737
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:763
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:788
+#: calendar/gui/dialogs/meeting-page.c:842
 #, 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
+#: calendar/gui/dialogs/meeting-page.c:790
+#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:962
 #, fuzzy
 msgid "Required Participants"
 msgstr "参加者が必要"
 
-#: calendar/gui/dialogs/meeting-page.c:767
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:792
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Optional Participants"
 msgstr "任意参加者"
 
-#: calendar/gui/dialogs/meeting-page.c:769
-#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:794
+#: calendar/gui/dialogs/meeting-page.c:842
 #, fuzzy
 msgid "Non-Participants"
 msgstr "不参加者"
 
-#: calendar/gui/dialogs/meeting-page.c:891
+#: calendar/gui/dialogs/meeting-page.c:920
 #, fuzzy
 msgid "Sent By:"
 msgstr "送信済"
 
-#: calendar/gui/dialogs/meeting-page.c:1442
+#: calendar/gui/dialogs/meeting-page.c:1471
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "削除..."
@@ -3010,19 +4167,18 @@ msgid "Role"
 msgstr "役割"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: calendar/gui/e-calendar-table.etspec.h:14 filter/libfilter-i18n.h:31
 #: 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
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:85
 #: 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 "主催者:"
@@ -3067,13 +4223,14 @@ msgstr ""
 msgid "th"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1274
+#: calendar/gui/dialogs/recurrence-page.c:1275
 msgid "occurrences"
 msgstr "出来事"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Custom recurrence"
-msgstr "再発のカスタマイズ"
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "A_dd"
+msgstr "追加"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
@@ -3084,26 +4241,33 @@ msgid "Exceptions"
 msgstr "例外"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "No recurrence"
-msgstr "再発なし"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Preview"
 msgstr "プレビュー"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Recurrence Rule"
 msgstr "再発ルール"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "Simple recurrence"
-msgstr "シンプルな再発"
+#, fuzzy
+msgid "_Custom recurrence"
+msgstr "再発のカスタマイズ"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 #, fuzzy
 msgid "_Modify"
 msgstr "修正"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#, fuzzy
+msgid "_No recurrence"
+msgstr "再発なし"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Simple recurrence"
+msgstr "シンプルな再発"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr ""
@@ -3149,166 +4313,162 @@ msgid "The journal entry has changed. Send an updated version?"
 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/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% 完了(_l):"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#, fuzzy
-msgid "Delegated To:"
-msgstr "削除"
+msgid "Date Completed:"
+msgstr "完了日:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#, fuzzy
-msgid "No one"
-msgstr "ノート"
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+msgid "Progress"
+msgstr "処理中"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:889
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:897
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor.c:130
-msgid "Task"
-msgstr "タスク"
+#: calendar/gui/dialogs/task-details-page.glade.h:14
+msgid "_Priority:"
+msgstr "優先度(_P):"
 
-#: calendar/gui/dialogs/task-page.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% 完了(_l):"
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+msgid "_Status:"
+msgstr "ステータス(_S):"
 
-#: calendar/gui/dialogs/task-page.glade.h:14
-msgid "Progress"
-msgstr "処理中"
+#: calendar/gui/dialogs/task-editor.c:161
+#: calendar/gui/dialogs/task-editor.c:239
+#, fuzzy
+msgid "Assignment"
+msgstr "割当て済み"
 
-#: calendar/gui/dialogs/task-page.glade.h:16
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "説明:"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Sta_rt Date:"
 msgstr "開始日(_r):"
 
-#: calendar/gui/dialogs/task-page.glade.h:21
+#: calendar/gui/dialogs/task-page.glade.h:9
+msgid "_Confidential"
+msgstr "機密(_C)"
+
+#: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "期日(_D):"
 
-#: calendar/gui/dialogs/task-page.glade.h:22
-msgid "_Priority:"
-msgstr "優先度(_P):"
-
-#: calendar/gui/dialogs/task-page.glade.h:23
-msgid "_Status:"
-msgstr "ステータス(_S):"
-
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:350
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:361
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
+#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1287
 msgid "_Open"
 msgstr "開く(_O)"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
+#: calendar/gui/e-week-view.c:3273 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
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
+#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
+#: 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
+#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
+#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
+#: ui/evolution-tasks.xml.h:16
 msgid "_Paste"
 msgstr "貼り付け(_P)"
 
-#: calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-calendar-table.c:863
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "完了をマークします"
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:865
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "このタスクを削除します"
 
-#: calendar/gui/e-calendar-table.c:866
+#: calendar/gui/e-calendar-table.c:868
 #, fuzzy
 msgid "_Mark Tasks as Complete"
 msgstr "完了したタスクをマークします"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:870
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "選択したタスクを削除します"
 
-#: calendar/gui/e-calendar-table.c:1137
-msgid "Click here to add a task"
+#: calendar/gui/e-calendar-table.c:1130
+#, fuzzy
+msgid "Click to add a task"
 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 "アラーム"
@@ -3342,23 +4502,23 @@ msgstr "緯度経度"
 msgid "Priority"
 msgstr "優先度"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr "開始日"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#. FIXME: Inbox shortcut should point to something else for
+#. people who won't care about using /Local Folders/Inbox
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1044
+#: shell/e-storage-set-view.c:1466 shell/e-summary-storage.c:78
 msgid "Summary"
 msgstr "サマリー"
 
-#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-calendar-table.etspec.h:16
 #, 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"
@@ -3370,155 +4530,262 @@ 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:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1354
 #: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 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:293 calendar/gui/e-day-view.c:1357
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1381
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%b/%d"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/e-day-view.c:588 calendar/gui/e-week-view.c:324
 #: 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/e-day-view.c:591 calendar/gui/e-week-view.c:327
 #: 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:3308 calendar/gui/e-week-view.c:3146
+#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "新規毎日のイベント"
 
-#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
-#: ui/evolution-calendar.xml.h:13
+#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "今日へ移動(_T)"
 
-#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "指定日へ移動..."
 
-#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "この約束を削除"
 
-#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "この出来事を可動にする"
 
-#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "この出来事を削除"
 
-#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "すべての出来事を削除"
 
-#: calendar/gui/e-itip-control.c:694
-msgid "This is an event that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:617
+#, c-format
+msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:697
+#: calendar/gui/e-itip-control.c:618
 #, fuzzy
-msgid "This is a meeting request."
-msgstr "これは郵便物の住所です"
+msgid "Meeting Information"
+msgstr "付加情報"
 
-#: calendar/gui/e-itip-control.c:700
-msgid "This is one or more additions to a current meeting."
+#: calendar/gui/e-itip-control.c:622
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
 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:623
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "打合せをキャンセル"
 
-#: calendar/gui/e-itip-control.c:706
-msgid "This is a reply to a meeting request."
+#: calendar/gui/e-itip-control.c:627
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
-msgid "This is an event cancellation."
+#: calendar/gui/e-itip-control.c:628
+#, fuzzy
+msgid "Meeting Update"
+msgstr "会議終了時間(_e):"
+
+#: calendar/gui/e-itip-control.c:632
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
-#: calendar/gui/e-itip-control.c:780
+#: calendar/gui/e-itip-control.c:633
 #, fuzzy
-msgid "The message is not understandable."
-msgstr "このメッセージは現在利用出来ません"
+msgid "Meeting Update Request"
+msgstr "打合せ要求(_q) (FIXME)"
 
-#: calendar/gui/e-itip-control.c:737
-msgid "This is an task that can be added to your calendar."
+#: calendar/gui/e-itip-control.c:637
+#, fuzzy, c-format
+msgid "<b>%s</b> has replyed to a meeting request."
+msgstr "これは郵便物の住所です"
+
+#: calendar/gui/e-itip-control.c:638
+#, fuzzy
+msgid "Meeting Reply"
+msgstr "打合せをキャンセル"
+
+#: calendar/gui/e-itip-control.c:642
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:740
-msgid "This is a task request."
+#: calendar/gui/e-itip-control.c:643
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "ファイルを選択"
+
+#: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:728
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:743
-msgid "This is a request for the latest task information."
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "メッセージを検索"
+
+#: calendar/gui/e-itip-control.c:665
+#, c-format
+msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:746
-msgid "This is a reply to a task request."
+#: calendar/gui/e-itip-control.c:666
+#, fuzzy
+msgid "Task Information"
+msgstr "情報"
+
+#: calendar/gui/e-itip-control.c:670
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:749
-msgid "This is an task cancellation."
+#: calendar/gui/e-itip-control.c:671
+#, fuzzy
+msgid "Task Proposal"
+msgstr "タスクパッド"
+
+#: calendar/gui/e-itip-control.c:675
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:771
-msgid "This is freebusy information."
+#: calendar/gui/e-itip-control.c:676
+#, fuzzy
+msgid "Task Update"
+msgstr "が次のものより後"
+
+#: calendar/gui/e-itip-control.c:680
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
-msgid "This is a request for freebusy information."
+#: calendar/gui/e-itip-control.c:681
+#, fuzzy
+msgid "Task Update Request"
+msgstr "タスク要求(_R) (FIXME)"
+
+#: calendar/gui/e-itip-control.c:685
+#, c-format
+msgid "<b>%s</b> has replyed to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:777
-msgid "This is a reply to a freebusy request."
+#: calendar/gui/e-itip-control.c:686
+#, fuzzy
+msgid "Task Reply"
+msgstr "返信"
+
+#: calendar/gui/e-itip-control.c:690
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:834
+#: calendar/gui/e-itip-control.c:691
 #, fuzzy
-msgid "The message does not appear to be properly formed"
-msgstr "フォルダで回復不能なエラーが発生したようです"
+msgid "Task Cancellation"
+msgstr "打合せをキャンセル"
 
-#: calendar/gui/e-itip-control.c:853
-msgid "The message contains only unsupported requests."
+#: calendar/gui/e-itip-control.c:696
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "カレンダメッセージ"
+
+#: calendar/gui/e-itip-control.c:713
+#, fuzzy, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "必須情報"
+
+#: calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "必須情報"
+
+#: calendar/gui/e-itip-control.c:718
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:877
-msgid "The information contained in this attachment was not valid"
+#: calendar/gui/e-itip-control.c:719
+msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:989
+#: calendar/gui/e-itip-control.c:723
+#, c-format
+msgid "<b>%s</b> has replyed to a free/busy request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:724
+msgid "Free/Busy Reply"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:729
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "前のメッセージへ移動します"
+
+#: calendar/gui/e-itip-control.c:940
 msgid "I couldn't update your calendar file!\n"
 msgstr "カレンダファイルを更新出来ませんでした!\n"
 
-#: calendar/gui/e-itip-control.c:1015
+#: calendar/gui/e-itip-control.c:942
+#, fuzzy
+msgid "Update complete\n"
+msgstr "完了日:"
+
+#: calendar/gui/e-itip-control.c:967
 #, fuzzy
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "カレンダファイルを開くことが出来ませんでした!\n"
 
+#: calendar/gui/e-itip-control.c:969
+#, fuzzy
+msgid "Removal Complete"
+msgstr "% 完了(_l):"
+
+#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
+#, fuzzy
+msgid "Item sent!\n"
+msgstr "送信日"
+
+#: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
+msgid "The item could not be sent!\n"
+msgstr ""
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -3556,44 +4823,27 @@ msgstr "終了日"
 msgid "date-start"
 msgstr "開始日"
 
-#: 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:252
-msgid "Category:"
-msgstr "カテゴリ:"
-
-#: calendar/gui/e-tasks.c:403
+#: calendar/gui/e-tasks.c:349
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "'%s' のタスクを読み込むことが出来ませんでした"
 
-#: calendar/gui/e-tasks.c:415
+#: calendar/gui/e-tasks.c:361
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "'%s' を読み込むことを要求されるメソッドはサポートしていません"
 
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
-#: my-evolution/e-summary-calendar.c:230
-msgid "%d %B"
-msgstr "%B %d"
-
-#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "新規約束..."
 
-#: calendar/gui/gnome-cal.c:999
+#: calendar/gui/gnome-cal.c:1260
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s' のフォルダを開くことが出来ませんでした"
 
-#: calendar/gui/gnome-cal.c:1010
+#: calendar/gui/gnome-cal.c:1271
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "'%s' を開くことを要求されるメソッドはサポートしていません"
@@ -3619,43 +4869,43 @@ msgid "Go To Date"
 msgstr "日にちに移動"
 
 #: calendar/gui/goto-dialog.glade.h:6
+#, fuzzy
+msgid "Go To Today"
+msgstr "今日へ移動"
+
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "1 月"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "July"
 msgstr "7 月"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "June"
 msgstr "6 月"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "March"
 msgstr "3 月"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "May"
 msgstr "5 月"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "November"
 msgstr "11 月"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "October"
 msgstr "10 月"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:14
 msgid "September"
 msgstr "9 月"
 
-#: calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
-msgid "_Go To Today"
-msgstr "今日へ移動"
-
-#: calendar/gui/itip-utils.c:224
+#: calendar/gui/itip-utils.c:253
 msgid "An organizer must be set."
 msgstr ""
 
@@ -3811,12 +5061,6 @@ msgstr "金"
 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:1815
 #, fuzzy
@@ -3853,9 +5097,8 @@ msgid "Print Calendar"
 msgstr "カレンダの印刷"
 
 #: 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
+#: mail/mail-callbacks.c:1921 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "印刷プレビュー"
 
@@ -3868,7 +5111,7 @@ msgstr "このアイテムを印刷"
 msgid "Print Setup"
 msgstr "プリンタの設定"
 
-#: calendar/gui/tasks-control.c:126
+#: calendar/gui/tasks-control.c:127
 msgid "The URI of the tasks folder to display"
 msgstr "タスクフォルダが表示する URI"
 
@@ -3877,8 +5120,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 ""
@@ -3887,10 +5130,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
@@ -3898,8 +5141,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
@@ -3907,13 +5150,110 @@ 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:284
+msgid "time-add-day expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:289
+msgid "time-add-day expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:296
+msgid "time-add-day expects argument 2 to be an integer"
+msgstr ""
+
+#: calendar/pcs/query.c:323
+msgid "time-day-begin expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:328
+msgid "time-day-begin expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:355
+msgid "time-day-end expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:360
+msgid "time-day-end expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:396
+msgid "get-vtype expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:492
+msgid "occur-in-time-range? expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:497
+msgid "occur-in-time-range? expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:504
+msgid "occur-in-time-range? expects argument 2 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:634
+#, fuzzy
+msgid "contains? expects 2 arguments"
+msgstr "パラメータあるいは引数に構文解析エラー"
+
+#: calendar/pcs/query.c:639
+msgid "contains? expects argument 1 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:646
+msgid "contains? expects argument 2 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:663
+msgid ""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
+msgstr ""
+
+#: calendar/pcs/query.c:705
+msgid "has-categories? expects at least 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:717
+msgid ""
+"has-categories? expects all arguments to be strings or one and only one "
+"argument to be a boolean false (#f)"
+msgstr ""
+
+#: calendar/pcs/query.c:805
+msgid "is-completed? expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:1008
+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 "サインはこの暗号をサポートしていません"
@@ -3971,6 +5311,7 @@ msgid "Unable to process spool folder"
 msgstr "スプールフォルダを処理することが出来ません"
 
 #: camel/camel-filter-driver.c:667
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "メッセージ %d を取得中 (%d%%)"
 
@@ -4007,7 +5348,7 @@ msgstr "フィルタの構文解析中にエラー: %s: %s"
 msgid "Error executing filter: %s: %s"
 msgstr "フィルタ実行中にエラー: %s: %s"
 
-#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
+#: camel/camel-filter-search.c:468 camel/camel-filter-search.c:475
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "フィルタ検索実行中にエラー: %s: %s"
@@ -4034,12 +5375,12 @@ msgstr ""
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:559
+#: camel/camel-folder-search.c:563
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "未知のヘッダでクエリを実行しています: %s"
 
-#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:716
 msgid "Invalid type in body-contains, expecting string"
 msgstr "無効な種別が本文に含まれています, 文字を期待しています"
 
@@ -4154,13 +5495,13 @@ msgid "No plaintext to sign."
 msgstr "サインするためのプレインテキストがありません"
 
 #: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
-#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
+#: camel/camel-pgp-context.c:1080 camel/camel-pgp-context.c:1295
 msgid "No password provided."
 msgstr "提供されたパスワードはありません"
 
 #: 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
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1087
+#: camel/camel-pgp-context.c:1302
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "GPG/PGP へのパイプが作成できませんでした: %s"
@@ -4178,15 +5519,15 @@ msgstr "ベリファイするためのプレインテキストがありません"
 msgid "Couldn't create temp file: %s"
 msgstr "作業ファイルを作成することが出来ませんでした: %s"
 
-#: camel/camel-pgp-context.c:1063
+#: camel/camel-pgp-context.c:1070
 msgid "No plaintext to encrypt."
 msgstr "符号化するためのプレインテキストがありません"
 
-#: camel/camel-pgp-context.c:1089
+#: camel/camel-pgp-context.c:1096
 msgid "No recipients specified"
 msgstr "受信者が指定されていません"
 
-#: camel/camel-pgp-context.c:1280
+#: camel/camel-pgp-context.c:1287
 msgid "No ciphertext to decrypt."
 msgstr "復号化するための暗号テキストがありません"
 
@@ -4194,8 +5535,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
@@ -4222,7 +5563,7 @@ msgid "Connection cancelled"
 msgstr "接続はキャンセルしました"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "%s (ポート %d) へ接続出来ませんでした: %s"
@@ -4233,7 +5574,7 @@ msgstr "(未知のホスト)"
 
 #: 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
+#: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "操作はキャンセルしました"
 
@@ -4289,8 +5630,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"
@@ -4301,8 +5642,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"
@@ -4363,42 +5704,69 @@ msgstr "このオプションは簡単なパスワードを使ってサーバへ接続します"
 msgid "Unknown authentication state."
 msgstr "未知の認証状態です"
 
+#: 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:54
+msgid "Password"
+msgstr "パスワード"
+
+#: camel/camel-sasl-popb4smtp.c:34
+msgid "POP before SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:36
+msgid "This option will authorise a POP connection before attempting SMTP"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:107
+#, fuzzy
+msgid "POP Source URI"
+msgstr "ソース"
+
+#: camel/camel-sasl-popb4smtp.c:111
+msgid "POP Before SMTP auth using an unknown transport"
+msgstr ""
+
+#: camel/camel-sasl-popb4smtp.c:116
+msgid "POP Before SMTP auth using a non-pop source"
+msgstr ""
+
 #: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "正規表現の編集に失敗: %s: %s"
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' はユーザ名コンポーネントが必要です"
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:163
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' はホストコンポーネントが必要です"
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:171
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' はパスコンポーネントが必要です"
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:549
 #, c-format
 msgid "Resolving: %s"
 msgstr "解決中: %s"
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:576
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "名前の検索に失敗しました: %s"
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:601
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "ホストの検索に失敗しました: %s: ホストは見つかりません"
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:603
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "ホストの検索に失敗しました: %s: 未知の理由です"
@@ -4411,12 +5779,12 @@ msgstr "仮想フォルダメールプロバイダ"
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:295 camel/camel-session.c:364
+#: camel/camel-session.c:297 camel/camel-session.c:366
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "プロトコル `%s' を利用できるプロバイダはありません"
 
-#: camel/camel-session.c:481
+#: camel/camel-session.c:483
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4462,7 +5830,7 @@ msgstr "メッセージのデコードに失敗しました"
 msgid "Failed to verify certificates."
 msgstr "認証の証明に失敗しました"
 
-#: camel/camel-tcp-stream-openssl.c:415
+#: camel/camel-tcp-stream-openssl.c:463
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -4472,7 +5840,7 @@ msgstr ""
 "対象: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -4525,61 +5893,61 @@ msgstr "そのようなメッセージはありません: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "このゴミ箱フォルダからメッセージをコピーすることが出来ません"
 
-#: camel/providers/imap/camel-imap-command.c:325
+#: camel/providers/imap/camel-imap-command.c:329
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP サーバから予期しない応答がありました: %s"
 
-#: camel/providers/imap/camel-imap-command.c:335
+#: camel/providers/imap/camel-imap-command.c:339
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP コマンドは失敗しました: %s"
 
-#: camel/providers/imap/camel-imap-command.c:390
+#: camel/providers/imap/camel-imap-command.c:394
 msgid "Server response ended too soon."
 msgstr "サーバレスポンスはあっけなく終わりました"
 
-#: camel/providers/imap/camel-imap-command.c:582
+#: camel/providers/imap/camel-imap-command.c:586
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP サーバの応答は %s 情報を含んでいません"
 
-#: camel/providers/imap/camel-imap-command.c:618
+#: camel/providers/imap/camel-imap-command.c:622
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP サーバから予期しない OK 応答がありました: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:192
+#: camel/providers/imap/camel-imap-folder.c:190
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "ディレクトリ %s を作成出来ませんでした: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:211
+#: camel/providers/imap/camel-imap-folder.c:209
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s のサマリーをロード出来ませんでした"
 
-#: camel/providers/imap/camel-imap-folder.c:275
+#: camel/providers/imap/camel-imap-folder.c:273
 msgid "Folder was destroyed and recreated on server."
 msgstr "フォルダは破壊され再作成されました"
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:437
+#: camel/providers/imap/camel-imap-folder.c:435
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "メッセージを保存中"
 
-#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1491
 #: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr "このメッセージは現在利用出来ません"
 
-#: camel/providers/imap/camel-imap-folder.c:1641
-#: camel/providers/imap/camel-imap-folder.c:1722
+#: camel/providers/imap/camel-imap-folder.c:1634
+#: camel/providers/imap/camel-imap-folder.c:1715
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1647
+#: camel/providers/imap/camel-imap-folder.c:1640
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "メッセージを保存中"
@@ -4593,7 +5961,7 @@ msgstr "FETCH 応答にメッセージ本体を見付けることが出来ませんでした"
 msgid "Could not open cache directory: %s"
 msgstr "キャッシュディレクトリを開くことが出来ませんでした: %s"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
 msgid "Checking for new mail"
 msgstr "新着メールのチェック"
 
@@ -4601,7 +5969,7 @@ msgstr "新着メールのチェック"
 msgid "Check for new messages in all folders"
 msgstr "すべてのフォルダの新着メールをチェックします"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:720
 msgid "Folders"
 msgstr "フォルダ"
 
@@ -4640,7 +6008,7 @@ msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP サーバ %s は要求した認証タイプ %s をサポートしていません"
 
 #: camel/providers/imap/camel-imap-store.c:473
-#: camel/providers/smtp/camel-smtp-transport.c:368
+#: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "認証タイプ %s をサポートしていません"
@@ -4651,7 +6019,7 @@ msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s %s@%s の IMAP パスワードを入力してください"
 
 #: camel/providers/imap/camel-imap-store.c:512
-#: camel/providers/smtp/camel-smtp-transport.c:412
+#: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr "パスワードを入力していません"
 
@@ -4666,12 +6034,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
+#: camel/providers/imap/camel-imap-store.c:837
 #, c-format
 msgid "No such folder %s"
 msgstr "そのようなフォルダ %s はありません"
 
-#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/imap/camel-imap-store.c:1038
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -4764,7 +6132,7 @@ msgstr "maildir 形式のフォルダへメッセージを追加出来ません: %s: %s"
 #: camel/providers/local/camel-maildir-folder.c:201
 #: camel/providers/local/camel-maildir-folder.c:213
 #: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
@@ -4778,7 +6146,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-maildir-folder.c:201
-#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
@@ -4851,20 +6219,20 @@ msgstr "maildir ディレクトリパスを開くことが出来ません: %s: %s"
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s のフォルダロックを作成することが出来ません: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-mbox-folder.c:209
 #: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "mailboxを開くことが出来ません: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:259
+#: camel/providers/local/camel-mbox-folder.c:265
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 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-mbox-folder.c:344
+#: camel/providers/local/camel-mbox-folder.c:376
+#: camel/providers/local/camel-mbox-folder.c:389
 #: camel/providers/local/camel-spool-folder.c:548
 #: camel/providers/local/camel-spool-folder.c:580
 #: camel/providers/local/camel-spool-folder.c:593
@@ -4876,12 +6244,12 @@ msgstr ""
 "メッセージ %s をフォルダ %s から取得出来ません\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-mbox-folder.c:377
 #: 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-mbox-folder.c:390
 #: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "メッセージの解釈に失敗しました: 間違ったメールボックスですか?"
@@ -4929,13 +6297,14 @@ msgstr "フォルダ `%s' は空ではありません. 削除しません"
 #. 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"
+#, fuzzy
+msgid "Summarizing 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"
+#, fuzzy, c-format
+msgid "Could not open folder: %s: summarizing from position %ld: %s"
 msgstr "フォルダを開けませんでした: %s: ポジション %ld からサマライズ中: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:296
@@ -4945,24 +6314,22 @@ 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"
+#, fuzzy, c-format
+msgid "Cannot summarize folder: %s: %s"
 msgstr "フォルダをサマライズすることが出来ません: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:502
 #: 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"
+#: camel/providers/local/camel-spool-summary.c:931
+#, fuzzy
+msgid "Synchronizing 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"
+#, fuzzy, c-format
+msgid "Could not open folder to summarize: %s: %s"
 msgstr "フォルダをサマライズすることが出来ませんでした: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
@@ -5066,6 +6433,17 @@ msgstr ""
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
+#: camel/providers/local/camel-spool-summary.c:498
+#, c-format
+msgid "Cannot summarise folder: %s: %s"
+msgstr "フォルダをサマライズすることが出来ません: %s: %s"
+
+#: 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-spool-summary.c:784
 #: camel/providers/local/camel-spool-summary.c:793
 #: camel/providers/local/camel-spool-summary.c:802
@@ -5155,39 +6533,39 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "%s の .newsrc ファイルを作成または開くことが出来ません: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:149
+#: camel/providers/pop3/camel-pop3-folder.c:189
 msgid "Retrieving POP summary"
 msgstr "POP サマリを取得中"
 
-#: camel/providers/pop3/camel-pop3-folder.c:155
+#: camel/providers/pop3/camel-pop3-folder.c:195
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "POP サーバで新規メッセージをチェックすることが出来ませんでした: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:199
+#: camel/providers/pop3/camel-pop3-folder.c:235
 msgid "Could not open folder: message listing was incomplete."
 msgstr "フォルダを開けませんでした: メッセージリストは未完成です"
 
-#: camel/providers/pop3/camel-pop3-folder.c:292
-#, c-format
-msgid "No message with uid %s"
-msgstr "uid %s のメッセージはありません"
-
-#: camel/providers/pop3/camel-pop3-folder.c:296
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "POP メッセージ %d を取得中"
-
-#: camel/providers/pop3/camel-pop3-folder.c:303
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "メッセージを取り出すことが出来ませんでした: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:320
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "POP サーバ %s からメッセージを取得出来ませんでした: %s"
 
+#: camel/providers/pop3/camel-pop3-folder.c:367
+#, c-format
+msgid "No message with uid %s"
+msgstr "uid %s のメッセージはありません"
+
+#: camel/providers/pop3/camel-pop3-folder.c:371
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr "POP メッセージ %d を取得中"
+
 #: camel/providers/pop3/camel-pop3-provider.c:37
 msgid "Message storage"
 msgstr ""
@@ -5201,7 +6579,7 @@ msgstr "サーバにメッセージを残す"
 msgid "Delete after %s day(s)"
 msgstr "%s 日後に削除する"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:53
 msgid "POP"
 msgstr "POP"
 
@@ -5210,9 +6588,8 @@ 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 ""
@@ -5228,9 +6605,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 ""
@@ -5294,7 +6671,7 @@ msgid "No such folder `%s'."
 msgstr "そのようなフォルダ `%s' はありません"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -5308,7 +6685,8 @@ 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
@@ -5347,7 +6725,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:82
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -5355,122 +6733,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:170
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error, command unrecognized"
 msgstr "構文解析エラー, コマンドではありません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error in parameters or arguments"
 msgstr "パラメータあるいは引数に構文解析エラー"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command not implemented"
 msgstr "コマンドは実装されていません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command parameter not implemented"
 msgstr "コマンドパラメータは実装されていません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "System status, or system help reply"
 msgstr "システムステータスあるいはシステムヘルプ応答"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Help message"
 msgstr "ヘルプメッセージ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service ready"
 msgstr "サービスは利用できます"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service closing transmission channel"
 msgstr "サービスは送信チャンネルを閉じています"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service not available, closing transmission channel"
 msgstr "サービスは利用できません, 送信チャンネルを閉じています"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested mail action okay, completed"
 msgstr "要求されたメールの動作はOK, 完了しました"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "User not local; will forward to <forward-path>"
 msgstr "ユーザはローカルではありません; <forward-path> へ転送します"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "要求されたメールの動作は完了しません: メールボックスは利用できません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "要求された動作は完了しません: メールボックスは利用できません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action aborted: error in processing"
 msgstr "要求された動作を中断しました: 処理中にエラー"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "User not local; please try <forward-path>"
 msgstr "ユーザはローカルではありません; <forward-path> を試してください"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action not taken: insufficient system storage"
 msgstr "要求された動作は完了しません: システムの保存領域が足りません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "要求されたメールの動作を中断しました: 領域割り当てを越えました"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "要求された動作は完了しません: メールボックス名は認められません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "メールの入力を開始します; <CRLF>.<CRLF> で終了します"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Transaction failed"
 msgstr "処理は失敗しました"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "A password transition is needed"
 msgstr "パスワードの変更が必要です"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication mechanism is too weak"
 msgstr "認証メカニズムは不十分過ぎます"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Encryption required for requested authentication mechanism"
 msgstr "要求した認証メカニズムのために暗号化が必要です"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Temporary authentication failure"
 msgstr "一時的な認証に失敗しました"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Authentication required"
 msgstr "認証を必要としています"
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:316
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "初期応答エラー: %s: たぶん致命的ではありません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:378
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "SMTP サーバ %s は要求した認証タイプ %s をサポートしていません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:397
+#: camel/providers/smtp/camel-smtp-transport.c:417
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%s %s@%s の SMTP パスワードを入力してください"
 
-#: camel/providers/smtp/camel-smtp-transport.c:420
+#: camel/providers/smtp/camel-smtp-transport.c:440
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5481,127 +6859,128 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP サーバ %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:538
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s 経由で SMTP メールを配信します"
 
-#: camel/providers/smtp/camel-smtp-transport.c:563
+#: camel/providers/smtp/camel-smtp-transport.c:583
 msgid "Cannot send message: sender address not defined."
 msgstr "メッセージを送信出来ません: 送信者のアドレスが定義されていません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:590
 msgid "Cannot send message: sender address not valid."
 msgstr "メッセージを送信出来ません: 送信者のアドレスが正しくありません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:595
 msgid "Sending message"
 msgstr "メッセージを送信中"
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
+#: camel/providers/smtp/camel-smtp-transport.c:606
 msgid "Cannot send message: no recipients defined."
 msgstr "メッセージを送信出来ません: 受信者が定義されていません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:686
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "HELO 要求のタイムアウト: %s: 致命的ではありません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:708
+#: camel/providers/smtp/camel-smtp-transport.c:728
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO レスポンスエラー: %s: 致命的ではありません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:744
-msgid "Error creating SASL authentication object."
-msgstr "SASL 認証オブジェクトの生成中にエラーが発生しました"
-
-#: camel/providers/smtp/camel-smtp-transport.c:748
+#: camel/providers/smtp/camel-smtp-transport.c:760
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "認証"
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
-#: camel/providers/smtp/camel-smtp-transport.c:773
+#: camel/providers/smtp/camel-smtp-transport.c:766
+msgid "Error creating SASL authentication object."
+msgstr "SASL 認証オブジェクトの生成中にエラーが発生しました"
+
+#: camel/providers/smtp/camel-smtp-transport.c:781
+#: camel/providers/smtp/camel-smtp-transport.c:793
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH 要求のタイムアウト: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:782
+#: camel/providers/smtp/camel-smtp-transport.c:802
 msgid "AUTH request failed."
 msgstr "AUTH 要求に失敗しました"
 
-#: camel/providers/smtp/camel-smtp-transport.c:829
+#: camel/providers/smtp/camel-smtp-transport.c:850
 msgid "Bad authentication response from server.\n"
 msgstr "サーバから間違った認証応答がありました\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:857
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM 要求のタイムアウト: %s: メールは送信しませんでした"
 
-#: camel/providers/smtp/camel-smtp-transport.c:876
+#: camel/providers/smtp/camel-smtp-transport.c:895
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "MAIL FROM レスポンスエラー: %s: メールは送信しませんでした"
 
-#: camel/providers/smtp/camel-smtp-transport.c:901
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO 要求のタイムアウト: %s: メールは送信しませんでした"
 
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:939
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "RCPT TO レスポンスエラー: %s: メールは送信しませんでした"
 
-#: camel/providers/smtp/camel-smtp-transport.c:951
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA 要求のタイムアウト: %s: メールは送信しませんでした"
 
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "DATA レスポンスエラー: %s: メールは送信しませんでした"
 
-#: camel/providers/smtp/camel-smtp-transport.c:987
-#: camel/providers/smtp/camel-smtp-transport.c:1005
+#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA 送信のタイムアウト: メッセージの終了: %s: メールは送信しませんでした"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1043
 #, 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:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET 要求のタイムアウト: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1086
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET レスポンスエラー: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1090
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "QUIT 要求のタイムアウト: %s: 致命的ではありません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1109
+#: camel/providers/smtp/camel-smtp-transport.c:1128
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUIT レスポンスエラー: %s: 致命的ではありません"
@@ -5631,7 +7010,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:133
 msgid "attachment"
 msgstr "添付"
 
@@ -5664,58 +7043,58 @@ msgstr "MIME タイプ:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:328
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr "アドレス帳のためにここでクリック"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:359
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "差出人:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr "返信先:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "件名:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "宛先:"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr "メッセージの受信者を入力します"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "メッセージのカーボンコピーを受信するアドレスを入力します"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:398
 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
@@ -5738,30 +7117,30 @@ msgid ""
 "%s"
 msgstr "ファイルのロード中にエラー: %s"
 
-#: composer/e-msg-composer.c:873
+#: composer/e-msg-composer.c:865
 msgid "Save as..."
 msgstr "別名で保存..."
 
-#: composer/e-msg-composer.c:882
+#: composer/e-msg-composer.c:874
 #, fuzzy
 msgid "Warning!"
 msgstr "警告"
 
-#: composer/e-msg-composer.c:884
+#: composer/e-msg-composer.c:878
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:906
+#: composer/e-msg-composer.c:900
 #, c-format
 msgid "Error saving file: %s"
 msgstr "ファイルの保存中にエラー: %s"
 
-#: composer/e-msg-composer.c:926
+#: composer/e-msg-composer.c:919
 #, c-format
 msgid "Error loading file: %s"
 msgstr "ファイルのロード中にエラー: %s"
 
-#: composer/e-msg-composer.c:997
+#: composer/e-msg-composer.c:990
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -5769,17 +7148,17 @@ msgstr ""
 "このアカウントの草案フォルダを開くことが出来ません\n"
 "デフォルトの草案フォルダを使ってもよろしいですか?"
 
-#: composer/e-msg-composer.c:1047
+#: composer/e-msg-composer.c:1043
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "ファイルの保存中にエラー: %s"
 
-#: composer/e-msg-composer.c:1055
+#: composer/e-msg-composer.c:1051
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "POP サーバ %s からメッセージを取得出来ませんでした: %s"
 
-#: composer/e-msg-composer.c:1061
+#: composer/e-msg-composer.c:1057
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -5788,7 +7167,7 @@ msgstr ""
 "出力ファイルを作成出来ません: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1063
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -5797,7 +7176,7 @@ msgstr ""
 "出力ファイルを作成出来ません: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1076
+#: composer/e-msg-composer.c:1072
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5806,16 +7185,16 @@ msgstr ""
 "ファイルの保存中にエラー: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1173
+#: composer/e-msg-composer.c:1172
 #, fuzzy
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
-"Would you like to attempt recovery?"
+"Would you like to try to recover them?"
 msgstr ""
 "Evolution は Pine メールファイルを発見しました\n"
 "Evolution へインポートしてもよろしいですか?"
 
-#: composer/e-msg-composer.c:1321
+#: composer/e-msg-composer.c:1320
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5825,25 +7204,25 @@ msgstr ""
 "\n"
 "変更を保存しますか?"
 
-#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:215
+#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:217
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:1351
+#: composer/e-msg-composer.c:1350
 msgid "Open file"
 msgstr "ファイルを開く"
 
-#: composer/e-msg-composer.c:1500
+#: composer/e-msg-composer.c:1499
 #, fuzzy
 msgid "Insert File"
 msgstr "テキストファイルの挿入..."
 
-#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
 msgid "Compose a message"
 msgstr "メッセージを作成します"
 
-#: composer/e-msg-composer.c:2351
+#: composer/e-msg-composer.c:2406
 msgid "Could not create composer window."
 msgstr "メール作成ウィンドウを作成出来ませんでした"
 
@@ -5871,57 +7250,103 @@ msgstr "アドレスカード"
 msgid "calendar information"
 msgstr "カレンダ情報"
 
+#: default_user/searches.xml.h:1
+#, fuzzy
+msgid "Body contains"
+msgstr "が次のものを含む"
+
+#: default_user/searches.xml.h:2
+#, fuzzy
+msgid "Body does not contain"
+msgstr "が次のものを含まない"
+
+#: default_user/searches.xml.h:3
+#, fuzzy
+msgid "Body or subject contains"
+msgstr "コメントが次のものを含む"
+
+#: default_user/searches.xml.h:4
+#, fuzzy
+msgid "Message contains"
+msgstr "名前が次のものを含む"
+
+#: default_user/searches.xml.h:5
+#, fuzzy
+msgid "Recipients contain"
+msgstr "受信者"
+
+#: default_user/searches.xml.h:6
+#, fuzzy
+msgid "Sender contains"
+msgstr "名前が次のものを含む"
+
+#: default_user/searches.xml.h:7
+#, fuzzy
+msgid "Subject contains"
+msgstr "名前が次のものを含む"
+
+#: default_user/searches.xml.h:8
+#, fuzzy
+msgid "Subject does not contain"
+msgstr "が次のものを含まない"
+
 #. strptime format for a date.
 #: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
-#: e-util/e-time-utils.c:239
+#: e-util/e-time-utils.c:240
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1480
+#: widgets/misc/e-dateedit.c:1531
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
-#: e-util/e-time-utils.c:352
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:362
 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:102 e-util/e-time-utils.c:267
-#: e-util/e-time-utils.c:344
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:277
+#: e-util/e-time-utils.c:354
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#: 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
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:281
+#: e-util/e-time-utils.c:359 widgets/misc/e-dateedit.c:1339
+#: widgets/misc/e-dateedit.c:1566
 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: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
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:284
+#: e-util/e-time-utils.c:351 widgets/misc/e-dateedit.c:1336
+#: widgets/misc/e-dateedit.c:1563
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: e-util/e-time-utils.c:240
+#. This is the second-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%Y/%m/%d"
 
-#: e-util/e-time-utils.c:241
+#. This is the third-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:248
 #, fuzzy
 msgid "%Y/%m/%d"
 msgstr "%Y/%m/%d (%a)"
 
-#: e-util/e-time-utils.c:242
+#. This is the final-choice date format for the locale, which we use
+#. if previous attempts to parse the date string failed.
+#: e-util/e-time-utils.c:252
 #, fuzzy, c-format
 msgid "%x"
 msgstr "x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:298
+#: e-util/e-time-utils.c:308
 #: 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"
@@ -5929,13 +7354,13 @@ 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:303
+#: e-util/e-time-utils.c:313
 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:312
+#: e-util/e-time-utils.c:322
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M"
 
@@ -6033,7 +7458,7 @@ msgstr "現在時刻への相対時間"
 msgid "Compare against"
 msgstr "逆比較"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
 msgid "now"
 msgstr "今"
 
@@ -6045,11 +7470,15 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:709
+#: filter/filter-datespec.c:711 mail/message-list.c:936
+msgid "%b %d %l:%M %p"
+msgstr "%m月 %d日 %p %l:%M"
+
+#: filter/filter-datespec.c:722
 msgid "<click here to select a date>"
 msgstr "<日付を選択するためにここをクリックしてください>"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:3
 msgid "Filter Rules"
 msgstr "フィルタルール"
 
@@ -6070,20 +7499,20 @@ msgstr ""
 "フォルダの選択を忘れています\n"
 "戻ってメールを配送する有効なフォルダを指定してください"
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:781
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:809
 msgid "Select Folder"
 msgstr "フォルダを選択"
 
-#: filter/filter-folder.c:250
+#: filter/filter-folder.c:257
 msgid "Enter folder URI"
 msgstr "フォルダ URI の入力"
 
-#: filter/filter-folder.c:296
+#: filter/filter-folder.c:303
 msgid "<click here to select a folder>"
 msgstr "<フォルダを選択するためにここをクリックしてください>"
 
-#: filter/filter-input.c:193
+#: filter/filter-input.c:198
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -6104,62 +7533,51 @@ msgstr "ルール名: "
 msgid "Untitled"
 msgstr "タイトルなし"
 
-#: filter/filter-rule.c:648
+#: filter/filter-rule.c:647
 msgid "If"
 msgstr "もし"
 
-#: filter/filter-rule.c:666
+#: filter/filter-rule.c:665
 msgid "Execute actions"
 msgstr "次の条件で動作を実行:"
 
-#: filter/filter-rule.c:670
+#: filter/filter-rule.c:669
 msgid "if all criteria are met"
 msgstr "すべての基準が合った時"
 
-#: filter/filter-rule.c:675
+#: filter/filter-rule.c:674
 msgid "if any criteria are met"
 msgstr "いくつかの基準が合った時"
 
-#: filter/filter-rule.c:686
+#: filter/filter-rule.c:685
 msgid "Add criterion"
 msgstr "基準を追加"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 msgid "incoming"
 msgstr "入力"
 
-#: filter/filter-rule.c:771
+#: filter/filter-rule.c:770
 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
+#: filter/filter.glade.h:1
 msgid "Edit Filters"
 msgstr "フィルタを編集"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:2
 msgid "Edit VFolders"
 msgstr "仮想フォルダの編集"
 
-#: filter/filter.glade.h:7
+#: filter/filter.glade.h:4
 msgid "Incoming"
 msgstr "入力"
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:5
 msgid "Outgoing"
 msgstr "出力"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "仮想フォルダ"
 
@@ -6183,193 +7601,194 @@ msgstr "すべてのローカルと有効なリモートフォルダ"
 msgid "with all local folders"
 msgstr "すべてのローカルフォルダ"
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 #, fuzzy
 msgid "Assign Color"
 msgstr "割当て済み"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Attachments"
 msgstr "添付"
 
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "が次のものを含む"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Copy to Folder"
 msgstr "フォルダへコピー"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date received"
 msgstr "受信日"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 msgid "Date sent"
 msgstr "送信日"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:9
 msgid "Deleted"
 msgstr "削除"
 
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "が次のものを含まない"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "が次のもので終らない"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "が存在しない"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not sound like"
-msgstr "が次のもののようでない"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not start with"
-msgstr "が次のもので始まらない"
-
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:10
 msgid "Do Not Exist"
 msgstr "が存在しない"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:11
 msgid "Draft"
 msgstr "草案"
 
-#: filter/libfilter-i18n.h:20
-msgid "ends with"
-msgstr "が次のもので終わる"
-
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:12
 msgid "Exist"
 msgstr "が存在する"
 
-#: filter/libfilter-i18n.h:22
-msgid "exists"
-msgstr "が存在する"
-
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:13
 msgid "Expression"
 msgstr "表現"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:14
 msgid "Important"
 msgstr "重要"
 
-#: filter/libfilter-i18n.h:25
-msgid "is"
-msgstr "が次のものと一致する"
-
-#: filter/libfilter-i18n.h:26
-msgid "is greater than"
-msgstr "が次のものより大きい"
-
-#: filter/libfilter-i18n.h:27
-msgid "is less than"
-msgstr "が次のものより小さい"
-
-#: filter/libfilter-i18n.h:28
-msgid "is not"
-msgstr "が次のものではない"
-
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:15
 msgid "Mailing list"
 msgstr "メーリングリスト"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:16
 msgid "Message Body"
 msgstr "メッセージ本体"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:17
 msgid "Message Header"
 msgstr "メッセージヘッダ"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:18
 msgid "Message was received"
 msgstr "受信したメッセージ"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:19
 msgid "Message was sent"
 msgstr "送信したメッセージ"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:20
 msgid "Move to Folder"
 msgstr "フォルダへ移動"
 
-#: filter/libfilter-i18n.h:35
-msgid "on or after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:36
-msgid "on or before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:21
 msgid "Read"
 msgstr "既読"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:22
 msgid "Recipients"
 msgstr "受信者"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:23
 msgid "Regex Match"
 msgstr "正規表現と一致"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:24
 msgid "Replied to"
 msgstr "返信先"
 
-#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "記録"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1075
 msgid "Sender"
 msgstr "送信者"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:27
 msgid "Set Status"
 msgstr "ステータス設定"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:28
 msgid "Size (kB)"
 msgstr ""
 
-#: filter/libfilter-i18n.h:45
-msgid "sounds like"
-msgstr "が次のもののように見える"
-
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:29
 msgid "Source Account"
 msgstr "ソースアカウント"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:30
 msgid "Specific header"
 msgstr "指定のヘッダ"
 
-#: filter/libfilter-i18n.h:48
-msgid "starts with"
-msgstr "が次のもので開始する"
-
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:32
 msgid "Stop Processing"
 msgstr "処理停止"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: filter/libfilter-i18n.h:33 mail/mail-format.c:889
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "件名"
 
+#: filter/libfilter-i18n.h:36
+msgid "contains"
+msgstr "が次のものを含む"
+
+#: filter/libfilter-i18n.h:37
+msgid "does not contain"
+msgstr "が次のものを含まない"
+
+#: filter/libfilter-i18n.h:38
+msgid "does not end with"
+msgstr "が次のもので終らない"
+
+#: filter/libfilter-i18n.h:39
+msgid "does not exist"
+msgstr "が存在しない"
+
+#: filter/libfilter-i18n.h:40
+msgid "does not sound like"
+msgstr "が次のもののようでない"
+
+#: filter/libfilter-i18n.h:41
+msgid "does not start with"
+msgstr "が次のもので始まらない"
+
+#: filter/libfilter-i18n.h:42
+msgid "ends with"
+msgstr "が次のもので終わる"
+
+#: filter/libfilter-i18n.h:43
+msgid "exists"
+msgstr "が存在する"
+
+#: filter/libfilter-i18n.h:44
+msgid "is greater than"
+msgstr "が次のものより大きい"
+
+#: filter/libfilter-i18n.h:45
+msgid "is less than"
+msgstr "が次のものより小さい"
+
+#: filter/libfilter-i18n.h:46
+msgid "is not"
+msgstr "が次のものではない"
+
+#: filter/libfilter-i18n.h:47
+msgid "is"
+msgstr "が次のものと一致する"
+
+#: filter/libfilter-i18n.h:48
+msgid "on or after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:49
+msgid "on or before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:50
+msgid "sounds like"
+msgstr "が次のもののように見える"
+
+#: filter/libfilter-i18n.h:51
+msgid "starts with"
+msgstr "が次のもので開始する"
+
 #: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr "が次のものより後"
@@ -6399,14 +7818,13 @@ 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:194
+#: importers/netscape-importer.c:816 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:685 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "インポート"
 
-#: importers/elm-importer.c:475 importers/netscape-importer.c:819
-#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#: importers/elm-importer.c:475 importers/netscape-importer.c:821
+#: importers/pine-importer.c:632 mail/component-factory.c:96
 msgid "Mail"
 msgstr "メール"
 
@@ -6434,11 +7852,11 @@ msgstr ""
 "Evolution は GnomeCard ファイルを発見しました\n"
 "Evolution へインポートしてもよろしいですか?"
 
-#: importers/netscape-importer.c:824
+#: importers/netscape-importer.c:826
 msgid "Settings"
 msgstr "設定"
 
-#: importers/netscape-importer.c:849
+#: importers/netscape-importer.c:851
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6494,169 +7912,190 @@ msgstr "メールサマリコンポーネントのためのファクトリ"
 msgid "Mail configuration interface"
 msgstr "メール設定のインターフェース"
 
-#: mail/component-factory.c:111
+#: mail/component-factory.c:96
+#, fuzzy
+msgid "Folder containing mail"
+msgstr "メーリングリストの仮想フォルダ"
+
+#: mail/component-factory.c:114
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Properties..."
 msgstr "プロパティ(_P)..."
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:341
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "ファイルのプロパティを修正します"
 
 #: mail/component-factory.c:757
+#, fuzzy
+msgid "New Mail Message"
+msgstr "メッセージをメール(_M)"
+
+#: mail/component-factory.c:757
+#, fuzzy
+msgid "New _Mail Message"
+msgstr "メッセージをメール(_M)"
+
+#: mail/component-factory.c:789
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolution メールコンポーネントの初期化が出来ません"
 
-#: mail/component-factory.c:894
+#: mail/component-factory.c:928
 msgid "Cannot register storage with shell"
 msgstr "シェルでストレージを登録出来ません"
 
-#: mail/folder-browser-ui.c:254
+#: mail/folder-browser-ui.c:261
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\" のプロパティ"
 
-#: mail/folder-browser-ui.c:256
+#: mail/folder-browser-ui.c:263
 msgid "Properties"
 msgstr "プロパティ"
 
-#: mail/folder-browser.c:231 mail/mail-display.c:278
+#: mail/folder-browser.c:236 mail/mail-display.c:281
 #, 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:909
+#, fuzzy
+msgid "Create vFolder from Search"
+msgstr "メッセージからフィルタを作成(_C)"
 
-#: mail/folder-browser.c:1238
+#: mail/folder-browser.c:1254
 msgid "VFolder on _Subject"
 msgstr "件名の仮想フォルダ(_S)"
 
-#: mail/folder-browser.c:1241
+#: mail/folder-browser.c:1257
 msgid "VFolder on Se_nder"
 msgstr "送信者の仮想フォルダ(_n)"
 
-#: mail/folder-browser.c:1244
+#: mail/folder-browser.c:1260
 msgid "VFolder on _Recipients"
 msgstr "受信者の仮想フォルダ(_R)"
 
-#: mail/folder-browser.c:1247
+#: mail/folder-browser.c:1263
 msgid "VFolder on Mailing _List"
 msgstr "メーリングリストの仮想フォルダ(_L)"
 
-#: mail/folder-browser.c:1253
+#: mail/folder-browser.c:1269
 msgid "Filter on Sub_ject"
 msgstr "件名のフィルタ(_j)"
 
-#: mail/folder-browser.c:1256
+#: mail/folder-browser.c:1272
 msgid "Filter on Sen_der"
 msgstr "送信者のフィルタ(_d)"
 
-#: mail/folder-browser.c:1259
+#: mail/folder-browser.c:1275
 msgid "Filter on Re_cipients"
 msgstr "受信者のフィルタ(_c)"
 
-#: mail/folder-browser.c:1262
+#: mail/folder-browser.c:1278
 msgid "Filter on _Mailing List"
 msgstr "メーリングリストのフィルタ(_M)"
 
-#: mail/folder-browser.c:1273
-msgid "Resend"
-msgstr "再送信"
+#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "_Edit as New Message..."
+msgstr "メッセージを印刷..."
 
-#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "別名で保存(_S)..."
 
-#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1293
 msgid "_Print"
 msgstr "印刷(_P)"
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr "送信者へ返信(_R)"
 
-#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Reply to _List"
 msgstr "全員へ返信(_A)"
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "全員へ返信(_A)"
 
-#: mail/folder-browser.c:1288
+#: mail/folder-browser.c:1304
 msgid "_Forward"
 msgstr "転送(_F)"
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1307 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "既読としてマーク(_k)"
 
-#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1309 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "未読としてマーク(_n)"
 
-#: mail/folder-browser.c:1295
+#: mail/folder-browser.c:1311
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "重要"
 
-#: mail/folder-browser.c:1297
+#: mail/folder-browser.c:1313
 #, fuzzy
 msgid "Mark as Unim_portant"
 msgstr "未読としてマーク(_n)"
 
-#: mail/folder-browser.c:1302
+#: mail/folder-browser.c:1318
 msgid "_Move to Folder..."
 msgstr "フォルダへ移動(_M)..."
 
-#: mail/folder-browser.c:1304
+#: mail/folder-browser.c:1320
 msgid "_Copy to Folder..."
 msgstr "フォルダへコピー(_C)..."
 
-#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "削除取消(_U)"
 
-#: mail/folder-browser.c:1313
+#: mail/folder-browser.c:1329
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "アドレス帳に追加"
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1334
 msgid "Apply Filters"
 msgstr "フィルタ適用"
 
-#: mail/folder-browser.c:1322
+#: mail/folder-browser.c:1338
 msgid "Create Ru_le From Message"
 msgstr "メッセージからルールを作成(_l)"
 
-#: mail/folder-browser.c:1479
+#: mail/folder-browser.c:1496
 msgid "Filter on Mailing List"
 msgstr "メーリングリストのフィルタ"
 
-#: mail/folder-browser.c:1480
+#: mail/folder-browser.c:1497
 msgid "VFolder on Mailing List"
 msgstr "メーリングリストの仮想フォルダ"
 
-#: mail/folder-browser.c:1482
+#: mail/folder-browser.c:1499
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "メーリングリストのフィルタ (%s)"
 
-#: mail/folder-browser.c:1483
+#: mail/folder-browser.c:1500
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "メーリングリストの仮想フォルダ (%s)"
 
+#: mail/folder-info.c:64
+#, fuzzy
+msgid "Getting Folder Information"
+msgstr "付加情報"
+
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 msgid "Factory to import mbox into Evolution"
 msgstr "Evolution へ mbox をインポートするファクトリ"
@@ -6718,16 +8157,16 @@ msgid "Evolution News Editor"
 msgstr "Evolution アカウントエディタ"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:156
+#: mail/mail-account-editor.c:163
 msgid "Evolution Account Editor"
 msgstr "Evolution アカウントエディタ"
 
-#: mail/mail-account-gui.c:971
+#: mail/mail-account-gui.c:999
 #, fuzzy
 msgid "Save signature"
 msgstr "署名ファイル:"
 
-#: mail/mail-account-gui.c:977
+#: mail/mail-account-gui.c:1005
 #, fuzzy
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
@@ -6738,40 +8177,45 @@ msgstr ""
 "\n"
 "変更を保存しますか?"
 
-#: mail/mail-accounts.c:135
+#: mail/mail-account-gui.c:1585
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
+#: mail/mail-accounts.c:145
 msgid " (default)"
 msgstr " (デフォルト)"
 
-#: mail/mail-accounts.c:174
+#: mail/mail-accounts.c:190
 msgid "Disable"
 msgstr "無効"
 
-#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
+#: mail/mail-accounts.c:192
 msgid "Enable"
 msgstr "有効"
 
-#: mail/mail-accounts.c:264
+#: mail/mail-accounts.c:280
 msgid "Are you sure you want to delete this account?"
 msgstr "本当にこのアカウントを削除してもよろしいですか?"
 
-#: mail/mail-accounts.c:268
+#: mail/mail-accounts.c:284
 #, fuzzy
 msgid "Don't delete"
 msgstr "削除"
 
-#: mail/mail-accounts.c:271
+#: mail/mail-accounts.c:287
 #, fuzzy
 msgid "Really delete account?"
 msgstr "デフォルトアカウントを作る"
 
-#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+#: mail/mail-accounts.c:513 mail/mail-accounts.c:517
 msgid "Are you sure you want to delete this news account?"
 msgstr "本当に news アカウントを削除してもよろしいですか?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:742
-msgid "Evolution Account Manager"
-msgstr "Evolution アカウントマネージャ"
+#: mail/mail-accounts.c:759 mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Mail Settings"
+msgstr "メール設定(_M)..."
 
 #: mail/mail-autofilter.c:70
 #, c-format
@@ -6825,11 +8269,11 @@ msgstr ""
 "あなたはメールを作成する前にメール\n"
 "配送の設定をする必要があります"
 
-#: mail/mail-callbacks.c:205
+#: mail/mail-callbacks.c:185
 msgid "You have not set a mail transport method"
 msgstr "メール転送メソッドの設定がありません"
 
-#: mail/mail-callbacks.c:238
+#: mail/mail-callbacks.c:218
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6837,7 +8281,7 @@ msgstr ""
 "このメッセージは件名がありません\n"
 "本当に送信しますか?"
 
-#: mail/mail-callbacks.c:273
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -6845,37 +8289,36 @@ msgid ""
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:359
+#: mail/mail-callbacks.c:339
 msgid "You must specify recipients in order to send this message."
 msgstr "このメッセージを送信する適切な受信者を指定しなければなりません"
 
-#: mail/mail-callbacks.c:410
+#: mail/mail-callbacks.c:390
 msgid "You must configure an account before you can send this email."
 msgstr "このメールを送信する前にアカウントを設定しなければなりません"
 
-#: mail/mail-callbacks.c:653
-#, c-format
-msgid "On %s, %s wrote:"
-msgstr "On %s, %s wrote:"
+#: mail/mail-callbacks.c:632
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr ""
 
-#: mail/mail-callbacks.c:914
+#: mail/mail-callbacks.c:895
 msgid "Forwarded message:\n"
 msgstr "メッセージを転送:\n"
 
-#: mail/mail-callbacks.c:1011
+#: mail/mail-callbacks.c:995
 msgid "Move message(s) to"
 msgstr "メッセージを移動します: "
 
-#: mail/mail-callbacks.c:1013
+#: mail/mail-callbacks.c:997
 msgid "Copy message(s) to"
 msgstr "メッセージをコピーします: "
 
-#: mail/mail-callbacks.c:1374
+#: mail/mail-callbacks.c:1366
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "本当に %d メッセージを編集してもよろしいですか?"
 
-#: mail/mail-callbacks.c:1396
+#: mail/mail-callbacks.c:1388
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6883,7 +8326,7 @@ msgstr ""
 "ドラフトフォルダ内に保存された\n"
 "メッセージだけを編集することが出来ます"
 
-#: mail/mail-callbacks.c:1430
+#: mail/mail-callbacks.c:1422
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6891,24 +8334,41 @@ msgstr ""
 "送信フォルダのメッセージだけ\n"
 "再送信することが出来ます"
 
-#: mail/mail-callbacks.c:1442
+#: mail/mail-callbacks.c:1434
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "本当に %d メッセージを再送してもよろしいですか?"
 
-#: mail/mail-callbacks.c:1463
+#: mail/mail-callbacks.c:1455
 msgid "No Message Selected"
 msgstr "選択されたメッセージはありません"
 
-#: mail/mail-callbacks.c:1545
+#: mail/mail-callbacks.c:1540
 msgid "Save Message As..."
 msgstr "メッセージを別名で保存..."
 
-#: mail/mail-callbacks.c:1547
+#: mail/mail-callbacks.c:1542
 msgid "Save Messages As..."
 msgstr "メッセージを別名で保存..."
 
-#: mail/mail-callbacks.c:1766
+#: mail/mail-callbacks.c:1709 widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr "警告"
+
+#: mail/mail-callbacks.c:1714
+msgid ""
+"This operation will permanently erase all messages marked as deleted. If you "
+"continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1721
+#, fuzzy
+msgid "Do not ask me again."
+msgstr "このメッセージを二度と表示しない"
+
+#: mail/mail-callbacks.c:1826
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6917,144 +8377,161 @@ msgstr ""
 "フィルタ情報のロード中にエラー:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1776
+#: mail/mail-callbacks.c:1836
 msgid "Filters"
 msgstr "フィルタ"
 
-#: mail/mail-callbacks.c:1823
+#: mail/mail-callbacks.c:1882
 msgid "Print Message"
 msgstr "メッセージを印刷"
 
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1928
 msgid "Printing of message failed"
 msgstr "メッセージの印刷に失敗しました"
 
-#: mail/mail-callbacks.c:1966
+#: mail/mail-callbacks.c:2012
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "本当に %d メッセージを別ウィンドウで開いてもよろしいですか?"
 
-#: mail/mail-config-druid.c:99
+#: mail/mail-config-druid.c:135
+#, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+"below do not need to be filled in,\n"
+"unless you wish to include this information in email you send."
 msgstr ""
 "以下にあなたの名前とメールアドレスを入力してください．\"オプション\"\n"
 "フィールド以下は送るメールにこの情報を含みたいないならうめる必要は\n"
 "ありません"
 
-#: mail/mail-config-druid.c:101
+#: mail/mail-config-druid.c:137
+#, fuzzy
 msgid ""
-"Please enter information about your incoming mail server below. If you don't "
-"know what kind of server you use, contact your system administrator or "
-"Internet Service Provider."
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 "以下にメールサーバついての情報を入力してください．もしあなたの使うサーバの\n"
 "種類が何かを知らないならばシステム管理者かインターネットプロバイダと\n"
 "連絡をとってみてください"
 
-#: mail/mail-config-druid.c:105
+#: mail/mail-config-druid.c:139
+msgid "Please select among the following options"
+msgstr ""
+
+#: mail/mail-config-druid.c:141
+#, fuzzy
 msgid ""
-"Please enter information about your outgoing mail protocol below. If you "
-"don't know which protocol you use, contact your system administrator or "
-"Internet Service Provider."
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system\n"
+"administrator or Internet Service Provider."
 msgstr ""
 "以下に送信プロトコルについての情報を入力してください．もしあなたの使う\n"
 "プロトコルを知らないならば，システム管理者かインターネットプロバイダと\n"
 "連絡をとってみてください"
 
-#: mail/mail-config-druid.c:107
+#: mail/mail-config-druid.c:143
+#, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
-msgstr ""
-"メール設定の処理はだいたい完了しました．あなたが提供した身元，メールサーバや"
-"\n"
-"送信プロトコルは Evolution "
-"メールアカウントを作るために一纏めにされるでしょう\n"
-"以下にこのアカウントの空間の名前を入力してください．この名前は表示目的だけに"
-"\n"
+"incoming mail server and\n"
+"outgoing mail transport method which you provided will be grouped together "
+"to\n"
+"make an Evolution mail account. Please enter a name for this account in the "
+"space below.\n"
+"This name will be used for display purposes only."
+msgstr ""
+"メール設定の処理はだいたい完了しました．あなたが提供した身元，メールサーバ"
+"や\n"
+"送信プロトコルは Evolution メールアカウントを作るために一纏めにされるでしょ"
+"う\n"
+"以下にこのアカウントの空間の名前を入力してください．この名前は表示目的だけ"
+"に\n"
 "使用されます．"
 
 #. set window title
-#: mail/mail-config-druid.c:466
-msgid "Evolution Account Wizard"
+#: mail/mail-config-druid.c:558
+#, fuzzy
+msgid "Evolution Account Assistant"
 msgstr "Evolution アカウントウィザード"
 
-#: mail/mail-config.c:1587 mail/mail-config.c:1590
+#. right now, the URL always works basically as a matter of luck...
+#. * both IMAP and mbox spool stores have INBOX as their inbox folder
+#. * name. I don't think this will work with maildir. How can we figure out
+#. * what shortcut to insert?
+#.
+#: mail/mail-config.c:1579
+#, fuzzy, c-format
+msgid "%s: Inbox"
+msgstr "mbox"
+
+#: mail/mail-config.c:1809
+msgid "Checking Service"
+msgstr ""
+
+#: mail/mail-config.c:1880 mail/mail-config.c:1883
 msgid "Connecting to server..."
 msgstr "サーバへ接続中..."
 
 #: mail/mail-config.glade.h:1
-msgid " Check for supported types "
-msgstr "サポートされた種別をチェック"
-
-#: mail/mail-config.glade.h:2
 msgid " color"
 msgstr " カラー"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "サインはこの暗号をサポートしていません"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "Account"
 msgstr "アカウント"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "Account Information"
 msgstr "アカウント情報"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "Account Management"
 msgstr "アカウント管理"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 msgid "Accounts"
 msgstr "アカウント"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:7
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr "暗号化したメールを送信する時に常に自分自身に暗号化します"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr "暗号化したメールを送信する時に常に自分自身に暗号化します"
 
-#: mail/mail-config.glade.h:11
-msgid "Always load images off the net"
-msgstr "常に画像を読み込まない"
+#: mail/mail-config.glade.h:9
+msgid "Always sign outgoing messages when using this account"
+msgstr ""
 
-#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "添付"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:11
 msgid "Authentication"
 msgstr "認証"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:12
 msgid "Authentication Type: "
 msgstr "認証種別: "
 
-#: mail/mail-config.glade.h:15
-msgid "Automatically check for new mail every"
-msgstr "新着メールを自動的にチェックする"
-
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:13
 msgid "Certificate ID:"
 msgstr "認証 ID"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:15
 msgid "Composer"
 msgstr "メール作成"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:16
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -7070,279 +8547,256 @@ msgstr ""
 "\n"
 "\"完了\" をクリックして設定を保存してください"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:22
 msgid "De_fault"
 msgstr "デフォルト(_f)"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:23
 #, fuzzy
 msgid "Default Forward style is: "
 msgstr "デフォルトの \"転送\" 方法: "
 
-#: mail/mail-config.glade.h:27
-msgid "Default character set: "
+#: mail/mail-config.glade.h:24
+#, fuzzy
+msgid "Default character encoding: "
 msgstr "デフォルトのキャラクタセット: "
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:25
 msgid "Digital IDs..."
 msgstr "デジタル ID..."
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:26
+msgid "Display"
+msgstr "表示"
+
+#: mail/mail-config.glade.h:27
 msgid "Done"
 msgstr "完了"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
 msgid "Drafts"
 msgstr "草案"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:29
 msgid "Drafts folder:"
 msgstr "草案フォルダ:"
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "編集..."
+#: mail/mail-config.glade.h:30
+#, fuzzy
+msgid "E_nable"
+msgstr "有効"
 
-#: mail/mail-config.glade.h:36
-msgid "Email Address:"
-msgstr "メールアドレス:"
+#: mail/mail-config.glade.h:31
+#, fuzzy
+msgid "Each account must have a different name."
+msgstr "現在のファイルを別名で保存します"
 
-#: mail/mail-config.glade.h:37
-msgid "Empty trash folders on exit"
-msgstr ""
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr "編集..."
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Enabled"
 msgstr "有効"
 
-#: mail/mail-config.glade.h:40
-msgid "Full Name:"
-msgstr "フルネーム:"
-
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr "デジタルID を取得..."
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:35
 #, fuzzy
-msgid "HTML Signature:"
+msgid "HTML signature file:"
 msgstr "署名ファイル:"
 
-#: mail/mail-config.glade.h:43
-msgid "Highlight citations with"
-msgstr "引用を強調する"
-
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:37
 msgid "Identity"
 msgstr "身元"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr "HTML メール"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr "インライン"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:50
-msgid "Load images if sender is in addressbook"
-msgstr "送信者がアドレス帳にいれる場合画像を読み込む"
-
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "メールの設定"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Mailbox location"
 msgstr "メールボックスの形式"
 
-#: mail/mail-config.glade.h:53
-msgid "Make this my default account"
-msgstr "デフォルトアカウントを作る"
-
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:44
 #, fuzzy
-msgid "Mark messages as Read after"
-msgstr "指定時間後にメッセージを \"既読\" としてマーク:"
+msgid "Make this my _default account"
+msgstr "デフォルトアカウントを作る"
 
-#: mail/mail-config.glade.h:55
-msgid "Message list should display in a threaded fashion by default"
+#: mail/mail-config.glade.h:45
+msgid "Message _preview should be displayed by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
-msgid "Message preview should be displayed by default"
+#: mail/mail-config.glade.h:46
+msgid "Message list should display in a _threaded fashion by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:47
 #, 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:60
+#: mail/mail-config.glade.h:48
 msgid "News"
 msgstr "ニュース"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:50
 msgid "Optional Information"
 msgstr "付加情報"
 
-#: mail/mail-config.glade.h:63
-msgid "Organization:"
-msgstr "組織:"
-
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:52
 msgid "PGP Key ID:"
 msgstr "PGPキー ID:"
 
-#: mail/mail-config.glade.h:66
-msgid "PGP binary path:"
-msgstr "PGP プログラムのパス:"
-
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:55
 msgid "Pick a color"
 msgstr "カラーを選択"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:56
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:57
 #, fuzzy
-msgid "Prompt when sending messages with an empty subject"
+msgid "Prompt when sending messages with an _empty subject"
 msgstr "この件名のメッセージをフィルタするルールを作成します"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:58
 #, fuzzy
-msgid "Prompt when sending messages with only Bcc recipients defined"
+msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr "メッセージを送信出来ません: 受信者が定義されていません"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:59
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:60
 msgid "Quoted"
 msgstr "引用"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:61
 msgid "Receiving Email"
 msgstr "メールの受信中"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr "メールの受信"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr "受信オプション"
 
-#: mail/mail-config.glade.h:79
-msgid "Remember PGP Passphrase until exit"
-msgstr ""
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr "必須情報"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr "セキュア MIME"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr "セキュリティ"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Select Filter Log file..."
+msgstr "ファイルを選択"
+
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "PGP プログラムを選択"
 
-#: mail/mail-config.glade.h:86
-msgid "Send mail in HTML format by default."
-msgstr "デフォルトで HTML 形式のメールを送信する"
-
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:70
 msgid "Sending Email"
 msgstr "メールを送信中"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr "メールの送信"
 
-#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:179
 msgid "Sent"
 msgstr "送信済"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:74
 msgid "Sent and Draft Messages"
 msgstr "送信済と草案メッセージ"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:75
 msgid "Sent messages folder:"
 msgstr "送信済メッセージフォルダ:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:76
 msgid "Server Configuration"
 msgstr "サーバの設定"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:77
 msgid "Server Type: "
 msgstr "サーバ種別:"
 
-#: mail/mail-config.glade.h:95
-msgid "Server requires authentication"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "Server requires _authentication"
 msgstr "サーバは認証が必要"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "署名ファイル:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Source"
 msgstr "ソース"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Source Information"
 msgstr "情報なし"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "ソース"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
 msgstr "特別なフォルダ"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr "標準的な UNIX の mbox ファイル"
 
-#: mail/mail-config.glade.h:103
-msgid "Use secure connection (SSL)"
+#: mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Use secure connection (_SSL)"
 msgstr "セキュア接続 (SSL) を使う"
 
-#: mail/mail-config.glade.h:104
-msgid "Username:"
-msgstr "ユーザ名:"
-
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:87
+#, fuzzy
 msgid ""
-"Welcome to the Evolution Mail Configuration Druid.\n"
+"Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
@@ -7350,15 +8804,122 @@ msgstr ""
 "\n"
 "\"次\" をクリックして始めてください"
 
+#: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "_Always load images off the net"
+msgstr "常に画像を読み込まない"
+
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "_Automatically check for new mail every"
+msgstr "新着メールを自動的にチェックする"
+
+#: mail/mail-config.glade.h:93
+#, fuzzy
+msgid "_Check for supported types"
+msgstr "サポートされた種別をチェック"
+
+#: mail/mail-config.glade.h:96
+#, fuzzy
+msgid "_Email Address:"
+msgstr "メールアドレス:"
+
+#: mail/mail-config.glade.h:97
+msgid "_Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "_Full Name:"
+msgstr "フルネーム:"
+
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "_HTML Signature:"
+msgstr "署名ファイル:"
+
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "_Highlight citations with"
+msgstr "引用を強調する"
+
+#: mail/mail-config.glade.h:101
+#, fuzzy
+msgid "_Host:"
+msgstr "ホスト:"
+
+#: mail/mail-config.glade.h:102
+#, fuzzy
+msgid "_Load images if sender is in addressbook"
+msgstr "送信者がアドレス帳にいれる場合画像を読み込む"
+
+#: mail/mail-config.glade.h:103
+msgid "_Log filter actions to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:104
+#, fuzzy
+msgid "_Mark messages as Read after"
+msgstr "指定時間後にメッセージを \"既読\" としてマーク:"
+
+#: mail/mail-config.glade.h:105
+#, fuzzy
+msgid "_Name:"
+msgstr "名前:"
+
+#: mail/mail-config.glade.h:106
+#, fuzzy
+msgid "_Never load images off the net"
+msgstr "二度と画像を読み込まない"
+
+#: mail/mail-config.glade.h:107
+#, fuzzy
+msgid "_Organization:"
+msgstr "組織:"
+
+#: mail/mail-config.glade.h:108
+#, fuzzy
+msgid "_PGP binary path:"
+msgstr "PGP プログラムのパス:"
+
+#: mail/mail-config.glade.h:109
+#, fuzzy
+msgid "_Path:"
+msgstr "パス:"
+
+#: mail/mail-config.glade.h:110
+msgid "_Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "_Remember this password"
+msgstr "このパスワードを記憶"
+
 #: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "_Send mail in HTML format by default."
+msgstr "デフォルトで HTML 形式のメールを送信する"
+
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "_Signature file:"
+msgstr "署名ファイル:"
+
+#: mail/mail-config.glade.h:114
+#, fuzzy
+msgid "_Username:"
+msgstr "ユーザ名:"
+
+#: mail/mail-config.glade.h:116
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:117
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:118
 msgid "seconds."
 msgstr " 秒"
 
@@ -7398,182 +8959,193 @@ msgstr "S/MIME エンベロープコンテキストを作成出来ませんでした"
 msgid "Could not create a S/MIME decode context."
 msgstr "S/MIME デコードコンテキストを作成出来ませんでした"
 
-#: mail/mail-display.c:221
+#: mail/mail-display.c:222
 msgid "Save Attachment"
 msgstr "添付の保存"
 
-#: mail/mail-display.c:338
+#: mail/mail-display.c:341
 msgid "Save to Disk..."
 msgstr "ディスクへ保存..."
 
-#: mail/mail-display.c:340
+#: mail/mail-display.c:343
 msgid "View Inline"
 msgstr "インライン表示"
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:345
 #, c-format
 msgid "Open in %s..."
 msgstr "%s に開く..."
 
-#: mail/mail-display.c:399
+#: mail/mail-display.c:406
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "インライン表示 (%s経由)"
 
-#: mail/mail-display.c:403
+#: mail/mail-display.c:410
 msgid "Hide"
 msgstr "隠す"
 
-#: mail/mail-display.c:424
+#: mail/mail-display.c:431
 msgid "External Viewer"
 msgstr "外部ビューア"
 
-#: mail/mail-display.c:1048
+#: mail/mail-display.c:1055
 msgid "Loading message content"
 msgstr "メッセージの内容を読み込み中"
 
-#: mail/mail-display.c:1404
+#: mail/mail-display.c:1411
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "ブラウザでリンクを開く"
 
-#: mail/mail-display.c:1406
+#: mail/mail-display.c:1413
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "場所をコピー (FIXME)"
 
-#: mail/mail-display.c:1408
+#: mail/mail-display.c:1415
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "別名で保存 (FIXME)"
 
-#: mail/mail-display.c:1410
+#: mail/mail-display.c:1417
 #, fuzzy
 msgid "Save Image as..."
 msgstr "別名で保存..."
 
-#: mail/mail-folder-cache.c:170
+#: mail/mail-folder-cache.c:147
 #, fuzzy, c-format
 msgid "%d new"
 msgstr "%d 分"
 
-#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+#: mail/mail-folder-cache.c:153 mail/mail-folder-cache.c:160
+#: mail/mail-folder-cache.c:167
 msgid ", "
 msgstr ""
 
-#: mail/mail-folder-cache.c:177
+#: mail/mail-folder-cache.c:154
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/mail-folder-cache.c:186
+#: mail/mail-folder-cache.c:161
+#, fuzzy, c-format
+msgid "%d selected"
+msgstr "削除"
+
+#: mail/mail-folder-cache.c:170
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr "%d 秒"
 
-#: mail/mail-folder-cache.c:188
+#: mail/mail-folder-cache.c:172
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/mail-format.c:609
+#: mail/mail-format.c:623
 #, c-format
 msgid "%s attachment"
 msgstr "%s を添付"
 
-#: mail/mail-format.c:662
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME メッセージを解析出来ませんでした, ソースを表示します"
 
-#: mail/mail-format.c:746
+#: mail/mail-format.c:760
 msgid "Date"
 msgstr "日付"
 
-#: mail/mail-format.c:842
+#: mail/mail-format.c:856
 #, fuzzy
 msgid "Bad Address"
 msgstr "メールアドレス:"
 
-#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+#: mail/mail-format.c:878 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "差出人"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:881
 msgid "Reply-To"
 msgstr "返信先"
 
-#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+#: mail/mail-format.c:884 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "宛先"
 
-#: mail/mail-format.c:873
+#: mail/mail-format.c:887
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1291
+#: mail/mail-format.c:1306
 msgid "No GPG/PGP program configured."
 msgstr "GPG/PGP プログラムの設定がありません"
 
-#: mail/mail-format.c:1307
+#: mail/mail-format.c:1322
 msgid "Encrypted message not displayed"
 msgstr "暗号化されたメッセージは表示しません"
 
-#: mail/mail-format.c:1318
+#: mail/mail-format.c:1333
 msgid "Encrypted message"
 msgstr "暗号化されたメッセージ"
 
-#: mail/mail-format.c:1319
+#: mail/mail-format.c:1334
 msgid "Click icon to decrypt."
 msgstr "アイコンをクリックして復号化してください"
 
-#: mail/mail-format.c:1377
+#: mail/mail-format.c:1392
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "このメッセージはデジタル署名され信頼できるものです"
 
-#: mail/mail-format.c:1388
+#: mail/mail-format.c:1403
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "このメッセージはデジタル署名されたものですが, 信頼を証明出来ません"
 
-#: mail/mail-format.c:2046
+#: mail/mail-format.c:2061
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP サイト (%s) を指しています"
 
-#: mail/mail-format.c:2060
+#: mail/mail-format.c:2075
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2065
+#: mail/mail-format.c:2080
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "ローカルファイル (%s) を指しています"
 
-#: mail/mail-format.c:2094
+#: mail/mail-format.c:2109
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "FTP サイト (%s) を指しています"
 
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2117
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "未知の外部データ (\"%s\" タイプ) を指しています"
 
-#: mail/mail-format.c:2107
+#: mail/mail-format.c:2122
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:458
-#, c-format
-msgid "Opening '%s'"
+#: mail/mail-local.c:330
+#, fuzzy, c-format
+msgid "No such folder /%s"
+msgstr "そのようなフォルダ %s はありません"
+
+#: mail/mail-local.c:460
+#, fuzzy, c-format
+msgid "Registering '%s'"
 msgstr "'%s' をオープン中"
 
-#: mail/mail-local.c:747
+#: mail/mail-local.c:748
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "フォルダ \"%s\" を \"%s\" 形式へ変更しています"
 
-#: mail/mail-local.c:868
+#: mail/mail-local.c:869
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -7582,7 +9154,7 @@ msgstr ""
 "フォルダのメタ情報を保存出来ません; もはやこのフォルダを開く\n"
 "ことが出来ないとたぶん気づいたのでしょう: %s"
 
-#: mail/mail-local.c:907
+#: mail/mail-local.c:909
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -7590,12 +9162,12 @@ msgstr ""
 "もしこのメールボックスを開くことはないなら\n"
 "手動で回復させる必要があるかもしれません"
 
-#: mail/mail-local.c:1000
+#: mail/mail-local.c:1002
 #, fuzzy
 msgid "You cannot change the format of a non-local folder."
 msgstr "このゴミ箱フォルダからメッセージをコピーすることが出来ません"
 
-#: mail/mail-local.c:1011
+#: mail/mail-local.c:1013
 #, c-format
 msgid "Reconfigure %s"
 msgstr "%s の再設定"
@@ -7618,104 +9190,129 @@ msgstr ""
 "操作の準備している間にエラーが発生しました:\n"
 "%s"
 
-#: mail/mail-mt.c:794
+#. Remember the password?
+#: mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "このパスワードを記憶"
+
+#: mail/mail-mt.c:796
 msgid "Working"
 msgstr "作業中"
 
-#: mail/mail-ops.c:578
+#: mail/mail-ops.c:84
+#, fuzzy
+msgid "Filtering Folder"
+msgstr "フォルダを更新中"
+
+#: mail/mail-ops.c:227
+#, fuzzy
+msgid "Fetching Mail"
+msgstr "メールの受信"
+
+#: mail/mail-ops.c:591
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" を送信中"
 
-#: mail/mail-ops.c:698
+#: mail/mail-ops.c:709
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "メッセージ %d / %d を送信中"
 
-#: mail/mail-ops.c:717
+#: mail/mail-ops.c:728
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "メッセージ %d / %d は失敗しました"
 
-#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
+#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
 msgid "Complete."
 msgstr "完了しました"
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:823
 msgid "Saving message to folder"
 msgstr "フォルダへメッセージを保存中"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Moving messages to %s"
 msgstr "%s へメッセージを移動中"
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Copying messages to %s"
 msgstr "%s へメッセージをコピー中"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:919
 msgid "Moving"
 msgstr "移動中"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:922
 msgid "Copying"
 msgstr "コピー中"
 
-#: mail/mail-ops.c:1016
+#: mail/mail-ops.c:1034
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" の中のフォルダを走査中"
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:181
 msgid "Trash"
 msgstr "ごみ箱"
 
-#: mail/mail-ops.c:1189
+#: mail/mail-ops.c:1211
 msgid "Forwarded messages"
 msgstr "メッセージを転送"
 
-#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
+#: mail/mail-ops.c:1253
 #, c-format
 msgid "Opening folder %s"
 msgstr "フォルダ %s をオープン中"
 
-#: mail/mail-ops.c:1297
+#: mail/mail-ops.c:1322
 #, c-format
 msgid "Opening store %s"
 msgstr "保存された %s をオープン中"
 
-#: mail/mail-ops.c:1436
+#: mail/mail-ops.c:1395
+#, fuzzy, c-format
+msgid "Creating folder %s"
+msgstr "新規フォルダを作成中"
+
+#: mail/mail-ops.c:1465
 #, c-format
 msgid "Removing folder %s"
 msgstr "フォルダ %s を削除中"
 
-#: mail/mail-ops.c:1568
+#: mail/mail-ops.c:1552
+#, fuzzy, c-format
+msgid "Synchronizing '%s'"
+msgstr "フォルダを同期中"
+
+#: mail/mail-ops.c:1603
 msgid "Refreshing folder"
 msgstr "フォルダを更新中"
 
-#: mail/mail-ops.c:1604
+#: mail/mail-ops.c:1639
 msgid "Expunging folder"
 msgstr "フォルダを削除中"
 
-#: mail/mail-ops.c:1653
+#: mail/mail-ops.c:1688
 #, c-format
 msgid "Retrieving message %s"
 msgstr "メッセージ %s を取得中"
 
-#: mail/mail-ops.c:1722
+#: mail/mail-ops.c:1755
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "メッセージを取得中"
 
-#: mail/mail-ops.c:1808
+#: mail/mail-ops.c:1841
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "メッセージを保存中"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1921
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -7724,7 +9321,7 @@ msgstr ""
 "出力ファイルを作成出来ません: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1913
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -7733,11 +9330,11 @@ msgstr ""
 "ファイルの保存中にエラー: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1987
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr "添付を保存中"
 
-#: mail/mail-ops.c:2003
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -7746,79 +9343,75 @@ msgstr ""
 "出力ファイルを作成出来ません: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2032
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr "データを書き出すことが出来ませんでした: %s"
 
-#: mail/mail-ops.c:2101
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s との接続を切っています"
 
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "検索(_S)"
+
 #: mail/mail-search.c:138
 msgid "(Untitled Message)"
 msgstr "(タイトルなしメッセージ)"
 
-#: mail/mail-search.c:235
+#: mail/mail-search.c:237
 #, fuzzy
 msgid "Untitled Message"
 msgstr "(タイトルなしメッセージ)"
 
-#: mail/mail-search.c:239
+#: mail/mail-search.c:241
 #, fuzzy
 msgid "Empty Message"
 msgstr "メッセージ"
 
-#: mail/mail-search.c:284
+#: mail/mail-search.c:288
 msgid "Find in Message"
 msgstr "メッセージを検索"
 
-#: mail/mail-search.c:314
+#: mail/mail-search.c:318
 msgid "Case Sensitive"
 msgstr "大文字/小文字を区別する"
 
-#: mail/mail-search.c:315
+#: mail/mail-search.c:320
 msgid "Search Forward"
 msgstr "前方検索"
 
-#: mail/mail-search.c:332
+#: mail/mail-search.c:340
 msgid "Find:"
 msgstr "検索:"
 
-#: mail/mail-search.c:335
+#: mail/mail-search.c:343
 msgid "Matches:"
 msgstr ""
 
-#: mail/mail-send-recv.c:141
+#: mail/mail-send-recv.c:138
 msgid "Cancelling..."
 msgstr "キャンセル中..."
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:257
 msgid "Send & Receive mail"
 msgstr "メールの送受信"
 
-#: mail/mail-send-recv.c:253
-msgid "Receiving"
-msgstr "受信中"
-
-#: mail/mail-send-recv.c:302
+#: mail/mail-send-recv.c:311
 msgid "Updating..."
 msgstr "更新中..."
 
-#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#: mail/mail-send-recv.c:311 mail/mail-send-recv.c:364
 msgid "Waiting..."
 msgstr "待機中..."
 
-#: mail/mail-send-recv.c:323
-msgid "Sending"
-msgstr "送信中"
-
-#: mail/mail-send-recv.c:488
+#: mail/mail-send-recv.c:494
 msgid "Cancelled."
 msgstr "キャンセルしました"
 
-#: mail/mail-session.c:171
+#: mail/mail-session.c:182
 msgid "User canceled operation."
 msgstr "ユーザによって操作をキャンセルされました"
 
@@ -7837,82 +9430,88 @@ msgstr "メッセージを転送しました - %s"
 msgid "Forwarded message"
 msgstr "メッセージを転送"
 
-#: mail/mail-tools.c:469
+#: mail/mail-tools.c:471
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "メッセージを転送"
 
-#: mail/mail-vfolder.c:270
+#: mail/mail-vfolder.c:278
 msgid "VFolders"
 msgstr "仮想フォルダ"
 
-#: mail/mail-vfolder.c:463
+#: mail/mail-vfolder.c:498
 msgid "New VFolder"
 msgstr "新規仮想フォルダ"
 
-#: mail/message-list.c:613
+#: mail/message-browser.c:125
+#, fuzzy
+msgid "(No subject)"
+msgstr "Fwd: (件名なし)"
+
+#: mail/message-browser.c:127
+#, fuzzy, c-format
+msgid "%s - Message"
+msgstr "メッセージ"
+
+#: mail/message-list.c:636
 msgid "Unseen"
 msgstr "未読"
 
-#: mail/message-list.c:614
+#: mail/message-list.c:637
 msgid "Seen"
 msgstr "既読"
 
-#: mail/message-list.c:615
+#: mail/message-list.c:638
 msgid "Answered"
 msgstr "返答済み"
 
-#: mail/message-list.c:616
+#: mail/message-list.c:639
 msgid "Multiple Unseen Messages"
 msgstr "複数の未読メッセージ"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:640
 msgid "Multiple Messages"
 msgstr "複数のメッセージ"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:644
 msgid "Lowest"
 msgstr "最も低い"
 
-#: mail/message-list.c:622
+#: mail/message-list.c:645
 msgid "Lower"
 msgstr "低い"
 
-#: mail/message-list.c:626
+#: mail/message-list.c:649
 msgid "Higher"
 msgstr "高い"
 
-#: mail/message-list.c:627
+#: mail/message-list.c:650
 msgid "Highest"
 msgstr "最も高い"
 
-#: mail/message-list.c:877
+#: mail/message-list.c:900
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:884
+#: mail/message-list.c:907
 msgid "Today %l:%M %p"
 msgstr "今日の %p %l:%M"
 
-#: mail/message-list.c:893
+#: mail/message-list.c:916
 msgid "Yesterday %l:%M %p"
 msgstr "昨日の %p %l:%M"
 
-#: mail/message-list.c:905
+#: mail/message-list.c:928
 msgid "%a %l:%M %p"
 msgstr "%p %l:%M (%a)"
 
-#: mail/message-list.c:913
-msgid "%b %d %l:%M %p"
-msgstr "%m月 %d日 %p %l:%M"
-
-#: mail/message-list.c:915
+#: mail/message-list.c:938
 msgid "%b %d %Y"
 msgstr "%Y年 %m月 %d日"
 
-#: mail/message-list.c:2290
+#: mail/message-list.c:2312
 #, fuzzy
-msgid "Updating message list"
+msgid "Generating message list"
 msgstr "メッセージを保存中"
 
 #: mail/message-list.etspec.h:2
@@ -7929,38 +9528,78 @@ msgstr "受信中"
 msgid "Size"
 msgstr "サイズ:"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
-msgid "Folder"
-msgstr "フォルダ"
-
-#: mail/subscribe-dialog.c:77
-msgid "Store"
-msgstr "記録"
-
-#: mail/subscribe-dialog.c:138
-msgid "Display folders starting with:"
-msgstr "表示するフォルダを開始する:"
+#: mail/subscribe-dialog.c:174
+#, fuzzy, c-format
+msgid "Scanning folders under %s on \"%s\""
+msgstr "\"%s\" の中のフォルダを走査中"
 
-#: mail/subscribe-dialog.c:168
-#, c-format
-msgid "Getting store for \"%s\""
-msgstr "\"%s\" の記録を取得中"
+#: mail/subscribe-dialog.c:176
+#, fuzzy, c-format
+msgid "Scanning root-level folders on \"%s\""
+msgstr "\"%s\" の中のフォルダを走査中"
 
-#: mail/subscribe-dialog.c:271
+#: mail/subscribe-dialog.c:275
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "フォルダ \"%s\" を購読中"
 
-#: mail/subscribe-dialog.c:273
+#: mail/subscribe-dialog.c:277
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "フォルダ \"%s\" の購読解除中"
 
-#. Construct the app
-#: mail/subscribe-dialog.c:878
+#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Folder"
+msgstr "フォルダ"
+
+#: mail/subscribe-dialog.c:1490
+#, fuzzy
+msgid "No server has been selected"
+msgstr "選択されたメッセージはありません"
+
+#: mail/subscribe-dialog.c:1547
+#, fuzzy
+msgid "Please select a server."
+msgstr "サービスを選択"
+
+#: mail/subscribe-dialog.glade.h:1
+#, fuzzy
+msgid " _Refresh List "
+msgstr "リストを更新"
+
+#: mail/subscribe-dialog.glade.h:2
+#, fuzzy
+msgid "All folders"
+msgstr "フォルダを選択"
+
+#: mail/subscribe-dialog.glade.h:3
+#, fuzzy
+msgid "Display options"
+msgstr "表示オプション"
+
+#: mail/subscribe-dialog.glade.h:4
+msgid "Folders whose names begin with:"
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:5
 msgid "Manage Subscriptions"
 msgstr "購読管理"
 
+#: mail/subscribe-dialog.glade.h:6
+msgid "Show _folders from server: "
+msgstr ""
+
+#: mail/subscribe-dialog.glade.h:7
+#, fuzzy
+msgid "_Subscribe"
+msgstr "購読"
+
+#: mail/subscribe-dialog.glade.h:8
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "購読解除"
+
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
 msgid "Evolution component for the executive summary."
 msgstr "実行サマリのための Evolution コンポーネント"
@@ -7969,54 +9608,71 @@ msgstr "実行サマリのための Evolution コンポーネント"
 msgid "Factory for the Evolution executive summary component."
 msgstr "Evolution 実行サマリコンポーネントのためのファクトリ"
 
-#: my-evolution/component-factory.c:140
+#: my-evolution/component-factory.c:30
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
+#: my-evolution/component-factory.c:141
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Evolution 実行サマリーコンポーネントの初期化が出来ません"
 
-#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+#: my-evolution/e-summary-calendar.c:182 my-evolution/e-summary-calendar.c:200
 msgid "Appointments"
 msgstr "約束"
 
-#: my-evolution/e-summary-calendar.c:177
+#: my-evolution/e-summary-calendar.c:183
 #, fuzzy
 msgid "No appointments"
 msgstr "約束の表示"
 
-#: my-evolution/e-summary-calendar.c:226
+#: my-evolution/e-summary-calendar.c:236
 #, fuzzy
 msgid "%l:%M%p"
 msgstr "%p %I:%M"
 
-#: my-evolution/e-summary-calendar.c:228
+#: my-evolution/e-summary-calendar.c:238
 #, fuzzy
 msgid "%a %l:%M%p"
 msgstr "%p %l:%M (%a)"
 
-#: my-evolution/e-summary-mail.c:104
+#: my-evolution/e-summary-mail.c:111
 #, fuzzy
 msgid "Mail summary"
 msgstr "メールサマリ"
 
-#: my-evolution/e-summary-preferences.c:420
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-preferences.c:65
+#: my-evolution/e-summary-weather.c:603
+msgid "KBOS:ZSAM:EGAA"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:428
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:450
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:877
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:885
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:1408
+#: my-evolution/e-summary-preferences.c:889
+msgid "Name:"
+msgstr "名前:"
+
+#: my-evolution/e-summary-preferences.c:1421
 #, fuzzy
-msgid "My Evolution Settings"
-msgstr "My Evolution"
+msgid "Summary Settings"
+msgstr "サマリが次のものを含む"
 
 #: my-evolution/e-summary-rdf.c:281
 #, fuzzy
@@ -8028,7 +9684,12 @@ msgstr "カレンダファイルを読み込み中にエラーが発生しました"
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>カレンダをロード中にエラー</b>"
 
-#: my-evolution/e-summary-tasks.c:206
+#: my-evolution/e-summary-rdf.c:479
+#, fuzzy
+msgid "News Feed"
+msgstr "設定"
+
+#: my-evolution/e-summary-tasks.c:213
 #, fuzzy
 msgid "No tasks"
 msgstr "タスクの表示"
@@ -8037,28 +9698,33 @@ msgstr "タスクの表示"
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:313
+#: my-evolution/e-summary-weather.c:324
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:643
+#: my-evolution/e-summary-weather.c:512
+#, fuzzy
+msgid "Weather"
+msgstr "その他"
+
+#: my-evolution/e-summary-weather.c:664
 #, fuzzy
 msgid "Regions"
 msgstr "セクション:"
 
 #: my-evolution/e-summary.c:145
 #, fuzzy
-msgid "%A, %d %B %Y"
-msgstr "%Y/%B/%e %A"
+msgid "%A, %B %e %Y"
+msgstr "%Y年 %m月 %d日 %A"
 
 #: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
 #, fuzzy
-msgid "Print My Evolution"
-msgstr "My Evolution"
+msgid "Print Summary"
+msgstr "サマリー"
 
 #: my-evolution/e-summary.c:518
 #, fuzzy
-msgid "Printing of My Evolution failed"
+msgid "Printing of Summary failed"
 msgstr "メッセージの印刷に失敗しました"
 
 #: my-evolution/main.c:52
@@ -8066,6 +9732,42 @@ msgstr "メッセージの印刷に失敗しました"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "init_bonobo(): Bonobo を初期化することが出来ませんでした"
 
+#: my-evolution/metar.c:29
+msgid "F"
+msgstr ""
+
+#: my-evolution/metar.c:29
+msgid "C"
+msgstr ""
+
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "フォント"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr ""
+
+#: my-evolution/metar.c:38
+#, fuzzy
+msgid "inHg"
+msgstr "移動中"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr ""
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "フィルタ"
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "kilometers"
+msgstr "フィルタ"
+
 #: my-evolution/metar.c:44
 #, fuzzy
 msgid "Clear sky"
@@ -9257,130 +10959,146 @@ msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
 #, fuzzy
-msgid "Add new feed"
-msgstr "返答済み"
+msgid " _Remove"
+msgstr "削除"
 
 #: my-evolution/my-evolution.glade.h:2
 #, fuzzy
-msgid "All folders:"
-msgstr "フォルダを選択"
+msgid "Add n_ew feed"
+msgstr "返答済み"
 
 #: my-evolution/my-evolution.glade.h:3
-msgid "All news feeds:"
-msgstr ""
+#, fuzzy
+msgid "Al_l stations:"
+msgstr "すべての付き添い"
 
 #: my-evolution/my-evolution.glade.h:4
 #, fuzzy
-msgid "All stations:"
-msgstr "すべての付き添い"
+msgid "All _folders:"
+msgstr "フォルダを選択"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:5
 #, fuzzy
-msgid "Display folders:"
-msgstr "表示するフォルダを開始する:"
+msgid "All news _feeds:"
+msgstr "返答済み"
 
 #: my-evolution/my-evolution.glade.h:7
-#, fuzzy
-msgid "Display stations:"
-msgstr "表示オプション"
+msgid "How many days should the calendar display at once?"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
-#, fuzzy
-msgid "Displayed feeds:"
-msgstr "表示"
+msgid "Ma_x number of items shown:"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:9
 #, fuzzy
-msgid "Five days"
-msgstr "金曜日"
+msgid "News Feed Settings"
+msgstr "設定"
 
 #: my-evolution/my-evolution.glade.h:10
-msgid "How many days should the calendar display at once?"
-msgstr ""
+#, fuzzy
+msgid "One mont_h"
+msgstr "月"
+
+#: my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "One w_eek"
+msgstr "1 週間"
 
 #: my-evolution/my-evolution.glade.h:12
-msgid "Max number of items shown:"
+msgid "Refresh _time (seconds):"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:13
 #, fuzzy
-msgid "News Feed Settings"
-msgstr "設定"
+msgid "Show _all tasks"
+msgstr "タスクの表示"
 
 #: my-evolution/my-evolution.glade.h:14
-msgid "News Feeds"
-msgstr ""
+#, fuzzy
+msgid "Show _today's tasks"
+msgstr "タスクの表示"
 
 #: my-evolution/my-evolution.glade.h:15
 #, fuzzy
-msgid "One day"
-msgstr "1 日"
+msgid "Tasks "
+msgstr "タスク"
 
 #: my-evolution/my-evolution.glade.h:16
 #, fuzzy
-msgid "One month"
-msgstr "月"
+msgid "Units: "
+msgstr ""
+"\n"
+"  部署:  "
 
 #: 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 ""
+msgid "Weather settings"
+msgstr "選択されたものをクリアします"
 
 #: my-evolution/my-evolution.glade.h:19
 #, fuzzy
-msgid "Schedule"
-msgstr ""
-"スケジュール\n"
-"時間"
+msgid "_Display folders:"
+msgstr "表示するフォルダを開始する:"
 
 #: my-evolution/my-evolution.glade.h:20
 #, fuzzy
-msgid "Show all tasks"
-msgstr "タスクの表示"
+msgid "_Display stations:"
+msgstr "表示オプション"
 
 #: my-evolution/my-evolution.glade.h:21
 #, fuzzy
-msgid "Show full path for folders"
-msgstr "すべてのヘッダを表示(_H)"
+msgid "_Displayed feeds:"
+msgstr "表示"
 
 #: my-evolution/my-evolution.glade.h:22
 #, fuzzy
-msgid "Show today's tasks"
-msgstr "タスクの表示"
+msgid "_Five days"
+msgstr "金曜日"
 
 #: my-evolution/my-evolution.glade.h:23
 #, fuzzy
-msgid "Tasks "
-msgstr "タスク"
+msgid "_Mail"
+msgstr "メール"
 
 #: my-evolution/my-evolution.glade.h:24
 #, fuzzy
-msgid "Units: "
-msgstr ""
-"\n"
-"  部署:  "
+msgid "_News Feeds"
+msgstr "設定"
 
 #: my-evolution/my-evolution.glade.h:25
 #, fuzzy
-msgid "Weather"
-msgstr "その他"
+msgid "_One day"
+msgstr "1 日"
 
 #: my-evolution/my-evolution.glade.h:26
-#, fuzzy
-msgid "Weather settings"
-msgstr "選択されたものをクリアします"
+msgid "_Refresh time (seconds):"
+msgstr ""
 
 #: my-evolution/my-evolution.glade.h:27
 #, fuzzy
-msgid "imperial"
-msgstr "4 月"
+msgid "_Schedule"
+msgstr ""
+"スケジュール\n"
+"時間"
 
 #: my-evolution/my-evolution.glade.h:28
-msgid "metric"
+#, fuzzy
+msgid "_Show full path for folders"
+msgstr "すべてのヘッダを表示(_H)"
+
+#: my-evolution/my-evolution.glade.h:29
+#, fuzzy
+msgid "_Weather"
+msgstr "その他"
+
+#: my-evolution/my-evolution.glade.h:30
+#, fuzzy
+msgid "_imperial"
+msgstr "4 月"
+
+#: my-evolution/my-evolution.glade.h:31
+msgid "m_etric"
 msgstr ""
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
@@ -9397,7 +11115,17 @@ msgstr "詳細"
 msgid "Cancel Operation"
 msgstr "打合せをキャンセル"
 
-#: shell/e-local-storage.c:554
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1045
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
+
+#: shell/e-local-storage.c:178
+#, fuzzy
+msgid "Outbox"
+msgstr "mbox"
+
+#: shell/e-local-storage.c:593
 #, fuzzy
 msgid "Local Folders"
 msgstr "特別なフォルダ"
@@ -9449,7 +11177,7 @@ msgid ""
 "`%s'."
 msgstr "ファイル読込中の間にエラーは発生しました"
 
-#: shell/e-setup.c:308
+#: shell/e-setup.c:309
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -9460,7 +11188,7 @@ msgstr ""
 "Evolution ユーザファイルのインストールを\n"
 "許容するために移動して下さい"
 
-#: shell/e-setup.c:322
+#: shell/e-setup.c:323
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -9474,7 +11202,7 @@ msgstr ""
 "削除する必要があります\n"
 "このディレクトリを削除しますか?"
 
-#: shell/e-setup.c:347
+#: shell/e-setup.c:348
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -9485,55 +11213,78 @@ msgstr ""
 "ディレクトリではありません．Evolution ユーザ\n"
 "ファイルのインストールを許容するために移動して下さい"
 
-#: shell/e-shell-folder-commands.c:160
+#: shell/e-shell-folder-commands.c:174
 #, fuzzy
 msgid "Cannot move a folder over itself."
 msgstr "フォルダを取得出来ません: %s: %s"
 
-#: shell/e-shell-folder-commands.c:162
+#: shell/e-shell-folder-commands.c:176
 #, fuzzy
 msgid "Cannot copy a folder over itself."
 msgstr ""
 "'%s' の中にファイルを\n"
 "コピー出来ません"
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:270
+#: shell/e-shell-folder-commands.c:285
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "フォルダ \"%s\" をコピーするフォルダを指定します:"
 
-#: shell/e-shell-folder-commands.c:275
+#: shell/e-shell-folder-commands.c:290
 msgid "Copy folder"
 msgstr "フォルダのコピー"
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:328
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "フォルダ \"%s\" を移動するフォルダを指定します:"
 
-#: shell/e-shell-folder-commands.c:318
+#: shell/e-shell-folder-commands.c:333
 msgid "Move folder"
 msgstr "フォルダの移動"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:358
+#, fuzzy, c-format
+msgid ""
+"Cannot delete folder:\n"
+"%s"
+msgstr ""
+"フォルダ `%s' を削除することが出来ませんでした:\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:374
 #, fuzzy, c-format
 msgid "Delete folder '%s'"
 msgstr "このフォルダを削除します"
 
-#: shell/e-shell-folder-commands.c:363
+#. "Are you sure..." label
+#: shell/e-shell-folder-commands.c:384
 #, fuzzy, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
 msgstr "本当にタスク `%s' を削除してもよろしいですか?"
 
-#: shell/e-shell-folder-commands.c:422
+#. Popup a dialog asking what the user would like to rename
+#. the folder to
+#: shell/e-shell-folder-commands.c:459
 #, fuzzy, c-format
 msgid "Rename folder '%s'"
 msgstr "フォルダ %s を削除中"
 
+#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
+#, fuzzy
+msgid "Rename"
+msgstr "リネーム(_R)..."
+
+#. Make, pack the label
+#: shell/e-shell-folder-commands.c:471
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "フォルダ名:"
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -9547,7 +11298,7 @@ msgstr ""
 msgid "The specified folder name is not valid."
 msgstr "指定されたフォルダ名は有効ではありません"
 
-#: shell/e-shell-folder-creation-dialog.c:275
+#: shell/e-shell-folder-creation-dialog.c:288
 msgid "Evolution - Create new folder"
 msgstr "Evolution - 新規フォルダの作成"
 
@@ -9559,11 +11310,11 @@ msgstr ""
 "選択したフォルダの種別は要求された操作のために\n"
 "有効ではありません"
 
-#: shell/e-shell-folder-selection-dialog.c:343
+#: shell/e-shell-folder-selection-dialog.c:348
 msgid "New..."
 msgstr "新規..."
 
-#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
+#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
 msgid "(Untitled)"
 msgstr "(タイトルなし)"
 
@@ -9575,12 +11326,11 @@ 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.
@@ -9604,7 +11354,7 @@ msgstr ""
 "%s をインポート中\n"
 "アイテム %d をインポート中"
 
-#: shell/e-shell-importer.c:352
+#: shell/e-shell-importer.c:350
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -9653,7 +11403,7 @@ msgstr "自働"
 msgid "Filename:"
 msgstr "ファイル名:"
 
-#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#: shell/e-shell-importer.c:543
 msgid "Select a file"
 msgstr "ファイルを選択"
 
@@ -9661,31 +11411,53 @@ msgstr "ファイルを選択"
 msgid "File type:"
 msgstr "ファイル種別:"
 
-#: shell/e-shell-importer.c:599
+#: shell/e-shell-importer.c:623
 msgid "Select folder"
 msgstr "フォルダを選択"
 
-#: shell/e-shell-importer.c:600
+#: shell/e-shell-importer.c:624
 msgid "Select a destination folder for importing this data"
 msgstr "このデータをインポートする送り先のフォルダを選択してください"
 
-#: shell/e-shell-offline-handler.c:554
+#: shell/e-shell-offline-handler.c:564
 msgid "Closing connections..."
 msgstr "接続を閉じています..."
 
-#: shell/e-shell-view-menu.c:181
+#: shell/e-shell-startup-wizard.c:144
+#, c-format
+msgid ""
+"Could not start the Evolution Mailer Wizard interface\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:153
+#, fuzzy
+msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgstr "Evolution メールコンポーネントの初期化が出来ません"
+
+#: shell/e-shell-startup-wizard.c:558
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:561
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:183
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy はあなたの $PATH には見つかりません"
 
-#: shell/e-shell-view-menu.c:189
+#: shell/e-shell-view-menu.c:191
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy は実行できませんでした"
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:219
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:221
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -9697,92 +11469,109 @@ msgstr ""
 "グループウェアアプリケーションの\n"
 "パッケージソフトです"
 
-#: shell/e-shell-view-menu.c:437
+#: shell/e-shell-view-menu.c:423
 msgid "Go to folder..."
 msgstr "フォルダへ移動..."
 
-#: shell/e-shell-view-menu.c:438
+#: shell/e-shell-view-menu.c:424
 msgid "Select the folder that you want to open"
 msgstr "開きたいフォルダを選択します"
 
-#: shell/e-shell-view-menu.c:583
+#: shell/e-shell-view-menu.c:569
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "新規ショートカットグループを作成します"
 
-#: shell/e-shell-view-menu.c:584
+#: shell/e-shell-view-menu.c:570
 #, fuzzy
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "開きたいフォルダを選択します"
 
-#: shell/e-shell-view-menu.c:689
+#: shell/e-shell-view-menu.c:684
 #, fuzzy
 msgid "Work Online"
 msgstr "オンライン作業"
 
-#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
-#: ui/evolution.xml.h:38
+#: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
+#: ui/evolution.xml.h:31
 msgid "Work Offline"
 msgstr "オフライン作業"
 
-#: shell/e-shell-view.c:175
+#: shell/e-shell-view.c:184
 msgid "(No folder displayed)"
 msgstr "(表示したフォルダはありません)"
 
-#. 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
+#: shell/e-shell-view.c:1459
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution - %s"
 
-#: shell/e-shell-view.c:1413
+#: shell/e-shell-view.c:1461
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1451
+#: shell/e-shell-view.c:1499
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
-"Evolution "
-"は現在オンラインです．オフラインにするにはこのボタンをクリックしてください"
+"Evolution は現在オンラインです．オフラインにするにはこのボタンをクリックして"
+"ください"
 
-#: shell/e-shell-view.c:1458
+#: shell/e-shell-view.c:1506
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution はオフライン処理中です"
 
-#: shell/e-shell-view.c:1464
+#: shell/e-shell-view.c:1512
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
-"Evolution "
-"は現在オフラインです．オンラインにするにはこのボタンをクリックしてください"
+"Evolution は現在オフラインです．オンラインにするにはこのボタンをクリックして"
+"ください"
 
-#: shell/e-shell.c:446
+#: shell/e-shell.c:509
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "局部記憶装置のセットアップが出来ません -- %s"
 
-#: shell/e-shell.c:1311
-#, c-format
+#: shell/e-shell.c:1438
+#, fuzzy, c-format
 msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"Ooops!  The views 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
+#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
+msgid "OK"
+msgstr "OK"
+
+#: shell/e-shell.c:1644
+#, fuzzy
+msgid "Invalid arguments"
+msgstr "メッセージの内容は無効です"
+
+#: shell/e-shell.c:1646
+#, fuzzy
+msgid "Cannot register on OAF"
+msgstr "シェルでストレージを登録出来ません"
+
+#: shell/e-shell.c:1648
+msgid "Configuration Database not found"
+msgstr ""
+
+#: shell/e-shell.c:1650 shell/e-storage.c:491
+msgid "Generic error"
+msgstr "一般的なエラー"
+
+#: shell/e-shortcuts-view.c:72
 msgid "Create new shortcut group"
 msgstr "新規ショートカットグループを作成します"
 
-#: shell/e-shortcuts-view.c:144
+#: shell/e-shortcuts-view.c:73
 msgid "Group name:"
 msgstr "グループ名:"
 
-#: shell/e-shortcuts-view.c:267
+#: shell/e-shortcuts-view.c:171
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -9791,183 +11580,169 @@ msgstr ""
 "本当にショートカットバーからグループ\n"
 "`%s' を削除したいですか?"
 
-#: shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:176
 msgid "Don't remove"
 msgstr "削除しません"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:204
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "このショートカットグループを削除します"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:205
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "このショートカットグループを削除します"
 
-#: shell/e-shortcuts-view.c:314
+#: shell/e-shortcuts-view.c:218
 msgid "_Small Icons"
 msgstr "小さいアイコン(_S)"
 
-#: shell/e-shortcuts-view.c:315
+#: shell/e-shortcuts-view.c:219
 msgid "Show the shortcuts as small icons"
 msgstr "小さいアイコンでショートカットを表示します"
 
-#: shell/e-shortcuts-view.c:317
+#: shell/e-shortcuts-view.c:221
 msgid "_Large Icons"
 msgstr "大きいアイコン(_L)"
 
-#: shell/e-shortcuts-view.c:318
+#: shell/e-shortcuts-view.c:222
 msgid "Show the shortcuts as large icons"
 msgstr "大きいアイコンでショートカットを表示します"
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:233
 msgid "_New Group..."
 msgstr "新規グループ(_N)..."
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:234
 msgid "Create a new shortcut group"
 msgstr "新規ショートカットグループを作成します"
 
-#: shell/e-shortcuts-view.c:332
+#: shell/e-shortcuts-view.c:236
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "このグループを削除(_R)..."
 
-#: shell/e-shortcuts-view.c:333
+#: shell/e-shortcuts-view.c:237
 msgid "Remove this shortcut group"
 msgstr "このショートカットグループを削除します"
 
-#: shell/e-shortcuts-view.c:335
+#: shell/e-shortcuts-view.c:239
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "このグループを削除(_R)..."
 
-#: shell/e-shortcuts-view.c:336
+#: shell/e-shortcuts-view.c:240
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "このショートカットグループを削除します"
 
-#: shell/e-shortcuts-view.c:341
+#: shell/e-shortcuts-view.c:245
 msgid "_Hide the Shortcut Bar"
 msgstr "ショートカットバーを隠す(_H)"
 
-#: shell/e-shortcuts-view.c:342
+#: shell/e-shortcuts-view.c:246
 msgid "Hide the shortcut bar"
 msgstr "ショートカットバーを隠します"
 
-#: shell/e-shortcuts-view.c:461
+#: shell/e-shortcuts-view.c:365
 #, fuzzy
 msgid "Rename shortcut"
 msgstr "このショートカットグループを削除します"
 
-#: shell/e-shortcuts-view.c:462
+#: shell/e-shortcuts-view.c:366
 #, fuzzy
 msgid "Rename selected shortcut to:"
 msgstr "このショートカットグループを削除します"
 
-#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "開く"
-
-#: shell/e-shortcuts-view.c:474
+#: shell/e-shortcuts-view.c:378
 #, fuzzy
 msgid "Open the folder linked to this shortcut"
 msgstr "別のウィンドウでこのフォルダを開きます"
 
-#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:19
 msgid "Open in New Window"
 msgstr "新規ウィンドウで開く"
 
-#: shell/e-shortcuts-view.c:476
+#: shell/e-shortcuts-view.c:380
 #, 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
+#: shell/e-shortcuts-view.c:383
 #, fuzzy
 msgid "Rename this shortcut"
 msgstr "このショートカットグループを削除します"
 
-#: shell/e-shortcuts-view.c:481
+#: shell/e-shortcuts-view.c:385
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "ショートカットバーからこのショートカットを削除します"
 
-#: shell/e-shortcuts.c:585
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "ショートカットの保存中にエラーが発生しました"
 
-#: shell/e-shortcuts.c:982
+#: shell/e-shortcuts.c:1040
 #, 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
+#: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(名前なし)"
 
-#: shell/e-storage.c:475
+#: shell/e-storage.c:489
 msgid "No error"
 msgstr "エラーはありません"
 
-#: shell/e-storage.c:477
-msgid "Generic error"
-msgstr "一般的なエラー"
-
-#: shell/e-storage.c:479
+#: shell/e-storage.c:493
 msgid "A folder with the same name already exists"
 msgstr "同じ名前のフォルダがすでに存在しています"
 
-#: shell/e-storage.c:481
+#: shell/e-storage.c:495
 msgid "The specified folder type is not valid"
 msgstr "指定されたフォルダ種別は有効ではありません"
 
-#: shell/e-storage.c:483
+#: shell/e-storage.c:497
 msgid "I/O error"
 msgstr "I/O エラー"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:499
 msgid "Not enough space to create the folder"
 msgstr "フォルダを作成する十分な空きがありません"
 
-#: shell/e-storage.c:487
+#: shell/e-storage.c:501
 msgid "The specified folder was not found"
 msgstr "指定されたフォルダは見付かりませんでした"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:503
 msgid "Function not implemented in this storage"
 msgstr "機能はこの記憶装置では実装されていません"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:507
 msgid "Operation not supported"
 msgstr "操作はサポートされていません"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:509
 msgid "The specified type is not supported in this storage"
 msgstr "指定された種別はこの記憶装置ではサポートされていません"
 
-#: shell/e-task-widget.c:168
+#: shell/e-storage.c:511
+#, fuzzy
+msgid "The specified folder cannot be modified or removed"
+msgstr "指定されたフォルダは見付かりませんでした"
+
+#: shell/e-storage.c:513
+msgid "Cannot make a folder a child of one of its descendants"
+msgstr ""
+
+#: shell/e-task-widget.c:170
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:173
-#, fuzzy
+#: shell/e-task-widget.c:175
+#, fuzzy, c-format
 msgid "%s (%d%% complete)"
 msgstr "% 完了(_l):"
 
@@ -9989,10 +11764,6 @@ msgstr "ホスト:"
 msgid "The following connections are currently active:"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "フォルダ名:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder type:"
 msgstr "フォルダ種別:"
@@ -10004,21 +11775,33 @@ msgstr "フォルダを作成する場所を指定してください:"
 #: 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"
+#, fuzzy
+msgid "Evolution Import Assistant"
 msgstr "Evolution インポートユーティリティ"
 
 #: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
+#, fuzzy
+msgid "Evolution Importer Assistant"
 msgstr "Evolution インポートユーティリティ"
 
+#: shell/importer/import.glade.h:4
+msgid "Import File (Step 2 of 2)"
+msgstr ""
+
+#: shell/importer/import.glade.h:5
+#, fuzzy
+msgid "Select a File (step 1 of 2)"
+msgstr "ファイルを選択"
+
 #: shell/importer/import.glade.h:6
+#, fuzzy
 msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
 "ようこそ, Evolution インポートユーティリティへ\n"
@@ -10038,10 +11821,11 @@ msgid "Don't ask me again"
 msgstr "このメッセージを二度と表示しない"
 
 #: shell/importer/intelligent.c:209
-msgid "Evolution has found the following data sources:"
-msgstr ""
+#, fuzzy
+msgid "Evolution can import data from the following files:"
+msgstr "メールを扱うための Evolution コンポーネント"
 
-#: shell/main.c:96
+#: shell/main.c:95
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -10073,7 +11857,7 @@ msgstr ""
 "我々はあなたが我々の成果を楽しむことを望んでいます．そして我々は\n"
 "熱心にあなたの貢献を待ち受けています!\n"
 
-#: shell/main.c:117
+#: shell/main.c:116
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -10081,25 +11865,30 @@ msgstr ""
 "ありがとう\n"
 "Evolution チーム\n"
 
-#: shell/main.c:155
+#: shell/main.c:173
 #, fuzzy
 msgid "Cannot access the Evolution shell."
 msgstr "Evolution シェルの初期化が出来ません"
 
-#: shell/main.c:215
+#: shell/main.c:184
+#, fuzzy, c-format
+msgid "Cannot initialize the Evolution shell: %s"
+msgstr "Evolution シェルの初期化が出来ません"
+
+#: shell/main.c:228
 msgid "Disable splash screen"
 msgstr "スプラッシュ画面を無効にする"
 
-#: shell/main.c:216
+#: shell/main.c:229
 msgid "Send the debugging output of all components to a file."
 msgstr "すべてのコンポーネントのデバッグ出力をファイルへ送る"
 
-#: shell/main.c:255
+#: shell/main.c:271
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo コンポーネントシステムを初期化出来ません"
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy"
 msgstr "コピー"
 
@@ -10116,11 +11905,11 @@ msgstr "新規コンタクトを作成します"
 msgid "Create new contact list"
 msgstr "新規コンタクトを作成します"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
 msgid "Cut"
 msgstr "切り取り"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 msgid "Cut the selection"
 msgstr "選択されたものを切り取ります"
 
@@ -10128,77 +11917,120 @@ msgstr "選択されたものを切り取ります"
 msgid "Delete selected contacts"
 msgstr "選択したコンタクトを削除します"
 
-#: ui/evolution-addressbook.xml.h:10
-msgid "New contact"
-msgstr "新規コンタクト"
-
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
-msgid "New list"
+msgid "New List"
 msgstr "ニュース"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "貼り付け"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 msgid "Paste the clipboard"
 msgstr "クリップボードへ貼り付けます"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:15
 #, fuzzy
 msgid "Previews the contacts to be printed"
 msgstr "印刷されるカレンダのプレビューを表示します"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "選択したコンタクトを印刷します"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
+#, fuzzy
+msgid "Save selected contacts as a VCard."
+msgstr "選択したコンタクトを削除します"
+
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "すべて選択"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "Select all contacts"
 msgstr "すべてのコンタクトを表示します"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Send _Message to Contact..."
+msgstr "コンタクトへメッセージを送信(_m)..."
+
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "Send a mess to the selected contacts."
+msgstr "選択したコンタクトを削除します"
+
+#: ui/evolution-addressbook.xml.h:25
+msgid "Send message to contact"
+msgstr "コンタクト先へメッセージを送信"
+
+#: ui/evolution-addressbook.xml.h:26
+#, fuzzy
+msgid "Send selected contacts to another person."
+msgstr "他へコンタクトを送信"
+
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "停止"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "詠み込みを停止します"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9
+msgid "_Actions"
+msgstr "動作(_A)"
+
+#: ui/evolution-addressbook.xml.h:30
 msgid "_Addressbook Sources..."
 msgstr "アドレス帳のソース(_A)..."
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:31
 msgid "_Contact"
 msgstr "コンタクト(_C)"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:32
 #, fuzzy
-msgid "_Contact Group"
+msgid "_Contact List"
 msgstr "コンタクト(_C)"
 
-#: 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
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#, fuzzy
+msgid "_Forward Contact..."
+msgstr "コンタクト(_C)..."
+
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
+#: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "印刷(_P)..."
 
-#: ui/evolution-addressbook.xml.h:28
-msgid "_Search for contacts"
+#: ui/evolution-addressbook.xml.h:37
+#, fuzzy
+msgid "_Save as VCard"
+msgstr "VCard で保存"
+
+#: ui/evolution-addressbook.xml.h:38
+#, fuzzy
+msgid "_Search for Contacts"
 msgstr "コンタクトの検索(_S)"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Select All"
 msgstr "すべて選択(_A)"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
-#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
+#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:18
+#: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "ツール(_T)"
 
@@ -10208,112 +12040,131 @@ msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
 #, fuzzy
-msgid "Create a New All-Day _Event"
+msgid "Create a New All Day _Event"
 msgstr "新規に毎日のイベントを作成します"
 
 #: ui/evolution-calendar.xml.h:5
 #, fuzzy
-msgid "Create a _New Appointment"
-msgstr "新規約束を作成します"
+msgid "Create a New _Task"
+msgstr "新規タスクを作成します"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "新規約束を作成します"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:9
 msgid "Create an event for the whole day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:11
+msgid "Day"
+msgstr "日"
+
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Delete the appointment"
+msgstr "この約束を削除"
+
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "移動"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Go back in time"
+#: ui/evolution-calendar.xml.h:14
+#, fuzzy
+msgid "Go back"
 msgstr "時間を戻します"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go forward in time"
+#: ui/evolution-calendar.xml.h:15
+#, fuzzy
+msgid "Go forward"
 msgstr "時間を進めます"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to _Date"
 msgstr "指定日に移動(_D)"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr "指定日に移動します"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to present time"
-msgstr "現在の時間へ移動します"
+#: ui/evolution-calendar.xml.h:19
+#, fuzzy
+msgid "Go to today"
+msgstr "今日へ移動"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:20
+#, fuzzy
+msgid "Month"
+msgstr "月(_M)"
+
+#: ui/evolution-calendar.xml.h:21
 msgid "New Appointment"
 msgstr "新規約束"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+msgid "New Task"
+msgstr "新規タスク"
+
+#: ui/evolution-calendar.xml.h:24
 msgid "Previews the calendar to be printed"
 msgstr "印刷されるカレンダのプレビューを表示します"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Print calendar"
-msgstr "カレンダの印刷"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Print this Calendar"
-msgstr "このカレンダの印刷します"
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
+msgid "Print Pre_view"
+msgstr "印刷プレビュー(_v)"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
-msgid "Publish Free/Busy Information"
-msgstr "必須情報"
+msgid "Print this calendar"
+msgstr "このカレンダの印刷します"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:27
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Show 1 day"
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Show one day"
 msgstr "1 日を表示します"
 
-#: ui/evolution-calendar.xml.h:25
-msgid "Show 1 month"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "Show one month"
 msgstr "1 ヶ月を表示します"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Show 1 week"
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "Show one week"
 msgstr "1 週間を表示します"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "週間労働時間を表示します"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "W_ork Week"
-msgstr "週間労働時間(_o)"
+#: ui/evolution-calendar.xml.h:32
+msgid "Week"
+msgstr "週"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:35
 #, fuzzy
 msgid "_Appointment..."
 msgstr "約束(_A)"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:36
 #, fuzzy
 msgid "_Calendar Settings..."
 msgstr "メール設定(_M)..."
 
-#: ui/evolution-calendar.xml.h:32
-msgid "_Day"
-msgstr "日(_D)"
-
-#: ui/evolution-calendar.xml.h:33
-msgid "_Month"
-msgstr "月(_M)"
+#: ui/evolution-calendar.xml.h:41
+#, fuzzy
+msgid "_Publish Free/Busy Information"
+msgstr "必須情報"
 
-#: ui/evolution-calendar.xml.h:37
-msgid "_Week"
-msgstr "週(_W)"
+#: ui/evolution-calendar.xml.h:42
+#, fuzzy
+msgid "_Task..."
+msgstr "タスク(_T)"
 
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -10324,15 +12175,16 @@ msgid "Close"
 msgstr "閉じる"
 
 #: ui/evolution-comp-editor.xml.h:3
-msgid "Close this appointment"
-msgstr "この約束を閉じます"
+#, fuzzy
+msgid "Close this item"
+msgstr "このアイテムを削除します"
 
-#: ui/evolution-comp-editor.xml.h:5
-msgid "Delete this appointment"
-msgstr "この約束を削除"
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+msgid "Delete this item"
+msgstr "このアイテムを削除します"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution.xml.h:21
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
+#: ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr "メインツールバー"
 
@@ -10341,117 +12193,85 @@ msgstr "メインツールバー"
 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
+#: ui/evolution-comp-editor.xml.h:10 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
+#: ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "印刷..."
 
-#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
+msgid "Save"
+msgstr "保存"
+
+#: ui/evolution-comp-editor.xml.h:14
 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:15
+#, fuzzy
+msgid "Save the item and close the dialog box"
+msgstr "タスクを保存してダイアログボックスを閉じます"
 
-#: ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-comp-editor.xml.h:16
 #, 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-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:7
 #: 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
+#: ui/evolution.xml.h:37
 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 "削除..."
-
-#: ui/evolution-contact-editor.xml.h:4
-msgid "Help"
-msgstr "ヘルプ"
-
 #: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr "表紙を印刷(_v)..."
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "別名で保存(_A)..."
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr "コンタクトを保存してこのダイアログボックスを閉じます"
 
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Se_nd contact to other..."
-msgstr "他へコンタクトを送信(_n)..."
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "See online help"
-msgstr "オンラインヘルプを参照してください"
-
-#: ui/evolution-contact-editor.xml.h:13
-msgid "Send _message to contact..."
-msgstr "コンタクトへメッセージを送信(_m)..."
-
-#: ui/evolution-contact-editor.xml.h:16
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:54
 #: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:3
 #, fuzzy
 msgid "Delete this list"
 msgstr "このアイテムを削除します"
 
-#: ui/evolution-contact-list-editor.xml.h:6
+#: ui/evolution-contact-list-editor.xml.h:4
+msgid "Delete..."
+msgstr "削除..."
+
+#: ui/evolution-contact-list-editor.xml.h:7
 #, fuzzy
 msgid "Save the list and close the dialog box"
 msgstr "タスクを保存してダイアログボックスを閉じます"
 
-#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:8
 #, fuzzy
 msgid "Se_nd list to other..."
 msgstr "他へコンタクトを送信(_n)..."
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:9
 #, fuzzy
 msgid "Send _message to list..."
 msgstr "コンタクトへメッセージを送信(_m)..."
@@ -10461,22 +12281,22 @@ msgstr "コンタクトへメッセージを送信(_m)..."
 msgid "Cancel Mee_ting"
 msgstr "打合せをキャンセル"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#: ui/evolution-event-editor.xml.h:2
 #, fuzzy
 msgid "Cancel the meeting for this item"
 msgstr "このフォルダの設定を変更します"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 #, fuzzy
 msgid "Forward as i_Calendar"
 msgstr "vCalenderとして転送(_C) (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 #, fuzzy
 msgid "Forward this item via email"
 msgstr "このメッセージを転送します"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:5
 msgid "Obtain the latest meeting information"
 msgstr ""
 
@@ -10491,16 +12311,11 @@ msgstr ""
 msgid "Schedule _Meeting"
 msgstr "打合せのスケジュール(_M)"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 #, fuzzy
 msgid "Schedule a meeting for this item"
 msgstr "打合せのスケジュール"
 
-#: 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-executive-summary.xml.h:1
 msgid "Customise My Evolution"
 msgstr "My Evolution のカスタマイズ"
@@ -10514,68 +12329,65 @@ msgid "Cancel the current mail operation"
 msgstr "現在のメール操作をキャンセルします"
 
 #: ui/evolution-mail-global.xml.h:3
-msgid "Compose"
-msgstr "作成"
-
-#: ui/evolution-mail-global.xml.h:4
 #, fuzzy
 msgid "Compose _New Message"
 msgstr "メッセージを作成します"
 
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:4
 msgid "Create or edit mail accounts and other preferences"
 msgstr "メールアカウントと他の設定を作成/編集します"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr "新規メールをフィルタするルールの作成/編集をします"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit virtual folder definitions"
 msgstr "仮想フォルダの定義を作成/編集します"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
 msgstr "ゴミ箱を空にする(_T)"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget _Passwords"
 msgstr "パスワードの紛失(_P)"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "記憶したパスワードを忘れた場合に再び表示します"
 
-#: ui/evolution-mail-global.xml.h:11
-msgid "Manage _Subscriptions..."
-msgstr "定期購読管理(_S)..."
+#: ui/evolution-mail-global.xml.h:10
+#, fuzzy
+msgid "New Message"
+msgstr "次のメッセージへ移動します"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:11
 msgid "Open a window for composing a mail message"
 msgstr "メールを作成するためにウィンドウを開きます"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "すべてのフォルダから削除マークされたメッセージを永久的に削除します"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:13
 msgid "Send / Receive"
 msgstr "送受信"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:14
 msgid "Send queued mail and retrieve new mail"
 msgstr "キューにあるメールを送信して新規メールを取得します"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:15
 #, fuzzy
 msgid "Show message preview window"
 msgstr "通常のメッセージを表示します"
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:16
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "サーバ上のフォルダの購読/購読解除をします"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:17
 msgid "Virtual Folder _Editor..."
 msgstr "仮想フォルダエディタ(_E)..."
 
@@ -10600,92 +12412,103 @@ msgstr "プレビュー"
 msgid "_Send / Receive"
 msgstr "送受信(_S)"
 
+#: ui/evolution-mail-global.xml.h:24
+#, fuzzy
+msgid "_Subscribe to Folders..."
+msgstr "フォルダ \"%s\" を購読中"
+
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "このフォルダの設定を変更します"
 
-#: ui/evolution-mail-list.xml.h:3
+#: ui/evolution-mail-list.xml.h:2
 #, fuzzy
 msgid "Copy selected messages"
 msgstr "選択されたメッセージを隠す(_e)"
 
-#: ui/evolution-mail-list.xml.h:5
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Cu_t"
+msgstr "切り取り"
+
+#: ui/evolution-mail-list.xml.h:4
 #, fuzzy
 msgid "Cut selected messages"
 msgstr "選択されたメッセージを印刷します"
 
-#: ui/evolution-mail-list.xml.h:6
+#: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "選択されたメッセージを隠す(_e)"
 
-#: ui/evolution-mail-list.xml.h:7
+#: ui/evolution-mail-list.xml.h:6
 msgid "Hide _Deleted Messages"
 msgstr "削除されたメッセージを隠す(_D)"
 
-#: ui/evolution-mail-list.xml.h:8
+#: ui/evolution-mail-list.xml.h:7
 #, fuzzy
 msgid "Hide _Read Messages"
 msgstr "既読メッセージを隠す(_R)"
 
-#: ui/evolution-mail-list.xml.h:9
+#: ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr "表示しているメッセージではなく削除されたメッセージを隠します"
 
-#: ui/evolution-mail-list.xml.h:10
+#: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as R_ead"
 msgstr "既読としてすべてマーク(_e)"
 
-#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr "既読としてすべてのメッセージをマークします"
 
-#: ui/evolution-mail-list.xml.h:13
+#: ui/evolution-mail-list.xml.h:11
 #, fuzzy
 msgid "Paste message in the clipboard"
 msgstr "クリップボードへ貼り付けます"
 
-#: ui/evolution-mail-list.xml.h:14
+#: ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "このフォルダから削除マークされたメッセージを永久的に削除します"
 
-#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "すべて選択(_A)"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
 msgstr "スレッドを選択(_T)"
 
-#: ui/evolution-mail-list.xml.h:17
+#: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr "現在選択されていないメッセージだけをすべて選択します"
 
-#: ui/evolution-mail-list.xml.h:18
+#: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr "選択されたメッセージと同じスレッドのメッセージをすべて選択します"
 
-#: ui/evolution-mail-list.xml.h:19
+#: ui/evolution-mail-list.xml.h:17
 msgid "Select all visible messages"
 msgstr "すべてのメッセージを選択します"
 
-#: ui/evolution-mail-list.xml.h:20
-msgid "Show _All"
-msgstr "すべて表示(_A)"
+#: ui/evolution-mail-list.xml.h:18
+#, fuzzy
+msgid "Sh_ow Hidden Messages"
+msgstr "既読メッセージを隠す(_R)"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr "一時的に隠したメッセージを表示します"
 
-#: ui/evolution-mail-list.xml.h:22
+#: ui/evolution-mail-list.xml.h:20
 msgid "Temporarily hide all messages that have already been read"
 msgstr "すべての既読メッセージを一時的に隠します"
 
-#: ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-list.xml.h:21
 msgid "Temporarily hide the selected messages"
 msgstr "選択されたメッセージを一時的に隠します"
 
-#: ui/evolution-mail-list.xml.h:24
+#: ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
 msgstr "メッセージリストをスレッド化します"
 
@@ -10693,7 +12516,7 @@ msgstr "メッセージリストをスレッド化します"
 msgid "_Expunge"
 msgstr "抹消(_E)"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
 msgid "_Folder"
 msgstr "フォルダ(_F)"
 
@@ -10701,11 +12524,11 @@ msgstr "フォルダ(_F)"
 msgid "_Invert Selection"
 msgstr "選択を反転(_I)"
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:29
 msgid "_Properties..."
 msgstr "プロパティ(_P)..."
 
-#: ui/evolution-mail-list.xml.h:29
+#: ui/evolution-mail-list.xml.h:30
 msgid "_Threaded Message List"
 msgstr "メッセージリストをスレッド化(_T)"
 
@@ -10931,7 +12754,8 @@ msgid "Open the selected message in the composer to re-send it"
 msgstr "選択されたメッセージをコンポーザで開き再送します"
 
 #: ui/evolution-mail-message.xml.h:58
-msgid "Previews the message to be printed"
+#, fuzzy
+msgid "Preview the message to be printed"
 msgstr "印刷されるメッセージのプレビューを表示します"
 
 #: ui/evolution-mail-message.xml.h:59
@@ -10953,39 +12777,35 @@ msgstr "前のメッセージへ移動します"
 msgid "Previous Unread Message"
 msgstr "前のメッセージへ移動します"
 
-#: ui/evolution-mail-message.xml.h:64
-msgid "Print Message..."
-msgstr "メッセージを印刷..."
-
 #: ui/evolution-mail-message.xml.h:65
-msgid "Print Preview..."
-msgstr "印刷プレビュー..."
-
-#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
 msgid "Print this message"
 msgstr "メッセージを印刷"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:66
 msgid "Reply"
 msgstr "返信"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply to All"
 msgstr "全員へ返信"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:70
 msgid "S_earch Message"
 msgstr "メッセージを検索(_e)"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:71
 msgid "Save the message as a text file"
 msgstr "テキストファイルへメッセージを保存します"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:72
 msgid "Search for text in the body of the displayed message"
 msgstr "表示されたメッセージ本体の含まれるテキストを検索します"
 
+#: ui/evolution-mail-message.xml.h:73
+msgid "Setup the page settings for your current printer"
+msgstr "現在のプリンタのページ設定を行います"
+
 #: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr "メールのソースを表示(_S)"
@@ -11026,67 +12846,51 @@ msgstr "受信者の仮想フォルダ(_R)..."
 msgid "VFolder on _Subject..."
 msgstr "件名の仮想フォルダ(_S)..."
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Apply Filters"
 msgstr "フィルタ適用(_A)"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Copy to Folder"
 msgstr "フォルダへコピー(_C)"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "_Create Filter From Message"
 msgstr "メッセージからフィルタを作成(_C)"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Forward Message"
 msgstr "メッセージを転送(_F)"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Message Display"
 msgstr "メッセージ表示(_M)"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Move to Folder"
 msgstr "フォルダへ移動(_M)"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Normal Display"
 msgstr "通常表示(_N)"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Open Message"
 msgstr "メッセージを開く(_O)"
 
-#: ui/evolution-mail-message.xml.h:93
-msgid "_Re-send Message"
-msgstr "メッセージを再送信(_R)"
-
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "このウィンドウを閉じます"
 
-#: 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-mail-messagedisplay.xml.h:5
 #: 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
+#: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "閉じる(_C)"
 
-#: ui/evolution-mail-messagedisplay.xml.h:12
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+#: ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
 msgid "_View"
 msgstr "表示(_V)"
 
@@ -11151,11 +12955,6 @@ msgstr "S/MIME による暗号化"
 msgid "S/MIME Sign"
 msgstr "S/MIME 署名"
 
-#: 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 "別名で保存"
@@ -11284,7 +13083,7 @@ msgstr "返信先フィールド(_R)"
 msgid "_Security"
 msgstr "セキュリティ(_S)"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
@@ -11318,15 +13117,28 @@ msgstr "購読解除"
 
 #: ui/evolution-task-editor.xml.h:1
 #, fuzzy
+msgid "Assign Task"
+msgstr "タスクの割当て(_n) (FIXME)"
+
+#: ui/evolution-task-editor.xml.h:2
+msgid "Assign this task to others"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
 msgid "Cancel Task"
 msgstr "キャンセル"
 
-#: ui/evolution-task-editor.xml.h:3
+#: ui/evolution-task-editor.xml.h:4
 #, fuzzy
-msgid "Delegate Task"
-msgstr "このタスクを削除します"
+msgid "Cancel this task"
+msgstr "キャンセル"
 
 #: ui/evolution-task-editor.xml.h:7
+msgid "Obtain the latest task information"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:8
 #, fuzzy
 msgid "Re_fresh Task"
 msgstr "リストを更新"
@@ -11335,43 +13147,31 @@ msgstr "リストを更新"
 msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 #, fuzzy
 msgid "Copy selected task"
 msgstr "選択したタスクを削除します"
 
-#: ui/evolution-tasks.xml.h:4
-msgid "Create a new task"
-msgstr "新規タスクを作成します"
-
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:7
 #, fuzzy
 msgid "Cut selected task"
 msgstr "選択したタスクを削除します"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:9
 msgid "Delete selected tasks"
 msgstr "選択したタスクを削除します"
 
-#: ui/evolution-tasks.xml.h:8
-msgid "New Task"
-msgstr "新規タスク"
-
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:12
 #, 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:13
 #, fuzzy
-msgid "Tasks Settings"
+msgid "Tasks Settings..."
 msgstr "メール設定(_M)..."
 
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-tasks.xml.h:17
 msgid "_Task"
 msgstr "タスク(_T)"
 
@@ -11403,175 +13203,155 @@ msgstr "ショートカットバーにこのフォルダのリンクを作成します"
 msgid "Create a new folder"
 msgstr "新規フォルダを作成します"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:10
 msgid "Delete this folder"
 msgstr "このフォルダを削除します"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:11
 msgid "Display a different folder"
 msgstr "別のフォルダを表示します"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:12
 msgid "E_xit"
 msgstr "終了(_x)"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:13
 msgid "Evolution _FAQ"
 msgstr "Evolution FAQ(_F)"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:14
 msgid "Evolution _Window"
 msgstr "Evolution ウィンドウ(_W)"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:15
 msgid "Exit the program"
 msgstr "プログラムを終了します"
 
-#: ui/evolution.xml.h:19
-msgid "Getting _Started"
-msgstr "始めに(_S)"
-
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:16
 msgid "Import an external file format"
 msgstr "外部ファイル形式をインポートします"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:18
 msgid "Move this folder to another place"
 msgstr "別の場所へこのフォルダを移動します"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:20
 msgid "Open in New _Window"
 msgstr "新規ウィンドウで開く(_W)"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:21
 msgid "Open this folder in an other window"
 msgstr "別のウィンドウでこのフォルダを開きます"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:22
 msgid "Show information about Evolution"
 msgstr "Evolution についての情報を表示します"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:23
 msgid "Submit Bug Report"
 msgstr "不具合報告の提出"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:24
 msgid "Submit _Bug Report"
 msgstr "不具合報告の提出(_B)"
 
-#: ui/evolution.xml.h:29
-msgid "Submit bug report using Bug Buddy."
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug Buddyを使って不具合報告を提出します"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:26
 msgid "Toggle"
 msgstr "切替え"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the folder bar"
 msgstr "フォルダバーを表示するかどうか切替えます"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:28
 msgid "Toggle whether to show the shortcut bar"
 msgstr "ショートカットバーを表示するかどうか切替えます"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:29
 msgid "Toggle whether we are working offline."
 msgstr "オフライン作業かどうかを切替えます"
 
-#: ui/evolution.xml.h:34
-msgid "Using the C_ontact Manager"
-msgstr "コンタクトマネージャを使う(_o)"
-
-#: ui/evolution.xml.h:35
-msgid "Using the _Calendar"
-msgstr "カレンダを使う(_C)"
-
-#: ui/evolution.xml.h:36
-msgid "Using the _Mailer"
-msgstr "メーラを使う(_M)"
-
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:30
 msgid "View the selected folder"
 msgstr "選択されたフォルダを表示します"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:32
 msgid "_About Evolution..."
 msgstr "Evolution について(_A)..."
 
-#: ui/evolution.xml.h:41
-msgid "_Appointment (FIXME)"
-msgstr "約束(_A) (FIXME)"
-
-#: ui/evolution.xml.h:43
-msgid "_Contact (FIXME)"
-msgstr "コンタクト(_C) (FIXME)"
-
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:34
 msgid "_Copy..."
 msgstr "コピー(_C)..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:39
 msgid "_Folder Bar"
 msgstr "フォルダバー(_F)"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:40
 msgid "_Go to Folder..."
 msgstr "フォルダへ移動(_G)..."
 
-#: ui/evolution.xml.h:52
-msgid "_Import file..."
+#: ui/evolution.xml.h:42
+#, fuzzy
+msgid "_Import File..."
 msgstr "ファイルをインポート(_I)..."
 
-#: ui/evolution.xml.h:53
-msgid "_Index"
-msgstr "インデックス(_I)"
-
-#: ui/evolution.xml.h:54
-msgid "_Mail message"
-msgstr "メッセージをメール(_M)"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:43
 msgid "_Move..."
 msgstr "移動(_M)..."
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:44
 msgid "_New"
 msgstr "新規(_N)"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:45
 msgid "_New Folder"
 msgstr "新規フォルダ(_N)"
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:46
 msgid "_Rename..."
 msgstr "リネーム(_R)..."
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:47
 #, fuzzy
 msgid "_Shortcut"
 msgstr "ショートカットバー(_S)"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr "ショートカットバー(_S)"
 
-#: ui/evolution.xml.h:61
-msgid "_Task (FIXME)"
-msgstr "タスク(_T) (FIXME)"
-
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:50
 msgid "_Work Offline"
 msgstr "オフライン作業(_W)"
 
 #: ui/my-evolution.xml.h:1
 #, fuzzy
-msgid "Change the settings for My Evolution"
+msgid "Change the settings for the summary"
 msgstr "このフォルダの設定を変更します"
 
 #: ui/my-evolution.xml.h:4
 #, fuzzy
-msgid "_My Evolution Settings..."
+msgid "Print summary"
+msgstr "メールサマリ"
+
+#: ui/my-evolution.xml.h:5
+#, fuzzy
+msgid "Reload"
+msgstr "既読"
+
+#: ui/my-evolution.xml.h:6
+msgid "Reload the view"
+msgstr ""
+
+#: ui/my-evolution.xml.h:8
+#, fuzzy
+msgid "_Summary Settings..."
 msgstr "メール設定(_M)..."
 
 #: views/addressbook/galview.xml.h:1
@@ -11606,6 +13386,30 @@ msgstr "メッセージ"
 msgid "With Category"
 msgstr "カテゴリ"
 
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "ファイルを選択"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "セクション:"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"タイムゾーン: "
+
+#: widgets/e-timezone-dialog/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 ""
+
 #. 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
@@ -11613,10 +13417,6 @@ msgstr "カテゴリ"
 msgid "%A, %B %d, %Y"
 msgstr "%Y年 %m月 %d日 %A"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
-msgid "Busy"
-msgstr "ビジー"
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "オフィスの外"
@@ -11689,7 +13489,7 @@ msgstr "すべての付き添い"
 msgid "_Current View"
 msgstr "現在の表示(_C)"
 
-#: widgets/menus/gal-view-menus.c:259
+#: widgets/menus/gal-view-menus.c:260
 msgid "Define Views"
 msgstr "表示を定義"
 
@@ -11699,19 +13499,20 @@ msgstr "表示を定義"
 msgid "MTWTFSS"
 msgstr "MTWTFSS"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1071
+msgid "%B %Y"
+msgstr "%Y %B"
+
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
 msgid "Now"
 msgstr "今"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
 msgid "Today"
 msgstr "今日"
 
-#: widgets/misc/e-cell-date-edit.c:248
-msgid "OK"
-msgstr "OK"
-
-#: widgets/misc/e-cell-date-edit.c:731
+#: widgets/misc/e-cell-date-edit.c:732
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "時間はフォーマットに入れなければなりません: %s"
@@ -11800,35 +13601,33 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:157
+#: widgets/misc/e-filter-bar.c:158
 #, fuzzy
 msgid "Search Editor"
 msgstr "コンタクトエディタ"
 
-#: widgets/misc/e-filter-bar.c:173
+#: widgets/misc/e-filter-bar.c:174
 msgid "Save Search"
 msgstr "検索を保存"
 
-#: widgets/misc/e-filter-bar.c:241
-msgid "Advanced Search"
-msgstr "上級検索"
+#: widgets/misc/e-filter-bar.h:94
+#, fuzzy
+msgid "Add to Saved Searches"
+msgstr "検索を保存"
+
+#: widgets/misc/e-filter-bar.h:95
+#, fuzzy
+msgid "Clear"
+msgstr "クリア(_l)"
 
 #: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "すべて表示"
 
-#: widgets/misc/e-filter-bar.h:104
-msgid "Advanced..."
-msgstr "詳細..."
-
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "情報"
 
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "警告"
-
 #: widgets/misc/e-messagebox.c:166
 msgid "Error"
 msgstr "エラー"
@@ -11846,10 +13645,15 @@ msgstr "メッセージ"
 msgid "Don't show this message again."
 msgstr "このメッセージを二度と表示しない"
 
-#: widgets/misc/e-search-bar.c:155
+#: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr "検索(_c)"
 
+#: widgets/misc/e-search-bar.c:460
+#, fuzzy
+msgid "Find Now"
+msgstr "検索"
+
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 msgid "The Personal Addressbook Server"
 msgstr "パーソナルアドレス帳サーバ"
@@ -11870,6 +13674,302 @@ msgstr "init_corba(): GNOME を初期化することが出来ませんでした"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo を初期化することが出来ませんでした"
 
+#~ msgid "RDF Summary"
+#~ msgstr "RDF サマリ"
+
+#~ msgid "LDAP Server"
+#~ msgstr "LDAP サーバ"
+
+#~ msgid "Unknown addressbook type"
+#~ msgstr "未知のアドレス帳種別"
+
+#~ msgid "None (anonymous mode)"
+#~ msgstr "なし (匿名モード)"
+
+#~ msgid "Unknown auth type"
+#~ msgstr "未知の認証種別"
+
+#~ msgid "Subtree"
+#~ msgstr "すべてのエントリ"
+
+#~ msgid "Unknown scope type"
+#~ msgstr "未知のスコープ種別"
+
+#~ msgid "Bind DN:"
+#~ msgstr "バインドDN:"
+
+#~ msgid "FIXME Bind DN Help text here"
+#~ msgstr "FIXME バインド DN のヘルプテキストです"
+
+#~ msgid "FIXME Host help text here."
+#~ msgstr "FIXME ホストヘルプテキストです"
+
+#~ msgid "Root DN:"
+#~ msgstr "ルート DN:"
+
+#~ msgid "FIXME Root DN help text here."
+#~ msgstr "FIXME ルート DN ヘルプテキストです"
+
+#~ msgid "FIXME Port help text here."
+#~ msgstr "FIXME ポートヘルプテキストです"
+
+#~ msgid "Authentication:"
+#~ msgstr "認証方式:"
+
+#~ msgid "Advanced LDAP Options"
+#~ msgstr "上級 LDAP オプション"
+
+#~ msgid "FIXME Path Help text here"
+#~ msgstr "FIXME パスヘルプテキストです"
+
+#~ msgid "Create path if it doesn't exist."
+#~ msgstr "存在しない場合パスを作成する"
+
+#~ msgid ""
+#~ "Select the kind of addressbook you have, and enter the relevant "
+#~ "information about it."
+#~ msgstr ""
+#~ "あなたの持つアドレス帳を選択し, それについての関連した情報を入力してくださ"
+#~ "い"
+
+#~ msgid "FIXME Name help text here"
+#~ msgstr "FIXME 名前ヘルプテキストです"
+
+#~ msgid "FIXME Description help text here"
+#~ msgstr "FIXME 説明ヘルプテキストです"
+
+#~ msgid "Name"
+#~ msgstr "名前"
+
+#~ msgid "URI"
+#~ msgstr "URI"
+
+#~ msgid "Enter password for %s"
+#~ msgstr "%s のパスワードを入力してください"
+
+#, fuzzy
+#~ msgid "Category contains"
+#~ msgstr "名前が次のものを含む"
+
+#, fuzzy
+#~ msgid "Select name from _folder:"
+#~ msgstr "次から名前を選択:"
+
+#~ msgid "USA"
+#~ msgstr "アメリカ"
+
+#, fuzzy
+#~ msgid "Canceled"
+#~ msgstr "キャンセルしました"
+
+#~ msgid "Transparent"
+#~ msgstr "透明"
+
+#~ msgid "Opaque"
+#~ msgstr "不透明"
+
+#~ msgid ""
+#~ "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+#~ msgstr ""
+#~ "分類を '一般', '私的', '極秘' あるいは 'なし' を選択しなければなりません"
+
+#~ msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+#~ msgstr "透明度は '透明', '不透明', あるいは 'なし' でなければなりません"
+
+#~ msgid "Beep when alarm windows appear."
+#~ msgstr "アラームウィンドウが現れた時 BEEP 音を鳴らす"
+
+#~ msgid "Calendar Preferences"
+#~ msgstr "カレンダの設定"
+
+#, fuzzy
+#~ msgid "Date Navigator"
+#~ msgstr "日付操作オプション"
+
+#~ msgid "Defaults"
+#~ msgstr "デフォルト"
+
+#~ msgid "Remind me of all appointments"
+#~ msgstr "すべての約束を催促する"
+
+#~ msgid "minutes before they occur."
+#~ msgstr "分前"
+
+#, fuzzy
+#~ msgid "Delegated From:"
+#~ msgstr "削除"
+
+#, fuzzy
+#~ msgid "No one"
+#~ msgstr "ノート"
+
+#~ msgid "Task"
+#~ msgstr "タスク"
+
+#~ msgid "% Comp_lete:"
+#~ msgstr "% 完了(_l):"
+
+#~ msgid "Transparency"
+#~ msgstr "透明度"
+
+#, fuzzy
+#~ msgid "The message is not understandable."
+#~ msgstr "このメッセージは現在利用出来ません"
+
+#, fuzzy
+#~ msgid "The message does not appear to be properly formed"
+#~ msgstr "フォルダで回復不能なエラーが発生したようです"
+
+#~ msgid "All"
+#~ msgstr "すべて"
+
+#~ msgid "Edit"
+#~ msgstr "編集"
+
+#~ msgid "Resend"
+#~ msgstr "再送信"
+
+#~ msgid "Evolution Account Manager"
+#~ msgstr "Evolution アカウントマネージャ"
+
+#~ msgid "On %s, %s wrote:"
+#~ msgstr "On %s, %s wrote:"
+
+#~ msgid "Receiving"
+#~ msgstr "受信中"
+
+#~ msgid "Store"
+#~ msgstr "記録"
+
+#~ msgid "Display folders starting with:"
+#~ msgstr "表示するフォルダを開始する:"
+
+#~ msgid "Getting store for \"%s\""
+#~ msgstr "\"%s\" の記録を取得中"
+
+#, fuzzy
+#~ msgid "My Evolution Settings"
+#~ msgstr "My Evolution"
+
+#, fuzzy
+#~ msgid "%A, %d %B %Y"
+#~ msgstr "%Y/%B/%e %A"
+
+#, fuzzy
+#~ msgid "Print My Evolution"
+#~ msgstr "My Evolution"
+
+#, fuzzy
+#~ msgid "Printing of My Evolution failed"
+#~ msgstr "メッセージの印刷に失敗しました"
+
+#~ msgid "My Evolution"
+#~ msgstr "My Evolution"
+
+#~ msgid "New contact"
+#~ msgstr "新規コンタクト"
+
+#, fuzzy
+#~ msgid "_Contact Group"
+#~ msgstr "コンタクト(_C)"
+
+#~ msgid "Go to present time"
+#~ msgstr "現在の時間へ移動します"
+
+#~ msgid "W_ork Week"
+#~ msgstr "週間労働時間(_o)"
+
+#~ msgid "_Day"
+#~ msgstr "日(_D)"
+
+#~ msgid "_Week"
+#~ msgstr "週(_W)"
+
+#~ msgid "Close this appointment"
+#~ msgstr "この約束を閉じます"
+
+#, fuzzy
+#~ msgid "Print S_etup"
+#~ msgstr "プリンタの設定"
+
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "約束を保存してダイアログボックスを閉じます"
+
+#, fuzzy
+#~ msgid "_Action"
+#~ msgstr "動作(_A)"
+
+#~ msgid "Help"
+#~ msgstr "ヘルプ"
+
+#~ msgid "Se_nd contact to other..."
+#~ msgstr "他へコンタクトを送信(_n)..."
+
+#~ msgid "See online help"
+#~ msgstr "オンラインヘルプを参照してください"
+
+#~ msgid "Compose"
+#~ msgstr "作成"
+
+#~ msgid "Manage _Subscriptions..."
+#~ msgstr "定期購読管理(_S)..."
+
+#~ msgid "Show _All"
+#~ msgstr "すべて表示(_A)"
+
+#~ msgid "Print Preview..."
+#~ msgstr "印刷プレビュー..."
+
+#~ msgid "_Re-send Message"
+#~ msgstr "メッセージを再送信(_R)"
+
+#~ msgid "Customi_ze Toolbars..."
+#~ msgstr "ツールバーのカスタマイズ(_z)..."
+
+#~ msgid "Customize"
+#~ msgstr "カスタマイズ"
+
+#~ msgid "Customize toolbars"
+#~ msgstr "ツールバーをカスタマイズします"
+
+#, fuzzy
+#~ msgid "Delegate Task"
+#~ msgstr "このタスクを削除します"
+
+#~ msgid "Save task as something else"
+#~ msgstr "別のものとしてタスクを保存します"
+
+#~ msgid "Getting _Started"
+#~ msgstr "始めに(_S)"
+
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "コンタクトマネージャを使う(_o)"
+
+#~ msgid "Using the _Calendar"
+#~ msgstr "カレンダを使う(_C)"
+
+#~ msgid "Using the _Mailer"
+#~ msgstr "メーラを使う(_M)"
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "約束(_A) (FIXME)"
+
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "コンタクト(_C) (FIXME)"
+
+#~ msgid "_Index"
+#~ msgstr "インデックス(_I)"
+
+#~ msgid "_Mail message"
+#~ msgstr "メッセージをメール(_M)"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "タスク(_T) (FIXME)"
+
+#, fuzzy
+#~ msgid "_My Evolution Settings..."
+#~ msgstr "メール設定(_M)..."
+
 #, fuzzy
 #~ msgid "Set task view preferences"
 #~ msgstr "タスクの設定..."
@@ -11905,9 +14005,6 @@ msgstr "init_bonobo(): Bonobo を初期化することが出来ませんでした"
 #~ msgid "Alarms timeout after"
 #~ msgstr "指定時間後にアラームがタイムアウト"
 
-#~ msgid "Colors"
-#~ msgstr "カラー"
-
 #~ msgid "Enable snoozing for"
 #~ msgstr "アラーム停止を有効"
 
@@ -11926,9 +14023,6 @@ msgstr "init_bonobo(): Bonobo を初期化することが出来ませんでした"
 #~ msgid "Overdue Items:"
 #~ msgstr "期限を過ぎたアイテム:"
 
-#~ msgid "TaskPad"
-#~ msgstr "タスクパッド"
-
 #~ msgid "Time Until Due"
 #~ msgstr "期限までの時間"
 
@@ -11944,9 +14038,6 @@ msgstr "init_bonobo(): Bonobo を初期化することが出来ませんでした"
 #~ msgid "Edit this task"
 #~ msgstr "このタスクを編集します"
 
-#~ msgid "Go to Today"
-#~ msgstr "今日へ移動"
-
 #~ msgid "Delete all Occurrences"
 #~ msgstr "すべての出来事を削除"
 
@@ -12006,12 +14097,6 @@ msgstr "init_bonobo(): Bonobo を初期化することが出来ませんでした"
 #~ "発表\n"
 #~ "イベント"
 
-#~ msgid "Summary contains"
-#~ msgstr "サマリが次のものを含む"
-
-#~ msgid "Comment contains"
-#~ msgstr "コメントが次のものを含む"
-
 #~ msgid "Has category"
 #~ msgstr "次のカテゴリを持つ"
 
@@ -12044,7 +14129,8 @@ msgstr "init_bonobo(): Bonobo を初期化することが出来ませんでした"
 #~ msgstr "そのファイルは存在しますが，読み取り可能ではありません"
 
 #~ msgid "That file appeared accesible but open(2) failed."
-#~ msgstr "そのファイルはアクセス可能のように見えますが，open(2) は失敗しました"
+#~ msgstr ""
+#~ "そのファイルはアクセス可能のように見えますが，open(2) は失敗しました"
 
 #~ msgid ""
 #~ "The file is very large (more than 100K).\n"
@@ -12070,9 +14156,6 @@ msgstr "init_bonobo(): Bonobo を初期化することが出来ませんでした"
 #~ 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"
@@ -12134,9 +14217,6 @@ msgstr "init_bonobo(): Bonobo を初期化することが出来ませんでした"
 #~ msgid "Factory for the RDF summary."
 #~ msgstr "RDF サマリのためのファクトリ"
 
-#~ msgid "RDF Summary"
-#~ msgstr "RDF サマリ"
-
 #~ msgid "Factory for the test bonobo component."
 #~ msgstr "テスト Bonobo コンポーネントのためのファクトリ"
 
@@ -12173,9 +14253,6 @@ msgstr "init_bonobo(): Bonobo を初期化することが出来ませんでした"
 #~ msgid "Renaming old folder and opening"
 #~ msgstr "古いフォルダをリネームしてオープン中"
 
-#~ msgid "Creating new folder"
-#~ msgstr "新規フォルダを作成中"
-
 #~ msgid "Copying messages"
 #~ msgstr "メッセージをコピー中"
 
@@ -12200,18 +14277,15 @@ msgstr "init_bonobo(): Bonobo を初期化することが出来ませんでした"
 #~ 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>"
+#~ "-----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>"
+#~ "-----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 "メッセージの送信者へ返信します"
@@ -12243,9 +14317,6 @@ msgstr "init_bonobo(): Bonobo を初期化することが出来ませんでした"
 #~ msgid "Create a new calendar"
 #~ msgstr "新規カレンダを作成します"
 
-#~ msgid "Day"
-#~ msgstr "日"
-
 #~ msgid "New _Event"
 #~ msgstr "新規イベント(_E)"
 
@@ -12258,9 +14329,6 @@ msgstr "init_bonobo(): Bonobo を初期化することが出来ませんでした"
 #~ msgid "Save calendar as something else"
 #~ msgstr "別のものとしてカレンダを保存します"
 
-#~ msgid "Week"
-#~ msgstr "週"
-
 #~ msgid "_Open Calendar"
 #~ msgstr "カレンダを開く(_O)"
 
@@ -12276,9 +14344,6 @@ msgstr "init_bonobo(): Bonobo を初期化することが出来ませんでした"
 #~ msgid "Address _Book... (FIXME)"
 #~ msgstr "アドレス帳(_B)... (FIXME)"
 
-#~ msgid "C_lear"
-#~ msgstr "クリア(_l)"
-
 #~ msgid "Chec_k Names (FIXME)"
 #~ msgstr "名前のチェック (_k) (FIXME)"
 
@@ -12315,9 +14380,6 @@ msgstr "init_bonobo(): Bonobo を初期化することが出来ませんでした"
 #~ msgid "Print S_etup..."
 #~ msgstr "プリンタの設定(_e)..."
 
-#~ msgid "Task _Request (FIXME)"
-#~ msgstr "タスク要求(_R) (FIXME)"
-
 #~ msgid "_About..."
 #~ msgstr "情報(_A)..."
 
@@ -12357,15 +14419,6 @@ msgstr "init_bonobo(): Bonobo を初期化することが出来ませんでした"
 #~ 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 "やり直し"
author	Ettore Perazzoli <ettore@src.gnome.org>	2001-08-23 07:18:14 +0800
committer	Ettore Perazzoli <ettore@src.gnome.org>	2001-08-23 07:18:14 +0800
commit	df73d86dcb9f2a9b2177d6694c68c0ebe432b364 (patch)
tree	badb87b38dc4b74df00899b45d774054672cc19a /po/ja.po
parent	d9e5feffa70559cb7ff8201c1493e0a0f2ca9af9 (diff)
download	gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.tar gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.tar.gz gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.tar.bz2 gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.tar.lz gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.tar.xz gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.tar.zst gsoc2013-evolution-df73d86dcb9f2a9b2177d6694c68c0ebe432b364.zip