Updated Japanese translation.

* ja.po: Updated Japanese translation. svn path=/trunk/; revision=8899
author: Akira Tagoh <tagoh@src.gnome.org> 2001-03-23 03:31:38 +0800
committer: Akira Tagoh <tagoh@src.gnome.org> 2001-03-23 03:31:38 +0800
commit: 65cb1664da2ba2bb678ee78b8dff1fd01b297cc0 (patch)
tree: 96c39d5bd77f5f2010083900107516790b6c7b90 /po/ja.po
parent: 81742b667755e307683e6178d073ee8f31661d5c (diff)
download: gsoc2013-evolution-65cb1664da2ba2bb678ee78b8dff1fd01b297cc0.tar
gsoc2013-evolution-65cb1664da2ba2bb678ee78b8dff1fd01b297cc0.tar.gz
gsoc2013-evolution-65cb1664da2ba2bb678ee78b8dff1fd01b297cc0.tar.bz2
gsoc2013-evolution-65cb1664da2ba2bb678ee78b8dff1fd01b297cc0.tar.lz
gsoc2013-evolution-65cb1664da2ba2bb678ee78b8dff1fd01b297cc0.tar.xz
gsoc2013-evolution-65cb1664da2ba2bb678ee78b8dff1fd01b297cc0.tar.zst
gsoc2013-evolution-65cb1664da2ba2bb678ee78b8dff1fd01b297cc0.zip
1 files changed, 2000 insertions, 1680 deletions
diff --git a/po/ja.po b/po/ja.po
index 79fe86d2e0..b59e7c6a53 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -2,23 +2,22 @@
 # Copyright (C) 2000-2001 Free Software Foundation, Inc.
 # Akira TAGOH <tagoh@gnome.gr.jp>, 2000-2001.
 #
-#: camel/providers/smtp/camel-smtp-transport.c:343
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution CVS-20010216\n"
-"POT-Creation-Date: 2001-02-16 18:32-0500\n"
-"PO-Revision-Date: 2001-02-16 19:48-0500\n"
+"Project-Id-Version: evolution CVS-20010323\n"
+"POT-Creation-Date: 2001-03-23 02:56+0900\n"
+"PO-Revision-Date: 2001-03-23 04:30+0900\n"
 "Last-Translator: Akira TAGOH <tagoh@gnome.gr.jp>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3255
 msgid "Card: "
 msgstr "名刺: "
 
-#: addressbook/backend/ebook/e-card.c:3055
+#: addressbook/backend/ebook/e-card.c:3257
 msgid ""
 "\n"
 "Name: "
@@ -26,7 +25,7 @@ msgstr ""
 "\n"
 "名前: "
 
-#: addressbook/backend/ebook/e-card.c:3056
+#: addressbook/backend/ebook/e-card.c:3258
 msgid ""
 "\n"
 "  Prefix:     "
@@ -34,19 +33,21 @@ msgstr ""
 "\n"
 "  敬称(前つけ):     "
 
-#: addressbook/backend/ebook/e-card.c:3057
+#: addressbook/backend/ebook/e-card.c:3259
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
+"\n"
+"  姓:      "
 
-#: addressbook/backend/ebook/e-card.c:3058
+#: addressbook/backend/ebook/e-card.c:3260
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3059
+#: addressbook/backend/ebook/e-card.c:3261
 msgid ""
 "\n"
 "  Family:     "
@@ -54,7 +55,7 @@ msgstr ""
 "\n"
 "  ファミリー名:     "
 
-#: addressbook/backend/ebook/e-card.c:3060
+#: addressbook/backend/ebook/e-card.c:3262
 msgid ""
 "\n"
 "  Suffix:     "
@@ -62,7 +63,7 @@ msgstr ""
 "\n"
 "  敬称(後つけ):     "
 
-#: addressbook/backend/ebook/e-card.c:3074
+#: addressbook/backend/ebook/e-card.c:3276
 msgid ""
 "\n"
 "Birth Date: "
@@ -70,7 +71,7 @@ msgstr ""
 "\n"
 "誕生日: "
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3287
 msgid ""
 "\n"
 "Address:"
@@ -78,7 +79,7 @@ msgstr ""
 "\n"
 "住所:"
 
-#: addressbook/backend/ebook/e-card.c:3087
+#: addressbook/backend/ebook/e-card.c:3289
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -86,7 +87,7 @@ msgstr ""
 "\n"
 "郵便番号:  "
 
-#: addressbook/backend/ebook/e-card.c:3088
+#: addressbook/backend/ebook/e-card.c:3290
 msgid ""
 "\n"
 "  Ext:         "
@@ -94,25 +95,25 @@ msgstr ""
 "\n"
 "  "
 
-#: addressbook/backend/ebook/e-card.c:3089
+#: addressbook/backend/ebook/e-card.c:3291
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3090
+#: addressbook/backend/ebook/e-card.c:3292
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3091
+#: addressbook/backend/ebook/e-card.c:3293
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3092
+#: addressbook/backend/ebook/e-card.c:3294
 msgid ""
 "\n"
 "  Postal Code: "
@@ -120,7 +121,7 @@ msgstr ""
 "\n"
 "  郵便番号: "
 
-#: addressbook/backend/ebook/e-card.c:3093
+#: addressbook/backend/ebook/e-card.c:3295
 msgid ""
 "\n"
 "  Country:     "
@@ -128,13 +129,13 @@ msgstr ""
 "\n"
 "  国:       "
 
-#: addressbook/backend/ebook/e-card.c:3106
+#: addressbook/backend/ebook/e-card.c:3308
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3118
+#: addressbook/backend/ebook/e-card.c:3320
 msgid ""
 "\n"
 "Telephones:\n"
@@ -142,7 +143,7 @@ msgstr ""
 "\n"
 "電話番号:\n"
 
-#: addressbook/backend/ebook/e-card.c:3121
+#: addressbook/backend/ebook/e-card.c:3323
 msgid ""
 "\n"
 "Telephone:"
@@ -150,7 +151,7 @@ msgstr ""
 "\n"
 "電話番号:"
 
-#: addressbook/backend/ebook/e-card.c:3145
+#: addressbook/backend/ebook/e-card.c:3347
 msgid ""
 "\n"
 "E-mail:\n"
@@ -158,7 +159,7 @@ msgstr ""
 "\n"
 "メール:\n"
 
-#: addressbook/backend/ebook/e-card.c:3148
+#: addressbook/backend/ebook/e-card.c:3350
 msgid ""
 "\n"
 "E-mail:"
@@ -166,7 +167,7 @@ msgstr ""
 "\n"
 "メール:"
 
-#: addressbook/backend/ebook/e-card.c:3167
+#: addressbook/backend/ebook/e-card.c:3369
 msgid ""
 "\n"
 "Mailer: "
@@ -174,7 +175,7 @@ msgstr ""
 "\n"
 "メーラ: "
 
-#: addressbook/backend/ebook/e-card.c:3173
+#: addressbook/backend/ebook/e-card.c:3375
 msgid ""
 "\n"
 "Time Zone: "
@@ -182,7 +183,7 @@ msgstr ""
 "\n"
 "タイムゾーン: "
 
-#: addressbook/backend/ebook/e-card.c:3181
+#: addressbook/backend/ebook/e-card.c:3383
 msgid ""
 "\n"
 "Geo Location: "
@@ -190,7 +191,7 @@ msgstr ""
 "\n"
 "経緯: "
 
-#: addressbook/backend/ebook/e-card.c:3185
+#: addressbook/backend/ebook/e-card.c:3387
 msgid ""
 "\n"
 "Business Role: "
@@ -198,7 +199,7 @@ msgstr ""
 "\n"
 "仕事の職務: "
 
-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3399
 msgid ""
 "\n"
 "Org: "
@@ -206,7 +207,7 @@ msgstr ""
 "\n"
 "組織: "
 
-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3400
 msgid ""
 "\n"
 "  Name:  "
@@ -214,7 +215,7 @@ msgstr ""
 "\n"
 "  社名:  "
 
-#: addressbook/backend/ebook/e-card.c:3199
+#: addressbook/backend/ebook/e-card.c:3401
 msgid ""
 "\n"
 "  Unit:  "
@@ -222,7 +223,7 @@ msgstr ""
 "\n"
 "  部署:  "
 
-#: addressbook/backend/ebook/e-card.c:3200
+#: addressbook/backend/ebook/e-card.c:3402
 msgid ""
 "\n"
 "  Unit2: "
@@ -230,7 +231,7 @@ msgstr ""
 "\n"
 "  部署2: "
 
-#: addressbook/backend/ebook/e-card.c:3201
+#: addressbook/backend/ebook/e-card.c:3403
 msgid ""
 "\n"
 "  Unit3: "
@@ -238,7 +239,7 @@ msgstr ""
 "\n"
 "  部署3: "
 
-#: addressbook/backend/ebook/e-card.c:3202
+#: addressbook/backend/ebook/e-card.c:3404
 msgid ""
 "\n"
 "  Unit4: "
@@ -246,7 +247,7 @@ msgstr ""
 "\n"
 "  部署4: "
 
-#: addressbook/backend/ebook/e-card.c:3206
+#: addressbook/backend/ebook/e-card.c:3408
 msgid ""
 "\n"
 "Categories: "
@@ -254,7 +255,7 @@ msgstr ""
 "\n"
 "業務分野: "
 
-#: addressbook/backend/ebook/e-card.c:3207
+#: addressbook/backend/ebook/e-card.c:3409
 msgid ""
 "\n"
 "Comment: "
@@ -272,13 +273,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3220
+#: addressbook/backend/ebook/e-card.c:3422
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3223
+#: addressbook/backend/ebook/e-card.c:3425
 msgid ""
 "\n"
 "Public Key: "
@@ -299,131 +300,13 @@ msgstr "Evolution へ GnomeCard ファイルをインポート"
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
 #: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:38
+#: addressbook/gui/component/addressbook-factory.c:39
 #: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:54
+#: calendar/conduits/todo/todo-conduit.c:965
+#: calendar/gui/alarm-notify/notify-main.c:68 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo の初期化が出来ませんでした"
 
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "無効"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "同期"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "パイロットからコピー"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "パイロットへコピー"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "パイロットからマージ"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "パイロットへマージ"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "オリジナル作成者:"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Evolution アドレス帳コンジット"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998-2000 the Free Software Foundation and Helix Code"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr "Evolution アドレス帳コンジットのための設定ユーティリティです\n"
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "同期動作"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "コンジットの状況"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"パイロットは設定されていません，初めに\n"
-"'パイロットリンクプロパティ' キャプレットを選択してください"
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "gnome-pilot デーモンに接続していません"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"gnome-pilot デーモンからパイロットリストを\n"
-"取得しようとした時にエラーが発生しました"
-
 #: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr "カーソルは読み込まれることが出来ませんでした\n"
@@ -450,14 +333,6 @@ msgid "Could not read pilot's Address application block"
 msgstr ""
 "パイロットのアドレスアプリケーションブロックを読み込むことが出来ませんでした"
 
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:1
-msgid "Configure the address conduit"
-msgstr "アドレス帳コンジットの設定"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Address conduit "
-msgstr "Evolution アドレス帳コンジット "
-
 #: addressbook/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/component/addressbook-config.glade.h:1
 #: calendar/gui/e-meeting-dialog.glade.h:1
@@ -520,7 +395,7 @@ msgid "Phone Types"
 msgstr "電話種別"
 
 #: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1339
+#: addressbook/contact-editor/e-contact-editor.c:1271
 msgid "Primary Email"
 msgstr "主要なメール"
 
@@ -533,6 +408,7 @@ msgid "Web page address:"
 msgstr "ウェブページの URL:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:17
+#: mail/mail-config.glade.h:82
 msgid "_Add"
 msgstr "追加(_A)"
 
@@ -557,8 +433,8 @@ msgid "_Company:"
 msgstr "会社(_C):"
 
 #: addressbook/contact-editor/contact-editor.glade.h:23
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:49
-#: ui/evolution-task-editor-dialog.xml.h:69
+#: mail/mail-config.glade.h:83 ui/evolution-event-editor.xml.h:57
+#: ui/evolution-mail.xml.h:59 ui/evolution-task-editor-dialog.xml.h:69
 msgid "_Delete"
 msgstr "削除(_D)"
 
@@ -610,113 +486,129 @@ msgstr "これは郵便物の住所です"
 msgid "Delete Contact?"
 msgstr "コンタクトを削除しますか?"
 
-#: addressbook/contact-editor/e-contact-editor.c:574
+#: addressbook/contact-editor/e-contact-editor.c:590
 msgid "This contact belongs to these categories:"
 msgstr "このコンタクトはこれらのカテゴリに所属しています:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:594
+#: addressbook/contact-editor/e-contact-editor.c:1229
+#: addressbook/gui/widgets/e-addressbook-view.c:628
 msgid "Assistant"
 msgstr "アシスタント"
 
-#: addressbook/contact-editor/e-contact-editor.c:1278
-#: addressbook/contact-editor/e-contact-editor.c:1382
-#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/contact-editor/e-contact-editor.c:1230
+#: addressbook/contact-editor/e-contact-editor.c:1297
+#: addressbook/gui/widgets/e-addressbook-view.c:608
 msgid "Business"
 msgstr "仕事"
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:581
+#: addressbook/contact-editor/e-contact-editor.c:1231
+#: addressbook/gui/widgets/e-addressbook-view.c:615
 msgid "Business 2"
 msgstr "仕事 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
-#: addressbook/gui/widgets/e-addressbook-view.c:579
+#: addressbook/contact-editor/e-contact-editor.c:1232
+#: addressbook/gui/widgets/e-addressbook-view.c:613
 msgid "Business Fax"
 msgstr "仕事の FAX"
 
-#: addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1233
 msgid "Callback"
 msgstr "呼び戻し"
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:578
+#: addressbook/contact-editor/e-contact-editor.c:1234
+#: addressbook/gui/widgets/e-addressbook-view.c:612
 msgid "Car"
 msgstr "車"
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/contact-editor/e-contact-editor.c:1235
 msgid "Company"
 msgstr "会社"
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/contact-editor/e-contact-editor.c:1383
-#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/contact-editor/e-contact-editor.c:1236
+#: addressbook/contact-editor/e-contact-editor.c:1298
+#: addressbook/gui/widgets/e-addressbook-view.c:609
 msgid "Home"
 msgstr "家"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:582
+#: addressbook/contact-editor/e-contact-editor.c:1237
+#: addressbook/gui/widgets/e-addressbook-view.c:616
 msgid "Home 2"
 msgstr "家 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:580
+#: addressbook/contact-editor/e-contact-editor.c:1238
+#: addressbook/gui/widgets/e-addressbook-view.c:614
 msgid "Home Fax"
 msgstr "家の FAX"
 
-#: addressbook/contact-editor/e-contact-editor.c:1287
-#: addressbook/gui/widgets/e-addressbook-view.c:583
+#: addressbook/contact-editor/e-contact-editor.c:1239
+#: addressbook/gui/widgets/e-addressbook-view.c:617
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/contact-editor/e-contact-editor.c:1240
+#: addressbook/gui/widgets/e-addressbook-view.c:611
 msgid "Mobile"
 msgstr "モバイル"
 
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/contact-editor/e-contact-editor.c:1384
-#: addressbook/gui/widgets/e-addressbook-view.c:584
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:47
+#: addressbook/contact-editor/e-contact-editor.c:1241
+#: addressbook/contact-editor/e-contact-editor.c:1299
+#: addressbook/gui/widgets/e-addressbook-view.c:618
+#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:48
 msgid "Other"
 msgstr "その他"
 
-#: addressbook/contact-editor/e-contact-editor.c:1290
+#: addressbook/contact-editor/e-contact-editor.c:1242
 msgid "Other Fax"
 msgstr "その他の FAX"
 
-#: addressbook/contact-editor/e-contact-editor.c:1291
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+#: addressbook/contact-editor/e-contact-editor.c:1243
+#: addressbook/gui/widgets/e-addressbook-view.c:619
 msgid "Pager"
 msgstr "ポケベル"
 
-#: addressbook/contact-editor/e-contact-editor.c:1292
-#: addressbook/gui/widgets/e-addressbook-view.c:573
+#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/widgets/e-addressbook-view.c:607
 msgid "Primary"
 msgstr "プライマリ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1293
+#: addressbook/contact-editor/e-contact-editor.c:1245
 msgid "Radio"
 msgstr "ラジオ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1294
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Telex"
 msgstr "テレックス"
 
-#: addressbook/contact-editor/e-contact-editor.c:1295
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1340
-#: addressbook/gui/widgets/e-addressbook-view.c:586
+#: addressbook/contact-editor/e-contact-editor.c:1272
+#: addressbook/gui/widgets/e-addressbook-view.c:620
 msgid "Email 2"
 msgstr "メール2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1341
-#: addressbook/gui/widgets/e-addressbook-view.c:587
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/gui/widgets/e-addressbook-view.c:621
 msgid "Email 3"
 msgstr "メール3"
 
+#: addressbook/contact-editor/e-contact-quick-add.c:215
+msgid "Contact Quick-Add"
+msgstr "コンタクトの簡易追加"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:217
+msgid "Edit Full"
+msgstr "すべて編集"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:254
+msgid "Full Name"
+msgstr "フルネーム"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:260
+msgid "E-mail"
+msgstr "メール"
+
 #: addressbook/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "住所 2(_2):"
@@ -829,25 +721,25 @@ msgstr "敬称(後つけ)(_S):"
 msgid "_Title:"
 msgstr "敬称(前つけ)(_T):"
 
-#: addressbook/gui/component/addressbook.c:230
+#: addressbook/gui/component/addressbook.c:237
 msgid "As _Minicards"
 msgstr "ミニカード"
 
-#: addressbook/gui/component/addressbook.c:236
+#: addressbook/gui/component/addressbook.c:243
 #: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr "テーブル(_T)"
 
-#: addressbook/gui/component/addressbook.c:405
+#: addressbook/gui/component/addressbook.c:413
 #, c-format
 msgid "Enter password for %s"
 msgstr "%s のパスワードを入力してください"
 
-#: addressbook/gui/component/addressbook.c:433
+#: addressbook/gui/component/addressbook.c:441
 msgid "Unable to open addressbook"
 msgstr "アドレス帳を開くことが出来ません"
 
-#: addressbook/gui/component/addressbook.c:438
+#: addressbook/gui/component/addressbook.c:446
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -868,27 +760,27 @@ msgstr ""
 "ダウンロード，そしてインストールして, コンパイル仕直し\n"
 "て Evolution をインストールする必要があるでしょう.\n"
 
-#: addressbook/gui/component/addressbook.c:561 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:569
 msgid "Show All"
 msgstr "すべて表示"
 
-#: addressbook/gui/component/addressbook.c:563 mail/folder-browser.c:223
+#: addressbook/gui/component/addressbook.c:571
 msgid "Advanced..."
 msgstr "詳細..."
 
-#: addressbook/gui/component/addressbook.c:593
+#: addressbook/gui/component/addressbook.c:601
 msgid "Any field contains"
 msgstr "フィールドが次のものを含む"
 
-#: addressbook/gui/component/addressbook.c:594
+#: addressbook/gui/component/addressbook.c:602
 msgid "Name contains"
 msgstr "名前が次のものを含む"
 
-#: addressbook/gui/component/addressbook.c:595
+#: addressbook/gui/component/addressbook.c:603
 msgid "Email contains"
 msgstr "メールが次のものを含む"
 
-#: addressbook/gui/component/addressbook.c:738
+#: addressbook/gui/component/addressbook.c:746
 msgid "The URI that the Folder Browser will display"
 msgstr "フォルダブラウザが表示する URI"
 
@@ -913,9 +805,9 @@ msgid "None (anonymous mode)"
 msgstr "なし (匿名モード)"
 
 #: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:250
+#: camel/providers/imap/camel-imap-provider.c:75
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:140
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid "Password"
 msgstr "パスワード"
 
@@ -956,7 +848,7 @@ msgid "Remember this password"
 msgstr "このパスワードを記憶"
 
 #: addressbook/gui/component/addressbook-config.c:401
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:30
 msgid "Host:"
 msgstr "ホスト:"
 
@@ -990,7 +882,7 @@ msgid "Authentication:"
 msgstr "認証方式:"
 
 #: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:491 mail/mail-config.glade.h:50
+#: mail/mail-config-druid.c:517 mail/mail-config.glade.h:51
 msgid "Path:"
 msgstr "パス:"
 
@@ -1018,7 +910,7 @@ msgstr ""
 "あなたの持つアドレス帳を選択し, それについての関連した情報を入力してください"
 
 #: addressbook/gui/component/addressbook-config.c:666
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:43
 msgid "Name:"
 msgstr "名前:"
 
@@ -1043,7 +935,7 @@ msgstr "アドレス帳のソース"
 #: addressbook/gui/component/addressbook-config.glade.h:3
 #: calendar/gui/e-meeting-dialog.glade.h:8
 #: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:7 mail/folder-browser.c:684
+#: filter/libfilter-i18n.h:11 mail/folder-browser.c:574
 #: mail/mail-config.glade.h:21 mail/mail-view.c:150
 #: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
 #: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:18
@@ -1052,12 +944,12 @@ msgstr "削除"
 
 #: addressbook/gui/component/addressbook-config.glade.h:4
 #: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/folder-browser.c:670 mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Edit"
 msgstr "編集"
 
 #: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:571
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Name"
 msgstr "名前"
 
@@ -1065,31 +957,57 @@ msgstr "名前"
 msgid "URI"
 msgstr "URI"
 
+#: addressbook/gui/component/e-address-widget.c:366
+msgid "Disable Queries"
+msgstr "クエリを無効"
+
+#: addressbook/gui/component/e-address-widget.c:366
+msgid "Enable Queries (Dangerous!)"
+msgstr "クエリを有効 (危険です!)"
+
+#: addressbook/gui/component/e-address-widget.c:389
+#: addressbook/gui/component/select-names/e-select-names-popup.c:200
+msgid "Edit Contact Info"
+msgstr "コンタクト情報の編集"
+
+#: addressbook/gui/component/e-address-widget.c:425
+#: addressbook/gui/component/select-names/e-select-names-popup.c:259
+msgid "Add to Contacts"
+msgstr "コンタクトへ追加"
+
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for displaying an address."
+msgstr "アドレスを表示するための Bonobo コントロール"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
 msgid "A sample Bonobo control which displays an addressbook."
 msgstr "アドレス帳を表示する Bonobo コントロールのサンプルです"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Evolution アドレス帳ミニカードを表示するコントロール"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolution アドレス帳ミニカードビューア"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Evolution component for handling contacts."
 msgstr "コンタクトを扱うための Evolution コンポーネント"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Factory for the Addressbook Minicard control"
 msgstr "アドレス帳ミニカードコントロールのためのファクトリ"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook's address displayer"
+msgstr "アドレス帳のアドレス表示のためのファクトリ"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Factory for the Evolution addressbook component."
 msgstr "Evolution アドレス帳コンポーネントのためのファクトリ"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the sample Addressbook control"
 msgstr "サンプルアドレス帳コントロールのためのファクトリ"
 
@@ -1101,6 +1019,16 @@ msgstr "Evolution のアドレス帳の名前選択インターフェース"
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "アドレス帳の名前選択インターフェースのためのファクトリ"
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:121
+#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
+#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
+msgid "Remove"
+msgstr "削除"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:136
+msgid "Remove All"
+msgstr "すべて削除"
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Find..."
 msgstr "検索..."
@@ -1229,64 +1157,64 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:376
+#: addressbook/gui/widgets/e-addressbook-view.c:508
+#: addressbook/gui/widgets/e-minicard.c:450
 msgid "Save as VCard"
 msgstr "VCard で保存"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:570
+#: addressbook/gui/widgets/e-addressbook-view.c:604
 msgid "* Click here to add a contact *"
 msgstr "* コンタクトを追加するためにここをクリック *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:572
+#: addressbook/gui/widgets/e-addressbook-view.c:606
 msgid "Email"
 msgstr "メール"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:576
+#: addressbook/gui/widgets/e-addressbook-view.c:610
 msgid "Organization"
 msgstr "組織"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:588
+#: addressbook/gui/widgets/e-addressbook-view.c:622
 msgid "Web Site"
 msgstr "ウェブサイト"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:589
+#: addressbook/gui/widgets/e-addressbook-view.c:623
 msgid "Department"
 msgstr "担当部署"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:590
+#: addressbook/gui/widgets/e-addressbook-view.c:624
 msgid "Office"
 msgstr "事務所"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:591
+#: addressbook/gui/widgets/e-addressbook-view.c:625
 msgid "Title"
 msgstr "敬称(前つけ)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:592
+#: addressbook/gui/widgets/e-addressbook-view.c:626
 msgid "Profession"
 msgstr "専門職"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:593
+#: addressbook/gui/widgets/e-addressbook-view.c:627
 msgid "Manager"
 msgstr "マネージャ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:595
+#: addressbook/gui/widgets/e-addressbook-view.c:629
 msgid "Nickname"
 msgstr "ニックネーム"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:596
+#: addressbook/gui/widgets/e-addressbook-view.c:630
 msgid "Spouse"
 msgstr "配偶者"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:597
+#: addressbook/gui/widgets/e-addressbook-view.c:631
 msgid "Note"
 msgstr "ノート"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:598
+#: addressbook/gui/widgets/e-addressbook-view.c:632
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:599
+#: addressbook/gui/widgets/e-addressbook-view.c:633
 msgid "Click here to add a contact"
 msgstr "コンタクトを追加するためにここをクリック"
 
@@ -1294,7 +1222,7 @@ msgstr "コンタクトを追加するためにここをクリック"
 msgid "Save in addressbook"
 msgstr "アドレス帳に保存"
 
-#: addressbook/gui/widgets/e-minicard-view.c:129
+#: addressbook/gui/widgets/e-minicard-view.c:145
 msgid ""
 "\n"
 "\n"
@@ -1308,6 +1236,10 @@ msgstr ""
 "\n"
 "ダブルクリックをして新規コンタクトを作成して下さい"
 
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+msgid "Card View"
+msgstr "名刺表示"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -1465,7 +1397,7 @@ msgstr "スタイル名:"
 msgid "Top:"
 msgstr "上:"
 
-#: addressbook/printing/e-contact-print.glade.h:40 mail/mail-config.glade.h:72
+#: addressbook/printing/e-contact-print.glade.h:40
 msgid "Type:"
 msgstr "種別:"
 
@@ -1473,18 +1405,6 @@ msgstr "種別:"
 msgid "Width:"
 msgstr "幅:"
 
-#: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr "label26"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr "Evolution カレンダコンジット"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr "Evolution カレンダコンジットのための設定ユーティリティです\n"
-
 #: calendar/conduits/calendar/calendar-conduit.c:687
 #: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
@@ -1496,130 +1416,131 @@ msgid "Could not read pilot's Calendar application block"
 msgstr ""
 "パイロットのカレンダアプリケーションブロックを読み込むことが出来ませんでした"
 
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:1
-msgid "Configure the GnomeCal conduit"
-msgstr "GnomeCal 設定コンジット"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Calendar conduit"
-msgstr "Evolution カレンダコンジット"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:1
-msgid "Configure the todo conduit"
-msgstr "todo コンジットの設定"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:2
-msgid "Evolution ToDo conduit "
-msgstr "Evolution ToDo コンジット "
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr "Evolution ToDo コンジット"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr "Evolutiuon ToDo コンジットのための設定ユーティリティです\n"
-
 #: calendar/conduits/todo/todo-conduit.c:600
 #: calendar/conduits/todo/todo-conduit.c:603
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 "パイロットの ToDo アプリケーションブロックを読み込むことが出来ませんでした"
 
-#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
-#: calendar/gui/alarm-notify.c:940
-msgid "Reminder of your appointment at "
-msgstr "約束の催促"
-
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "アラーム停止"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-msgid "Ok"
-msgstr "Ok"
-
-#: calendar/gui/calendar-commands.c:233
+#: calendar/gui/calendar-commands.c:258
 msgid "File not found"
 msgstr "ファイルが見つかりません"
 
-#: calendar/gui/calendar-commands.c:257
+#: calendar/gui/calendar-commands.c:282
 msgid "Open calendar"
 msgstr "カレンダを開く"
 
-#: calendar/gui/calendar-commands.c:299
+#: calendar/gui/calendar-commands.c:324
 msgid "Save calendar"
 msgstr "カレンダを保存"
 
-#: calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-commands.c:478
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "カレンダビューを作成出来ませんでした. ORBitとOAFの設定をチェックしてください"
 
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:334
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
-msgstr "%Y/%m/%d (%a)"
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:338 calendar/gui/calendar-model.c:768
-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,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:342 calendar/gui/calendar-model.c:771
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
-
-#: calendar/gui/calendar-model.c:376
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:901
+#: calendar/gui/e-calendar-table.c:329
 msgid "Public"
-msgstr "公的"
+msgstr "一般"
 
-#: calendar/gui/calendar-model.c:379
+#: calendar/gui/calendar-model.c:369 calendar/gui/calendar-model.c:903
+#: calendar/gui/e-calendar-table.c:330
 msgid "Private"
 msgstr "私的"
 
-#: calendar/gui/calendar-model.c:382
+#: calendar/gui/calendar-model.c:372 calendar/gui/calendar-model.c:905
+#: calendar/gui/e-calendar-table.c:331
 msgid "Confidential"
-msgstr "機密"
+msgstr "極秘"
 
-#: calendar/gui/calendar-model.c:385 calendar/gui/calendar-model.c:553
-#: calendar/gui/event-editor.c:1579 calendar/gui/event-editor.c:1606
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: calendar/gui/calendar-model.c:375 calendar/gui/event-editor.c:1590
+#: calendar/gui/event-editor.c:1617
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Unknown"
 msgstr "未知"
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:463
 msgid "N"
 msgstr "北"
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:463
 msgid "S"
 msgstr "南"
 
-#: calendar/gui/calendar-model.c:475
+#: calendar/gui/calendar-model.c:465
 msgid "E"
 msgstr "東"
 
-#: calendar/gui/calendar-model.c:475
+#: calendar/gui/calendar-model.c:465
 msgid "W"
 msgstr "西"
 
-#: calendar/gui/calendar-model.c:547
+#: calendar/gui/calendar-model.c:503 calendar/gui/calendar-model.c:1069
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
+#: calendar/gui/e-calendar-table.c:351 mail/message-list.c:626
+msgid "High"
+msgstr "高い"
+
+#: calendar/gui/calendar-model.c:505 calendar/gui/calendar-model.c:1071
+#: calendar/gui/calendar-model.c:1596
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
+#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:625
+msgid "Normal"
+msgstr "普通"
+
+#: calendar/gui/calendar-model.c:507 calendar/gui/calendar-model.c:1073
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
+#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:624
+msgid "Low"
+msgstr "低い"
+
+#: calendar/gui/calendar-model.c:543 calendar/gui/calendar-model.c:1125
+#: calendar/gui/e-calendar-table.c:405
 msgid "Transparent"
 msgstr "透明"
 
-#: calendar/gui/calendar-model.c:550
+#: calendar/gui/calendar-model.c:546 calendar/gui/calendar-model.c:1127
+#: calendar/gui/e-calendar-table.c:404
 msgid "Opaque"
 msgstr "不透明"
 
-#: calendar/gui/calendar-model.c:776
+#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1179
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
+#: calendar/gui/e-calendar-table.c:425
+msgid "Not Started"
+msgstr "開始していない"
+
+#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/e-calendar-table.c:426
+msgid "In Progress"
+msgstr "処理中"
+
+#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
+#: calendar/gui/e-calendar-table.c:427
+msgid "Completed"
+msgstr "完了しました"
+
+#: calendar/gui/calendar-model.c:650 calendar/gui/calendar-model.c:1185
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
+#: calendar/gui/e-calendar-table.c:428
+msgid "Cancelled"
+msgstr "キャンセルしました"
+
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:277
+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:800 e-util/e-time-utils.c:286
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
+
+#: calendar/gui/calendar-model.c:805
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1630,36 +1551,25 @@ msgstr ""
 "\n"
 "%s"
 
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:877 calendar/gui/calendar-model.c:925
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
-msgstr "%Y/%m/%d"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:895
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
-
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:898
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:902
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
+#: calendar/gui/calendar-model.c:885
+msgid ""
+"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+msgstr ""
+"分類を '一般', '私的', '極秘' あるいは 'なし' を選択しなければなりません"
 
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:905
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:899 calendar/gui/calendar-model.c:1123
+#: calendar/gui/calendar-model.c:1177 calendar/gui/e-calendar-table.c:328
+#: calendar/gui/e-calendar-table.c:403 mail/mail-account-editor.c:770
+#: mail/mail-account-editor.c:772 mail/mail-account-editor.c:863
+#: mail/mail-accounts.c:115 mail/mail-config-druid.c:1090
+#: mail/mail-config.glade.h:45 shell/e-shell-view.c:1119
+#: widgets/misc/e-cell-date-edit.c:231 widgets/misc/e-dateedit.c:421
+#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr "ノート"
 
-#: calendar/gui/calendar-model.c:1025
+#: calendar/gui/calendar-model.c:973
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1669,64 +1579,71 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1065
+#: calendar/gui/calendar-model.c:1013
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "パーセント値は 0 と 100 の間で含んでいなければなりません"
 
-#: calendar/gui/calendar-model.c:1105
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr "優先順位は 1 と 9 の間で含んでいなければなりません"
+#: calendar/gui/calendar-model.c:1054
+msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
+msgstr ""
+"優先度を '高い', '普通', '低い' あるいは '未定義' を選択しなければなりません"
 
-#: calendar/gui/calendar-model.c:1548
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Normal"
-msgstr "普通"
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1067
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
+#: calendar/gui/e-calendar-table.c:354
+msgid "Undefined"
+msgstr "未定義"
 
-#: calendar/gui/calendar-model.c:1550
+#: calendar/gui/calendar-model.c:1108
+msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1598
 msgid "Recurring"
 msgstr "再発"
 
-#: calendar/gui/calendar-model.c:1552
+#: calendar/gui/calendar-model.c:1600
 msgid "Assigned"
 msgstr "割当て済み"
 
-#: calendar/gui/calendar-model.c:1558
+#: calendar/gui/calendar-model.c:1606
 msgid "Yes"
 msgstr "はい"
 
-#: calendar/gui/calendar-model.c:1558
+#: calendar/gui/calendar-model.c:1606
 msgid "No"
 msgstr "いいえ"
 
-#: calendar/gui/calendar-summary.c:197
+#: calendar/gui/calendar-summary.c:196
 msgid "%A, %e %B %Y"
 msgstr "%Y/%B/%e %A"
 
-#: calendar/gui/calendar-summary.c:240 calendar/gui/calendar-summary.c:246
+#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
 msgid "%I:%M%p"
 msgstr "%p %I:%M"
 
-#: calendar/gui/calendar-summary.c:438
+#: calendar/gui/calendar-summary.c:437
 msgid "<b>Error loading calendar</b>"
 msgstr "<b>カレンダをロード中にエラー</b>"
 
-#: calendar/gui/calendar-summary.c:450
+#: calendar/gui/calendar-summary.c:449
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr "<b>カレンダをロード中にエラー:<br>メソッドはサポートしていません"
 
-#: calendar/gui/calendar-summary.c:620
+#: calendar/gui/calendar-summary.c:616
 msgid "Display"
 msgstr "表示"
 
-#: calendar/gui/calendar-summary.c:625
+#: calendar/gui/calendar-summary.c:621
 msgid "Show appointments"
 msgstr "約束の表示"
 
-#: calendar/gui/calendar-summary.c:633
+#: calendar/gui/calendar-summary.c:629
 msgid "Show tasks"
 msgstr "タスクの表示"
 
-#: calendar/gui/calendar-summary.c:719 calendar/gui/e-itip-control.glade.h:7
+#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "カレンダをロード中"
 
@@ -1734,6 +1651,39 @@ msgstr "カレンダをロード中"
 msgid "The URI that the calendar will display"
 msgstr "カレンダが表示する URI"
 
+#: calendar/gui/alarm-notify/alarm-queue.c:586
+#: calendar/gui/alarm-notify/alarm-queue.c:885
+#: calendar/gui/alarm-notify/alarm-queue.c:941
+msgid "Reminder of your appointment at "
+msgstr "約束の催促"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/dialogs/alarm-notify.glade.h:3
+msgid "Snooze"
+msgstr "アラーム停止"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:890
+#: calendar/gui/alarm-notify/alarm-queue.c:945
+msgid "Ok"
+msgstr "Ok"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr "アラーム通知サービス"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr "アラーム通知サービスのためのファクトリ"
+
+#: calendar/gui/alarm-notify/notify-main.c:63 calendar/gui/main.c:49
+msgid "Could not initialize GNOME"
+msgstr "GNOME の初期化が出来ませんでした"
+
+#: calendar/gui/alarm-notify/notify-main.c:73
+msgid "Could not create the alarm notify service factory"
+msgstr "アラーム通知サービスファクトリを作成出来ませんでした"
+
 #: calendar/gui/dialogs/alarm-notify-dialog.c:184
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "%Y/%b/%d %A %H:%M にアラーム"
@@ -1802,7 +1752,7 @@ msgid "Beep when alarm windows appear."
 msgstr "アラームウィンドウが現れた時 BEEP 音を鳴らす"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:4
+#: ui/evolution-calendar.xml.h:3
 msgid "Calendar"
 msgstr "カレンダ"
 
@@ -1831,7 +1781,7 @@ msgid "Display options"
 msgstr "表示オプション"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:159
+#: calendar/gui/e-calendar-table.c:161
 msgid "Due Date"
 msgstr "期日"
 
@@ -1852,7 +1802,7 @@ msgid "Fri"
 msgstr "金"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/event-editor.c:479
 msgid "Friday"
 msgstr "金曜日"
 
@@ -1881,7 +1831,7 @@ msgid "Mon"
 msgstr "月"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:473
+#: calendar/gui/event-editor.c:475
 msgid "Monday"
 msgstr "月曜日"
 
@@ -1894,11 +1844,12 @@ msgid "Overdue Items:"
 msgstr "期限を過ぎたアイテム:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: mail/mail-config.glade.h:52
 msgid "Pick a color"
 msgstr "カラーを選択"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:162
+#: calendar/gui/e-calendar-table.c:164
 msgid "Priority"
 msgstr "優先度"
 
@@ -1916,7 +1867,7 @@ msgid "Sat"
 msgstr "土"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/event-editor.c:480
 msgid "Saturday"
 msgstr "土曜日"
 
@@ -1941,7 +1892,7 @@ msgid "Sun"
 msgstr "日"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/event-editor.c:481
 msgid "Sunday"
 msgstr "日曜日"
 
@@ -1954,7 +1905,7 @@ msgid "Thu"
 msgstr "木"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:476
+#: calendar/gui/event-editor.c:478
 msgid "Thursday"
 msgstr "木曜日"
 
@@ -1975,7 +1926,7 @@ msgid "Tue"
 msgstr "火"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:474
+#: calendar/gui/event-editor.c:476
 msgid "Tuesday"
 msgstr "火曜日"
 
@@ -1988,7 +1939,7 @@ msgid "Wed"
 msgstr "水"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:475
+#: calendar/gui/event-editor.c:477
 msgid "Wednesday"
 msgstr "水曜日"
 
@@ -2001,7 +1952,7 @@ msgid "minutes before they occur."
 msgstr "分前"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:86
 msgid "seconds."
 msgstr " 秒"
 
@@ -2041,20 +1992,12 @@ msgstr "変更を保存したいですか?"
 msgid "% Comp_lete:"
 msgstr "% 完了(_l):"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-msgid "Cancelled"
-msgstr "キャンセルしました"
-
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:155
+#: calendar/gui/e-calendar-table.c:157
 #: calendar/gui/event-editor-dialog.glade.h:6
 msgid "Classification"
 msgstr "分類"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "Completed"
-msgstr "完了しました"
-
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:7
 #: calendar/gui/event-editor-dialog.glade.h:8
 msgid "Date & Time"
@@ -2064,22 +2007,6 @@ msgstr "日付と時間"
 msgid "Date Completed:"
 msgstr "完了日:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "High"
-msgstr "高い"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-msgid "In Progress"
-msgstr "処理中"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Low"
-msgstr "低い"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "Not Started"
-msgstr "開始していない"
-
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:15
 #: calendar/gui/event-editor-dialog.glade.h:16
 msgid "Pri_vate"
@@ -2111,10 +2038,6 @@ msgstr "タスク"
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "Undefined"
-msgstr "未定義"
-
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:23
 #: calendar/gui/event-editor-dialog.glade.h:28
 msgid "_Confidential"
@@ -2141,91 +2064,146 @@ msgstr "ステータス(_S):"
 msgid "Edit Task"
 msgstr "タスクの編集"
 
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:375
+#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:377
 msgid "No summary"
 msgstr "サマリーなし"
 
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:381
+#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:383
 #, c-format
 msgid "Appointment - %s"
 msgstr "約束 - %s"
 
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:384
+#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:386
 #, c-format
 msgid "Task - %s"
 msgstr "タスク - %s"
 
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:387
+#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:389
 #, c-format
 msgid "Journal entry - %s"
 msgstr "仕訳記入 - %s"
 
-#: calendar/gui/e-calendar-table.c:154
+#: calendar/gui/e-calendar-table.c:156
 msgid "Categories"
 msgstr "カテゴリ"
 
-#: calendar/gui/e-calendar-table.c:156
+#: calendar/gui/e-calendar-table.c:158
 msgid "Completion Date"
 msgstr "完了日"
 
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:159
 msgid "End Date"
 msgstr "終了日"
 
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:160
 msgid "Start Date"
 msgstr "開始日"
 
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:162
 msgid "Geographical Position"
 msgstr "緯度経度"
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Precent complete"
-msgstr ""
-
 #: calendar/gui/e-calendar-table.c:163
+msgid "Percent complete"
+msgstr "パーセント完了"
+
+#: calendar/gui/e-calendar-table.c:165
 msgid "Summary"
 msgstr "サマリー"
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:166
 msgid "Transparency"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:167
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:168
 msgid "Alarms"
 msgstr "アラーム"
 
-#: calendar/gui/e-calendar-table.c:167
+#: calendar/gui/e-calendar-table.c:169
 msgid "Click here to add a task"
 msgstr "タスクを追加するためにここをクリック"
 
-#: calendar/gui/e-calendar-table.c:398
+#: calendar/gui/e-calendar-table.c:373
+#, c-format
+msgid "0%"
+msgstr "0%"
+
+#: calendar/gui/e-calendar-table.c:374
+#, c-format
+msgid "10%"
+msgstr "10%"
+
+#: calendar/gui/e-calendar-table.c:375
+#, c-format
+msgid "20%"
+msgstr "20%"
+
+#: calendar/gui/e-calendar-table.c:376
+#, c-format
+msgid "30%"
+msgstr "30%"
+
+#: calendar/gui/e-calendar-table.c:377
+#, c-format
+msgid "40%"
+msgstr "40%"
+
+#: calendar/gui/e-calendar-table.c:378
+#, c-format
+msgid "50%"
+msgstr "50%"
+
+#: calendar/gui/e-calendar-table.c:379
+#, c-format
+msgid "60%"
+msgstr "60%"
+
+#: calendar/gui/e-calendar-table.c:380
+#, c-format
+msgid "70%"
+msgstr "70%"
+
+#: calendar/gui/e-calendar-table.c:381
+#, c-format
+msgid "80%"
+msgstr "80%"
+
+#: calendar/gui/e-calendar-table.c:382
+#, c-format
+msgid "90%"
+msgstr "90%"
+
+#: calendar/gui/e-calendar-table.c:383
+#, c-format
+msgid "100%"
+msgstr "100%"
+
+#: calendar/gui/e-calendar-table.c:550
 msgid "Mark Complete"
 msgstr "完了をマーク"
 
-#: calendar/gui/e-calendar-table.c:399
+#: calendar/gui/e-calendar-table.c:551
 msgid "Mark the task complete"
 msgstr "完了したタスクをマークします"
 
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/e-calendar-table.c:556
 msgid "Edit this task..."
 msgstr "このタスクを編集..."
 
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/e-calendar-table.c:557
 msgid "Edit the task"
 msgstr "タスクを編集します"
 
-#: calendar/gui/e-calendar-table.c:407
+#: calendar/gui/e-calendar-table.c:559
 #: ui/evolution-task-editor-dialog.xml.h:19
 msgid "Delete this task"
 msgstr "このタスクを削除します"
 
-#: calendar/gui/e-calendar-table.c:408
+#: calendar/gui/e-calendar-table.c:560
 msgid "Delete the task"
 msgstr "タスクを削除します"
 
@@ -2236,68 +2214,78 @@ 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:271 calendar/gui/e-day-view.c:1273
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1281
 #: calendar/gui/e-week-view-main-item.c:321
 msgid "%A %d %B"
 msgstr "%B %d %A"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1287
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1295
 #: calendar/gui/e-week-view-main-item.c:330
 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:279 calendar/gui/e-day-view.c:1300
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1308
 #: calendar/gui/e-week-view-main-item.c:344
 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:555 calendar/gui/e-week-view.c:289
-#: calendar/gui/print.c:612
+#: calendar/gui/e-day-view.c:563 calendar/gui/e-week-view.c:297
+#: calendar/gui/print.c:613
 msgid "am"
 msgstr "午前"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:558 calendar/gui/e-week-view.c:292
-#: calendar/gui/print.c:611
+#: calendar/gui/e-day-view.c:566 calendar/gui/e-week-view.c:300
+#: calendar/gui/print.c:612
 msgid "pm"
 msgstr "午後"
 
-#: calendar/gui/e-day-view.c:3010 calendar/gui/e-day-view.c:3023
-#: calendar/gui/e-day-view.c:3038 calendar/gui/e-week-view.c:3213
-#: calendar/gui/e-week-view.c:3226 calendar/gui/e-week-view.c:3241
-msgid "New appointment..."
-msgstr "新規約束..."
+#: calendar/gui/e-day-view.c:3027 ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "新規約束"
 
-#: calendar/gui/e-day-view.c:3014 calendar/gui/e-day-view.c:3028
-#: calendar/gui/e-week-view.c:3217 calendar/gui/e-week-view.c:3231
-msgid "Schedule meeting"
-msgstr "打合せのスケジュール"
+#: calendar/gui/e-day-view.c:3029 calendar/gui/e-week-view.c:3237
+msgid "New All Day Event"
+msgstr "新規毎日のイベント"
 
-#: calendar/gui/e-day-view.c:3018 calendar/gui/e-day-view.c:3032
-#: calendar/gui/e-week-view.c:3221 calendar/gui/e-week-view.c:3235
-msgid "Edit this appointment..."
-msgstr "この約束を編集..."
+#: calendar/gui/e-day-view.c:3034 calendar/gui/e-week-view.c:3242
+msgid "Go to Today"
+msgstr "今日へ移動"
 
-#: calendar/gui/e-day-view.c:3019 calendar/gui/e-week-view.c:3222
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
+#: calendar/gui/e-day-view.c:3036 calendar/gui/e-week-view.c:3244
+msgid "Go to Date..."
+msgstr "指定日へ移動..."
+
+#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3250
+#: mail/folder-browser.c:543 ui/evolution-calendar.xml.h:19
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "開く"
+
+#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3252
+msgid "Delete this Appointment"
 msgstr "この約束を削除"
 
-#: calendar/gui/e-day-view.c:3027 calendar/gui/e-week-view.c:3230
-msgid "Make this appointment movable"
-msgstr "この約束を可動にする"
+#: calendar/gui/e-day-view.c:3047 calendar/gui/e-week-view.c:3254
+#: ui/evolution-event-editor.xml.h:45
+msgid "Schedule Meeting"
+msgstr "打合せのスケジュール"
+
+#: calendar/gui/e-day-view.c:3056 calendar/gui/e-week-view.c:3267
+msgid "Make this Occurrence Movable"
+msgstr "この出来事を可動にする"
 
-#: calendar/gui/e-day-view.c:3033 calendar/gui/e-week-view.c:3236
-msgid "Delete this occurrence"
+#: calendar/gui/e-day-view.c:3058 calendar/gui/e-week-view.c:3269
+msgid "Delete this Occurrence"
 msgstr "この出来事を削除"
 
-#: calendar/gui/e-day-view.c:3034 calendar/gui/e-week-view.c:3237
-msgid "Delete all occurrences"
+#: calendar/gui/e-day-view.c:3060
+msgid "Delete all Occurrences"
 msgstr "すべての出来事を削除"
 
 #: calendar/gui/e-itip-control.c:153
@@ -2382,7 +2370,7 @@ msgstr ""
 msgid "Calendar Message"
 msgstr "カレンダメッセージ"
 
-#: calendar/gui/e-itip-control.glade.h:5
+#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:598
 msgid "Date:"
 msgstr "日付:"
 
@@ -2394,7 +2382,7 @@ msgstr "カレンダをロード中..."
 msgid "Organizer:"
 msgstr "主催者:"
 
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:18
+#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:43
 msgid "Sender"
 msgstr "送信者"
 
@@ -2486,26 +2474,26 @@ msgstr ""
 "スケジュール\n"
 "時間"
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:22
-#: mail/message-list.c:1167
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:48
+#: mail/message-list.c:1014
 msgid "Status"
 msgstr "ステータス"
 
-#: calendar/gui/e-tasks.c:144 calendar/gui/e-tasks.c:459
-#: calendar/gui/e-tasks.c:492
+#: calendar/gui/e-tasks.c:148 calendar/gui/e-tasks.c:468
+#: calendar/gui/e-tasks.c:501
 msgid "All"
 msgstr "すべて"
 
-#: calendar/gui/e-tasks.c:150
+#: calendar/gui/e-tasks.c:154
 msgid "Category:"
 msgstr "カテゴリ:"
 
-#: calendar/gui/e-tasks.c:288
+#: calendar/gui/e-tasks.c:297
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "'%s' のタスクを読み込むことが出来ませんでした"
 
-#: calendar/gui/e-tasks.c:300
+#: calendar/gui/e-tasks.c:309
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "'%s' を読み込むことを要求されるメソッドはサポートしていません"
@@ -2517,6 +2505,14 @@ msgstr "'%s' を読み込むことを要求されるメソッドはサポートしていません"
 msgid "%d %B"
 msgstr "%B %d"
 
+#: calendar/gui/e-week-view.c:3235 calendar/gui/e-week-view.c:3258
+msgid "New Appointment..."
+msgstr "新規約束..."
+
+#: calendar/gui/e-week-view.c:3271
+msgid "Delete All Occurrences"
+msgstr "すべての出来事を削除"
+
 #: calendar/gui/event-editor-dialog.glade.h:1
 msgid "A_ll day event"
 msgstr "毎日のイベント(_l)"
@@ -2550,7 +2546,7 @@ msgid "No recurrence"
 msgstr "再発なし"
 
 #: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1566
+#: calendar/gui/event-editor.c:1577
 msgid "Play a sound"
 msgstr "音楽を再生"
 
@@ -2571,21 +2567,21 @@ msgid "Reminder"
 msgstr "催促状"
 
 #: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1575
+#: calendar/gui/event-editor.c:1586
 msgid "Run a program"
 msgstr "プログラムを実行する"
 
 #: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1572
+#: calendar/gui/event-editor.c:1583
 msgid "Send an email"
 msgstr "メールを送信する"
 
-#: calendar/gui/event-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
 msgid "Settings..."
 msgstr "設定..."
 
 #: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1569
+#: calendar/gui/event-editor.c:1580
 msgid "Show a dialog"
 msgstr "ダイアログを表示する"
 
@@ -2605,11 +2601,12 @@ msgstr "開始時間(_S):"
 msgid "_Starting date:"
 msgstr "開始日(_S):"
 
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:25
+#. Automatically generated. Do not edit.
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
 msgid "after"
 msgstr "後"
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:26
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
 msgid "before"
 msgstr "前"
 
@@ -2634,169 +2631,161 @@ msgid "hour(s)"
 msgstr "時"
 
 #: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "label21"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "label55"
-msgstr "label55"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "minute(s)"
 msgstr "分"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:41
 msgid "month(s)"
 msgstr "月"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "start of appointment"
 msgstr "約束の最初"
 
-#: calendar/gui/event-editor-dialog.glade.h:45
+#: calendar/gui/event-editor-dialog.glade.h:43
 msgid "until"
 msgstr "まで"
 
-#: calendar/gui/event-editor-dialog.glade.h:46
+#: calendar/gui/event-editor-dialog.glade.h:44
 msgid "week(s)"
 msgstr "週"
 
-#: calendar/gui/event-editor-dialog.glade.h:47
+#: calendar/gui/event-editor-dialog.glade.h:45
 msgid "year(s)"
 msgstr "年"
 
-#: calendar/gui/event-editor.c:369
+#: calendar/gui/event-editor.c:371
 msgid "Edit Appointment"
 msgstr "約束の編集"
 
-#: calendar/gui/event-editor.c:447
+#: calendar/gui/event-editor.c:449
 msgid "on"
 msgstr ""
 
-#: calendar/gui/event-editor.c:472 filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:65
 msgid "day"
 msgstr "日"
 
-#: calendar/gui/event-editor.c:599
+#: calendar/gui/event-editor.c:601
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/event-editor.c:606
+#: calendar/gui/event-editor.c:608
 msgid "th"
 msgstr ""
 
-#: calendar/gui/event-editor.c:752
+#: calendar/gui/event-editor.c:754
 msgid "occurrences"
 msgstr "出来事"
 
-#: calendar/gui/event-editor.c:869
+#: calendar/gui/event-editor.c:871
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "この約束は Evolution が編集出来ない再発を含んでいます"
 
-#: calendar/gui/event-editor.c:1521
+#: calendar/gui/event-editor.c:1532
 #, c-format
 msgid " %d days"
 msgstr "%d 日"
 
-#: calendar/gui/event-editor.c:1523
+#: calendar/gui/event-editor.c:1534
 msgid " 1 day"
 msgstr "1 日"
 
-#: calendar/gui/event-editor.c:1526
+#: calendar/gui/event-editor.c:1537
 #, c-format
 msgid " %d weeks"
 msgstr "%d 週間"
 
-#: calendar/gui/event-editor.c:1528
+#: calendar/gui/event-editor.c:1539
 msgid " 1 week"
 msgstr "1 週間"
 
-#: calendar/gui/event-editor.c:1531
+#: calendar/gui/event-editor.c:1542
 #, c-format
 msgid " %d hours"
 msgstr "%d 時間"
 
-#: calendar/gui/event-editor.c:1533
+#: calendar/gui/event-editor.c:1544
 msgid " 1 hour"
 msgstr "1 時間"
 
-#: calendar/gui/event-editor.c:1536
+#: calendar/gui/event-editor.c:1547
 #, c-format
 msgid " %d minutes"
 msgstr "%d 分"
 
-#: calendar/gui/event-editor.c:1538
+#: calendar/gui/event-editor.c:1549
 msgid " 1 minute"
 msgstr "1 分"
 
-#: calendar/gui/event-editor.c:1541
+#: calendar/gui/event-editor.c:1552
 #, c-format
 msgid " %d seconds"
 msgstr "%d 秒"
 
-#: calendar/gui/event-editor.c:1543
+#: calendar/gui/event-editor.c:1554
 msgid " 1 second"
 msgstr "1 秒"
 
-#: calendar/gui/event-editor.c:1590
+#: calendar/gui/event-editor.c:1601
 msgid " before start of appointment"
 msgstr "最初の約束の前"
 
-#: calendar/gui/event-editor.c:1592
+#: calendar/gui/event-editor.c:1603
 msgid " after start of appointment"
 msgstr "最初の約束の後"
 
-#: calendar/gui/event-editor.c:1600
+#: calendar/gui/event-editor.c:1611
 msgid " before end of appointment"
 msgstr "最後の約束の前"
 
-#: calendar/gui/event-editor.c:1602
+#: calendar/gui/event-editor.c:1613
 msgid " after end of appointment"
 msgstr "最後の約束の後"
 
-#: calendar/gui/event-editor.c:3101 calendar/gui/print.c:1092
-#: calendar/gui/print.c:1094 calendar/gui/print.c:1095
+#: calendar/gui/event-editor.c:3113 calendar/gui/print.c:1093
+#: calendar/gui/print.c:1095 calendar/gui/print.c:1096
 msgid "%a %b %d %Y"
 msgstr "%Y/%b/%d (%a)"
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "カレンダを表示する Bonobo コントロールのサンプル"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
 msgid "Evolution calendar executive summary component."
 msgstr "Evolution カレンダ実行サマリコンポーネント"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Evolution カレンダ iTip/iMip ビューア"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
 msgid "Evolution component for handling the calendar."
 msgstr "カレンダを扱うための Evolution コンポーネント"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Factory for the Calendar Summary component."
 msgstr "カレンダサマリーコンポーネントのためのファクトリ"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Factory for the Evolution calendar component."
 msgstr "Evolution カレンダコンポーネントのためのファクトリ"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Factory for the calendar iTip view control"
 msgstr "カレンダ iTip ビューコントロールのためのファクトリ"
 
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "カレンダを表示する Bonobo コントロールのサンプル"
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:2
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the sample Calendar control"
 msgstr "サンプルカレンダコントロールのファクトリ"
 
-#: calendar/gui/gnome-cal.c:694
+#: calendar/gui/gnome-cal.c:695
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s' のフォルダを開くことが出来ませんでした"
 
-#: calendar/gui/gnome-cal.c:705
+#: calendar/gui/gnome-cal.c:706
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "'%s' を開くことを要求されるメソッドはサポートしていません"
@@ -2857,199 +2846,197 @@ msgstr "10 月"
 msgid "September"
 msgstr "9 月"
 
-#: calendar/gui/main.c:49
-msgid "Could not initialize GNOME"
-msgstr "GNOME の初期化が出来ませんでした"
-
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "1st"
 msgstr "1 日"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "2nd"
 msgstr "2 日"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "3rd"
 msgstr "3 日"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "4th"
 msgstr "4 日"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "5th"
 msgstr "5 日"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "6th"
 msgstr "6 日"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "7th"
 msgstr "7 日"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "8th"
 msgstr "8 日"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "9th"
 msgstr "9 日"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "10th"
 msgstr "10 日"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "11th"
 msgstr "11 日"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "12th"
 msgstr "12 日"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "13th"
 msgstr "13 日"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "14th"
 msgstr "14 日"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "15th"
 msgstr "15 日"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "16th"
 msgstr "16 日"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "17th"
 msgstr "17 日"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "18th"
 msgstr "18 日"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "19th"
 msgstr "19 日"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "20th"
 msgstr "20 日"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:300
 msgid "21st"
 msgstr "21 日"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:300
 msgid "22nd"
 msgstr "22 日"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:300
 msgid "23rd"
 msgstr "23 日"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:300
 msgid "24th"
 msgstr "24 日"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:300
 msgid "25th"
 msgstr "25 日"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:301
 msgid "26th"
 msgstr "26 日"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:301
 msgid "27th"
 msgstr "27 日"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:301
 msgid "28th"
 msgstr "28 日"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:301
 msgid "29th"
 msgstr "29 日"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:301
 msgid "30th"
 msgstr "30 日"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:302
 msgid "31st"
 msgstr "31 日"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Su"
 msgstr "日"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Mo"
 msgstr "月"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Tu"
 msgstr "火"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "We"
 msgstr "水"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Th"
 msgstr "木"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Fr"
 msgstr "金"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Sa"
 msgstr "土"
 
-#: calendar/gui/print.c:943
+#: calendar/gui/print.c:944
 msgid "Tasks"
 msgstr "タスク"
 
 #. Day
-#: calendar/gui/print.c:1073
+#: calendar/gui/print.c:1074
 msgid "Current day (%a %b %d %Y)"
 msgstr "今日の日付 [%Y/%b/%d (%a)]"
 
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1091
+#: calendar/gui/print.c:1088 calendar/gui/print.c:1092
 msgid "%a %b %d"
 msgstr "%b/%d (%a)"
 
-#: calendar/gui/print.c:1088
+#: calendar/gui/print.c:1089
 msgid "%a %d %Y"
 msgstr "%Y/%d (%a)"
 
-#: calendar/gui/print.c:1099
+#: calendar/gui/print.c:1100
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "今週 (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1107
+#: calendar/gui/print.c:1108
 msgid "Current month (%b %Y)"
 msgstr "今月 (%Y/%b)"
 
 #. Year
-#: calendar/gui/print.c:1114
+#: calendar/gui/print.c:1115
 msgid "Current year (%Y)"
 msgstr "今年 (%Y)"
 
-#: calendar/gui/print.c:1151
+#: calendar/gui/print.c:1152
 msgid "Print Calendar"
 msgstr "カレンダの印刷"
 
-#: calendar/gui/print.c:1316 mail/mail-callbacks.c:1229
+#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1334
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
+#: ui/evolution-mail.xml.h:29
 msgid "Print Preview"
 msgstr "印刷プレビュー"
 
@@ -3057,26 +3044,54 @@ msgstr "印刷プレビュー"
 msgid "The URI of the tasks folder to display"
 msgstr "タスクフォルダが表示する URI"
 
+#: calendar/gui/tasks-migrate.c:106
+msgid ""
+"Evolution has taken the tasks that were in your calendar folder and "
+"automatically migrated them to the new tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:109
+msgid ""
+"Evolution has tried to take the tasks that were in your calendar folder and "
+"migrate them to the new tasks folder.\n"
+"Some of the tasks could not be migrated, so this process may be attempted "
+"again in the future."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:121
+#, c-format
+msgid ""
+"Could not open `%s'; no items from the calendar folder will be migrated to "
+"the tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:134
+#, c-format
+msgid ""
+"The method required to load `%s' is not supported; no items from the "
+"calendar folder will be migrated to the tasks folder."
+msgstr ""
+
 #: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
 msgid "SMTWTFS"
 msgstr "SMTWTFS"
 
-#: camel/camel-filter-driver.c:767
+#: camel/camel-filter-driver.c:848
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "フィルタの構文解析中にエラー: %s: %s"
 
-#: camel/camel-filter-driver.c:772
+#: camel/camel-filter-driver.c:853
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "フィルタ実行中にエラー: %s: %s"
 
-#: camel/camel-filter-search.c:420 camel/camel-filter-search.c:426
+#: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "フィルタ検索実行中にエラー: %s: %s"
 
-#: camel/camel-folder-search.c:320
+#: camel/camel-folder-search.c:323
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -3085,7 +3100,7 @@ msgstr ""
 "正規表現の構文を解析出来ません: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:330
+#: camel/camel-folder-search.c:333
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -3094,16 +3109,16 @@ msgstr ""
 "正規表現での検索を実行中にエラー: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:475 camel/camel-folder-search.c:503
+#: camel/camel-folder-search.c:480 camel/camel-folder-search.c:508
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:547
+#: camel/camel-folder-search.c:554
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:656 camel/camel-folder-search.c:693
+#: camel/camel-folder-search.c:663 camel/camel-folder-search.c:700
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
@@ -3184,82 +3199,207 @@ msgstr "Movemail プログラムは失敗しました: %s"
 msgid "(Unknown error)"
 msgstr "(未知のエラー)"
 
-#: camel/camel-provider.c:133
+#: camel/camel-provider.c:137
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s をロード出来ませんでした: %s"
 
-#: camel/camel-provider.c:141
+#: camel/camel-provider.c:145
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s をロード出来ませんでした: モジュールのコードが初期化されていません"
 
-#: camel/camel-remote-store.c:176
+#: camel/camel-remote-store.c:170
 #, c-format
 msgid "%s server %s"
 msgstr "%s サーバ %s"
 
-#: camel/camel-remote-store.c:180
+#: camel/camel-remote-store.c:174
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:306
+#: camel/camel-remote-store.c:221
 msgid "Connection cancelled"
 msgstr "接続はキャンセルしました"
 
-#: camel/camel-remote-store.c:309 camel/camel-remote-store.c:322
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/camel-remote-store.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:243
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "%s (ポート %d) へ接続出来ませんでした: %s"
 
-#: camel/camel-remote-store.c:310 camel/camel-remote-store.c:323
+#: camel/camel-remote-store.c:225
 msgid "(unknown host)"
 msgstr "(未知のホスト)"
 
-#: camel/camel-remote-store.c:408 camel/camel-remote-store.c:470
-#: camel/camel-remote-store.c:538
+#: camel/camel-remote-store.c:306 camel/camel-remote-store.c:368
+#: camel/camel-remote-store.c:439
 #: camel/providers/imap/camel-imap-command.c:289
 msgid "Operation cancelled"
 msgstr "操作はキャンセルしました"
 
+#: camel/camel-remote-store.c:445
+msgid "Server unexpectedly disconnected"
+msgstr "サーバは突然切断しました"
+
+#: camel/camel-sasl-anonymous.c:97 camel/camel-sasl-plain.c:84
+msgid "Authentication failed."
+msgstr "認証に失敗しました"
+
+#: camel/camel-sasl-anonymous.c:106
+#, c-format
+msgid ""
+"Invalid email address trace information:\n"
+"%s"
+msgstr ""
+"無効なメールアドレストレース情報:\n"
+"%s"
+
+#: camel/camel-sasl-anonymous.c:118
+#, c-format
+msgid ""
+"Invalid opaque trace information:\n"
+"%s"
+msgstr ""
+"無効で不可解なトレース情報:\n"
+"%s"
+
+#: camel/camel-sasl-anonymous.c:130
+#, c-format
+msgid ""
+"Invalid trace information:\n"
+"%s"
+msgstr ""
+"無効なトレース情報:\n"
+"%s"
+
+#: camel/camel-sasl-cram-md5.c:32 mail/mail-config.glade.h:11
+msgid "CRAM-MD5"
+msgstr "CRAM-MD5"
+
+#: camel/camel-sasl-cram-md5.c:34
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr ""
+"もしサーバがサポートしているなら, このオプションはセキュアな CRAM-MD5 "
+"認証を使ってサーバへ接続します"
+
+#: camel/camel-sasl-digest-md5.c:37 mail/mail-config.glade.h:19
+msgid "DIGEST-MD5"
+msgstr "DIGEST-MD5"
+
+#: camel/camel-sasl-digest-md5.c:39
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+"もしサーバがサポートしているなら, このオプションはセキュアな DIGEST-MD5 "
+"を使ってサーバに接続します"
+
+#: camel/camel-sasl-digest-md5.c:761
+msgid "Server challenge too long (>2048 octets)\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:770
+msgid "Server challenge invalid\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:776
+msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:798
+msgid "Server response did not contain authorization data\n"
+msgstr "サーバの応答は認証データを含んでいません\n"
+
+#: camel/camel-sasl-digest-md5.c:816
+msgid "Server response contained incomplete authorization data\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:826
+msgid "Server response does not match\n"
+msgstr "サーバの応答は一致しません\n"
+
+#: camel/camel-sasl-kerberos4.c:38
+msgid "Kerberos 4"
+msgstr "Kerberos 4"
+
+#: camel/camel-sasl-kerberos4.c:40
+msgid "This option will connect to the server using Kerberos 4 authentication."
+msgstr "このオプションは Kerberos 4 認証を使ってサーバに接続します"
+
+#: camel/camel-sasl-kerberos4.c:158
+#, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr ""
+"Kerberos チケットを取得することが出来ませんでした:\n"
+"%s"
+
+#: camel/camel-sasl-kerberos4.c:215
+#: camel/providers/imap/camel-imap-store.c:418
+msgid "Bad authentication response from server."
+msgstr "サーバから間違った認証応答がありました"
+
+#: camel/camel-sasl-plain.c:29
+msgid "PLAIN"
+msgstr "プレイン"
+
+#: camel/camel-sasl-plain.c:31
+msgid ""
+"This option will connect to the server using a the PLAIN SASL mechanism if "
+"the server supports it."
+msgstr ""
+"もしサーバがサポートしているなら, このオプションはプレイン SASL "
+"メカニズムを使ってサーバに接続します"
+
 #: camel/camel-search-private.c:105
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "正規表現の編集に失敗: %s: %s"
 
-#: camel/camel-service.c:142
+#: camel/camel-service.c:139
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' はユーザ名コンポーネントが必要です"
 
-#: camel/camel-service.c:151
+#: camel/camel-service.c:147
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' はホストコンポーネントが必要です"
 
-#: camel/camel-service.c:160
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' はパスコンポーネントが必要です"
 
-#: camel/camel-service.c:512
+#: camel/camel-service.c:478
 #, c-format
 msgid "No such host %s."
 msgstr "そのようなホスト %s はありません"
 
-#: camel/camel-service.c:515
+#: camel/camel-service.c:481
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr "一時的にホスト名 %s を見つけることが出来ません"
 
-#: camel/camel-session.c:299
+#: camel/camel-session.c:54
+msgid "Virtual folder email provider"
+msgstr "仮想フォルダメールプロバイダ"
+
+#: camel/camel-session.c:56
+msgid "For reading mail as a query of another set of folders"
+msgstr ""
+
+#: camel/camel-session.c:320
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "プロトコル `%s' を利用できるプロバイダはありません"
 
-#: camel/camel-session.c:394
+#: camel/camel-session.c:415
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3268,33 +3408,31 @@ msgstr ""
 "ディレクトリ %s を作成出来ません:\n"
 "%s"
 
-#: camel/camel-url.c:75
+#. Fill in the new fields
+#: camel/camel-store.c:382 mail/mail-ops.c:941 mail/mail-ops.c:948
+#: mail/mail-ops.c:966 mail/mail-ops.c:967
+msgid "Trash"
+msgstr "ごみ箱"
+
+#: camel/camel-url.c:77
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr "URL 文字列 `%s' はプロトコルを含んでいません"
 
-#: camel/camel-url.c:90
+#: camel/camel-url.c:92
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr "URL 文字列 `%s' は無効なプロトコルを含んでいます"
 
-#: camel/camel-url.c:150
+#: camel/camel-url.c:152
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "URL `%s' のポート番号は数字ではありません"
 
-#: camel/providers/imap/camel-imap-auth.c:133
+#: camel/camel-vee-folder.c:962
 #, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Kerberos チケットを取得することが出来ませんでした:\n"
-"%s"
-
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
-msgstr "サーバから間違った認証応答がありました"
+msgid "No such message: %s"
+msgstr "そのようなメッセージはありません: %s"
 
 #: camel/providers/imap/camel-imap-command.c:234
 #, c-format
@@ -3306,7 +3444,7 @@ msgstr "IMAP サーバから予期しない応答がありました: %s"
 msgid "IMAP command failed: %s"
 msgstr "IMAP コマンドは失敗しました: %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:433
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:481
 msgid "Unknown error"
 msgstr "未知のエラー"
 
@@ -3324,44 +3462,68 @@ msgstr "IMAP サーバの応答は %s 情報を含んでいません"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP サーバから予期しない OK 応答がありました: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:198
+#: camel/providers/imap/camel-imap-folder.c:176
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s のサマリーをロード出来ませんでした"
 
-#: camel/providers/imap/camel-imap-folder.c:702
-#: camel/providers/imap/camel-imap-folder.c:864
+#: camel/providers/imap/camel-imap-folder.c:345
+msgid "Scanning IMAP folder"
+msgstr "IMAP フォルダを走査中"
+
+#: camel/providers/imap/camel-imap-folder.c:946
+#: camel/providers/imap/camel-imap-folder.c:1143
+msgid "This message is not currently available"
+msgstr "このメッセージは現在利用出来ません"
+
+#: camel/providers/imap/camel-imap-folder.c:976
+#: camel/providers/imap/camel-imap-folder.c:1177
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH 応答にメッセージ本体を見付けることが出来ませんでした"
 
-#: camel/providers/imap/camel-imap-provider.c:39
+#: camel/providers/imap/camel-imap-provider.c:40
 msgid "IMAPv4"
 msgstr "IMAPv4"
 
-#: camel/providers/imap/camel-imap-provider.c:41
+#: camel/providers/imap/camel-imap-provider.c:42
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP サーバでメールを読んだり蓄積するためのものです"
 
-#: camel/providers/imap/camel-imap-store.c:252
+#: camel/providers/imap/camel-imap-provider.c:58
+msgid "Secure IMAPv4"
+msgstr "セキュア IMAPv4"
+
+#: camel/providers/imap/camel-imap-provider.c:60
+msgid "For reading and storing mail on IMAP servers over an SSL connection."
+msgstr "SSL 接続を越えて IMAP サーバ上のメールを読んだり保存するためのものです"
+
+#: camel/providers/imap/camel-imap-provider.c:77
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "このオプションはプレインテキストパスワードを使って IMAP サーバに接続します"
 
-#: camel/providers/imap/camel-imap-store.c:261
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
+#: camel/providers/imap/camel-imap-store.c:441
+#, c-format
+msgid "IMAP server %s does not support requested authentication type %s"
+msgstr "IMAP サーバ %s は要求した認証タイプ %s をサポートしていません"
 
-#: camel/providers/imap/camel-imap-store.c:263
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
-msgstr "このオプションは Kerberos 4 認証を使って IMAP サーバに接続します"
+#: camel/providers/imap/camel-imap-store.c:451
+#, c-format
+msgid "No support for authentication type %s"
+msgstr "認証タイプ %s をサポートしていません"
 
-#: camel/providers/imap/camel-imap-store.c:369
+#: camel/providers/imap/camel-imap-store.c:476
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s %s@%s の IMAP パスワードを入力してください"
 
-#: camel/providers/imap/camel-imap-store.c:397
+#: camel/providers/imap/camel-imap-store.c:491
+#: camel/providers/smtp/camel-smtp-transport.c:374
+msgid "You didn't enter a password."
+msgstr "パスワードを入力していません"
+
+#: camel/providers/imap/camel-imap-store.c:519
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3372,11 +3534,15 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:674
+#: camel/providers/imap/camel-imap-store.c:871
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "ディレクトリ %s を作成出来ませんでした: %s"
 
+#: camel/providers/imap/camel-imap-store.c:1328
+msgid "You must be working online to complete this operation"
+msgstr "この動作を完了するためにオンラインで作業しなければなりません"
+
 #: camel/providers/local/camel-local-provider.c:36
 msgid "MH-format mail directories"
 msgstr "MH 形式のメールディレクトリ"
@@ -3385,19 +3551,19 @@ msgstr "MH 形式のメールディレクトリ"
 msgid "For storing local mail in MH-like mail directories"
 msgstr "MHライクなメールディレクトリにローカルメールを保存します"
 
-#: camel/providers/local/camel-local-provider.c:47
+#: camel/providers/local/camel-local-provider.c:46
 msgid "Standard Unix mailbox file"
 msgstr "標準的な UNIX の mailbox ファイル"
 
-#: camel/providers/local/camel-local-provider.c:48
+#: camel/providers/local/camel-local-provider.c:47
 msgid "For storing local mail in standard mbox format"
 msgstr "標準 mbox 型式でローカルメールを保存します"
 
-#: camel/providers/local/camel-local-provider.c:58
+#: camel/providers/local/camel-local-provider.c:56
 msgid "Qmail maildir-format mail files"
 msgstr "Qmail maildir型式のメールファイル"
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:57
 msgid "For storing local mail in qmail maildir directories"
 msgstr "qmail maildirディレクトリにローカルメールを保存します"
 
@@ -3608,7 +3774,7 @@ msgid "Cannot summarise folder: %s: %s"
 msgstr "フォルダをサマライズすることが出来ません: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1326
+#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1327
 msgid "Synchronising folder"
 msgstr "フォルダを同期中"
 
@@ -3740,25 +3906,25 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "%s の .newsrc ファイルを作成または開くことが出来ません: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:145
+#: camel/providers/pop3/camel-pop3-folder.c:149
 msgid "Retrieving POP summary"
 msgstr "POP サマリを取得中"
 
-#: camel/providers/pop3/camel-pop3-folder.c:188
+#: camel/providers/pop3/camel-pop3-folder.c:192
 msgid "Could not open folder: message listing was incomplete."
 msgstr "フォルダを開けませんでした: メッセージリストは未完成です"
 
-#: camel/providers/pop3/camel-pop3-folder.c:282
+#: camel/providers/pop3/camel-pop3-folder.c:286
 #, c-format
 msgid "No message with uid %s"
 msgstr "uid %s のメッセージはありません"
 
-#: camel/providers/pop3/camel-pop3-folder.c:286
+#: camel/providers/pop3/camel-pop3-folder.c:290
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "POP メッセージ %d を取得中"
 
-#: camel/providers/pop3/camel-pop3-folder.c:304
+#: camel/providers/pop3/camel-pop3-folder.c:308
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "POP サーバ %s からメッセージを取得出来ませんでした: %s"
@@ -3776,7 +3942,21 @@ msgstr ""
 "メールプロバイダや独自のメールシステムから E "
 "メールを受信するために使うことが出来ます"
 
-#: camel/providers/pop3/camel-pop3-store.c:142
+#: camel/providers/pop3/camel-pop3-provider.c:52
+msgid "Secure POP"
+msgstr "セキュア POP"
+
+#: camel/providers/pop3/camel-pop3-provider.c:54
+msgid ""
+"For connecting to POP servers over an SSL connection. The POP protocol can "
+"also be used to retrieve mail from certain web mail providers and "
+"proprietary email systems."
+msgstr ""
+"SSL 接続を越えた POP サーバへ接続するために, POP プロトコルは特定の web "
+"メールプロバイダや独自のメールシステムから E "
+"メールを受信するために使うことが出来ます"
+
+#: camel/providers/pop3/camel-pop3-provider.c:71
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -3784,7 +3964,7 @@ msgstr ""
 "このオプションはプレインテキストのパスワードを使って POP サーバへ接続します. "
 "これは多くの POP サーバでサポートされるオプションです"
 
-#: camel/providers/pop3/camel-pop3-store.c:152
+#: camel/providers/pop3/camel-pop3-provider.c:81
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -3794,27 +3974,27 @@ msgstr ""
 "サーバへ接続します. これは公平なサポートを要求するサーバで, "
 "すべてのユーザが正常に動作するわけではありません."
 
-#: camel/providers/pop3/camel-pop3-store.c:164
+#: camel/providers/pop3/camel-pop3-provider.c:93
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr "これは POP サーバへ接続し, Kerberos 4 認証を使います."
 
-#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:181
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "KPOP サーバへ認証出来ませんでした: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:326
+#: camel/providers/pop3/camel-pop3-store.c:298
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "%s の POP サーバへ接続出来ませんでした"
 
-#: camel/providers/pop3/camel-pop3-store.c:373
+#: camel/providers/pop3/camel-pop3-store.c:337
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%s %s@%s の POP3 パスワードを入力してください"
 
-#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:356
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3823,12 +4003,12 @@ msgstr ""
 "POP サーバへ接続出来ません\n"
 "ユーザ名の送信中にエラー: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:395
-#: camel/providers/pop3/camel-pop3-store.c:432
+#: camel/providers/pop3/camel-pop3-store.c:359
+#: camel/providers/pop3/camel-pop3-store.c:396
 msgid "(Unknown)"
 msgstr "(未知)"
 
-#: camel/providers/pop3/camel-pop3-store.c:422
+#: camel/providers/pop3/camel-pop3-store.c:386
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -3836,7 +4016,7 @@ msgstr ""
 "POP サーバへ接続出来ません\n"
 "要求した認証手段はサポートしていません"
 
-#: camel/providers/pop3/camel-pop3-store.c:430
+#: camel/providers/pop3/camel-pop3-store.c:394
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3845,13 +4025,13 @@ msgstr ""
 "POP サーバへ接続できません\n"
 "パスワードの送信中にエラー: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:530
+#: camel/providers/pop3/camel-pop3-store.c:503
 #, c-format
 msgid "No such folder `%s'."
 msgstr "そのようなフォルダ `%s' はありません"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:64
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3893,237 +4073,253 @@ msgstr "%s を実行出来ませんでした: メールは送信しませんでした"
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail はステータス %d で終了しました: メールは送信しませんでした"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
+#: camel/providers/sendmail/camel-sendmail-transport.c:192
+msgid "Could not find 'From' address in message"
+msgstr "メッセージに 'From' アドレスを見つけることが出来ませんでした"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
 msgid "Mail delivery via the sendmail program"
 msgstr "sendmail 経由でメールを配信"
 
-#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:56
+#: camel/providers/smtp/camel-smtp-provider.c:35 mail/mail-config.glade.h:58
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:36
+#: camel/providers/smtp/camel-smtp-provider.c:37
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "SMTPを使ってリモートメールハブに接続することでメールを配信します\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:141
+#: camel/providers/smtp/camel-smtp-provider.c:52
+msgid "Secure SMTP"
+msgstr "セキュア SMTP"
+
+#: camel/providers/smtp/camel-smtp-provider.c:54
+msgid ""
+"For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
+"connection.\n"
+msgstr ""
+"SSL 接続を越えた "
+"SMTPを使ってリモートメールハブに接続することでメールを配信します\n"
+
+#: camel/providers/smtp/camel-smtp-transport.c:146
 msgid "Syntax error, command unrecognized"
 msgstr "構文解析エラー, コマンドではありません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:143
+#: camel/providers/smtp/camel-smtp-transport.c:148
 msgid "Syntax error in parameters or arguments"
 msgstr "パラメータあるいは引数に構文解析エラー"
 
-#: camel/providers/smtp/camel-smtp-transport.c:145
+#: camel/providers/smtp/camel-smtp-transport.c:150
 msgid "Command not implemented"
 msgstr "コマンドは実装されていません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:147
+#: camel/providers/smtp/camel-smtp-transport.c:152
 msgid "Command parameter not implemented"
 msgstr "コマンドパラメータは実装されていません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:149
+#: camel/providers/smtp/camel-smtp-transport.c:154
 msgid "System status, or system help reply"
 msgstr "システムステータスあるいはシステムヘルプ応答"
 
-#: camel/providers/smtp/camel-smtp-transport.c:151
+#: camel/providers/smtp/camel-smtp-transport.c:156
 msgid "Help message"
 msgstr "ヘルプメッセージ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:153
+#: camel/providers/smtp/camel-smtp-transport.c:158
 msgid "Service ready"
 msgstr "サービスは利用できます"
 
-#: camel/providers/smtp/camel-smtp-transport.c:155
+#: camel/providers/smtp/camel-smtp-transport.c:160
 msgid "Service closing transmission channel"
 msgstr "サービスは送信チャンネルを閉じています"
 
-#: camel/providers/smtp/camel-smtp-transport.c:157
+#: camel/providers/smtp/camel-smtp-transport.c:162
 msgid "Service not available, closing transmission channel"
 msgstr "サービスは利用できません, 送信チャンネルを閉じています"
 
-#: camel/providers/smtp/camel-smtp-transport.c:159
+#: camel/providers/smtp/camel-smtp-transport.c:164
 msgid "Requested mail action okay, completed"
 msgstr "要求されたメールの動作はOK, 完了しました"
 
-#: camel/providers/smtp/camel-smtp-transport.c:161
+#: camel/providers/smtp/camel-smtp-transport.c:166
 msgid "User not local; will forward to <forward-path>"
 msgstr "ユーザはローカルではありません; <forward-path> へ転送します"
 
-#: camel/providers/smtp/camel-smtp-transport.c:163
+#: camel/providers/smtp/camel-smtp-transport.c:168
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "要求されたメールの動作は完了しません: メールボックスは利用できません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "要求された動作は完了しません: メールボックスは利用できません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Requested action aborted: error in processing"
 msgstr "要求された動作を中断しました: 処理中にエラー"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "User not local; please try <forward-path>"
 msgstr "ユーザはローカルではありません; <forward-path> を試してください"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Requested action not taken: insufficient system storage"
 msgstr "要求された動作は完了しません: システムの保存領域が足りません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "要求されたメールの動作を中断しました: 領域割り当てを越えました"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "要求された動作は完了しません: メールボックス名は認められません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "メールの入力を開始します; <CRLF>.<CRLF> で終了します"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Transaction failed"
 msgstr "処理は失敗しました"
 
-#: camel/providers/smtp/camel-smtp-transport.c:243
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "初期応答エラー: %s: たぶん致命的ではありません"
+#: camel/providers/smtp/camel-smtp-transport.c:188
+msgid "A password transition is needed"
+msgstr "パスワードの変更が必要です"
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-msgid "No authentication required"
-msgstr "認証の必要なし"
+#: camel/providers/smtp/camel-smtp-transport.c:190
+msgid "Authentication mechanism is too weak"
+msgstr "認証メカニズムは不十分過ぎます"
 
-#: camel/providers/smtp/camel-smtp-transport.c:339
-msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
-msgstr ""
-"このオプションは一種の認証を使わずに SMTP サーバを接続します. "
-"これはたいていの SMTP サーバへ接続しても構わないはずです"
+#: camel/providers/smtp/camel-smtp-transport.c:192
+msgid "Encryption required for requested authentication mechanism"
+msgstr "要求した認証メカニズムのために暗号化が必要です"
 
-#: camel/providers/smtp/camel-smtp-transport.c:348
-#: camel/providers/smtp/camel-smtp-transport.c:353 mail/mail-config.glade.h:11
-msgid "CRAM-MD5"
-msgstr "CRAM-MD5"
+#: camel/providers/smtp/camel-smtp-transport.c:194
+msgid "Temporary authentication failure"
+msgstr "一時的な認証に失敗しました"
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
-msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr "このオプションは CRAM-MD5 認証を使って SMTP サーバへ接続します"
+#: camel/providers/smtp/camel-smtp-transport.c:196
+msgid "Authentication required"
+msgstr "認証を必要としています"
+
+#: camel/providers/smtp/camel-smtp-transport.c:287
+#, c-format
+msgid "Welcome response error: %s: possibly non-fatal"
+msgstr "初期応答エラー: %s: たぶん致命的ではありません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:359
+#, c-format
+msgid "%sPlease enter the SMTP password for %s@%s"
+msgstr "%s %s@%s の SMTP パスワードを入力してください"
+
+#: camel/providers/smtp/camel-smtp-transport.c:494
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP サーバ %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:380
+#: camel/providers/smtp/camel-smtp-transport.c:496
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s 経由で SMTP メールを配信します"
 
-#: camel/providers/smtp/camel-smtp-transport.c:405
+#: camel/providers/smtp/camel-smtp-transport.c:521
 msgid "Cannot send message: sender address not defined."
 msgstr "メッセージを送信出来ません: 送信者のアドレスが定義されていません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:412
+#: camel/providers/smtp/camel-smtp-transport.c:528
 msgid "Cannot send message: sender address not valid."
 msgstr "メッセージを送信出来ません: 送信者のアドレスが正しくありません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:426
+#: camel/providers/smtp/camel-smtp-transport.c:542
 msgid "Cannot send message: no recipients defined."
 msgstr "メッセージを送信出来ません: 受信者が定義されていません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:636
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "HELO 要求のタイムアウト: %s: 致命的ではありません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:539
+#: camel/providers/smtp/camel-smtp-transport.c:655
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO レスポンスエラー: %s: 致命的ではありません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:578
+#: camel/providers/smtp/camel-smtp-transport.c:690
+#: camel/providers/smtp/camel-smtp-transport.c:702
+#, c-format
+msgid "AUTH request timed out: %s"
+msgstr "AUTH 要求のタイムアウト: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:760
+msgid "Bad authentication response from server.\n"
+msgstr "サーバから間違った認証応答がありました\n"
+
+#: camel/providers/smtp/camel-smtp-transport.c:785
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM 要求のタイムアウト: %s: メールは送信しませんでした"
 
-#: camel/providers/smtp/camel-smtp-transport.c:597
+#: camel/providers/smtp/camel-smtp-transport.c:804
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "MAIL FROM レスポンスエラー: %s: メールは送信しませんでした"
 
-#: camel/providers/smtp/camel-smtp-transport.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:829
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO 要求のタイムアウト: %s: メールは送信しませんでした"
 
-#: camel/providers/smtp/camel-smtp-transport.c:641
+#: camel/providers/smtp/camel-smtp-transport.c:848
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "RCPT TO レスポンスエラー: %s: メールは送信しませんでした"
 
-#: camel/providers/smtp/camel-smtp-transport.c:672
+#: camel/providers/smtp/camel-smtp-transport.c:879
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA 要求のタイムアウト: %s: メールは送信しませんでした"
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:898
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "DATA レスポンスエラー: %s: メールは送信しませんでした"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
-#: camel/providers/smtp/camel-smtp-transport.c:724
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#: camel/providers/smtp/camel-smtp-transport.c:931
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA 送信のタイムアウト: メッセージの終了: %s: メールは送信しませんでした"
 
-#: camel/providers/smtp/camel-smtp-transport.c:743
+#: camel/providers/smtp/camel-smtp-transport.c:950
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 "DATA レスポンスエラー: メッセージの終了: %s: メールは送信しませんでした"
 
-#: camel/providers/smtp/camel-smtp-transport.c:767
+#: camel/providers/smtp/camel-smtp-transport.c:974
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET 要求のタイムアウト: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:786
+#: camel/providers/smtp/camel-smtp-transport.c:993
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET レスポンスエラー: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:809
+#: camel/providers/smtp/camel-smtp-transport.c:1016
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "QUIT 要求のタイムアウト: %s: 致命的ではありません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:828
+#: camel/providers/smtp/camel-smtp-transport.c:1035
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUIT レスポンスエラー: %s: 致命的ではありません"
 
-#: camel/providers/vee/camel-vee-folder.c:617
-#, c-format
-msgid "No such message: %s"
-msgstr "そのようなメッセージはありません: %s"
-
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr "仮想フォルダメールプロバイダ"
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-
 #: composer/e-msg-composer-attachment-bar.c:87
 msgid "1 byte"
 msgstr "1 バイト"
@@ -4149,7 +4345,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:113
+#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:115
 msgid "attachment"
 msgstr "添付"
 
@@ -4158,11 +4354,6 @@ msgstr "添付"
 msgid "Attach a file"
 msgstr "ファイルを添付します"
 
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "削除"
-
 #: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr "添付物リストから選択したアイテムを削除します"
@@ -4175,7 +4366,7 @@ msgstr "添付の追加..."
 msgid "Attach a file to the message"
 msgstr "メッセージへファイルを添付します"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1167
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1014
 msgid "Attachment"
 msgstr "添付"
 
@@ -4197,42 +4388,54 @@ msgstr "MIME タイプ:"
 
 #: composer/e-msg-composer-attachment.glade.h:7
 msgid "Send as:"
-msgstr ""
+msgstr "送信先:"
+
+#: composer/e-msg-composer-hdrs.c:314
+msgid "Click here for the address book"
+msgstr "アドレス帳のためにここでクリック"
 
-#: composer/e-msg-composer-hdrs.c:176 composer/e-msg-composer-hdrs.c:386
-#: mail/mail-format.c:627
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:718
 msgid "From:"
 msgstr "差出人:"
 
-#: composer/e-msg-composer-hdrs.c:330
-msgid "Click here for the address book"
-msgstr "アドレス帳のためにここでクリック"
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:720
+msgid "Reply-To:"
+msgstr "返信先:"
 
-#: composer/e-msg-composer-hdrs.c:387
-msgid "Enter the identity you wish to send this message from"
-msgstr "このメッセージを送信したい身元を入力します"
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:618
+msgid "Subject:"
+msgstr "件名:"
 
-#: composer/e-msg-composer-hdrs.c:391 mail/mail-format.c:631
+#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:722
 msgid "To:"
 msgstr "宛先:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:377
 msgid "Enter the recipients of the message"
 msgstr "メッセージの受取人を入力します"
 
-#: composer/e-msg-composer-hdrs.c:396 mail/mail-format.c:633
+#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:724
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:397
+#: composer/e-msg-composer-hdrs.c:381
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "メッセージのカーボンコピーを受信するアドレスを入力します"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:384
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:385
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4240,15 +4443,7 @@ msgstr ""
 "メッセージの受取人リストの中に現れないで, "
 "メッセージのカーボンコピーを受信するアドレスを入力します"
 
-#: composer/e-msg-composer-hdrs.c:409 mail/mail-format.c:635
-msgid "Subject:"
-msgstr "件名:"
-
-#: composer/e-msg-composer-hdrs.c:410
-msgid "Enter the subject of the mail"
-msgstr "メールの件名を入力します"
-
-#: composer/e-msg-composer.c:497
+#: composer/e-msg-composer.c:518
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -4257,39 +4452,26 @@ msgstr ""
 "署名ファイル %s を開くことが出来ませんでした:\n"
 "%s"
 
-#: composer/e-msg-composer.c:665
+#: composer/e-msg-composer.c:706
 msgid "Save as..."
 msgstr "別名で保存..."
 
-#: composer/e-msg-composer.c:676
+#: composer/e-msg-composer.c:717
 #, c-format
 msgid "Error saving file: %s"
 msgstr "ファイルの保存中にエラー: %s"
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:737
 #, c-format
 msgid "Error loading file: %s"
 msgstr "ファイルのロード中にエラー: %s"
 
-#: composer/e-msg-composer.c:718
-msgid "Saving changes to message..."
-msgstr "メッセージの変更を保存中..."
-
-#: composer/e-msg-composer.c:720
-msgid "Save changes to message..."
-msgstr "メッセージの変更を保存..."
-
-#: composer/e-msg-composer.c:761
-#, c-format
-msgid "Error saving composition to 'Drafts': %s"
-msgstr "'草案箱' へ草案を保存中にエラーが発生しました: %s"
-
-#: composer/e-msg-composer.c:819 evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:192
+#: composer/e-msg-composer.c:818 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:193
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:825
+#: composer/e-msg-composer.c:824
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4299,27 +4481,27 @@ msgstr ""
 "\n"
 "変更を保存しますか?"
 
-#: composer/e-msg-composer.c:850
+#: composer/e-msg-composer.c:849
 msgid "Open file"
 msgstr "ファイルを開く"
 
-#: composer/e-msg-composer.c:976
+#: composer/e-msg-composer.c:975
 msgid "That file does not exist."
 msgstr "そのファイルは存在しません"
 
-#: composer/e-msg-composer.c:986
+#: composer/e-msg-composer.c:985
 msgid "That is not a regular file."
 msgstr "それは通常のファイルではありません"
 
-#: composer/e-msg-composer.c:996
+#: composer/e-msg-composer.c:995
 msgid "That file exists but is not readable."
 msgstr "そのファイルは存在しますが，読み取り可能ではありません"
 
-#: composer/e-msg-composer.c:1006
+#: composer/e-msg-composer.c:1005
 msgid "That file appeared accesible but open(2) failed."
 msgstr "そのファイルはアクセス可能のように見えますが，open(2) は失敗しました"
 
-#: composer/e-msg-composer.c:1028
+#: composer/e-msg-composer.c:1027
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4327,22 +4509,32 @@ msgstr ""
 "ファイルはとても大きい (100K 以上) です\n"
 "本当にそれを挿入することを望みますか?"
 
-#: composer/e-msg-composer.c:1049
+#: composer/e-msg-composer.c:1048
 msgid "An error occurred while reading the file."
 msgstr "ファイル読込中の間にエラーは発生しました"
 
-#: composer/e-msg-composer.c:1292 composer/e-msg-composer.c:1527
+#: composer/e-msg-composer.c:1349 composer/e-msg-composer.c:1681
 msgid "Compose a message"
 msgstr "メッセージを作成します"
 
-#: composer/e-msg-composer.c:1608
+#: composer/e-msg-composer.c:1765
 msgid "Could not create composer window."
 msgstr "メール作成ウィンドウを作成出来ませんでした"
 
-#: composer/evolution-composer.c:359
+#: composer/evolution-composer.c:352
+msgid ""
+"Could not create composer window, because you have not yet\n"
+"configured any identities in the mail component."
+msgstr ""
+
+#: composer/evolution-composer.c:367
 msgid "Cannot initialize Evolution's composer."
 msgstr "Evolution メール作成の初期化が出来ません"
 
+#: data/evolution.desktop.in.h:2
+msgid "The Evolution groupware suite"
+msgstr "Evolution グループウェアスイート"
+
 #: data/evolution.keys.in.h:1
 msgid "address card"
 msgstr "アドレスカード"
@@ -4351,6 +4543,78 @@ msgstr "アドレスカード"
 msgid "calendar information"
 msgstr "カレンダ情報"
 
+#. strptime format for a date.
+#: e-util/e-time-utils.c:68 e-util/e-time-utils.c:116
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
+#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
+msgid "%m/%d/%Y"
+msgstr "%Y/%m/%d"
+
+#. strptime format for a time of day, in 12-hour format.
+#. If it is not appropriate in the locale set to an empty string.
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
+msgid "%I:%M:%S %p%n"
+msgstr "%I:%M:%S %p%n"
+
+#. strptime format for a time of day, in 24-hour format.
+#: e-util/e-time-utils.c:89 e-util/e-time-utils.c:200
+msgid "%H:%M:%S%n"
+msgstr "%H:%M:%S%n"
+
+#. strptime format for time of day, without seconds, 12-hour format.
+#. If it is is not appropriate in the locale set to an empty string.
+#: e-util/e-time-utils.c:93 e-util/e-time-utils.c:204
+msgid "%I:%M %p%n"
+msgstr "%I:%M %p%n"
+
+#. strptime format for time of day, without seconds 24-hour format.
+#: e-util/e-time-utils.c:96 e-util/e-time-utils.c:207
+msgid "%H:%M%n"
+msgstr "%H:%M%n"
+
+#. strftime format of a weekday and a date.
+#: e-util/e-time-utils.c:268
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
+msgid "%a %m/%d/%Y"
+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:273
+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:282
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr "%Y/%m/%d (%a) %p %I:%M"
+
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#: e-util/e-time-utils.c:311 widgets/misc/e-dateedit.c:1248
+#: widgets/misc/e-dateedit.c:1307 widgets/misc/e-dateedit.c:1486
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#. strftime format of a time in 24-hour format.
+#: e-util/e-time-utils.c:314
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S"
+
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#: e-util/e-time-utils.c:319 widgets/misc/e-dateedit.c:1251
+#: widgets/misc/e-dateedit.c:1310 widgets/misc/e-dateedit.c:1489
+msgid "%I:%M %p"
+msgstr "%p %I:%M"
+
+#. strftime format of a time in 12-hour format.
+#: e-util/e-time-utils.c:322
+msgid "%I:%M:%S %p"
+msgstr "%I:%M:%S %p"
+
 #: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
 msgid "Evolution component for the executive summary."
 msgstr "実行サマリのための Evolution コンポーネント"
@@ -4629,38 +4893,20 @@ msgstr "今"
 msgid "<click here to select a date>"
 msgstr "<日付を選択するためにここをクリックしてください>"
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-msgid "Add Filter Rule"
-msgstr "フィルタルールを追加"
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "フィルタルールを編集"
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr "入力"
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr "出力"
-
-#: filter/filter-editor.c:456 filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "フィルタを編集"
+#: filter/filter-editor.c:126 filter/filter.glade.h:6
+msgid "Filter Rules"
+msgstr "フィルタルール"
 
 #. and now for the action area
-#: filter/filter-filter.c:403
+#: filter/filter-filter.c:424
 msgid "Then"
 msgstr "その結果"
 
-#: filter/filter-filter.c:416
+#: filter/filter-filter.c:437
 msgid "Add action"
 msgstr "動作を追加"
 
-#: filter/filter-filter.c:422
+#: filter/filter-filter.c:443
 msgid "Remove action"
 msgstr "動作を削除"
 
@@ -4672,7 +4918,7 @@ msgstr ""
 "フォルダの選択を忘れています\n"
 "戻ってメールを配送する有効なフォルダを指定してください"
 
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:279
 msgid "Select Folder"
 msgstr "フォルダを選択"
 
@@ -4697,60 +4943,46 @@ msgstr ""
 msgid "Test"
 msgstr "テスト"
 
-#: filter/filter-rule.c:530
+#: filter/filter-rule.c:598
 msgid "Rule name: "
 msgstr "ルール名: "
 
-#: filter/filter-rule.c:534
+#: filter/filter-rule.c:602
 msgid "Untitled"
 msgstr "タイトルなし"
 
-#: filter/filter-rule.c:550
+#: filter/filter-rule.c:618
 msgid "If"
 msgstr "もし"
 
-#: filter/filter-rule.c:567
+#: filter/filter-rule.c:635
 msgid "Execute actions"
 msgstr "次の条件で動作を実行:"
 
-#: filter/filter-rule.c:571
+#: filter/filter-rule.c:639
 msgid "if all criteria are met"
 msgstr "すべての基準が合った時"
 
-#: filter/filter-rule.c:576
+#: filter/filter-rule.c:644
 msgid "if any criteria are met"
 msgstr "いくつかの基準が合った時"
 
-#: filter/filter-rule.c:587
+#: filter/filter-rule.c:655
 msgid "Add criterion"
 msgstr "基準を追加"
 
-#: filter/filter-rule.c:593
+#: filter/filter-rule.c:661
 msgid "Remove criterion"
 msgstr "基準を削除"
 
-#: filter/filter-system-flag.c:67
-msgid "Replied to"
-msgstr ""
-
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:70
-msgid "Important"
-msgstr "重要"
-
-#: filter/filter-system-flag.c:71
-msgid "Read"
-msgstr "既読"
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "フィルタを編集"
 
 #: filter/filter.glade.h:5
 msgid "Edit VFolders"
 msgstr "仮想フォルダの編集"
 
-#: filter/filter.glade.h:6
-msgid "Filter Rules"
-msgstr "フィルタルール"
-
 #: filter/filter.glade.h:7
 msgid "Incoming"
 msgstr "入力"
@@ -4759,319 +4991,345 @@ msgstr "入力"
 msgid "Outgoing"
 msgstr "出力"
 
-#: filter/filter.glade.h:10
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
 msgid "Virtual Folders"
 msgstr "仮想フォルダ"
 
 #: filter/filter.glade.h:11
+msgid "specific folders only"
+msgstr "指定フォルダだけ"
+
+#: filter/filter.glade.h:12
 msgid "vFolder Sources"
 msgstr "仮想フォルダのソース"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
-msgstr ""
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr "すべての有効なリモートフォルダ"
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr "すべてのローカルと有効なリモートフォルダ"
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
+msgstr "すべてのローカルフォルダ"
 
 #: filter/libfilter-i18n.h:3
-msgid "Assign Score"
+msgid "Assign Colour"
 msgstr ""
 
 #: filter/libfilter-i18n.h:4
-msgid "Copy to Folder"
-msgstr "フォルダへコピー"
+msgid "Assign Score"
+msgstr ""
 
 #: filter/libfilter-i18n.h:5
-msgid "Date received"
-msgstr "受信日"
+msgid "Attachments"
+msgstr "添付"
 
-#: filter/libfilter-i18n.h:6
-msgid "Date sent"
-msgstr "送信日"
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "が次のものを含む"
 
 #: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "表現"
+msgid "Copy to Folder"
+msgstr "フォルダへコピー"
 
 #: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "アドレスへ転送"
+msgid "Date received"
+msgstr "受信日"
 
 #: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "メッセージ本体"
-
-#: filter/libfilter-i18n.h:11
-msgid "Message Header"
-msgstr "メッセージヘッダ"
+msgid "Date sent"
+msgstr "送信日"
 
 #: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr "受信したメッセージ"
+msgid "Deleted"
+msgstr "削除"
 
 #: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr "送信したメッセージ"
+msgid "does not contain"
+msgstr "が次のものを含まない"
 
 #: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "フォルダへ移動"
+msgid "does not end with"
+msgstr "が次のもので終らない"
 
 #: filter/libfilter-i18n.h:15
-msgid "Recipients"
-msgstr "受信者"
+msgid "does not exist"
+msgstr "が存在しない"
 
 #: filter/libfilter-i18n.h:16
-msgid "Regex Match"
-msgstr "正規表現と一致"
+msgid "does not sound like"
+msgstr "が次のもののようでない"
 
-#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1167
-msgid "Score"
-msgstr "記録"
+#: filter/libfilter-i18n.h:17
+msgid "does not start with"
+msgstr "が次のもので始まらない"
+
+#: filter/libfilter-i18n.h:18
+msgid "Do Not Exist"
+msgstr "が存在しない"
 
 #: filter/libfilter-i18n.h:19
-msgid "Set Status"
-msgstr "ステータス設定"
+msgid "Draft"
+msgstr "草案"
 
 #: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr "ソース"
+msgid "ends with"
+msgstr "が次のもので終わる"
 
 #: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr "指定のヘッダ"
+msgid "Exist"
+msgstr "が存在する"
+
+#: filter/libfilter-i18n.h:22
+msgid "exists"
+msgstr "が存在する"
 
 #: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr "処理停止"
+msgid "Expression"
+msgstr "表現"
 
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1168
-msgid "Subject"
-msgstr "件名"
+#: filter/libfilter-i18n.h:24
+msgid "Forward to Address"
+msgstr "アドレスへ転送"
+
+#: filter/libfilter-i18n.h:25
+msgid "Important"
+msgstr "重要"
+
+#: filter/libfilter-i18n.h:26
+msgid "is"
+msgstr "が次のものと一致する"
 
 #: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "が次のものを含む"
+msgid "is greater than"
+msgstr "が次のものより大きい"
 
 #: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "が次のものを含まない"
+msgid "is less than"
+msgstr "が次のものより小さい"
 
 #: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr "が次のもので終らない"
+msgid "is not"
+msgstr "が次のものではない"
 
 #: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "が存在しない"
+msgid "Mailing list"
+msgstr "メーリングリスト"
 
 #: filter/libfilter-i18n.h:31
-msgid "does not sound like"
-msgstr "が次のもののようでない"
+msgid "Message Body"
+msgstr "メッセージ本体"
 
 #: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr "が次のもので始まらない"
+msgid "Message Header"
+msgstr "メッセージヘッダ"
 
 #: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr "が次のもので終わる"
+msgid "Message was received"
+msgstr "受信したメッセージ"
 
 #: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr "が存在する"
+msgid "Message was sent"
+msgstr "送信したメッセージ"
 
 #: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "が次のものより大きい"
+msgid "Move to Folder"
+msgstr "フォルダへ移動"
 
 #: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "が次のものより小さい"
+msgid "on or after"
+msgstr ""
 
 #: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr "が次のものではない"
+msgid "on or before"
+msgstr ""
 
 #: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr "が次のものと一致する"
+msgid "Read"
+msgstr "既読"
 
 #: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr ""
+msgid "Recipients"
+msgstr "受信者"
 
 #: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr ""
+msgid "Regex Match"
+msgstr "正規表現と一致"
 
 #: filter/libfilter-i18n.h:41
+msgid "Replied to"
+msgstr ""
+
+#: filter/libfilter-i18n.h:42 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1014
+msgid "Score"
+msgstr "記録"
+
+#: filter/libfilter-i18n.h:44
+msgid "Set Status"
+msgstr "ステータス設定"
+
+#: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "が次のもののように見える"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:46
+msgid "Specific header"
+msgstr "指定のヘッダ"
+
+#: filter/libfilter-i18n.h:47
 msgid "starts with"
 msgstr "が次のもので開始する"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:49
+msgid "Stop Processing"
+msgstr "処理停止"
+
+#: filter/libfilter-i18n.h:50 mail/message-list.c:1015
+msgid "Subject"
+msgstr "件名"
+
+#: filter/libfilter-i18n.h:51
 msgid "was after"
 msgstr "が次のものより後"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:52
 msgid "was before"
 msgstr "が次のものより前"
 
-#: filter/score-editor.c:127
-msgid "Add Rule"
-msgstr "ルールを追加"
-
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
-msgstr "スコアルールの編集"
+#: filter/score-editor.c:126
+msgid "Score Rules"
+msgstr "スコアルール"
 
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr "仮想フォルダルールの追加"
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr "仮想フォルダルールの編集"
-
-#. mail_msg_wait (mail_get_trash ("file:/", got_folder, &trash_folder));
-#: mail/component-factory.c:219 mail/mail-ops.c:1746
-msgid "Trash"
-msgstr "ごみ箱"
-
-#: mail/component-factory.c:305
+#: mail/component-factory.c:319
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolution メールコンポーネントの初期化が出来ません"
 
-#: mail/component-factory.c:378
+#: mail/component-factory.c:392
 msgid "Cannot register storage with shell"
 msgstr "シェルでストレージを登録出来ません"
 
-#: mail/folder-browser.c:225
-msgid "Store search as vFolder"
-msgstr ""
-
-#: mail/folder-browser.c:239
-msgid "Body or subject contains"
-msgstr "本体または件名が次のものを含む"
-
-#: mail/folder-browser.c:240
-msgid "Body contains"
-msgstr "本体が次のものを含む"
-
-#: mail/folder-browser.c:241
-msgid "Subject contains"
-msgstr "件名が次のものを含む"
-
-#: mail/folder-browser.c:242
-msgid "Body does not contain"
-msgstr "本体が次のものを含まない"
+#: mail/folder-browser-factory.c:244
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "\"%s\" のプロパティ"
 
-#: mail/folder-browser.c:243
-msgid "Subject does not contain"
-msgstr "件名が次のものを含まない"
+#: mail/folder-browser-factory.c:246 ui/evolution-event-editor.xml.h:39
+#: ui/evolution-task-editor-dialog.xml.h:42
+msgid "Properties"
+msgstr "プロパティ"
 
-#: mail/folder-browser.c:244
-msgid "Sender contains"
-msgstr "送信者が次のものを含む"
+#: mail/folder-browser.c:219
+msgid "Store search as vFolder"
+msgstr ""
 
-#: mail/folder-browser.c:656
+#: mail/folder-browser.c:510
 msgid "VFolder on Subject"
 msgstr "件名の仮想フォルダ"
 
-#: mail/folder-browser.c:657
+#: mail/folder-browser.c:513
 msgid "VFolder on Sender"
 msgstr "送信者の仮想フォルダ"
 
-#: mail/folder-browser.c:658
+#: mail/folder-browser.c:516
 msgid "VFolder on Recipients"
 msgstr "受信者の仮想フォルダ"
 
-#: mail/folder-browser.c:660
+#: mail/folder-browser.c:519 mail/folder-browser.c:710
+msgid "VFolder on Mailing List"
+msgstr "メーリングリストの仮想フォルダ"
+
+#: mail/folder-browser.c:525
 msgid "Filter on Subject"
 msgstr "件名のフィルタ"
 
-#: mail/folder-browser.c:661
+#: mail/folder-browser.c:528
 msgid "Filter on Sender"
 msgstr "送信者のフィルタ"
 
-#: mail/folder-browser.c:662
+#: mail/folder-browser.c:531
 msgid "Filter on Recipients"
 msgstr "受信者のフィルタ"
 
-#: mail/folder-browser.c:663 mail/folder-browser.c:777
+#: mail/folder-browser.c:534 mail/folder-browser.c:709
 msgid "Filter on Mailing List"
 msgstr "メーリングリストのフィルタ"
 
-#: mail/folder-browser.c:669 ui/evolution-calendar.xml.h:17
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "開く"
+#: mail/folder-browser.c:545
+msgid "Resend"
+msgstr "再送信"
 
-#: mail/folder-browser.c:671
+#: mail/folder-browser.c:547
 msgid "Save As..."
 msgstr "別名で保存..."
 
-#: mail/folder-browser.c:672 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail.xml.h:26 ui/evolution-tasks.xml.h:4
+#: mail/folder-browser.c:549 mail/mail-view.c:148
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
+#: ui/evolution-mail.xml.h:28 ui/evolution-tasks.xml.h:4
 msgid "Print"
 msgstr "印刷"
 
-#: mail/folder-browser.c:674
+#: mail/folder-browser.c:554
 msgid "Reply to Sender"
 msgstr "送信者へ返信"
 
-#: mail/folder-browser.c:675 mail/mail-view.c:141 ui/evolution-mail.xml.h:32
+#: mail/folder-browser.c:556 mail/mail-view.c:141 ui/evolution-mail.xml.h:35
 msgid "Reply to All"
 msgstr "全員へ返信"
 
-#: mail/folder-browser.c:676 mail/mail-view.c:144 ui/evolution-mail.xml.h:12
+#: mail/folder-browser.c:558 mail/mail-view.c:144 ui/evolution-mail.xml.h:14
 msgid "Forward"
 msgstr "転送"
 
-#: mail/folder-browser.c:677 ui/evolution-mail.xml.h:13
+#: mail/folder-browser.c:560
 msgid "Forward inline"
 msgstr "インラインで転送"
 
-#: mail/folder-browser.c:679
+#: mail/folder-browser.c:563
 msgid "Mark as Read"
 msgstr "既読としてマーク"
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:565
 msgid "Mark as Unread"
 msgstr "未読としてマーク"
 
-#: mail/folder-browser.c:682
+#: mail/folder-browser.c:570
 msgid "Move to Folder..."
 msgstr "フォルダへ移動..."
 
-#: mail/folder-browser.c:683
+#: mail/folder-browser.c:572
 msgid "Copy to Folder..."
 msgstr "フォルダへコピー..."
 
-#: mail/folder-browser.c:685
+#: mail/folder-browser.c:576
 msgid "Undelete"
 msgstr "削除取消"
 
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:689
+#. { _("Add Sender to Address Book"),  NULL,
+#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
+#. { "",                               NULL,
+#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
+#: mail/folder-browser.c:586
 msgid "Apply Filters"
 msgstr "フィルタ適用"
 
-#: mail/folder-browser.c:691
+#: mail/folder-browser.c:590
 msgid "Create Rule From Message"
 msgstr "メッセージからルールを作成"
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:712
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "メーリングリストのフィルタ (%s)"
 
+#: mail/folder-browser.c:713
+#, c-format
+msgid "VFolder on Mailing List (%s)"
+msgstr "メーリングリストの仮想フォルダ (%s)"
+
 #: mail/GNOME_Evolution_Mail.oaf.in.h:1
 msgid "Evolution component for handling mail."
 msgstr "メールを扱うための Evolution コンポーネント"
@@ -5104,22 +5362,6 @@ msgstr "Evolution メールコンポーネントのためのファクトリ"
 msgid "Factory for the Mail Summary component."
 msgstr "メールサマリコンポーネントのためのファクトリ"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr "Outlook Express 4 のメールを Evolution にインポートするファクトリ"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Factory to import mbox into Evolution"
-msgstr "mbox を Evolution にインポートするファクトリ"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "Outlook Express 4 のファイルを Evolution にインポート"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Imports mbox files into Evolution"
-msgstr "mbox ファイルを Evolution にインポート"
-
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "現在の保存形式:"
@@ -5151,25 +5393,24 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:695 mail/mail-account-editor.c:697
-#: mail/mail-account-editor.c:777 mail/mail-accounts.c:114
-#: mail/mail-config-druid.c:916 mail/mail-config.glade.h:44
-#: shell/e-shell-view.c:1119 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "ノート"
-
-#: mail/mail-accounts.c:115
+#: mail/mail-accounts.c:116
 msgid " (default)"
 msgstr " (デフォルト)"
 
+#: mail/mail-accounts.c:224 mail/mail-accounts.c:228
+msgid "Are you sure you want to delete this account?"
+msgstr "本当にこのアカウントを削除してもよろしいですか?"
+
+#: mail/mail-accounts.c:334 mail/mail-accounts.c:338
+msgid "Are you sure you want to delete this news account?"
+msgstr "本当に news アカウントを削除してもよろしいですか?"
+
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:367
+#: mail/mail-accounts.c:452
 msgid "Evolution Account Manager"
 msgstr "Evolution アカウントマネージャ"
 
-#: mail/mail-account-editor.c:286
+#: mail/mail-account-editor.c:301
 msgid ""
 "One or more of your servers are not configured correctly.\n"
 "Do you wish to save anyway?"
@@ -5178,10 +5419,14 @@ msgstr ""
 "どうしても保存したいですか?"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:646
+#: mail/mail-account-editor.c:720
 msgid "Evolution Account Editor"
 msgstr "Evolution アカウントエディタ"
 
+#: mail/mail-account-editor.c:741
+msgid "Unspecified"
+msgstr "未指定"
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -5197,12 +5442,16 @@ msgstr "件名は %s です"
 msgid "Mail from %s"
 msgstr "%s からメール"
 
-#: mail/mail-autofilter.c:331
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "%s メーリングリスト"
 
-#: mail/mail-callbacks.c:83
+#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+msgid "Add Filter Rule"
+msgstr "フィルタルールを追加"
+
+#: mail/mail-callbacks.c:85
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5214,7 +5463,7 @@ msgstr ""
 "必要があります\n"
 "今設定しますか?"
 
-#: mail/mail-callbacks.c:134
+#: mail/mail-callbacks.c:138
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5222,7 +5471,7 @@ msgstr ""
 "あなたはメールを作成する前に身元の\n"
 "設定をする必要があります"
 
-#: mail/mail-callbacks.c:146
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5230,11 +5479,11 @@ msgstr ""
 "あなたはメールを作成する前にメール\n"
 "配送の設定をする必要があります"
 
-#: mail/mail-callbacks.c:190
+#: mail/mail-callbacks.c:194
 msgid "You have not set a mail transport method"
 msgstr "メール転送メソッドの設定がありません"
 
-#: mail/mail-callbacks.c:223
+#: mail/mail-callbacks.c:227
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5242,32 +5491,32 @@ msgstr ""
 "このメッセージは件名がありません\n"
 "本当に送信しますか?"
 
-#: mail/mail-callbacks.c:290
+#: mail/mail-callbacks.c:296
 msgid "You must configure an account before you can send this email."
 msgstr "このメールを送信する前にアカウントを設定しなければなりません"
 
-#: mail/mail-callbacks.c:310
+#: mail/mail-callbacks.c:318
 msgid "You must specify recipients in order to send this message."
 msgstr "このメッセージを送信する適切な受信者を指定しなければなりません"
 
-#: mail/mail-callbacks.c:571
+#: mail/mail-callbacks.c:583
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "On %s, %s wrote:\n"
 
-#: mail/mail-callbacks.c:727
+#: mail/mail-callbacks.c:765
 msgid "Forwarded message:\n"
 msgstr "メッセージを転送:\n"
 
-#: mail/mail-callbacks.c:812
+#: mail/mail-callbacks.c:868
 msgid "Move message(s) to"
 msgstr "メッセージを移動します: "
 
-#: mail/mail-callbacks.c:814
+#: mail/mail-callbacks.c:870
 msgid "Copy message(s) to"
 msgstr "メッセージをコピーします: "
 
-#: mail/mail-callbacks.c:949
+#: mail/mail-callbacks.c:1011
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -5275,11 +5524,19 @@ msgstr ""
 "ドラフトフォルダ内に保存された\n"
 "メッセージだけを編集することが出来ます"
 
-#: mail/mail-callbacks.c:982 mail/mail-display.c:83
+#: mail/mail-callbacks.c:1048
+msgid ""
+"You may only resend messages\n"
+"in the Sent folder."
+msgstr ""
+"送信フォルダのメッセージだけ\n"
+"再送信することが出来ます"
+
+#: mail/mail-callbacks.c:1081 mail/mail-display.c:85
 msgid "Overwrite file?"
 msgstr "ファイルを上書きしますか?"
 
-#: mail/mail-callbacks.c:986 mail/mail-display.c:87
+#: mail/mail-callbacks.c:1085 mail/mail-display.c:89
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -5287,15 +5544,15 @@ msgstr ""
 "その名前のファイルはすでに存在します\n"
 "上書きしますか?"
 
-#: mail/mail-callbacks.c:1030
+#: mail/mail-callbacks.c:1129
 msgid "Save Message As..."
 msgstr "メッセージを別名で保存..."
 
-#: mail/mail-callbacks.c:1032
+#: mail/mail-callbacks.c:1131
 msgid "Save Messages As..."
 msgstr "メッセージを別名で保存..."
 
-#: mail/mail-callbacks.c:1140
+#: mail/mail-callbacks.c:1245
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5304,38 +5561,30 @@ msgstr ""
 "フィルタ情報のロード中にエラー:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1189
+#: mail/mail-callbacks.c:1294
 msgid "Print Message"
 msgstr "メッセージを印刷"
 
-#: mail/mail-callbacks.c:1236
+#: mail/mail-callbacks.c:1341
 msgid "Printing of message failed"
 msgstr "メッセージの印刷に失敗しました"
 
-#: mail/mail-config.c:835
-msgid "Connecting to server"
-msgstr "サーバへ接続中"
-
-#: mail/mail-config.c:837
-msgid "Connect to server"
-msgstr "サーバへ接続"
-
 #: mail/mail-config.glade.h:1
+msgid " color"
+msgstr " カラー"
+
+#: mail/mail-config.glade.h:2
 msgid "Account"
 msgstr "アカウント"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:3
 msgid "Account Information"
 msgstr "アカウント情報"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 msgid "Account Management"
 msgstr "アカウント管理"
 
-#: mail/mail-config.glade.h:4
-msgid "Account Properties"
-msgstr "アカウントのプロパティ"
-
 #: mail/mail-config.glade.h:6
 msgid "Advanced"
 msgstr "上級"
@@ -5372,24 +5621,20 @@ msgstr ""
 "\n"
 "\"完了\" をクリックして設定を保存してください"
 
-#: mail/mail-config.glade.h:19
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
 #: mail/mail-config.glade.h:20
-msgid "Default"
-msgstr "デフォルト"
+msgid "De_fault"
+msgstr "デフォルト(_f)"
 
 #: mail/mail-config.glade.h:22
 msgid "Done"
 msgstr "完了"
 
-#: mail/mail-config.glade.h:23
-msgid "E-Mail Address:"
+#: mail/mail-config.glade.h:24
+msgid "Email Address:"
 msgstr "メールアドレス:"
 
 #: mail/mail-config.glade.h:25
-msgid "Email Address:"
+msgid "Email address:"
 msgstr "メールアドレス:"
 
 #: mail/mail-config.glade.h:26
@@ -5400,162 +5645,178 @@ msgstr "Evolution メール設定"
 msgid "Full Name:"
 msgstr "フルネーム:"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
+msgid "Highlight citations with "
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 msgid "Hostname:"
 msgstr "ホスト名:"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
+msgid "IMAP"
+msgstr "IMAP"
+
+#: mail/mail-config.glade.h:33
 msgid "Identity"
 msgstr "身元"
 
-#: mail/mail-config.glade.h:32
-msgid "Incoming Mail Server"
-msgstr "受信メールサーバ"
+#: mail/mail-config.glade.h:34
+msgid "Include this account when receiving mail"
+msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 msgid "Keep mail on server"
 msgstr "サーバにメールを残します"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Kerberos"
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:37
 msgid "Mail"
 msgstr "メール"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 msgid "Mail Account"
 msgstr "メールアカウント"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "Mail Configuration"
 msgstr "メールの設定"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Mail Configuration Druid"
 msgstr "メール設定ドルイド"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Make this my default account"
 msgstr "デフォルトアカウントを作る"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Mark messages as \"Read\" after:"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
-msgid "Miscellaneous"
-msgstr "その他"
-
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "News"
 msgstr "ニュース"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:46
 msgid "Optional"
 msgstr "オプション"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 msgid "Organization:"
 msgstr "組織:"
 
-#: mail/mail-config.glade.h:48
-msgid "Outgoing Mail Server"
-msgstr "送信メールサーバ"
-
 #: mail/mail-config.glade.h:49
+msgid "PGP binary path:"
+msgstr "PGP プログラムのパス:"
+
+#: mail/mail-config.glade.h:50
 msgid "Password:"
 msgstr "パスワード:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Plain Text"
 msgstr "プレインテキスト"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Receiving Email"
 msgstr "メールを受信中"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Remember my password"
 msgstr "このパスワードを記憶"
 
-#: mail/mail-config.glade.h:54 mail/mail-format.c:629
-msgid "Reply-To:"
-msgstr "返信先:"
+#: mail/mail-config.glade.h:56
+msgid "Reply address:"
+msgstr "返信アドレス:"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Required"
 msgstr "必要"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 msgid "Save password"
 msgstr "パスワードを保存"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
+msgid "Select PGP binary"
+msgstr "PGP プログラムを選択"
+
+#: mail/mail-config.glade.h:61
 msgid "Select signature file"
 msgstr "署名ファイルを選択"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "Send mail in HTML format by default."
 msgstr "デフォルトで HTML 形式のメールを送信する"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:63
 msgid "Sending Email"
 msgstr "メールを送信中"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Server Configuration"
 msgstr "サーバの設定"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Server Type: "
 msgstr "サーバ種別:"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Server requires authentication"
 msgstr "サーバは認証が必要"
 
-#: mail/mail-config.glade.h:65
-msgid "Servers"
-msgstr "サーバ"
+#: mail/mail-config.glade.h:68
+msgid "Server type:"
+msgstr "サーバ種別:"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Signature file:"
 msgstr "署名ファイル:"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Signature:"
 msgstr "署名:"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:71
+msgid "Source"
+msgstr "ソース"
+
+#: mail/mail-config.glade.h:72
 msgid "Sources"
 msgstr "ソース"
 
-#: mail/mail-config.glade.h:69
-msgid "This server requires a secure connection (SSL)"
-msgstr "このサーバは安全な接続 (SSL) が必要です"
+#: mail/mail-config.glade.h:73
+msgid "Transport"
+msgstr "送信"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:74
+msgid "Transport Authentication"
+msgstr "送信の認証"
+
+#: mail/mail-config.glade.h:75
 msgid "Type"
 msgstr "種別"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:76
 msgid ""
 "Type the name by which you would like to refer to these servers. For "
 "example: \"Work\" or \"Home\"."
 msgstr ""
 "それらのサーバを参照したい名前の種別です. 例えば: \"仕事\" あるいは \"家\""
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:77
 msgid "User Information"
 msgstr "ユーザ情報"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:78
 msgid "Username:"
 msgstr "ユーザ名:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:79
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -5565,11 +5826,17 @@ msgstr ""
 "\n"
 "\"次\" をクリックして始めてください"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:84 ui/evolution-event-editor.xml.h:58
+#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:29
+msgid "_Edit"
+msgstr "編集(_E)"
+
+#: mail/mail-config.glade.h:85
 msgid "minutes."
 msgstr "分"
 
-#: mail/mail-config-druid.c:399
+#: mail/mail-config-druid.c:421
 #, c-format
 msgid ""
 "Failed to verify the incoming mail configuration.\n"
@@ -5578,11 +5845,11 @@ msgstr ""
 "入力のメール設定の確認に失敗しました\n"
 "%s からあなたのメールを取得中に問題を発見した可能性があります"
 
-#: mail/mail-config-druid.c:489
+#: mail/mail-config-druid.c:515
 msgid "Namespace:"
 msgstr "名前空間:"
 
-#: mail/mail-config-druid.c:677
+#: mail/mail-config-druid.c:708
 #, c-format
 msgid ""
 "Failed to verify the outgoing mail configuration.\n"
@@ -5592,147 +5859,160 @@ msgstr ""
 "%s を使ってあなたのメールを送信中に問題を発見した可能性があります"
 
 #. set window title
-#: mail/mail-config-druid.c:1036
+#: mail/mail-config-druid.c:1215
 msgid "Evolution Account Wizard"
 msgstr "Evolution アカウントウィザード"
 
-#: mail/mail-display.c:189
+#: mail/mail-display.c:191
 msgid "Save Attachment"
 msgstr "添付の保存"
 
-#: mail/mail-display.c:229
+#: mail/mail-display.c:231
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "作業ディレクトリを作成出来ませんでした: %s"
 
-#: mail/mail-display.c:290
+#: mail/mail-display.c:292
 msgid "Save to Disk..."
 msgstr "ディスクへ保存..."
 
-#: mail/mail-display.c:292
+#: mail/mail-display.c:294
 #, c-format
 msgid "Open in %s..."
 msgstr "%s に開く..."
 
-#: mail/mail-display.c:294
+#: mail/mail-display.c:296
 msgid "View Inline"
 msgstr "インライン表示"
 
-#: mail/mail-display.c:323
+#: mail/mail-display.c:325
 msgid "External Viewer"
 msgstr "外部ビューア"
 
-#: mail/mail-display.c:346
+#: mail/mail-display.c:348
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "インライン表示 (%s経由)"
 
-#: mail/mail-display.c:350
+#: mail/mail-display.c:352
 msgid "Hide"
 msgstr "隠す"
 
+#: mail/mail-display.c:1073
+msgid "Add to addressbook (FIXME)"
+msgstr "アドレス帳へ追加 (FIXME)"
+
+#: mail/mail-display.c:1075
+msgid "Open in addressbook (FIXME)"
+msgstr "アドレス帳を開く (FIXME)"
+
+#: mail/mail-display.c:1082
+msgid "Open link in browser (FIXME)"
+msgstr "ブラウザでリンクを開く (FIXME)"
+
+#: mail/mail-display.c:1084
+msgid "Save as (FIXME)"
+msgstr "別名で保存 (FIXME)"
+
+#: mail/mail-display.c:1086
+msgid "Copy location (FIXME)"
+msgstr "場所をコピー (FIXME)"
+
 #: mail/mail-format.c:506
 #, c-format
 msgid "%s attachment"
 msgstr "%s を添付"
 
-#: mail/mail-format.c:654
+#: mail/mail-format.c:745
 msgid "Loading message content"
 msgstr "メッセージの内容を読み込み中"
 
-#: mail/mail-format.c:943
+#: mail/mail-format.c:1034
 msgid "Encrypted message not displayed"
 msgstr "暗号化されたメッセージは表示しません"
 
-#: mail/mail-format.c:949
+#: mail/mail-format.c:1040
 msgid "Encrypted message"
 msgstr "暗号化されたメッセージ"
 
-#: mail/mail-format.c:950
+#: mail/mail-format.c:1041
 msgid "Click icon to decrypt."
 msgstr "アイコンをクリックして復号化してください"
 
-#: mail/mail-format.c:1019 mail/mail-format.c:1399
+#: mail/mail-format.c:1110 mail/mail-format.c:1497
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "このメッセージはデジタル署名され信頼できるものです"
 
-#: mail/mail-format.c:1027 mail/mail-format.c:1407
+#: mail/mail-format.c:1118 mail/mail-format.c:1505
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "このメッセージはデジタル署名されたものですが, 信頼を証明出来ません"
 
-#: mail/mail-format.c:1611
+#: mail/mail-format.c:1718
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP サイト (%s) を指しています"
 
-#: mail/mail-format.c:1623
+#: mail/mail-format.c:1730
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1627
+#: mail/mail-format.c:1734
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "ローカルファイル (%s) を指しています"
 
-#: mail/mail-format.c:1661
+#: mail/mail-format.c:1768
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "未知の外部データ (\"%s\" タイプ) を指しています"
 
-#: mail/mail-format.c:1666
+#: mail/mail-format.c:1773
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:444
-msgid "Registering local folder"
-msgstr "ローカルフォルダを登録中"
-
-#: mail/mail-local.c:446
-msgid "Register local folder"
-msgstr "ローカルフォルダを登録します"
+#: mail/mail-local.c:335
+#, c-format
+msgid "No such folder %s"
+msgstr "そのようなフォルダ %s はありません"
 
-#: mail/mail-local.c:553
+#: mail/mail-local.c:508
 #, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr ""
-"フォルダ '%s' を登録することが出来ません:\n"
-"%s"
+msgid "Opening '%s'"
+msgstr "'%s' をオープン中"
 
-#: mail/mail-local.c:717
+#: mail/mail-local.c:786
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "フォルダ \"%s\" を \"%s\" 形式へ変更しています"
 
-#: mail/mail-local.c:721
+#: mail/mail-local.c:790
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "フォルダ \"%s\" を \"%s\" 形式へ変更します"
 
-#: mail/mail-local.c:752
+#: mail/mail-local.c:814
 msgid "Reconfiguring folder"
 msgstr "フォルダの再構成中"
 
 #. first, 'close' the old folder
-#: mail/mail-local.c:781
+#: mail/mail-local.c:843
 msgid "Closing current folder"
 msgstr "現在のフォルダをクローズ中"
 
-#: mail/mail-local.c:813
+#: mail/mail-local.c:875
 msgid "Renaming old folder and opening"
 msgstr "古いフォルダをリネームしてオープン中"
 
-#: mail/mail-local.c:831
+#: mail/mail-local.c:893
 msgid "Creating new folder"
 msgstr "新規フォルダを作成中"
 
-#: mail/mail-local.c:845
+#: mail/mail-local.c:907
 msgid "Copying messages"
 msgstr "メッセージをコピー中"
 
-#: mail/mail-local.c:866
+#: mail/mail-local.c:928
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -5741,13 +6021,13 @@ msgstr ""
 "フォルダのメタ情報を保存出来ません; もはやこのフォルダを開く\n"
 "ことが出来ないとたぶん気づいたのでしょう: %s"
 
-#: mail/mail-local.c:898
+#: mail/mail-local.c:967
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-mt.c:88
+#: mail/mail-mt.c:181
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -5756,7 +6036,7 @@ msgstr ""
 "'%s' の際にエラーが発生しました:\n"
 "%s"
 
-#: mail/mail-mt.c:90
+#: mail/mail-mt.c:183
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -5765,118 +6045,96 @@ msgstr ""
 "操作の準備している間にエラーが発生しました:\n"
 "%s"
 
-#: mail/mail-mt.c:386 mail/mail-mt.c:415
+#: mail/mail-mt.c:506 mail/mail-mt.c:535 mail/mail-mt.c:882
 msgid "Working"
 msgstr "作業中"
 
-#: mail/mail-ops.c:519
+#: mail/mail-mt.c:670 mail/session.c:91
+msgid "Do you accept?"
+msgstr "承認しますか?"
+
+#: mail/mail-mt.c:864
+msgid "Evolution progress"
+msgstr "Evolution 進行"
+
+#: mail/mail-ops.c:518
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" を送信中"
 
-#: mail/mail-ops.c:521
+#: mail/mail-ops.c:520
 msgid "Sending message"
 msgstr "メッセージを送信中"
 
-#: mail/mail-ops.c:749 mail/mail-ops.c:756
-#, c-format
-msgid "Appending \"%s\""
-msgstr "\"%s\" を追加中"
-
-#: mail/mail-ops.c:753 mail/mail-ops.c:759
-msgid "Appending a message without a subject"
-msgstr "件名なしのメッセージを付加"
-
-#: mail/mail-ops.c:841
-#, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
-msgstr "\"%s\" から \"%s\" の中へメッセージを移動中"
+#: mail/mail-ops.c:751
+msgid "Saving message to folder"
+msgstr "フォルダへメッセージを保存中"
 
-#: mail/mail-ops.c:843
+#: mail/mail-ops.c:824
 #, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
-msgstr "\"%s\" から \"%s\" の中へメッセージをコピー中"
+msgid "Moving messages to %s"
+msgstr "%s へメッセージを移動中"
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:824
 #, c-format
-msgid "Move messages from \"%s\" into \"%s\""
-msgstr "\"%s\" から \"%s\" の中へメッセージを移動"
+msgid "Copying messages to %s"
+msgstr "%s へメッセージをコピー中"
 
-#: mail/mail-ops.c:848
-#, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
-msgstr "\"%s\" から \"%s\" の中へメッセージをコピー"
-
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:841
 msgid "Moving"
 msgstr "移動中"
 
-#: mail/mail-ops.c:882
+#: mail/mail-ops.c:844
 msgid "Copying"
 msgstr "コピー中"
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:855
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "メッセージを %s %d / %d (uid \"%s\")"
 
-#: mail/mail-ops.c:977
+#: mail/mail-ops.c:926
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" の中のフォルダを走査中"
 
-#: mail/mail-ops.c:1089
+#: mail/mail-ops.c:1084
 msgid "Forwarded messages"
 msgstr "メッセージを転送"
 
-#: mail/mail-ops.c:1130 mail/mail-ops.c:1264
+#: mail/mail-ops.c:1125 mail/mail-ops.c:1263
 #, c-format
 msgid "Opening folder %s"
 msgstr "\"%s\" の中のフォルダをオープン中"
 
-#: mail/mail-ops.c:1195
+#: mail/mail-ops.c:1192
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1376
+#: mail/mail-ops.c:1379
 msgid "Expunging folder"
 msgstr "フォルダを削除中"
 
-#: mail/mail-ops.c:1425
+#: mail/mail-ops.c:1428
 #, c-format
 msgid "Retrieving message %s"
 msgstr "メッセージ %s を取得中"
 
-#: mail/mail-ops.c:1492
+#: mail/mail-ops.c:1495
 msgid "Retrieving messages"
 msgstr "メッセージを取得中"
 
-#: mail/mail-ops.c:1502
+#: mail/mail-ops.c:1505
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "メッセージ番号 %d / %d (uid \"%s\") を取得中"
 
-#: mail/mail-ops.c:1654
-#, c-format
-msgid "Opening Trash folder for %s"
-msgstr "%s のごみ箱フォルダをオープン中"
-
-#: mail/mail-ops.c:1809
-#, c-format
-msgid "Loading %s Folder for %s"
-msgstr "%s フォルダ (%s 用) をロード中"
-
-#: mail/mail-ops.c:1811
-#, c-format
-msgid "Load %s Folder for %s"
-msgstr "%s フォルダ (%s 用) をロード"
-
-#: mail/mail-ops.c:1969
+#: mail/mail-ops.c:1579
 msgid "Saving messages"
 msgstr "メッセージを保存中"
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:1658
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -5885,12 +6143,12 @@ msgstr ""
 "出力ファイルを作成出来ません: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2061
+#: mail/mail-ops.c:1671
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "メッセージ %d / %d (uid \"%s\") を保存中"
 
-#: mail/mail-ops.c:2075
+#: mail/mail-ops.c:1685
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5899,11 +6157,11 @@ msgstr ""
 "ファイルの保存中にエラー: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2149
+#: mail/mail-ops.c:1759
 msgid "Saving attachment"
 msgstr "添付を保存中"
 
-#: mail/mail-ops.c:2164
+#: mail/mail-ops.c:1774
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -5912,7 +6170,7 @@ msgstr ""
 "出力ファイルを作成出来ません: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2192
+#: mail/mail-ops.c:1802
 #, c-format
 msgid "Could not write data: %s"
 msgstr "データを書き出すことが出来ませんでした: %s"
@@ -5921,135 +6179,101 @@ msgstr "データを書き出すことが出来ませんでした: %s"
 msgid "_Search"
 msgstr "検索(_S)"
 
-#: mail/mail-send-recv.c:127
+#: mail/mail-send-recv.c:136
 msgid "Cancelling ..."
 msgstr "キャンセル中 ..."
 
-#: mail/mail-send-recv.c:218
+#: mail/mail-send-recv.c:231
 msgid "Send & Receive mail"
 msgstr "メールの送受信"
 
-#: mail/mail-send-recv.c:221
+#: mail/mail-send-recv.c:234
 msgid "Receiving"
 msgstr "受信中"
 
-#: mail/mail-send-recv.c:267
+#: mail/mail-send-recv.c:283
 msgid "Updating ..."
 msgstr "更新中 ..."
 
-#: mail/mail-send-recv.c:269 mail/mail-send-recv.c:313
+#: mail/mail-send-recv.c:285 mail/mail-send-recv.c:331
 msgid "Waiting ..."
 msgstr "待機中 ..."
 
-#: mail/mail-send-recv.c:288
+#: mail/mail-send-recv.c:304
 msgid "Sending"
 msgstr "送信中"
 
-#: mail/mail-send-recv.c:483
+#: mail/mail-send-recv.c:469
 msgid "Cancelled."
 msgstr "キャンセルしました"
 
-#: mail/mail-send-recv.c:487
+#: mail/mail-send-recv.c:473
 msgid "Complete."
 msgstr "完了しました"
 
-#: mail/mail-summary.c:111 mail/mail-threads.c:734
+#: mail/mail-summary.c:111
 msgid "Incomplete message written on pipe!"
 msgstr "パイプ上に不完全なメッセージが書かれました!"
 
-#: mail/mail-threads.c:302
-#, c-format
-msgid ""
-"Error while preparing to %s:\n"
-"%s"
-msgstr ""
-"%s へ準備している間にエラーが発生しました:\n"
-"%s"
-
-#: mail/mail-threads.c:681
-#, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
-msgstr ""
-"`%s' の際にエラーが発生しました:\n"
-"%s"
-
-#: mail/mail-threads.c:738
-msgid "Error reading commands from dispatching thread."
-msgstr "派遣されたスレッドからコマンド読み込み中にエラーが発生しました"
-
-#: mail/mail-threads.c:803
-msgid "Corrupted message from dispatching thread?"
-msgstr "派遣されたスレッドから不正なメッセージ?"
-
-#: mail/mail-threads.c:922
-msgid "Could not create dialog box."
-msgstr "ダイアログボックスを作成することが出来ませんでした"
-
-#: mail/mail-threads.c:933
-msgid "User cancelled query."
-msgstr "ユーザはクエリをキャンセルしました"
-
-#: mail/mail-tools.c:198
+#: mail/mail-tools.c:138
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "テンポラリ mbox '%s' を作成できませんでした: %s"
 
-#: mail/mail-tools.c:256
+#: mail/mail-tools.c:185
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (メッセージを転送)"
 
-#: mail/mail-tools.c:266
+#: mail/mail-tools.c:195
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (件名なし)"
 
-#: mail/mail-tools.c:283
+#: mail/mail-tools.c:212
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "メッセージを転送しました - %s"
 
-#: mail/mail-tools.c:285
+#: mail/mail-tools.c:214
 msgid "Forwarded message (no subject)"
 msgstr "メッセージを転送しました (件名なし)"
 
-#: mail/mail-tools.c:357
+#: mail/mail-tools.c:411
 #, c-format
 msgid ""
-"Cannot open location `%s':\n"
-"%s"
+"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+"%s<br><b>Subject:</b> %s<br>"
 msgstr ""
-"`%s' の場所を開くことが出来ません:\n"
-"%s"
+"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+"%s<br><b>Subject:</b> %s<br>"
 
-#: mail/mail-vfolder.c:150
+#: mail/mail-vfolder.c:248
 msgid "VFolders"
 msgstr "仮想フォルダ"
 
-#: mail/mail-vfolder.c:303
+#: mail/mail-vfolder.c:426
 msgid "New VFolder"
 msgstr "新規仮想フォルダ"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:31
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:34
 msgid "Reply"
 msgstr "返信"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:36
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:38
 msgid "Reply to the sender of this message"
 msgstr "メッセージの差出人へ返信します"
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:35
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:37
 msgid "Reply to all recipients of this message"
 msgstr "このメッセージの受取人全員へ返信します"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:14
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:16
 msgid "Forward this message"
 msgstr "このメッセージを転送します"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:30
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:31
 msgid "Print the selected message"
 msgstr "選択されたメッセージを印刷します"
 
@@ -6057,164 +6281,150 @@ msgstr "選択されたメッセージを印刷します"
 msgid "Delete this message"
 msgstr "このメッセージを削除します"
 
-#: mail/message-list.c:618
+#: mail/message-list.c:614
 msgid "Unseen"
 msgstr "未読"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:615
 msgid "Seen"
 msgstr "既読"
 
-#: mail/message-list.c:624
+#: mail/message-list.c:616
 msgid "Answered"
 msgstr "返答済み"
 
-#: mail/message-list.c:627
+#: mail/message-list.c:617
 msgid "Multiple Unseen Messages"
 msgstr "複数の未読メッセージ"
 
-#: mail/message-list.c:630
+#: mail/message-list.c:618
 msgid "Multiple Messages"
 msgstr "複数のメッセージ"
 
-#: mail/message-list.c:948
-#, c-format
-msgid "[ %s ]"
-msgstr "[ %s ]"
+#: mail/message-list.c:622
+msgid "Lowest"
+msgstr "最も低い"
 
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:960 mail/message-list.c:976
-#, c-format
-msgid "%s, et al."
-msgstr ""
+#: mail/message-list.c:623
+msgid "Lower"
+msgstr "低い"
 
-#: mail/message-list.c:963 mail/message-list.c:979
-msgid "<unknown>"
-msgstr "<未知>"
+#: mail/message-list.c:627
+msgid "Higher"
+msgstr "高い"
 
-#: mail/message-list.c:1031
+#: mail/message-list.c:628
+msgid "Highest"
+msgstr "最も高い"
+
+#: mail/message-list.c:878
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1038
+#: mail/message-list.c:885
 msgid "Today %l:%M %p"
 msgstr "今日の %p %l:%M"
 
-#: mail/message-list.c:1047
+#: mail/message-list.c:894
 msgid "Yesterday %l:%M %p"
 msgstr "昨日の %p %l:%M"
 
-#: mail/message-list.c:1059
+#: mail/message-list.c:906
 msgid "%a %l:%M %p"
 msgstr "%p %l:%M (%a)"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:914
 msgid "%b %d %l:%M %p"
-msgstr "%b %d %p %l:%M"
+msgstr "%m月 %d日 %p %l:%M"
 
-#: mail/message-list.c:1069
+#: mail/message-list.c:916
 msgid "%b %d %Y"
-msgstr "%Y %b %d"
+msgstr "%Y年 %m月 %d日"
 
-#: mail/message-list.c:1167
+#: mail/message-list.c:1014
 msgid "Flagged"
 msgstr "フラグ"
 
-#: mail/message-list.c:1168
+#: mail/message-list.c:1015
 msgid "From"
 msgstr "差出人"
 
-#: mail/message-list.c:1168
+#: mail/message-list.c:1015
 msgid "Date"
 msgstr "日付"
 
-#: mail/message-list.c:1168
+#: mail/message-list.c:1015
 msgid "Received"
 msgstr ""
 
-#: mail/message-list.c:1169
+#: mail/message-list.c:1016
 msgid "To"
 msgstr "宛先"
 
-#: mail/message-list.c:1169
+#: mail/message-list.c:1016
 msgid "Size"
 msgstr "サイズ"
 
-#: mail/openpgp-utils.c:77
+#: mail/openpgp-utils.c:89
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "あなたの %s パスフレーズ ( %s 用) を入力してください"
 
-#: mail/openpgp-utils.c:80
+#: mail/openpgp-utils.c:92
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "あなたの %s パスフレーズを入力してください"
 
-#: mail/openpgp-utils.c:431 mail/openpgp-utils.c:534 mail/openpgp-utils.c:738
-#: mail/openpgp-utils.c:887 mail/openpgp-utils.c:1043
+#: mail/openpgp-utils.c:452 mail/openpgp-utils.c:558 mail/openpgp-utils.c:760
+#: mail/openpgp-utils.c:913 mail/openpgp-utils.c:1071
 msgid "No GPG/PGP program available."
 msgstr "GPG/PGP プログラムは利用できません"
 
-#: mail/openpgp-utils.c:438 mail/openpgp-utils.c:543 mail/openpgp-utils.c:745
-#: mail/openpgp-utils.c:894
+#: mail/openpgp-utils.c:459 mail/openpgp-utils.c:567 mail/openpgp-utils.c:767
+#: mail/openpgp-utils.c:920
 msgid "No password provided."
 msgstr "提供されたパスワードはありません"
 
-#: mail/openpgp-utils.c:444 mail/openpgp-utils.c:551 mail/openpgp-utils.c:752
-#: mail/openpgp-utils.c:901 mail/openpgp-utils.c:1049
+#: mail/openpgp-utils.c:467 mail/openpgp-utils.c:574 mail/openpgp-utils.c:773
+#: mail/openpgp-utils.c:928 mail/openpgp-utils.c:1077
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "GPG/PGP へのパイプが作成できませんでした: %s"
 
-#: mail/openpgp-utils.c:562 mail/openpgp-utils.c:607 mail/openpgp-utils.c:646
+#: mail/openpgp-utils.c:588
 msgid "No recipients specified"
 msgstr "受信者が指定されていません"
 
-#: mail/openpgp-utils.c:1060
+#: mail/openpgp-utils.c:1088
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "作業ファイルを作成することが出来ませんでした: %s"
 
-#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
+#: mail/subscribe-dialog.c:73 shell/e-storage-set-view.c:46
 msgid "Folder"
 msgstr "フォルダ"
 
-#: mail/subscribe-dialog.c:63
+#: mail/subscribe-dialog.c:74
 msgid "Store"
 msgstr "記録"
 
-#: mail/subscribe-dialog.c:145
+#: mail/subscribe-dialog.c:156
 msgid "Display folders starting with:"
 msgstr "表示するフォルダを開始する:"
 
-#: mail/subscribe-dialog.c:178
+#: mail/subscribe-dialog.c:186
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr "\"%s\" の記録を取得中"
 
-#: mail/subscribe-dialog.c:181
-#, c-format
-msgid "Get store for \"%s\""
-msgstr "\"%s\" の記録を取得"
-
-#: mail/subscribe-dialog.c:292
+#: mail/subscribe-dialog.c:289
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:296
+#: mail/subscribe-dialog.c:291
 #, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:300
-#, c-format
-msgid "Subscribe to folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:303
-#, c-format
-msgid "Unsubscribe from folder \"%s\""
+msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
@@ -6231,7 +6441,7 @@ msgstr "フォルダを作成する場所を指定してください:"
 
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/importer/importer.c:155
+#: shell/importer/importer.c:157
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -6242,7 +6452,7 @@ msgstr ""
 "インポータの準備が出来ていません\n"
 "5秒待って再度試してください"
 
-#: shell/importer/importer.c:173 shell/importer/importer.c:200
+#: shell/importer/importer.c:175 shell/importer/importer.c:202
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -6251,7 +6461,7 @@ msgstr ""
 "%s をインポート中\n"
 "アイテム %d をインポート中"
 
-#: shell/importer/importer.c:307
+#: shell/importer/importer.c:309
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -6260,11 +6470,11 @@ msgstr ""
 "扱うことが出来るインポートがありません\n"
 "%s"
 
-#: shell/importer/importer.c:317
+#: shell/importer/importer.c:319
 msgid "Importing"
 msgstr "インポート中"
 
-#: shell/importer/importer.c:325
+#: shell/importer/importer.c:327
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -6273,12 +6483,12 @@ msgstr ""
 "%s をインポート中\n"
 "%s を開始します"
 
-#: shell/importer/importer.c:340
+#: shell/importer/importer.c:342
 #, c-format
 msgid "Error loading %s"
 msgstr "%s のロード中にエラー"
 
-#: shell/importer/importer.c:355
+#: shell/importer/importer.c:357
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -6287,27 +6497,27 @@ msgstr ""
 "%s をインポート中\n"
 "アイテム 1 をインポート中"
 
-#: shell/importer/importer.c:426
+#: shell/importer/importer.c:428
 msgid "Automatic"
 msgstr "自働"
 
-#: shell/importer/importer.c:476
+#: shell/importer/importer.c:478
 msgid "Filename:"
 msgstr "ファイル名:"
 
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:481
+#: shell/importer/import.glade.h:5 shell/importer/importer.c:483
 msgid "Select a file"
 msgstr "ファイルを選択"
 
-#: shell/importer/importer.c:491
+#: shell/importer/importer.c:493
 msgid "File type:"
 msgstr "ファイル種別:"
 
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:572
+#: shell/importer/import.glade.h:4 shell/importer/importer.c:574
 msgid "Import"
 msgstr "インポート"
 
-#: shell/importer/importer.c:605
+#: shell/importer/importer.c:609
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -6336,6 +6546,9 @@ msgid ""
 "With this wizard you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
+"ようこそ, Evolution インポートユーティリティへ\n"
+"このウィザードでは Evolution の中に外部ファイルをインポート\n"
+"する処理を通して案内します"
 
 #: shell/e-setup.c:112 shell/e-setup.c:185
 msgid "Evolution installation"
@@ -6445,19 +6658,19 @@ msgstr "新規..."
 msgid "(Untitled)"
 msgstr "(タイトルなし)"
 
-#: shell/e-shell-view-menu.c:159
+#: shell/e-shell-view-menu.c:160
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy はあなたの $PATH には見つかりません"
 
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:166
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy は実行できませんでした"
 
-#: shell/e-shell-view-menu.c:194
+#: shell/e-shell-view-menu.c:195
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:196
+#: shell/e-shell-view-menu.c:197
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -6469,7 +6682,7 @@ msgstr ""
 "グループウェアアプリケーションの\n"
 "パッケージソフトです"
 
-#: shell/e-shell-view-menu.c:360
+#: shell/e-shell-view-menu.c:361
 msgid "Go to folder..."
 msgstr "フォルダへ移動..."
 
@@ -6496,7 +6709,7 @@ msgstr "%s - Evolution %s [%s]"
 msgid "Cannot set up local storage -- %s"
 msgstr "局部記憶装置のセットアップが出来ません -- %s"
 
-#: shell/e-shell.c:1238
+#: shell/e-shell.c:1242
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -6582,61 +6795,61 @@ msgstr "ショートカットバーからこのショートカットを削除します"
 msgid "Error saving shortcuts."
 msgstr "ショートカットの保存中にエラーが発生しました"
 
-#: shell/e-storage-set-view.c:345 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:41
+#: shell/e-storage-set-view.c:649 ui/evolution-event-editor.xml.h:76
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:43
 msgid "_View"
 msgstr "表示(_V)"
 
-#: shell/e-storage-set-view.c:345
+#: shell/e-storage-set-view.c:649
 msgid "View the selected folder"
 msgstr "選択されたフォルダを表示します"
 
-#: shell/e-storage.c:160
+#: shell/e-storage.c:178
 msgid "(No name)"
 msgstr "(名前なし)"
 
-#: shell/e-storage.c:411
+#: shell/e-storage.c:459
 msgid "No error"
 msgstr "エラーはありません"
 
-#: shell/e-storage.c:413
+#: shell/e-storage.c:461
 msgid "Generic error"
 msgstr "一般的なエラー"
 
-#: shell/e-storage.c:415
+#: shell/e-storage.c:463
 msgid "A folder with the same name already exists"
 msgstr "同じ名前のフォルダがすでに存在しています"
 
-#: shell/e-storage.c:417
+#: shell/e-storage.c:465
 msgid "The specified folder type is not valid"
 msgstr "指定されたフォルダ種別は有効ではありません"
 
-#: shell/e-storage.c:419
+#: shell/e-storage.c:467
 msgid "I/O error"
 msgstr "I/O エラー"
 
-#: shell/e-storage.c:421
+#: shell/e-storage.c:469
 msgid "Not enough space to create the folder"
 msgstr "フォルダを作成する十分な空きがありません"
 
-#: shell/e-storage.c:423
+#: shell/e-storage.c:471
 msgid "The specified folder was not found"
 msgstr "指定されたフォルダは見付かりませんでした"
 
-#: shell/e-storage.c:425
+#: shell/e-storage.c:473
 msgid "Function not implemented in this storage"
 msgstr "機能はこの記憶装置では実装されていません"
 
-#: shell/e-storage.c:427
+#: shell/e-storage.c:475
 msgid "Permission denied"
 msgstr "許可がありません"
 
-#: shell/e-storage.c:429
+#: shell/e-storage.c:477
 msgid "Operation not supported"
 msgstr "操作はサポートされていません"
 
-#: shell/e-storage.c:431
+#: shell/e-storage.c:479
 msgid "The specified type is not supported in this storage"
 msgstr "指定された種別はこの記憶装置ではサポートされていません"
 
@@ -6644,49 +6857,43 @@ msgstr "指定された種別はこの記憶装置ではサポートされていません"
 msgid "The Evolution shell."
 msgstr "Evolution シェル"
 
-#: shell/main.c:74
+#: shell/main.c:73
+#, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
+"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
+"Evolution is not yet complete. It's getting close, but there are\n"
+"places where features are either missing or only half working. If\n"
+"you can't figure out how to do something, it's probably because\n"
+"there's no way to do it yet! :-)\n"
 "\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
+"We hope Evolution will be usable for you, but we still feel the\n"
+"need to warn you that it may: crash, lose your mail, leave stray\n"
+"processes running, consume 100% of your CPU, send non-\n"
+"compliant commands to your servers, and generally embarass you\n"
+"in front of your friends and co-workers. Use only as directed.\n"
 "\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
 msgstr ""
-"やあ，Evolution グループウェアスイートのこの preview release の\n"
+"やあ，Evolution グループウェアスイートのこの PREVIEW RELEASE の\n"
 "ダウンロードに時間を割いてくれてありがとう\n"
 "\n"
-"過去のリリースからの間，我々の焦点は Evolution を有用にすることに\n"
-"ついてでした．Evolution 開発者の多くはフルタイムで彼らのメール\n"
-"を読むために今 Evolution を使っています．あなたも出来ました．\n"
-"(必ずバックアップを保持してください)\n"
+"Evolution は未完成です. それは近付いていますが, 特徴がないか作業\n"
+"途中の所があるということです. もし何かをする方法を思い付くことが\n"
+"出来ないならば, たぶんまだそれをする方法がないためです! :)\n"
 "\n"
-"しかし我々がその安定性とセキュリティに影響を与えている多くのバグ\n"
-"を修正した間に，あなたはまだ断り書きを受け取ります: Evolution は:\n"
-"クラッシュしたり，あなたがそう望まなくともメールを紛失したり，\n"
-"あなたが望んでもメールの削除を拒否したり，時折プロセスが動作した\n"
-"ままの状態になったり，100% の CPU パワーを消費したり，とても速く\n"
-"動いたり，ロックしたり，任意のメーリングリストに HTML メールを\n"
-"送ったり，そしてあなたの友人と仕事仲間の前であなたを困らせる\n"
-"でしょう．\n"
-"あくまで説明書に従ってお使いください．\n"
+"我々は Evolution が有用なものになることを望んでいますが, まだ次\n"
+"のことに対して注意する必要があるように感じます: クラッシュしたり\n"
+"メールを紛失したり, 動作したプロセスが残ったり, CPU パワーを 100%\n"
+"消費したり, サーバへ対応していないコマンドを送信して, あなたの\n"
+"友人や仕事仲間の前で困らせたりするかもしれません.\n"
 "\n"
 "我々はあなたが我々の成果を楽しむことを望んでいます．そして我々は\n"
 "熱心にあなたの貢献を待ち受けています!\n"
 
-#: shell/main.c:101
+#: shell/main.c:98
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -6694,15 +6901,15 @@ msgstr ""
 "ありがとう\n"
 "Evolution チーム\n"
 
-#: shell/main.c:132
+#: shell/main.c:129
 msgid "Cannot initialize the Evolution shell."
 msgstr "Evolution シェルの初期化が出来ません"
 
-#: shell/main.c:178
+#: shell/main.c:175
 msgid "Disable."
 msgstr "無効"
 
-#: shell/main.c:198
+#: shell/main.c:195
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo コンポーネントシステムを初期化出来ません"
 
@@ -6726,40 +6933,51 @@ msgstr "コンタクトを検索します"
 msgid "New contact"
 msgstr "新規コンタクト"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:22
+#: ui/evolution-mail.xml.h:27
+msgid "Previews the message to be printed"
+msgstr "印刷されるメッセージのプレビューを表示します"
+
+#: ui/evolution-addressbook.xml.h:11
 msgid "Print contacts"
 msgstr "コンタクトを印刷します"
 
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-mail.xml.h:41
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:47
 msgid "Stop"
 msgstr "停止"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:13
 msgid "Stop Loading"
 msgstr "詠み込みを停止します"
 
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:14
 msgid "View All"
 msgstr "すべて表示"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:15
 msgid "View all contacts"
 msgstr "すべてのコンタクトを表示します"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "_Addressbook Configuration..."
-msgstr "アドレス帳の設定(_A)..."
+#: ui/evolution-addressbook.xml.h:16
+msgid "_Addressbook Sources..."
+msgstr "アドレス帳のソース(_A)..."
 
-#: ui/evolution-addressbook.xml.h:15
-msgid "_Print Contacts..."
-msgstr "コンタクトの印刷(_P)..."
+#: ui/evolution-addressbook.xml.h:17
+msgid "_Contact"
+msgstr "コンタクト(_C)"
 
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
+#: ui/evolution-contact-editor.xml.h:15
+msgid "_Print..."
+msgstr "印刷(_P)..."
+
+#: ui/evolution-addressbook.xml.h:19
 msgid "_Search for contacts"
 msgstr "コンタクトの検索(_S)"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:74
-#: ui/evolution-task-editor-dialog.xml.h:88
+#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:77
+#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:42
 msgid "_Tools"
 msgstr "ツール(_T)"
 
@@ -6771,26 +6989,26 @@ msgstr "5 日"
 msgid "Alter preferences"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:3
-msgid "Ca_lendar"
-msgstr "カレンダ(_l)"
+#: ui/evolution-calendar.xml.h:4
+msgid "Create a new all day Event"
+msgstr "新規に毎日のイベントを作成します"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Calendar Preferences..."
-msgstr "カレンダの設定..."
-
-#: ui/evolution-calendar.xml.h:6
 msgid "Create a new appointment"
 msgstr "新規約束を作成します"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:6
 msgid "Create a new calendar"
 msgstr "新規カレンダを作成します"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:7
 msgid "Day"
 msgstr "日"
 
+#: ui/evolution-calendar.xml.h:8
+msgid "Go To"
+msgstr "移動"
+
 #: ui/evolution-calendar.xml.h:9
 msgid "Go back in time"
 msgstr "時間を戻します"
@@ -6800,91 +7018,117 @@ msgid "Go forward in time"
 msgstr "時間を進めます"
 
 #: ui/evolution-calendar.xml.h:11
-msgid "Go to"
-msgstr "移動"
+msgid "Go to _Date"
+msgstr "指定日に移動(_D)"
 
 #: ui/evolution-calendar.xml.h:12
+msgid "Go to _Today"
+msgstr "今日へ移動(_T)"
+
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to a specific date"
 msgstr "指定日に移動します"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to present time"
 msgstr "現在の時間へ移動します"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:15
 msgid "Month"
 msgstr "月"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "New appointment"
-msgstr "新規約束"
+#: ui/evolution-calendar.xml.h:17
+msgid "New _Event"
+msgstr "新規イベント(_E)"
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-event-editor.xml.h:29
+#: ui/evolution-calendar.xml.h:18 ui/evolution-event-editor.xml.h:29
 #: ui/evolution-task-editor-dialog.xml.h:32
 msgid "Next"
 msgstr "次"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:20
 msgid "Open Calendar"
 msgstr "カレンダを開く"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:21
 msgid "Prev"
 msgstr "前"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:25
+msgid "Print calendar"
+msgstr "カレンダの印刷"
+
+#: ui/evolution-calendar.xml.h:26
 msgid "Print this Calendar"
 msgstr "このカレンダの印刷します"
 
-#: ui/evolution-calendar.xml.h:22 ui/evolution-message-composer.xml.h:15
+#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
 msgid "Save As"
 msgstr "別名で保存"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:28
 msgid "Save calendar as something else"
 msgstr "別のものとしてカレンダを保存します"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:30
 msgid "Show 1 day"
 msgstr "1 日を表示"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:31
 msgid "Show 1 month"
 msgstr "1 ヶ月を表示"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:32
 msgid "Show 1 week"
 msgstr "1 週間を表示"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "週労働時間を表示"
 
-#: ui/evolution-calendar.xml.h:28 widgets/misc/e-dateedit.c:413
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:223
+#: widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "今日"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:35
+msgid "W_ork Week"
+msgstr "仕事の週(_o)"
+
+#: ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "週"
 
-#: ui/evolution-calendar.xml.h:30 ui/evolution-event-editor.xml.h:66
+#: ui/evolution-calendar.xml.h:37
+msgid "_Appointment"
+msgstr "約束(_A)"
+
+#: ui/evolution-calendar.xml.h:38
+msgid "_Day"
+msgstr "日(_D)"
+
+#: ui/evolution-calendar.xml.h:39
+msgid "_Month"
+msgstr "月(_M)"
+
+#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
 #: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
 msgid "_New"
 msgstr "新規(_N)"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:41
 msgid "_Open Calendar"
 msgstr "カレンダを開く(_O)"
 
-#: ui/evolution-calendar.xml.h:32
-msgid "_Print this calendar"
-msgstr "このカレンダの印刷(_P)"
-
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:8
+#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:74
+#: ui/evolution-tasks.xml.h:8
 msgid "_Save As..."
 msgstr "別名で保存(_S)..."
 
+#: ui/evolution-calendar.xml.h:45
+msgid "_Week"
+msgstr "週(_W)"
+
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "このアイテムを削除します"
@@ -6907,7 +7151,7 @@ msgid "Print this item"
 msgstr "このアイテムを印刷"
 
 #: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-mail.xml.h:32 ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "印刷..."
 
@@ -6928,7 +7172,7 @@ msgstr "コンタクトを保存してこのダイアログボックスを閉じます"
 
 #: ui/evolution-contact-editor.xml.h:11
 msgid "Se_nd contact to other..."
-msgstr ""
+msgstr "他へコンタクトを送信(_n)..."
 
 #: ui/evolution-contact-editor.xml.h:12
 msgid "See online help"
@@ -6936,20 +7180,16 @@ msgstr "オンラインヘルプを参照してください"
 
 #: ui/evolution-contact-editor.xml.h:13
 msgid "Send _message to contact..."
-msgstr ""
+msgstr "コンタクトへメッセージを送信(_m)..."
 
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:38 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
+#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:30
 msgid "_File"
 msgstr "ファイル(_F)"
 
-#: ui/evolution-contact-editor.xml.h:15
-msgid "_Print..."
-msgstr "印刷(_P)..."
-
 #: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:51
 #: ui/evolution-task-editor-dialog.xml.h:85
 msgid "_Save"
 msgstr "保存(_S)"
@@ -7015,6 +7255,10 @@ msgstr "切り取り"
 msgid "Cut the selection"
 msgstr "選択されたものを切り取ります"
 
+#: ui/evolution-event-editor.xml.h:18
+msgid "Delete this appointment"
+msgstr "この約束を削除"
+
 #: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
 msgid "Dump XML"
 msgstr "XMLのダンプ"
@@ -7083,12 +7327,8 @@ msgstr "プリンタの設定(_e)..."
 msgid "Print Setup"
 msgstr "プリンタの設定"
 
-#: ui/evolution-event-editor.xml.h:39 ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "プロパティ"
-
 #: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:233
 msgid "Save"
 msgstr "保存"
 
@@ -7101,10 +7341,6 @@ msgstr "約束を保存してダイアログボックスを閉じます"
 msgid "Save the current file"
 msgstr "現在のファイルを保存します"
 
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "打合せのスケジュール"
-
 #: ui/evolution-event-editor.xml.h:46
 msgid "Schedule _Meeting"
 msgstr "打合せのスケジュール(_M)"
@@ -7129,18 +7365,18 @@ msgstr "現在のプリンタのページ設定を行います"
 msgid "Task _Request (FIXME)"
 msgstr "タスク要求(_R) (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:34
+#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
 #: ui/evolution-task-editor-dialog.xml.h:63
 msgid "_About..."
 msgstr "情報(_A)..."
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:35
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
+#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:27
 msgid "_Close"
 msgstr "閉じる(_C)"
 
 #: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "_Contact (FIXME)"
 msgstr "コンタクト(_C) (FIXME)"
 
@@ -7148,18 +7384,12 @@ msgstr "コンタクト(_C) (FIXME)"
 msgid "_Copy"
 msgstr "コピー(_C)"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:36
+#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
 #: ui/evolution-task-editor-dialog.xml.h:68
 msgid "_Debug"
 msgstr "デバッグ(_D)"
 
-#: ui/evolution-event-editor.xml.h:58 ui/evolution-message-composer.xml.h:37
-#: ui/evolution-subscribe.xml.h:10 ui/evolution-task-editor-dialog.xml.h:70
-#: ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "編集(_E)"
-
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:39
+#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
 #: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
 msgid "_Help"
 msgstr "ヘルプ(_H)"
@@ -7197,7 +7427,8 @@ msgstr "貼り付け(_P)"
 msgid "_Print"
 msgstr "印刷(_P)"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-task-editor-dialog.xml.h:83
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:70
+#: ui/evolution-task-editor-dialog.xml.h:83
 msgid "_Properties..."
 msgstr "プロパティ(_P)..."
 
@@ -7206,7 +7437,7 @@ msgid "_Select All"
 msgstr "すべて選択(_A)"
 
 #: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:41
 msgid "_Task (FIXME)"
 msgstr "タスク(_T) (FIXME)"
 
@@ -7247,193 +7478,229 @@ msgid "Copy message to a new folder"
 msgstr "メッセージを新規フォルダへコピーします"
 
 #: ui/evolution-mail.xml.h:5
-msgid "Create Rule"
-msgstr "ルールを作成"
+msgid "Create _Virtual Folder From Message"
+msgstr "メッセージから仮想フォルダを作成(_V)"
 
-#: ui/evolution-mail.xml.h:8 ui/evolution-subscribe.xml.h:3
-msgid "F_older"
-msgstr "フォルダ(_o)"
+#: ui/evolution-mail.xml.h:8
+msgid "Display all of the message headers"
+msgstr "すべてのメッセージヘッダを表示します"
 
 #: ui/evolution-mail.xml.h:9
-msgid "Fi_lter on Sender"
-msgstr "送信者のフィルタ(_l)"
+msgid "Empty _Trash"
+msgstr "ゴミ箱を空にする(_T)"
 
 #: ui/evolution-mail.xml.h:10
-msgid "Filter on Rec_ipients"
-msgstr "受信者のフィルタ(_i)"
+msgid "Filter on Se_nder"
+msgstr "送信者のフィルタ(_n)"
 
 #: ui/evolution-mail.xml.h:11
+msgid "Filter on _Recipients"
+msgstr "受信者のフィルタ(_R)"
+
+#: ui/evolution-mail.xml.h:12
+msgid "Filter on _Subject"
+msgstr "件名のフィルタ(_S)"
+
+#: ui/evolution-mail.xml.h:13
 msgid "Forget _Passwords"
 msgstr "パスワードの紛失(_P)"
 
 #: ui/evolution-mail.xml.h:15
-msgid "Get Mail"
-msgstr "メール取得"
+msgid "Forward As"
+msgstr "転送"
 
-#: ui/evolution-mail.xml.h:16
+#: ui/evolution-mail.xml.h:17
+msgid "Full _Headers"
+msgstr "すべてのヘッダ(_H)"
+
+#: ui/evolution-mail.xml.h:18
 msgid "Hide S_elected Messages"
 msgstr "選択されたメッセージを隠す(_e)"
 
-#: ui/evolution-mail.xml.h:17
+#: ui/evolution-mail.xml.h:19
 msgid "Hide _Deleted Messages"
 msgstr "削除されたメッセージを隠す(_D)"
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail.xml.h:20
 msgid "Hide _Read messages"
 msgstr "既読メッセージを隠す(_R)"
 
-#: ui/evolution-mail.xml.h:19
-msgid "Mail _Filters..."
-msgstr "メールフィルタ(_F)..."
-
-#: ui/evolution-mail.xml.h:20
-msgid "Manage Subscriptions..."
-msgstr "定期購読管理..."
-
 #: ui/evolution-mail.xml.h:21
-msgid "Mar_k As Read"
-msgstr "既読としてマーク(_k)"
+msgid "Manage _Subscriptions..."
+msgstr "定期購読管理(_S)..."
 
 #: ui/evolution-mail.xml.h:22
-msgid "Mark As U_nread"
-msgstr "未読としてマーク(_n)"
+msgid "Mar_k as Read"
+msgstr "既読としてマーク(_k)"
 
 #: ui/evolution-mail.xml.h:23
-msgid "Move"
-msgstr "移動"
+msgid "Mark All as R_ead"
+msgstr "既読としてすべてマーク(_e)"
 
 #: ui/evolution-mail.xml.h:24
-msgid "Move message to a new folder"
-msgstr "メッセージを新規フォルダへ移動します"
+msgid "Mark as U_nread"
+msgstr "未読としてマーク(_n)"
 
 #: ui/evolution-mail.xml.h:25
-msgid "Previews the message to be printed"
-msgstr "印刷されるメッセージのプレビューを表示します"
+msgid "Move"
+msgstr "移動"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Print Preview of message..."
-msgstr "メッセージの印刷プレビュー..."
+#: ui/evolution-mail.xml.h:26
+msgid "Move message to a new folder"
+msgstr "メッセージを新規フォルダへ移動します"
 
-#: ui/evolution-mail.xml.h:28
+#: ui/evolution-mail.xml.h:30
 msgid "Print message to the printer"
 msgstr "メッセージをプリンタへ印刷します"
 
-#: ui/evolution-mail.xml.h:29
-msgid "Print message..."
-msgstr "メッセージを印刷..."
-
 #: ui/evolution-mail.xml.h:33
+msgid "Redirect (FIXME: implement me)"
+msgstr "宛名を書き換える (FIXME: 実装してください)"
+
+#: ui/evolution-mail.xml.h:36
 msgid "Reply to _All"
 msgstr "全員へ返信(_A)"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Reply to _Sender"
-msgstr "送信者へ返信(_S)"
-
-#: ui/evolution-mail.xml.h:37
+#: ui/evolution-mail.xml.h:39
 msgid "S_ource"
 msgstr "ソース(_o)"
 
-#: ui/evolution-mail.xml.h:38 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:40 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "すべて選択(_A)"
 
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:41
+msgid "Select _Thread"
+msgstr "スレッドを選択(_T)"
+
+#: ui/evolution-mail.xml.h:42
+msgid "Send / Receive"
+msgstr "送受信"
+
+#: ui/evolution-mail.xml.h:43
+msgid ""
+"Send queued mail\n"
+"    and retrieve new mail"
+msgstr ""
+"キューにあるメールを送信して\n"
+"    新規メールを取得します"
+
+#: ui/evolution-mail.xml.h:45
 msgid "Send queued mail and retrieve new mail"
 msgstr "キューにあるメールを送信して新規メールを取得します"
 
-#: ui/evolution-mail.xml.h:40
-msgid "Show _All Messages"
-msgstr "すべてのメッセージを表示(_A)"
+#: ui/evolution-mail.xml.h:46
+msgid "Show _All"
+msgstr "すべて表示(_A)"
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:48
 msgid "Threaded Message list"
 msgstr "メッセージリストをスレッド化します"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:49
 msgid "VFolder on Se_nder"
 msgstr "送信者の仮想フォルダ(_n)"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:50
 msgid "VFolder on _Recipients"
 msgstr "受信者の仮想フォルダ(_R)"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:51
+msgid "VFolder on _Subject"
+msgstr "件名の仮想フォルダ(_S)"
+
+#: ui/evolution-mail.xml.h:52
 msgid "View Raw Message Source"
 msgstr "未加工メッセージのソースを表示します"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:53
+msgid "Virtual Folder _Editor..."
+msgstr "仮想フォルダエディタ(_E)..."
+
+#: ui/evolution-mail.xml.h:54
 msgid "_Apply Filters"
 msgstr "フィルタ適用(_A)"
 
-#: ui/evolution-mail.xml.h:47
-msgid "_Configure Folder..."
-msgstr "フォルダの設定(_C)..."
+#: ui/evolution-mail.xml.h:55
+msgid "_Attachment"
+msgstr "添付(_A)"
 
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail.xml.h:56
+msgid "_Compose"
+msgstr "作成(_C)"
+
+#: ui/evolution-mail.xml.h:57
 msgid "_Copy to Folder..."
 msgstr "フォルダへコピー(_C)..."
 
-#: ui/evolution-mail.xml.h:50
-msgid "_Edit Message"
-msgstr "メッセージを編集(_E)"
+#: ui/evolution-mail.xml.h:58
+msgid "_Create Filter From Message"
+msgstr "メッセージからフィルタを作成(_C)"
 
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:60
 msgid "_Expunge"
 msgstr "抹消(_E)"
 
-#: ui/evolution-mail.xml.h:52
-msgid "_Filter on Subject"
-msgstr "件名のフィルタ(_F)"
+#: ui/evolution-mail.xml.h:61
+msgid "_Filters..."
+msgstr "フィルタ(_F)..."
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:62 ui/evolution.xml.h:31
+msgid "_Folder"
+msgstr "フォルダ(_F)"
+
+#: ui/evolution-mail.xml.h:63
 msgid "_Forward"
 msgstr "転送(_F)"
 
-#: ui/evolution-mail.xml.h:54 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:64
+msgid "_Inline"
+msgstr "インライン(_I)"
+
+#: ui/evolution-mail.xml.h:65 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "選択を反転(_I)"
 
-#: ui/evolution-mail.xml.h:55
-msgid "_Mail Configuration..."
-msgstr "メールの設定(_M)..."
+#: ui/evolution-mail.xml.h:66
+msgid "_Mail Message"
+msgstr "メッセージをメール(_M)"
 
-#: ui/evolution-mail.xml.h:56
-msgid "_Message"
-msgstr "メッセージ(_M)"
+#: ui/evolution-mail.xml.h:67
+msgid "_Mail Settings..."
+msgstr "メール設定(_M)..."
 
-#: ui/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:68
 msgid "_Move to Folder..."
 msgstr "フォルダへ移動(_M)..."
 
-#: ui/evolution-mail.xml.h:58
-msgid "_Open in New Window"
-msgstr "新規ウィンドウに開く(_O)"
+#: ui/evolution-mail.xml.h:69
+msgid "_Open Selected Items"
+msgstr "選択されたアイテムを開く(_O)"
 
-#: ui/evolution-mail.xml.h:59
-msgid "_Print Message"
-msgstr "メッセージを印刷(_P)"
+#: ui/evolution-mail.xml.h:71
+msgid "_Quoted"
+msgstr "引用(_Q)"
 
-#: ui/evolution-mail.xml.h:60
-msgid "_Save Message As..."
-msgstr "メッセージを別名で保存(_S)..."
+#: ui/evolution-mail.xml.h:72
+msgid "_Reply"
+msgstr "返信(_R)"
 
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:73
+msgid "_Resend Messages"
+msgstr "メッセージを再送信(_R)"
+
+#: ui/evolution-mail.xml.h:75
+msgid "_Send / Receive"
+msgstr "送受信(_S)"
+
+#: ui/evolution-mail.xml.h:76
 msgid "_Threaded"
 msgstr "スレッド(_T)"
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:78
 msgid "_Undelete"
 msgstr "削除取消(_U)"
 
-#: ui/evolution-mail.xml.h:63
-msgid "_VFolder on Subject"
-msgstr "件名の仮想フォルダ(_V)"
-
-#: ui/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor..."
-msgstr "仮想フォルダエディタ(_V)..."
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "添付"
@@ -7539,15 +7806,51 @@ msgstr "添付を表示"
 msgid "Sign this message with your PGP key"
 msgstr "PGP鍵でこのメッセージにサインします"
 
+#: ui/evolution-message-composer.xml.h:34
+msgid "Toggles whether the BCC field is displayed"
+msgstr "BCC フィールドを表示するかどうか切替えます"
+
+#: ui/evolution-message-composer.xml.h:35
+msgid "Toggles whether the CC field is displayed"
+msgstr "CC フィールドを表示するかどうか切替えます"
+
+#: ui/evolution-message-composer.xml.h:36
+msgid "Toggles whether the From chooser is displayed"
+msgstr "差出人の選択を表示するかどうか切替えます"
+
+#: ui/evolution-message-composer.xml.h:37
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "返信先フィールドを表示するかどうか切替えます"
+
+#: ui/evolution-message-composer.xml.h:39
+msgid "_Bcc Field"
+msgstr "Bcc フィールド(_B)"
+
 #: ui/evolution-message-composer.xml.h:40
+msgid "_Cc Field"
+msgstr "Cc フィールド(_C)"
+
+#: ui/evolution-message-composer.xml.h:45
+msgid "_From Field"
+msgstr "差出人フィールド(_F)"
+
+#: ui/evolution-message-composer.xml.h:47
+msgid "_Insert"
+msgstr "挿入(_I)"
+
+#: ui/evolution-message-composer.xml.h:48
 msgid "_Insert text file... (FIXME)"
 msgstr "テキストファイルの挿入(_I)... (FIXME)"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:49
 msgid "_Open..."
 msgstr "開く(_O)..."
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:50
+msgid "_Reply-To Field"
+msgstr "返信先フィールド(_R)"
+
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Security"
 msgstr "セキュリティ(_S)"
 
@@ -7555,6 +7858,10 @@ msgstr "セキュリティ(_S)"
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
 
+#: ui/evolution-subscribe.xml.h:3
+msgid "F_older"
+msgstr "フォルダ(_o)"
+
 #: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List"
 msgstr "リストを更新"
@@ -7635,7 +7942,7 @@ msgstr "元に戻す"
 msgid "Undo the last action"
 msgstr "最後の動作を元に戻します"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:26
 msgid "_Appointment (FIXME)"
 msgstr "約束(_A) (FIXME)"
 
@@ -7652,8 +7959,8 @@ msgid "Create a new task"
 msgstr "新規タスクを作成します"
 
 #: ui/evolution-tasks.xml.h:3
-msgid "New"
-msgstr "新規"
+msgid "New Task"
+msgstr "新規タスク"
 
 #: ui/evolution-tasks.xml.h:5
 msgid "Save task as something else"
@@ -7663,6 +7970,10 @@ msgstr "別のものとしてタスクを保存します"
 msgid "Tasks Preferences..."
 msgstr "タスクの設定..."
 
+#: ui/evolution-tasks.xml.h:9
+msgid "_Task"
+msgstr "タスク(_T)"
+
 #: ui/evolution.xml.h:1
 msgid "About Evolution..."
 msgstr "Evolution について..."
@@ -7672,8 +7983,8 @@ msgid "Close this window"
 msgstr "このウィンドウを閉じます"
 
 #: ui/evolution.xml.h:4
-msgid "Customi_ze..."
-msgstr "カスタマイズ(_z)..."
+msgid "Customi_ze Toolbars..."
+msgstr "ツールバーのカスタマイズ(_z)..."
 
 #: ui/evolution.xml.h:5
 msgid "Customize"
@@ -7696,76 +8007,72 @@ msgid "Evolution bar _shortcut"
 msgstr "Evolution バーショートカット(_s)"
 
 #: ui/evolution.xml.h:10
-msgid "Exit"
-msgstr "終了"
-
-#: ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "プログラムを終了します"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:11
 msgid "Getting _Started"
 msgstr "始めに(_S)"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:12
 msgid "Import an external file format"
 msgstr "外部ファイル形式をインポートします"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "メインツールバー"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:14
 msgid "Show information about Evolution"
 msgstr "Evolution についての情報を表示します"
 
-#: ui/evolution.xml.h:16
-msgid "Show the _Folder Bar"
-msgstr "フォルダバーを表示(_F)"
-
-#: ui/evolution.xml.h:17
-msgid "Show the _Shortcut Bar"
-msgstr "ショートカットバーを表示(_S)"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:15
 msgid "Submit Bug Report"
 msgstr "不具合報告の提出"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:16
 msgid "Submit _Bug Report"
 msgstr "不具合報告の提出(_B)"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:17
 msgid "Submit bug report using Bug Buddy."
 msgstr "Bug Buddyを使って不具合報告を提出します"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:18
 msgid "Toggle whether to show the folder bar"
 msgstr "フォルダバーを表示するかどうか切替えます"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:19
 msgid "Toggle whether to show the shortcut bar"
 msgstr "ショートカットバーを表示するかどうか切替えます"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:20
 msgid "Using the C_ontact Manager"
 msgstr "コンタクトマネージャを使う(_o)"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:21
 msgid "Using the _Calendar"
 msgstr "カレンダを使う(_C)"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:22
 msgid "Using the _Mailer"
 msgstr "メーラを使う(_M)"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:23
+msgid "Work Offline"
+msgstr "オフライン作業"
+
+#: ui/evolution.xml.h:24
 msgid "_About Evolution..."
 msgstr "Evolution について(_A)..."
 
+#: ui/evolution.xml.h:25
+msgid "_Actions"
+msgstr "動作(_A)"
+
 #: ui/evolution.xml.h:32
-msgid "_Folder"
-msgstr "フォルダ(_F)"
+msgid "_Folder Bar"
+msgstr "フォルダバー(_F)"
 
 #: ui/evolution.xml.h:33
 msgid "_Go to Folder..."
@@ -7784,15 +8091,19 @@ msgid "_Mail message"
 msgstr "メッセージをメール(_M)"
 
 #: ui/evolution.xml.h:39
-msgid "_Settings"
-msgstr "設定(_S)"
+msgid "_New Folder"
+msgstr "新規フォルダ(_N)"
+
+#: ui/evolution.xml.h:40
+msgid "_Shortcut Bar"
+msgstr "ショートカットバー(_S)"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
 msgid "%A, %B %d, %Y"
-msgstr "%Y %B %d %A"
+msgstr "%Y年 %m月 %d日 %A"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:387
 msgid "Busy"
@@ -7866,6 +8177,10 @@ msgstr "会議終了時間(_e):"
 msgid "All Attendees"
 msgstr "すべての付き添い"
 
+#: widgets/menus/gal-view-menus.c:171
+msgid "_Current View"
+msgstr "現在の表示(_C)"
+
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
 #: widgets/misc/e-calendar-item.c:421
@@ -7877,25 +8192,34 @@ msgstr "MTWTFSS"
 msgid "%B %Y"
 msgstr "%Y %B"
 
+#: widgets/misc/e-cell-date-edit.c:215 widgets/misc/e-dateedit.c:407
+msgid "Now"
+msgstr "今"
+
+#: widgets/misc/e-cell-date-edit.c:239
+msgid "OK"
+msgstr "OK"
+
+#: widgets/misc/e-cell-date-edit.c:720
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr "時間はフォーマットに入れなければなりません: %s"
+
 #: widgets/misc/e-clipped-label.c:107
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "今"
+#: widgets/misc/e-filter-bar.c:160
+msgid "Save Search"
+msgstr ""
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
+#: widgets/misc/e-filter-bar.c:231
+msgid "Advanced Search"
+msgstr "上級検索"
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%p %I:%M"
+#: widgets/misc/e-filter-bar.c:311
+msgid "Advanced ..."
+msgstr "上級 ..."
 
 #: widgets/misc/e-messagebox.c:141
 msgid "Information"
@@ -7918,7 +8242,7 @@ msgstr "メッセージ"
 msgid "Don't show this message again."
 msgstr "このメッセージを二度と表示しない"
 
-#: widgets/misc/e-search-bar.c:135
+#: widgets/misc/e-search-bar.c:140
 msgid "Sear_ch"
 msgstr "検索(_c)"
 
@@ -7930,18 +8254,14 @@ msgstr "パーソナルアドレス帳サーバ"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "パーソナルカレンダサーバ; カレンダファクトリ"
 
-#: wombat/wombat.c:182
+#: wombat/wombat.c:165
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): GNOME-VFSを初期化することが出来ませんでした"
 
-#: wombat/wombat.c:194
+#: wombat/wombat.c:177
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): GNOME を初期化することが出来ませんでした"
 
-#: wombat/wombat.c:207
+#: wombat/wombat.c:190
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo を初期化することが出来ませんでした"
-
-#: evolution.desktop.in.h:2
-msgid "The Evolution groupware suite"
-msgstr "Evolution グループウェアスイート"
author	Akira Tagoh <tagoh@src.gnome.org>	2001-03-23 03:31:38 +0800
committer	Akira Tagoh <tagoh@src.gnome.org>	2001-03-23 03:31:38 +0800
commit	65cb1664da2ba2bb678ee78b8dff1fd01b297cc0 (patch)
tree	96c39d5bd77f5f2010083900107516790b6c7b90 /po/ja.po
parent	81742b667755e307683e6178d073ee8f31661d5c (diff)
download	gsoc2013-evolution-65cb1664da2ba2bb678ee78b8dff1fd01b297cc0.tar gsoc2013-evolution-65cb1664da2ba2bb678ee78b8dff1fd01b297cc0.tar.gz gsoc2013-evolution-65cb1664da2ba2bb678ee78b8dff1fd01b297cc0.tar.bz2 gsoc2013-evolution-65cb1664da2ba2bb678ee78b8dff1fd01b297cc0.tar.lz gsoc2013-evolution-65cb1664da2ba2bb678ee78b8dff1fd01b297cc0.tar.xz gsoc2013-evolution-65cb1664da2ba2bb678ee78b8dff1fd01b297cc0.tar.zst gsoc2013-evolution-65cb1664da2ba2bb678ee78b8dff1fd01b297cc0.zip