Updated Japanese translation.

2001-06-12 Akira TAGOH <tagoh@gnome.gr.jp> * ja.po: Updated Japanese translation. svn path=/trunk/; revision=10196
author: Akira TAGOH <tagoh@gnome.gr.jp> 2001-06-12 18:57:17 +0800
committer: Akira Tagoh <tagoh@src.gnome.org> 2001-06-12 18:57:17 +0800
commit: fc20441fe388a89b5c5d61fa6ab5307e9d21dc89 (patch)
tree: ac864bbbec5404c006e7f92d4aeaf062728e441a /po/ja.po
parent: a138eedbcbc0799de590d900400d1047deb5ab9f (diff)
download: gsoc2013-evolution-fc20441fe388a89b5c5d61fa6ab5307e9d21dc89.tar
gsoc2013-evolution-fc20441fe388a89b5c5d61fa6ab5307e9d21dc89.tar.gz
gsoc2013-evolution-fc20441fe388a89b5c5d61fa6ab5307e9d21dc89.tar.bz2
gsoc2013-evolution-fc20441fe388a89b5c5d61fa6ab5307e9d21dc89.tar.lz
gsoc2013-evolution-fc20441fe388a89b5c5d61fa6ab5307e9d21dc89.tar.xz
gsoc2013-evolution-fc20441fe388a89b5c5d61fa6ab5307e9d21dc89.tar.zst
gsoc2013-evolution-fc20441fe388a89b5c5d61fa6ab5307e9d21dc89.zip
1 files changed, 1480 insertions, 1380 deletions
diff --git a/po/ja.po b/po/ja.po
index fd7a3cc691..7874c85443 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,20 +4,20 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution CVS-20010523\n"
-"POT-Creation-Date: 2001-05-23 22:03+0900\n"
-"PO-Revision-Date: 2001-05-23 22:56+0900\n"
+"Project-Id-Version: evolution CVS-20010612\n"
+"POT-Creation-Date: 2001-06-12 17:40+0900\n"
+"PO-Revision-Date: 2001-06-12 19:52+0900\n"
 "Last-Translator: Akira TAGOH <tagoh@gnome.gr.jp>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3314
+#: addressbook/backend/ebook/e-card.c:3324
 msgid "Card: "
 msgstr "名刺: "
 
-#: addressbook/backend/ebook/e-card.c:3316
+#: addressbook/backend/ebook/e-card.c:3326
 msgid ""
 "\n"
 "Name: "
@@ -25,7 +25,7 @@ msgstr ""
 "\n"
 "名前: "
 
-#: addressbook/backend/ebook/e-card.c:3317
+#: addressbook/backend/ebook/e-card.c:3327
 msgid ""
 "\n"
 "  Prefix:     "
@@ -33,7 +33,7 @@ msgstr ""
 "\n"
 "  敬称(前つけ):     "
 
-#: addressbook/backend/ebook/e-card.c:3318
+#: addressbook/backend/ebook/e-card.c:3328
 msgid ""
 "\n"
 "  Given:      "
@@ -41,13 +41,13 @@ msgstr ""
 "\n"
 "  姓:      "
 
-#: addressbook/backend/ebook/e-card.c:3319
+#: addressbook/backend/ebook/e-card.c:3329
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3320
+#: addressbook/backend/ebook/e-card.c:3330
 msgid ""
 "\n"
 "  Family:     "
@@ -55,7 +55,7 @@ msgstr ""
 "\n"
 "  ファミリー名:     "
 
-#: addressbook/backend/ebook/e-card.c:3321
+#: addressbook/backend/ebook/e-card.c:3331
 msgid ""
 "\n"
 "  Suffix:     "
@@ -63,7 +63,7 @@ msgstr ""
 "\n"
 "  敬称(後つけ):     "
 
-#: addressbook/backend/ebook/e-card.c:3335
+#: addressbook/backend/ebook/e-card.c:3345
 msgid ""
 "\n"
 "Birth Date: "
@@ -71,7 +71,7 @@ msgstr ""
 "\n"
 "誕生日: "
 
-#: addressbook/backend/ebook/e-card.c:3346
+#: addressbook/backend/ebook/e-card.c:3356
 msgid ""
 "\n"
 "Address:"
@@ -79,7 +79,7 @@ msgstr ""
 "\n"
 "住所:"
 
-#: addressbook/backend/ebook/e-card.c:3348
+#: addressbook/backend/ebook/e-card.c:3358
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -87,7 +87,7 @@ msgstr ""
 "\n"
 "郵便番号:  "
 
-#: addressbook/backend/ebook/e-card.c:3349
+#: addressbook/backend/ebook/e-card.c:3359
 msgid ""
 "\n"
 "  Ext:         "
@@ -95,25 +95,25 @@ msgstr ""
 "\n"
 "  "
 
-#: addressbook/backend/ebook/e-card.c:3350
+#: addressbook/backend/ebook/e-card.c:3360
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3351
+#: addressbook/backend/ebook/e-card.c:3361
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3352
+#: addressbook/backend/ebook/e-card.c:3362
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3353
+#: addressbook/backend/ebook/e-card.c:3363
 msgid ""
 "\n"
 "  Postal Code: "
@@ -121,7 +121,7 @@ msgstr ""
 "\n"
 "  郵便番号: "
 
-#: addressbook/backend/ebook/e-card.c:3354
+#: addressbook/backend/ebook/e-card.c:3364
 msgid ""
 "\n"
 "  Country:     "
@@ -129,13 +129,13 @@ msgstr ""
 "\n"
 "  国:       "
 
-#: addressbook/backend/ebook/e-card.c:3367
+#: addressbook/backend/ebook/e-card.c:3377
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3379
+#: addressbook/backend/ebook/e-card.c:3389
 msgid ""
 "\n"
 "Telephones:\n"
@@ -143,7 +143,7 @@ msgstr ""
 "\n"
 "電話番号:\n"
 
-#: addressbook/backend/ebook/e-card.c:3382
+#: addressbook/backend/ebook/e-card.c:3392
 msgid ""
 "\n"
 "Telephone:"
@@ -151,7 +151,7 @@ msgstr ""
 "\n"
 "電話番号:"
 
-#: addressbook/backend/ebook/e-card.c:3406
+#: addressbook/backend/ebook/e-card.c:3416
 msgid ""
 "\n"
 "E-mail:\n"
@@ -159,7 +159,7 @@ msgstr ""
 "\n"
 "メール:\n"
 
-#: addressbook/backend/ebook/e-card.c:3409
+#: addressbook/backend/ebook/e-card.c:3419
 msgid ""
 "\n"
 "E-mail:"
@@ -167,7 +167,7 @@ msgstr ""
 "\n"
 "メール:"
 
-#: addressbook/backend/ebook/e-card.c:3428
+#: addressbook/backend/ebook/e-card.c:3438
 msgid ""
 "\n"
 "Mailer: "
@@ -175,7 +175,7 @@ msgstr ""
 "\n"
 "メーラ: "
 
-#: addressbook/backend/ebook/e-card.c:3434
+#: addressbook/backend/ebook/e-card.c:3444
 msgid ""
 "\n"
 "Time Zone: "
@@ -183,7 +183,7 @@ msgstr ""
 "\n"
 "タイムゾーン: "
 
-#: addressbook/backend/ebook/e-card.c:3442
+#: addressbook/backend/ebook/e-card.c:3452
 msgid ""
 "\n"
 "Geo Location: "
@@ -191,7 +191,7 @@ msgstr ""
 "\n"
 "経緯: "
 
-#: addressbook/backend/ebook/e-card.c:3446
+#: addressbook/backend/ebook/e-card.c:3456
 msgid ""
 "\n"
 "Business Role: "
@@ -199,7 +199,7 @@ msgstr ""
 "\n"
 "仕事の職務: "
 
-#: addressbook/backend/ebook/e-card.c:3458
+#: addressbook/backend/ebook/e-card.c:3468
 msgid ""
 "\n"
 "Org: "
@@ -207,7 +207,7 @@ msgstr ""
 "\n"
 "組織: "
 
-#: addressbook/backend/ebook/e-card.c:3459
+#: addressbook/backend/ebook/e-card.c:3469
 msgid ""
 "\n"
 "  Name:  "
@@ -215,7 +215,7 @@ msgstr ""
 "\n"
 "  社名:  "
 
-#: addressbook/backend/ebook/e-card.c:3460
+#: addressbook/backend/ebook/e-card.c:3470
 msgid ""
 "\n"
 "  Unit:  "
@@ -223,7 +223,7 @@ msgstr ""
 "\n"
 "  部署:  "
 
-#: addressbook/backend/ebook/e-card.c:3461
+#: addressbook/backend/ebook/e-card.c:3471
 msgid ""
 "\n"
 "  Unit2: "
@@ -231,7 +231,7 @@ msgstr ""
 "\n"
 "  部署2: "
 
-#: addressbook/backend/ebook/e-card.c:3462
+#: addressbook/backend/ebook/e-card.c:3472
 msgid ""
 "\n"
 "  Unit3: "
@@ -239,7 +239,7 @@ msgstr ""
 "\n"
 "  部署3: "
 
-#: addressbook/backend/ebook/e-card.c:3463
+#: addressbook/backend/ebook/e-card.c:3473
 msgid ""
 "\n"
 "  Unit4: "
@@ -247,7 +247,7 @@ msgstr ""
 "\n"
 "  部署4: "
 
-#: addressbook/backend/ebook/e-card.c:3467
+#: addressbook/backend/ebook/e-card.c:3477
 msgid ""
 "\n"
 "Categories: "
@@ -255,7 +255,7 @@ msgstr ""
 "\n"
 "業務分野: "
 
-#: addressbook/backend/ebook/e-card.c:3468
+#: addressbook/backend/ebook/e-card.c:3478
 msgid ""
 "\n"
 "Comment: "
@@ -273,7 +273,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3481
+#: addressbook/backend/ebook/e-card.c:3491
 msgid ""
 "\n"
 "Unique String: "
@@ -281,7 +281,7 @@ msgstr ""
 "\n"
 "任意の文字列: "
 
-#: addressbook/backend/ebook/e-card.c:3484
+#: addressbook/backend/ebook/e-card.c:3494
 msgid ""
 "\n"
 "Public Key: "
@@ -289,11 +289,11 @@ msgstr ""
 "\n"
 "公開鍵: "
 
-#: addressbook/backend/ebook/e-card.c:3745
+#: addressbook/backend/ebook/e-card.c:3755
 msgid "Multiple VCards"
 msgstr "複数の VCard"
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3763
 #, c-format
 msgid "VCard for %s"
 msgstr "%s の VCard"
@@ -350,8 +350,9 @@ msgstr ""
 
 #: addressbook/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/e-meeting-dialog.glade.h:1 filter/filter.glade.h:1
 #: mail/mail-config.glade.h:7
 msgid "Add"
 msgstr "追加"
@@ -373,8 +374,8 @@ msgid "C_ontacts..."
 msgstr "コンタクト(_o)..."
 
 #: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "カテゴリ(_t)..."
 
@@ -383,7 +384,7 @@ msgid "Contact Editor"
 msgstr "コンタクトエディタ"
 
 #: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: calendar/gui/dialogs/task-editor.c:115
 msgid "Details"
 msgstr "詳細"
 
@@ -409,7 +410,7 @@ msgid "Phone Types"
 msgstr "電話種別"
 
 #: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/contact-editor/e-contact-editor.c:1283
 msgid "Primary Email"
 msgstr "主要なメール"
 
@@ -422,7 +423,7 @@ msgid "Web page address:"
 msgstr "ウェブページの URL:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:94
 msgid "_Add"
 msgstr "追加(_A)"
 
@@ -447,10 +448,10 @@ msgid "_Company:"
 msgstr "会社(_C):"
 
 #: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:715 mail/mail-config.glade.h:85
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:103
+#: mail/folder-browser.c:725 mail/mail-config.glade.h:95
+#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:108
 #: ui/evolution-task-editor-dialog.xml.h:69 ui/evolution-tasks.xml.h:9
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:47
 msgid "_Delete"
 msgstr "削除(_D)"
 
@@ -502,100 +503,101 @@ msgstr "これは郵便物の住所です"
 msgid "This contact belongs to these categories:"
 msgstr "このコンタクトはこれらのカテゴリに所属しています:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:745
+#: addressbook/contact-editor/e-contact-editor.c:1241
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Assistant"
 msgstr "アシスタント"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/contact-editor/e-contact-editor.c:1310
+#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/contact-editor/e-contact-editor.c:1309
 msgid "Business"
 msgstr "仕事"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/contact-editor/e-contact-editor.c:1243
 msgid "Business 2"
 msgstr "仕事 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Fax"
 msgstr "仕事の FAX"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/contact-editor/e-contact-editor.c:1245
 msgid "Callback"
 msgstr "呼び戻し"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Car"
 msgstr "車"
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "Company"
 msgstr "会社"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
-#: addressbook/contact-editor/e-contact-editor.c:1311
+#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/contact-editor/e-contact-editor.c:1310
 msgid "Home"
 msgstr "家"
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
+#: addressbook/contact-editor/e-contact-editor.c:1249
 msgid "Home 2"
 msgstr "家 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/contact-editor/e-contact-editor.c:1250
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Fax"
 msgstr "家の FAX"
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:729
+#: addressbook/contact-editor/e-contact-editor.c:1251
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
+#: addressbook/contact-editor/e-contact-editor.c:1252
 msgid "Mobile"
 msgstr "モバイル"
 
-#: addressbook/contact-editor/e-contact-editor.c:1254
-#: addressbook/contact-editor/e-contact-editor.c:1312
+#: addressbook/contact-editor/e-contact-editor.c:1253
+#: addressbook/contact-editor/e-contact-editor.c:1311
+#: mail/mail-config.glade.h:55
 msgid "Other"
 msgstr "その他"
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/contact-editor/e-contact-editor.c:1254
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Other Fax"
 msgstr "その他の FAX"
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/contact-editor/e-contact-editor.c:1255
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Pager"
 msgstr "ポケベル"
 
-#: addressbook/contact-editor/e-contact-editor.c:1257
+#: addressbook/contact-editor/e-contact-editor.c:1256
 msgid "Primary"
 msgstr "プライマリ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/contact-editor/e-contact-editor.c:1257
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "Radio"
 msgstr "ラジオ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/contact-editor/e-contact-editor.c:1258
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Telex"
 msgstr "テレックス"
 
-#: addressbook/contact-editor/e-contact-editor.c:1260
+#: addressbook/contact-editor/e-contact-editor.c:1259
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Email 2"
 msgstr "メール2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Email 3"
 msgstr "メール3"
 
@@ -603,20 +605,20 @@ msgstr "メール3"
 msgid "Delete Contact?"
 msgstr "コンタクトを削除しますか?"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:233
+#: addressbook/contact-editor/e-contact-quick-add.c:234
 msgid "Contact Quick-Add"
 msgstr "コンタクトの簡易追加"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:235
+#: addressbook/contact-editor/e-contact-quick-add.c:236
 msgid "Edit Full"
 msgstr "すべて編集"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:276
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/contact-editor/e-contact-quick-add.c:277
+#: addressbook/gui/widgets/e-addressbook-view.c:699
 msgid "Full Name"
 msgstr "フルネーム"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:282
+#: addressbook/contact-editor/e-contact-quick-add.c:283
 msgid "E-mail"
 msgstr "メール"
 
@@ -732,16 +734,16 @@ msgstr "敬称(後つけ)(_S):"
 msgid "_Title:"
 msgstr "敬称(前つけ)(_T):"
 
-#: addressbook/gui/component/addressbook.c:361
+#: addressbook/gui/component/addressbook.c:341
 #, c-format
 msgid "Enter password for %s"
 msgstr "%s のパスワードを入力してください"
 
-#: addressbook/gui/component/addressbook.c:389
+#: addressbook/gui/component/addressbook.c:369
 msgid "Unable to open addressbook"
 msgstr "アドレス帳を開くことが出来ません"
 
-#: addressbook/gui/component/addressbook.c:396
+#: addressbook/gui/component/addressbook.c:376
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -751,7 +753,7 @@ msgstr ""
 "を入力したか, あるいは LDAP サーバが落ちているかのどちらか\n"
 "を意味します"
 
-#: addressbook/gui/component/addressbook.c:401
+#: addressbook/gui/component/addressbook.c:381
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -763,7 +765,7 @@ msgstr ""
 "から OpenLDAP を取得した後 CVS ソースからプログラムを\n"
 "コンパイルしなければなりません\n"
 
-#: addressbook/gui/component/addressbook.c:409
+#: addressbook/gui/component/addressbook.c:389
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -771,19 +773,19 @@ msgstr ""
 "このアドレス帳を開くことが出来ませんでした. パスが存在し, アクセス権\n"
 "を持っているかどうかチェックしてください"
 
-#: addressbook/gui/component/addressbook.c:569 calendar/gui/gnome-cal.c:233
+#: addressbook/gui/component/addressbook.c:549 calendar/gui/gnome-cal.c:233
 msgid "Any field contains"
 msgstr "フィールドが次のものを含む"
 
-#: addressbook/gui/component/addressbook.c:570
+#: addressbook/gui/component/addressbook.c:550
 msgid "Name contains"
 msgstr "名前が次のものを含む"
 
-#: addressbook/gui/component/addressbook.c:571
+#: addressbook/gui/component/addressbook.c:551
 msgid "Email contains"
 msgstr "メールが次のものを含む"
 
-#: addressbook/gui/component/addressbook.c:715
+#: addressbook/gui/component/addressbook.c:697
 msgid "The URI that the Folder Browser will display"
 msgstr "フォルダブラウザが表示する URI"
 
@@ -806,7 +808,7 @@ msgstr "なし (匿名モード)"
 #: addressbook/gui/component/addressbook-config.c:165
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:59
 msgid "Password"
 msgstr "パスワード"
 
@@ -839,12 +841,12 @@ msgid "FIXME Bind DN Help text here"
 msgstr "FIXME バインド DN のヘルプテキストです"
 
 #: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:68
 msgid "Remember this password"
 msgstr "このパスワードを記憶"
 
 #: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:39
 msgid "Host:"
 msgstr "ホスト:"
 
@@ -881,7 +883,7 @@ msgid "Advanced LDAP Options"
 msgstr "上級 LDAP オプション"
 
 #: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:60
 msgid "Path:"
 msgstr "パス:"
 
@@ -909,7 +911,7 @@ msgstr ""
 "あなたの持つアドレス帳を選択し, それについての関連した情報を入力してください"
 
 #: addressbook/gui/component/addressbook-config.c:688
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:49
 msgid "Name:"
 msgstr "名前:"
 
@@ -933,11 +935,12 @@ msgstr "アドレス帳のソース"
 
 #: addressbook/gui/component/addressbook-config.glade.h:3
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-#: addressbook/gui/widgets/e-addressbook-view.c:622
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:23
-#: mail/message-browser.c:211 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:603
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#: calendar/gui/e-meeting-dialog.glade.h:8 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:27
+#: mail/message-browser.c:211 ui/evolution-addressbook.xml.h:7
 #: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:22
 #: ui/evolution-task-editor-dialog.xml.h:18 ui/evolution-tasks.xml.h:3
 msgid "Delete"
@@ -945,7 +948,7 @@ msgstr "削除"
 
 #: addressbook/gui/component/addressbook-config.glade.h:4
 #: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:33
 msgid "Edit"
 msgstr "編集"
 
@@ -1024,7 +1027,7 @@ msgid "Factory for the sample Addressbook control"
 msgstr "サンプルアドレス帳コントロールのためのファクトリ"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:161
-#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:401
+#: composer/e-msg-composer-attachment-bar.c:473 filter/filter-filter.c:401
 #: filter/filter-rule.c:549 filter/filter.glade.h:9
 #: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
 msgid "Remove"
@@ -1062,6 +1065,51 @@ msgstr "名前を選択"
 msgid "Select name from:"
 msgstr "次から名前を選択:"
 
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
+msgstr "とにかく追加"
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid "Duplicate Contact Detected"
+msgstr "重複したコンタクトを検出しました"
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
+msgid "New Contact:"
+msgstr "新規コンタクト:"
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+msgid "Original Contact:"
+msgstr "元のコンタクト:"
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
+msgid ""
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
+msgstr ""
+"このコンタクトの名前あるいはメールアドレスはこのフォルダに\n"
+"すでに存在しています．追加してもよろしいですか?"
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+msgid "Change Anyway"
+msgstr "とにかく変更"
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Changed Contact:"
+msgstr "変更後のコンタクト:"
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Conflicting Contact:"
+msgstr "衝突しているコンタクト:"
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:5
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"変更したこのコンタクトの名前あるいはメールアドレスは\n"
+"このフォルダにすでに存在しています．追加してもよろしいですか?"
+
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
 #: mail/mail-search.c:242
 msgid "Search"
@@ -1177,154 +1225,170 @@ msgstr "z"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
-#: addressbook/gui/widgets/e-addressbook-view.c:557
-#: addressbook/gui/widgets/e-addressbook-view.c:617
+#: addressbook/gui/widgets/e-addressbook-view.c:538
+#: addressbook/gui/widgets/e-addressbook-view.c:598
 msgid "Save as VCard"
 msgstr "VCard で保存"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
-#: addressbook/gui/widgets/e-addressbook-view.c:618
+#: addressbook/gui/widgets/e-addressbook-view.c:599
 msgid "Send contact to other"
 msgstr "他へコンタクトを送信"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:619
+#: addressbook/gui/widgets/e-addressbook-view.c:600
 msgid "Send message to contact"
 msgstr "コンタクト先へメッセージを送信"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
-#: addressbook/gui/widgets/e-addressbook-view.c:620 mail/message-browser.c:208
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:65 ui/evolution-tasks.xml.h:6
+#: addressbook/gui/widgets/e-addressbook-view.c:601 mail/message-browser.c:208
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:23
+#: ui/evolution-mail.xml.h:70 ui/evolution-tasks.xml.h:6
 msgid "Print"
 msgstr "印刷"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:621
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Print Envelope"
 msgstr "表紙を印刷"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:697
 msgid "* Click here to add a contact *"
 msgstr "* コンタクトを追加するためにここをクリック *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:698
 msgid "File As"
 msgstr "別名"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:700
 msgid "Email"
 msgstr "メール"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "Primary Phone"
 msgstr "主な電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "Assistant Phone"
 msgstr "補助の電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Business Phone"
 msgstr "仕事の電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Callback Phone"
 msgstr "呼び戻しの電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Company Phone"
 msgstr "会社の電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Home Phone"
 msgstr "家の電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Organization"
 msgstr "組織"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Business Address"
 msgstr "仕事の住所"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Home Address"
 msgstr "家の住所"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Mobile Phone"
 msgstr "携帯電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Car Phone"
 msgstr "車載電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Business Phone 2"
 msgstr "仕事の電話 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:728
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Home Phone 2"
 msgstr "家の電話 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Other Phone"
 msgstr "その他の電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Other Address"
 msgstr "その他の住所"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "Web Site"
 msgstr "ウェブサイト"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:740
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Department"
 msgstr "担当部署"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:741
+#: addressbook/gui/widgets/e-addressbook-view.c:728
 msgid "Office"
 msgstr "事務所"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:742
+#: addressbook/gui/widgets/e-addressbook-view.c:729
 msgid "Title"
 msgstr "敬称(前つけ)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:743
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Profession"
 msgstr "専門職"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:744
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Manager"
 msgstr "マネージャ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:746
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Nickname"
 msgstr "ニックネーム"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:747
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Spouse"
 msgstr "配偶者"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:748
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Note"
 msgstr "ノート"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:749
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/e-addressbook-view.c:1079
+msgid "Done."
+msgstr "完了"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
+msgid "Error removing card"
+msgstr "カードの削除中にエラーが発生しました"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1111
+msgid "Removing cards..."
+msgstr "カードを削除中..."
+
+#: addressbook/gui/widgets/e-minicard.c:436
+msgid "Error modifying card"
+msgstr "カードを修正中にエラーが発生しました"
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "アドレス帳に保存"
 
-#: addressbook/gui/widgets/e-minicard-view.c:216
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1583,22 +1647,22 @@ msgstr ""
 "カレンダビューを作成出来ませんでした. ORBitとOAFの設定をチェックしてください"
 
 #: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:898
-#: calendar/gui/e-calendar-table.c:322
+#: calendar/gui/e-calendar-table.c:323
 msgid "Public"
 msgstr "一般"
 
 #: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:900
-#: calendar/gui/e-calendar-table.c:323
+#: calendar/gui/e-calendar-table.c:324
 msgid "Private"
 msgstr "私的"
 
 #: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:902
-#: calendar/gui/e-calendar-table.c:324
+#: calendar/gui/e-calendar-table.c:325
 msgid "Confidential"
 msgstr "極秘"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1601
-#: calendar/gui/event-editor.c:1628
+#: calendar/gui/calendar-model.c:369 calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:356
 #: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Unknown"
 msgstr "未知"
@@ -1620,55 +1684,55 @@ msgid "W"
 msgstr "西"
 
 #: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1066
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:344 mail/message-list.c:690
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:345 mail/message-list.c:696
 msgid "High"
 msgstr "高い"
 
 #: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1068
 #: calendar/gui/calendar-model.c:1574
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:345 mail/message-list.c:689
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:346 mail/message-list.c:695
 msgid "Normal"
 msgstr "普通"
 
 #: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1070
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:346 mail/message-list.c:688
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:347 mail/message-list.c:694
 msgid "Low"
 msgstr "低い"
 
 #: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1122
-#: calendar/gui/e-calendar-table.c:398
+#: calendar/gui/e-calendar-table.c:399
 msgid "Transparent"
 msgstr "透明"
 
 #: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1124
-#: calendar/gui/e-calendar-table.c:397
+#: calendar/gui/e-calendar-table.c:398
 msgid "Opaque"
 msgstr "不透明"
 
 #: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1176
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:418
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:419
 msgid "Not Started"
 msgstr "開始していない"
 
 #: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1178
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:419
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:420
 msgid "In Progress"
 msgstr "処理中"
 
 #: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1180
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:420
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:421
 msgid "Completed"
 msgstr "完了しました"
 
 #: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1182
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:421 camel/camel-service.c:544
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:422 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "キャンセルしました"
@@ -1702,10 +1766,10 @@ msgstr ""
 
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:896 calendar/gui/calendar-model.c:1120
-#: calendar/gui/calendar-model.c:1174 calendar/gui/e-calendar-table.c:321
-#: calendar/gui/e-calendar-table.c:396 mail/mail-account-gui.c:976
-#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:46 shell/e-shell-view.c:1312
+#: calendar/gui/calendar-model.c:1174 calendar/gui/e-calendar-table.c:322
+#: calendar/gui/e-calendar-table.c:397 mail/mail-account-gui.c:997
+#: mail/mail-accounts.c:123 mail/mail-accounts.c:174
+#: mail/mail-config.glade.h:52 shell/e-shell-view.c:1394
 #: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
 #: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
 msgid "None"
@@ -1732,8 +1796,8 @@ msgstr ""
 
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:1064
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:347
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:348
 msgid "Undefined"
 msgstr "未定義"
 
@@ -1769,7 +1833,7 @@ msgstr "約束"
 msgid "%I:%M%p"
 msgstr "%p %I:%M"
 
-#: calendar/gui/calendar-summary.c:275 calendar/gui/print.c:948
+#: calendar/gui/calendar-summary.c:275 calendar/gui/print.c:1844
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "タスク"
@@ -1782,7 +1846,7 @@ msgstr "<b>カレンダをロード中にエラー</b>"
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr "<b>カレンダをロード中にエラー:<br>メソッドはサポートしていません"
 
-#: calendar/gui/calendar-summary.c:622 mail/mail-config.glade.h:24
+#: calendar/gui/calendar-summary.c:622 mail/mail-config.glade.h:29
 msgid "Display"
 msgstr "表示"
 
@@ -1796,7 +1860,7 @@ msgstr "タスクの表示"
 
 #: calendar/gui/calendar-summary.c:690
 msgid "Things to do"
-msgstr ""
+msgstr "TODOの状況"
 
 #: calendar/gui/calendar-summary.c:721 calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
@@ -1833,6 +1897,145 @@ msgstr "約束の編集"
 msgid "Snooze time (minutes)"
 msgstr "アラーム停止時間 (分)"
 
+#: calendar/gui/dialogs/alarm-page.c:255
+#, c-format
+msgid "%d days"
+msgstr "%d 日"
+
+#: calendar/gui/dialogs/alarm-page.c:257
+msgid "1 day"
+msgstr "1 日"
+
+#: calendar/gui/dialogs/alarm-page.c:260
+#, c-format
+msgid "%d weeks"
+msgstr "%d 週間"
+
+#: calendar/gui/dialogs/alarm-page.c:262
+msgid "1 week"
+msgstr "1 週間"
+
+#: calendar/gui/dialogs/alarm-page.c:265
+#, c-format
+msgid "%d hours"
+msgstr "%d 時間"
+
+#: calendar/gui/dialogs/alarm-page.c:267
+msgid "1 hour"
+msgstr "1 時間"
+
+#: calendar/gui/dialogs/alarm-page.c:270
+#, c-format
+msgid "%d minutes"
+msgstr "%d 分"
+
+#: calendar/gui/dialogs/alarm-page.c:272
+msgid "1 minute"
+msgstr "1 分"
+
+#: calendar/gui/dialogs/alarm-page.c:275
+#, c-format
+msgid "%d seconds"
+msgstr "%d 秒"
+
+#: calendar/gui/dialogs/alarm-page.c:277
+msgid "1 second"
+msgstr "1 秒"
+
+#: calendar/gui/dialogs/alarm-page.c:302
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+msgid "Play a sound"
+msgstr "次の時に音楽を再生する:"
+
+#: calendar/gui/dialogs/alarm-page.c:306
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+msgid "Show a dialog"
+msgstr "次の時にダイアログを表示する:"
+
+#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+msgid "Send an email"
+msgstr "次の時にメールを送信する:"
+
+#: calendar/gui/dialogs/alarm-page.c:314
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+msgid "Run a program"
+msgstr "次の時にプログラムを実行する:"
+
+#: calendar/gui/dialogs/alarm-page.c:332
+msgid " before start of appointment"
+msgstr "最初の約束の前"
+
+#: calendar/gui/dialogs/alarm-page.c:335
+msgid " after start of appointment"
+msgstr "最初の約束の後"
+
+#: calendar/gui/dialogs/alarm-page.c:345
+msgid " before end of appointment"
+msgstr "最後の約束の前"
+
+#: calendar/gui/dialogs/alarm-page.c:348
+msgid " after end of appointment"
+msgstr "最後の約束の後"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+msgid "Basics"
+msgstr "基本"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+msgid "Date/Time:"
+msgstr "日付/時間:"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+msgid "Reminders"
+msgstr "催促状"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:9 ui/evolution-calendar.xml.h:29
+msgid "Settings..."
+msgstr "設定..."
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "サマリ:"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "後に"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr "前に"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+msgid "day(s)"
+msgstr "日"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+msgid "end of appointment"
+msgstr "約束の最後が経過"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+msgid "hour(s)"
+msgstr "時"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:97
+msgid "minute(s)"
+msgstr "分"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+msgid "start of appointment"
+msgstr "約束の最初が経過"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
 msgstr "05 分"
@@ -1903,7 +2106,7 @@ msgid "Display options"
 msgstr "表示オプション"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:154
+#: calendar/gui/e-calendar-table.c:155
 msgid "Due Date"
 msgstr "期日"
 
@@ -1924,7 +2127,7 @@ msgid "Fri"
 msgstr "金"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/dialogs/recurrence-page.c:918
 msgid "Friday"
 msgstr "金曜日"
 
@@ -1953,7 +2156,7 @@ msgid "Mon"
 msgstr "月"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:475
+#: calendar/gui/dialogs/recurrence-page.c:914
 msgid "Monday"
 msgstr "月曜日"
 
@@ -1966,12 +2169,12 @@ msgid "Overdue Items:"
 msgstr "期限を過ぎたアイテム:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:61
 msgid "Pick a color"
 msgstr "カラーを選択"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:158
 msgid "Priority"
 msgstr "優先度"
 
@@ -1979,17 +2182,12 @@ msgstr "優先度"
 msgid "Remind me of all appointments"
 msgstr "すべての約束を催促する"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "催促状"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Sat"
 msgstr "土"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/dialogs/recurrence-page.c:919
 msgid "Saturday"
 msgstr "土曜日"
 
@@ -2014,7 +2212,7 @@ msgid "Sun"
 msgstr "日"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/dialogs/recurrence-page.c:920
 msgid "Sunday"
 msgstr "日曜日"
 
@@ -2027,7 +2225,7 @@ msgid "Thu"
 msgstr "木"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "Thursday"
 msgstr "木曜日"
 
@@ -2048,7 +2246,7 @@ msgid "Tue"
 msgstr "火"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:476
+#: calendar/gui/dialogs/recurrence-page.c:915
 msgid "Tuesday"
 msgstr "火曜日"
 
@@ -2061,7 +2259,7 @@ msgid "Wed"
 msgstr "水"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/dialogs/recurrence-page.c:916
 msgid "Wednesday"
 msgstr "水曜日"
 
@@ -2074,7 +2272,7 @@ msgid "minutes before they occur."
 msgstr "分前"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:99
 msgid "seconds."
 msgstr " 秒"
 
@@ -2120,298 +2318,388 @@ msgstr "本当に %d 個のタスクを削除してもよろしいですか?"
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "本当に %d 個の仕訳記入を削除してもよろしいですか?"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "変更を保存したいですか?"
-
-#: calendar/gui/dialogs/task-editor.c:709
-msgid "Edit Task"
-msgstr "タスクの編集"
-
-#: calendar/gui/dialogs/task-editor.c:714 calendar/gui/event-editor.c:382
-#, c-format
-msgid "Appointment - %s"
-msgstr "約束 - %s"
-
-#: calendar/gui/dialogs/task-editor.c:717 calendar/gui/event-editor.c:385
-#, c-format
-msgid "Task - %s"
-msgstr "タスク - %s"
+#: calendar/gui/dialogs/event-editor.c:112
+msgid "Appointment"
+msgstr "約束"
 
-#: calendar/gui/dialogs/task-editor.c:720 calendar/gui/event-editor.c:388
-#, c-format
-msgid "Journal entry - %s"
-msgstr "仕訳記入 - %s"
+#: calendar/gui/dialogs/event-editor.c:117
+msgid "Reminder"
+msgstr "催促状"
 
-#: calendar/gui/dialogs/task-editor.c:734 calendar/gui/event-editor.c:402
-msgid "No summary"
-msgstr "サマリーなし"
+#: calendar/gui/dialogs/event-editor.c:122
+msgid "Recurrence"
+msgstr "再発"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% 完了(_l):"
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
+msgstr "毎日のイベント(_l)"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:150
-#: calendar/gui/event-editor-dialog.glade.h:6
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.c:151
 msgid "Classification"
 msgstr "分類"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Date & Time"
 msgstr "日付と時間"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "完了日:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
 msgid "Pri_vate"
 msgstr "私的(_v)"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "処理中"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
 msgid "Pu_blic"
 msgstr "公的(_b)"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "開始日(_r):"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
 msgid "Su_mmary:"
 msgstr "サマリー(_m):"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "タスク"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
 msgid "_Confidential"
 msgstr "機密(_C)"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
 msgid "_Contacts..."
 msgstr "コンタクト(_C)..."
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+#: calendar/gui/dialogs/event-page.glade.h:10
+msgid "_End time:"
+msgstr "終了時間(_E):"
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
+msgstr "開始時間(_S):"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+msgid "Custom recurrence"
+msgstr "再発のカスタマイズ"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "Every"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Exceptions"
+msgstr "例外"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Modify"
+msgstr "修正"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "No recurrence"
+msgstr "再発なし"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+msgid "Preview"
+msgstr "プレビュー"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+msgid "Recurrence Rule"
+msgstr "再発ルール"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
+msgid "Simple recurrence"
+msgstr "シンプルな再発"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#, fuzzy
+msgid "month(s)"
+msgstr "月"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#, fuzzy
+msgid "until"
+msgstr "に指定日まで繰り返す"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#, fuzzy
+msgid "week(s)"
+msgstr "週"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#, fuzzy
+msgid "year(s)"
+msgstr "年"
+
+#: calendar/gui/dialogs/recurrence-page.c:398 calendar/gui/print.c:1975
+#: calendar/gui/print.c:1977 calendar/gui/print.c:1978
+msgid "%a %b %d %Y"
+msgstr "%Y/%b/%d (%a)"
+
+#: calendar/gui/dialogs/recurrence-page.c:544
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "この約束は Evolution が編集出来ない再発を含んでいます"
+
+#: calendar/gui/dialogs/recurrence-page.c:887
+msgid "on"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:913 filter/filter-datespec.c:81
+msgid "day"
+msgstr "日"
+
+#: calendar/gui/dialogs/recurrence-page.c:1043
+msgid "on the"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1051
+msgid "th"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1215
+msgid "occurrences"
+msgstr "出来事"
+
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr "変更を保存したいですか?"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
+msgstr "完了日:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+msgid "URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/task-editor.c:110
+msgid "Task"
+msgstr "タスク"
+
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr "% 完了(_l):"
+
+#: calendar/gui/dialogs/task-page.glade.h:14
+msgid "Progress"
+msgstr "処理中"
+
+#: calendar/gui/dialogs/task-page.glade.h:16
+msgid "Sta_rt Date:"
+msgstr "開始日(_r):"
+
+#: calendar/gui/dialogs/task-page.glade.h:21
 msgid "_Due Date:"
 msgstr "期日(_D):"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
+#: calendar/gui/dialogs/task-page.glade.h:22
 msgid "_Priority:"
 msgstr "優先度(_P):"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/task-page.glade.h:23
 msgid "_Status:"
 msgstr "ステータス(_S):"
 
-#: calendar/gui/e-calendar-table.c:149
+#: calendar/gui/e-calendar-table.c:150
 msgid "Categories"
 msgstr "カテゴリ"
 
-#: calendar/gui/e-calendar-table.c:151
+#: calendar/gui/e-calendar-table.c:152
 msgid "Completion Date"
 msgstr "完了日"
 
-#: calendar/gui/e-calendar-table.c:152
+#: calendar/gui/e-calendar-table.c:153
 msgid "End Date"
 msgstr "終了日"
 
-#: calendar/gui/e-calendar-table.c:153
+#: calendar/gui/e-calendar-table.c:154
 msgid "Start Date"
 msgstr "開始日"
 
-#: calendar/gui/e-calendar-table.c:155
+#: calendar/gui/e-calendar-table.c:156
 msgid "Geographical Position"
 msgstr "緯度経度"
 
-#: calendar/gui/e-calendar-table.c:156
+#: calendar/gui/e-calendar-table.c:157
 msgid "Percent complete"
 msgstr "パーセント完了"
 
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:159
 msgid "Summary"
 msgstr "サマリー"
 
-#: calendar/gui/e-calendar-table.c:159
+#: calendar/gui/e-calendar-table.c:160
 msgid "Transparency"
 msgstr "透明度"
 
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:161
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-calendar-table.c:161
+#: calendar/gui/e-calendar-table.c:162
 msgid "Alarms"
 msgstr "アラーム"
 
-#: calendar/gui/e-calendar-table.c:162
+#: calendar/gui/e-calendar-table.c:163
 msgid "Click here to add a task"
 msgstr "タスクを追加するためにここをクリック"
 
-#: calendar/gui/e-calendar-table.c:366
+#: calendar/gui/e-calendar-table.c:367
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:367
+#: calendar/gui/e-calendar-table.c:368
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:368
+#: calendar/gui/e-calendar-table.c:369
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:369
+#: calendar/gui/e-calendar-table.c:370
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:370
+#: calendar/gui/e-calendar-table.c:371
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:371
+#: calendar/gui/e-calendar-table.c:372
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:372
+#: calendar/gui/e-calendar-table.c:373
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:373
+#: calendar/gui/e-calendar-table.c:374
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/e-calendar-table.c:375
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:376
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:377
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:736
+#: calendar/gui/e-calendar-table.c:737
 msgid "Edit this task"
 msgstr "このタスクを編集します"
 
-#: calendar/gui/e-calendar-table.c:738
+#: calendar/gui/e-calendar-table.c:739
 msgid "Mark as complete"
 msgstr "完了をマークします"
 
-#: calendar/gui/e-calendar-table.c:739
+#: calendar/gui/e-calendar-table.c:740
 #: ui/evolution-task-editor-dialog.xml.h:19
 msgid "Delete this task"
 msgstr "このタスクを削除します"
 
-#: calendar/gui/e-calendar-table.c:744
+#: calendar/gui/e-calendar-table.c:745
 msgid "Mark tasks as complete"
 msgstr "完了したタスクをマークします"
 
-#: calendar/gui/e-calendar-table.c:745 ui/evolution-tasks.xml.h:4
+#: calendar/gui/e-calendar-table.c:746 ui/evolution-tasks.xml.h:4
 msgid "Delete selected tasks"
 msgstr "選択したタスクを削除します"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
+#: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:284
+#: calendar/gui/print.c:782
 msgid "am"
 msgstr "午前"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
+#: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:287
+#: calendar/gui/print.c:784
 msgid "pm"
 msgstr "午後"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1294
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1275
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1599
 msgid "%A %d %B"
 msgstr "%B %d %A"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
+#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1289
 #: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%b/%d (%a)"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1321
+#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1302
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%b/%d"
 
-#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
+#: calendar/gui/e-day-view.c:3129 ui/evolution-calendar.xml.h:16
 msgid "New Appointment"
 msgstr "新規約束"
 
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3279
+#: calendar/gui/e-day-view.c:3131 calendar/gui/e-week-view.c:2968
 msgid "New All Day Event"
 msgstr "新規毎日のイベント"
 
-#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3284
+#: calendar/gui/e-day-view.c:3136 calendar/gui/e-week-view.c:2973
 msgid "Go to Today"
 msgstr "今日へ移動"
 
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3286
+#: calendar/gui/e-day-view.c:3138 calendar/gui/e-week-view.c:2975
 msgid "Go to Date..."
 msgstr "指定日へ移動..."
 
-#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3292
-#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:11
+#: calendar/gui/e-day-view.c:3145 calendar/gui/e-week-view.c:2981
+#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:12
 msgid "Open"
 msgstr "開く"
 
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3294
+#: calendar/gui/e-day-view.c:3147 calendar/gui/e-week-view.c:2983
 msgid "Delete this Appointment"
 msgstr "この約束を削除"
 
-#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3296
+#: calendar/gui/e-day-view.c:3149 calendar/gui/e-week-view.c:2985
 #: ui/evolution-event-editor.xml.h:45
 msgid "Schedule Meeting"
 msgstr "打合せのスケジュール"
 
-#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3309
+#: calendar/gui/e-day-view.c:3158 calendar/gui/e-week-view.c:2998
 msgid "Make this Occurrence Movable"
 msgstr "この出来事を可動にする"
 
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3311
+#: calendar/gui/e-day-view.c:3160 calendar/gui/e-week-view.c:3000
 msgid "Delete this Occurrence"
 msgstr "この出来事を削除"
 
-#: calendar/gui/e-day-view.c:3179
+#: calendar/gui/e-day-view.c:3162
 msgid "Delete all Occurrences"
 msgstr "すべての出来事を削除"
 
@@ -2420,71 +2708,71 @@ msgstr "すべての出来事を削除"
 msgid "%02i minute divisions"
 msgstr "%02i 分分割"
 
-#: calendar/gui/e-itip-control.c:161
+#: calendar/gui/e-itip-control.c:163
 msgid "I couldn't update your calendar file!\n"
 msgstr "カレンダファイルを更新出来ませんでした!\n"
 
-#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
+#: calendar/gui/e-itip-control.c:169 calendar/gui/e-itip-control.c:512
 msgid "Component successfully updated."
 msgstr "コンポーネントは正しく更新されました"
 
-#: calendar/gui/e-itip-control.c:173
+#: calendar/gui/e-itip-control.c:175
 msgid "There was an error loading the calendar file."
 msgstr "カレンダファイルを読み込み中にエラーが発生しました"
 
-#: calendar/gui/e-itip-control.c:197
+#: calendar/gui/e-itip-control.c:199
 msgid "I couldn't open your calendar file!\n"
 msgstr "カレンダファイルを開くことが出来ませんでした!\n"
 
-#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
+#: calendar/gui/e-itip-control.c:460 calendar/gui/e-itip-control.c:531
 msgid "I couldn't load your calendar file!\n"
 msgstr "カレンダファイルをロードすることが出来ませんでした!\n"
 
-#: calendar/gui/e-itip-control.c:470
+#: calendar/gui/e-itip-control.c:472
 msgid "I couldn't read your calendar file!\n"
 msgstr "カレンダファイルを読み込むことが出来ませんでした!\n"
 
-#: calendar/gui/e-itip-control.c:483
+#: calendar/gui/e-itip-control.c:485
 msgid "This is a reply from someone who was uninvited!"
 msgstr "これは招かざる誰かからの返事です!"
 
-#: calendar/gui/e-itip-control.c:499
+#: calendar/gui/e-itip-control.c:501
 msgid "I couldn't update your calendar store."
 msgstr "保存したカレンダを更新出来ませんでした"
 
-#: calendar/gui/e-itip-control.c:540
+#: calendar/gui/e-itip-control.c:542
 msgid "I couldn't delete the calendar component!\n"
 msgstr "カレンダコンポーネントを削除出来ませんでした!\n"
 
-#: calendar/gui/e-itip-control.c:550
+#: calendar/gui/e-itip-control.c:552
 msgid "Component successfully deleted."
 msgstr "コンポーネントは正しく削除されました"
 
-#: calendar/gui/e-itip-control.c:694
+#: calendar/gui/e-itip-control.c:696
 msgid "I don't recognize this type of calendar component."
 msgstr "このカレンダコンポーネントの種別は認識しません"
 
-#: calendar/gui/e-itip-control.c:780
+#: calendar/gui/e-itip-control.c:782
 msgid "Add to Calendar"
 msgstr "カレンダの追加"
 
-#: calendar/gui/e-itip-control.c:814
+#: calendar/gui/e-itip-control.c:816
 msgid " Accept "
 msgstr " 受諾 "
 
-#: calendar/gui/e-itip-control.c:815
+#: calendar/gui/e-itip-control.c:817
 msgid " Decline "
 msgstr " 辞退 "
 
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:818
 msgid " Tentative "
 msgstr " 暫定 "
 
-#: calendar/gui/e-itip-control.c:860
+#: calendar/gui/e-itip-control.c:862
 msgid "Update Calendar"
 msgstr "カレンダを更新"
 
-#: calendar/gui/e-itip-control.c:883
+#: calendar/gui/e-itip-control.c:885
 msgid "Cancel Meeting"
 msgstr "打合せをキャンセル"
 
@@ -2517,10 +2805,6 @@ msgstr "主催者:"
 msgid "Server Message:"
 msgstr "サーバメッセージ:"
 
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "サマリ:"
-
 #: calendar/gui/e-itip-control.glade.h:12
 msgid "date-end"
 msgstr "終了日"
@@ -2606,7 +2890,6 @@ msgstr ""
 "時間"
 
 #: calendar/gui/e-meeting-dialog.glade.h:23 filter/libfilter-i18n.h:49
-#: mail/message-list.c:1082
 msgid "Status"
 msgstr "ステータス"
 
@@ -2629,257 +2912,18 @@ msgstr "'%s' のタスクを読み込むことが出来ませんでした"
 msgid "The method required to load `%s' is not supported"
 msgstr "'%s' を読み込むことを要求されるメソッドはサポートしていません"
 
-#: calendar/gui/event-editor.c:377
-msgid "Edit Appointment"
-msgstr "約束の編集"
-
-#: calendar/gui/event-editor.c:449
-msgid "on"
-msgstr ""
-
-#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:81
-msgid "day"
-msgstr "日"
-
-#: calendar/gui/event-editor.c:601
-msgid "on the"
-msgstr ""
-
-#: calendar/gui/event-editor.c:608
-msgid "th"
-msgstr ""
-
-#: calendar/gui/event-editor.c:754
-msgid "occurrences"
-msgstr "出来事"
-
-#: calendar/gui/event-editor.c:871
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "この約束は Evolution が編集出来ない再発を含んでいます"
-
-#: calendar/gui/event-editor.c:1543
-#, c-format
-msgid " %d days"
-msgstr "%d 日"
-
-#: calendar/gui/event-editor.c:1545
-msgid " 1 day"
-msgstr "1 日"
-
-#: calendar/gui/event-editor.c:1548
-#, c-format
-msgid " %d weeks"
-msgstr "%d 週間"
-
-#: calendar/gui/event-editor.c:1550
-msgid " 1 week"
-msgstr "1 週間"
-
-#: calendar/gui/event-editor.c:1553
-#, c-format
-msgid " %d hours"
-msgstr "%d 時間"
-
-#: calendar/gui/event-editor.c:1555
-msgid " 1 hour"
-msgstr "1 時間"
-
-#: calendar/gui/event-editor.c:1558
-#, c-format
-msgid " %d minutes"
-msgstr "%d 分"
-
-#: calendar/gui/event-editor.c:1560
-msgid " 1 minute"
-msgstr "1 分"
-
-#: calendar/gui/event-editor.c:1563
-#, c-format
-msgid " %d seconds"
-msgstr "%d 秒"
-
-#: calendar/gui/event-editor.c:1565
-msgid " 1 second"
-msgstr "1 秒"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1588
-msgid "Play a sound"
-msgstr "次の時に音楽を再生する:"
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1591
-msgid "Show a dialog"
-msgstr "次の時にダイアログを表示する:"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1594
-msgid "Send an email"
-msgstr "次の時にメールを送信する:"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1597
-msgid "Run a program"
-msgstr "次の時にプログラムを実行する:"
-
-#: calendar/gui/event-editor.c:1612
-msgid " before start of appointment"
-msgstr "最初の約束の前"
-
-#: calendar/gui/event-editor.c:1614
-msgid " after start of appointment"
-msgstr "最初の約束の後"
-
-#: calendar/gui/event-editor.c:1622
-msgid " before end of appointment"
-msgstr "最後の約束の前"
-
-#: calendar/gui/event-editor.c:1624
-msgid " after end of appointment"
-msgstr "最後の約束の後"
-
-#: calendar/gui/event-editor.c:3132 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
-msgstr "%Y/%b/%d (%a)"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "毎日のイベント(_l)"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "約束"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "普通の約束"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr "再発のカスタマイズ"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "例外"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "修正"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "再発なし"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "プレビュー"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "再発"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "再発ルール"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "催促状"
-
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
-msgstr "設定..."
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "シンプルな再発"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "終了時間(_E):"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "開始時間(_S):"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "開始日(_S):"
-
-#. 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:6
-msgid "before"
-msgstr "前に"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "日"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
-msgstr "約束の最後が経過"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr "時"
-
-#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:87
-msgid "minute(s)"
-msgstr "分"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-#, fuzzy
-msgid "month(s)"
-msgstr "月"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "start of appointment"
-msgstr "約束の最初が経過"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-#, fuzzy
-msgid "until"
-msgstr "に指定日まで繰り返す"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-#, fuzzy
-msgid "week(s)"
-msgstr "週"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-#, fuzzy
-msgid "year(s)"
-msgstr "年"
-
-#: calendar/gui/e-week-view.c:3277 calendar/gui/e-week-view.c:3300
+#: calendar/gui/e-week-view.c:2966 calendar/gui/e-week-view.c:2989
 msgid "New Appointment..."
 msgstr "新規約束..."
 
-#: calendar/gui/e-week-view.c:3313
+#: calendar/gui/e-week-view.c:3002
 msgid "Delete All Occurrences"
 msgstr "すべての出来事を削除"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1583
 msgid "%d %B"
 msgstr "%B %d"
 
@@ -2997,196 +3041,196 @@ msgstr "10 月"
 msgid "September"
 msgstr "9 月"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:448
 msgid "1st"
 msgstr "1 日"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:448
 msgid "2nd"
 msgstr "2 日"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:448
 msgid "3rd"
 msgstr "3 日"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:448
 msgid "4th"
 msgstr "4 日"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:448
 msgid "5th"
 msgstr "5 日"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:449
 msgid "6th"
 msgstr "6 日"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:449
 msgid "7th"
 msgstr "7 日"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:449
 msgid "8th"
 msgstr "8 日"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:449
 msgid "9th"
 msgstr "9 日"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:449
 msgid "10th"
 msgstr "10 日"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:450
 msgid "11th"
 msgstr "11 日"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:450
 msgid "12th"
 msgstr "12 日"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:450
 msgid "13th"
 msgstr "13 日"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:450
 msgid "14th"
 msgstr "14 日"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:450
 msgid "15th"
 msgstr "15 日"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:451
 msgid "16th"
 msgstr "16 日"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:451
 msgid "17th"
 msgstr "17 日"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:451
 msgid "18th"
 msgstr "18 日"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:451
 msgid "19th"
 msgstr "19 日"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:451
 msgid "20th"
 msgstr "20 日"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:452
 msgid "21st"
 msgstr "21 日"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:452
 msgid "22nd"
 msgstr "22 日"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:452
 msgid "23rd"
 msgstr "23 日"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:452
 msgid "24th"
 msgstr "24 日"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:452
 msgid "25th"
 msgstr "25 日"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:453
 msgid "26th"
 msgstr "26 日"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:453
 msgid "27th"
 msgstr "27 日"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:453
 msgid "28th"
 msgstr "28 日"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:453
 msgid "29th"
 msgstr "29 日"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:453
 msgid "30th"
 msgstr "30 日"
 
-#: calendar/gui/print.c:306
+#: calendar/gui/print.c:454
 msgid "31st"
 msgstr "31 日"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:513
 msgid "Su"
 msgstr "日"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:513
 msgid "Mo"
 msgstr "月"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:513
 msgid "Tu"
 msgstr "火"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:513
 msgid "We"
 msgstr "水"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:514
 msgid "Th"
 msgstr "木"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:514
 msgid "Fr"
 msgstr "金"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:514
 msgid "Sa"
 msgstr "土"
 
 #. Day
-#: calendar/gui/print.c:1078
+#: calendar/gui/print.c:1951
 msgid "Current day (%a %b %d %Y)"
 msgstr "今日の日付 [%Y/%b/%d (%a)]"
 
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
+#: calendar/gui/print.c:1970 calendar/gui/print.c:1974
 msgid "%a %b %d"
 msgstr "%b/%d (%a)"
 
-#: calendar/gui/print.c:1093
+#: calendar/gui/print.c:1971
 msgid "%a %d %Y"
 msgstr "%Y/%d (%a)"
 
-#: calendar/gui/print.c:1104
+#: calendar/gui/print.c:1982
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "今週 (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1112
+#: calendar/gui/print.c:1990
 msgid "Current month (%b %Y)"
 msgstr "今月 (%Y/%b)"
 
 #. Year
-#: calendar/gui/print.c:1119
+#: calendar/gui/print.c:1997
 msgid "Current year (%Y)"
 msgstr "今年 (%Y)"
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:2212
 msgid "Print Calendar"
 msgstr "カレンダの印刷"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1447
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:24
+#: calendar/gui/print.c:2299 mail/mail-callbacks.c:1487
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:24
 msgid "Print Preview"
 msgstr "印刷プレビュー"
 
-#: calendar/gui/tasks-control.c:136
+#: calendar/gui/tasks-control.c:112
 msgid "The URI of the tasks folder to display"
 msgstr "タスクフォルダが表示する URI"
 
@@ -3342,7 +3386,7 @@ msgstr "符号化はこの暗号をサポートしていません"
 msgid "Decryption is not supported by this cipher"
 msgstr "復号化はこの暗号をサポートしていません"
 
-#: camel/camel-disco-store.c:271
+#: camel/camel-disco-store.c:305
 msgid "You must be working online to complete this operation"
 msgstr "この動作を完了するためにオンラインで作業しなければなりません"
 
@@ -3363,7 +3407,7 @@ msgstr "スプールフォルダを処理することが出来ません"
 msgid "Getting message %d (%d%%)"
 msgstr "メッセージ %d を取得中 (%d%%)"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
+#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:680
 #, c-format
 msgid "Failed message %d"
 msgstr "メッセージ %d は失敗しました"
@@ -3372,30 +3416,30 @@ msgstr "メッセージ %d は失敗しました"
 msgid "Cannot open message"
 msgstr "メッセージを開くことが出来ません"
 
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:691 camel/camel-filter-driver.c:801
 msgid "Syncing folder"
 msgstr "フォルダを同期中"
 
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:806
 msgid "Complete"
 msgstr "完了しました"
 
-#: camel/camel-filter-driver.c:748
+#: camel/camel-filter-driver.c:761
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "メッセージ %d / %d を取得中"
 
-#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#: camel/camel-filter-driver.c:766 camel/camel-filter-driver.c:784
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "メッセージ %d / %d は失敗しました"
 
-#: camel/camel-filter-driver.c:866
+#: camel/camel-filter-driver.c:883
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "フィルタの構文解析中にエラー: %s: %s"
 
-#: camel/camel-filter-driver.c:871
+#: camel/camel-filter-driver.c:888
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "フィルタ実行中にエラー: %s: %s"
@@ -3612,7 +3656,7 @@ msgstr "(未知のホスト)"
 
 #: camel/camel-remote-store.c:337 camel/camel-remote-store.c:399
 #: camel/camel-remote-store.c:470
-#: camel/providers/imap/camel-imap-command.c:287
+#: camel/providers/imap/camel-imap-command.c:289
 msgid "Operation cancelled"
 msgstr "操作はキャンセルしました"
 
@@ -3726,7 +3770,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:433
+#: camel/providers/imap/camel-imap-store.c:442
 msgid "Bad authentication response from server."
 msgstr "サーバから間違った認証応答がありました"
 
@@ -3740,7 +3784,7 @@ msgstr "このオプションは簡単なパスワードを使ってサーバへ接続します"
 
 #: camel/camel-sasl-login.c:127
 msgid "Unknown authentication state."
-msgstr ""
+msgstr "未知の認証状態です"
 
 #: camel/camel-search-private.c:111
 #, c-format
@@ -3804,64 +3848,46 @@ msgstr ""
 "ディレクトリ %s を作成出来ません:\n"
 "%s"
 
-#: camel/camel-smime-context.c:194
+#: camel/camel-smime-context.c:173
 #, c-format
 msgid "Please enter your password for %s"
 msgstr "%s のためのあなたのパスワードを入力してください"
 
-#: camel/camel-smime-context.c:210
-msgid "Error hashing password."
-msgstr "パスワードのハッシュでエラーが発生しました"
-
-#: camel/camel-smime-context.c:219
-msgid "Invalid password."
-msgstr "無効なパスワードです"
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
+msgstr ""
 
-#: camel/camel-smime-context.c:327
+#: camel/camel-smime-context.c:209
 #, c-format
-msgid "Could not sign: certificate not found for \"%s\"."
-msgstr "署名出来ませんでした: \"%s\" のための証明書が見つかりません"
-
-#: camel/camel-smime-context.c:343
-msgid "Could not sign: failed to create content info."
-msgstr "署名出来ませんでした: コンテキスト情報の作成に失敗しました"
-
-#: camel/camel-smime-context.c:350
-msgid "Could not sign: failed to create signing context."
-msgstr "署名出来ませんでした: コンテキストの署名の作成に失敗しました"
-
-#: camel/camel-smime-context.c:356
-msgid "Could not sign: failed to create signature."
-msgstr "署名出来ませんでした: 署名の作成に失敗しました"
-
-#: camel/camel-smime-context.c:383
-msgid "'clearsign' is not supported by S/MIME."
-msgstr "'クリアサイン' は S/MIME をサポートしていません"
-
-#: camel/camel-smime-context.c:528
-msgid "Could not encrypt: failed to create enveloped data."
-msgstr "暗号化出来ませんでした: エンベロープデータの作成に失敗しました"
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr "\"%s\" の署名証明書が存在しません"
 
-#: camel/camel-smime-context.c:535
-msgid "Could not encrypt: failed to create encryption context."
-msgstr "暗号化出来ませんでした: 暗号コンテキストの作成に失敗しました"
+#: camel/camel-smime-context.c:249
+#, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr "\"%s\" の暗号化証明書が存在しません"
 
-#: camel/camel-smime-context.c:570
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
 #, c-format
-msgid "Could not encrypt data: invalid user key: \"%s\"."
-msgstr "データを暗号化出来ませんでした: 無効なユーザキーです: \"%s\""
+msgid "Failed to find certificate for \"%s\"."
+msgstr "\"%s\" の証明書の発見に失敗しました"
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
 
-#: camel/camel-smime-context.c:576
-msgid "Could not encrypt: encoding failed."
-msgstr "暗号化出来ませんでした: 符号化に失敗しました"
+#: camel/camel-smime-context.c:799
+msgid "Failed to decode message."
+msgstr "メッセージのデコードに失敗しました"
 
-#: camel/camel-smime-context.c:626
-msgid "Failed to decrypt: Unknown"
-msgstr "復号化に失敗しました: 未知のエラーです"
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr "認証の証明に失敗しました"
 
 #. Fill in the new fields
-#: camel/camel-store.c:378 mail/mail-ops.c:1007 mail/mail-ops.c:1014
-#: mail/mail-ops.c:1032 mail/mail-ops.c:1033
+#: camel/camel-store.c:378 mail/mail-ops.c:1017 mail/mail-ops.c:1024
+#: mail/mail-ops.c:1042 mail/mail-ops.c:1043
 msgid "Trash"
 msgstr "ごみ箱"
 
@@ -3933,59 +3959,63 @@ msgstr "このゴミ箱フォルダからメッセージをコピーすることが出来ません"
 msgid "Could not open cache directory: %s"
 msgstr "キャッシュディレクトリを開くことが出来ませんでした: %s"
 
-#: camel/providers/imap/camel-imap-command.c:232
+#: camel/providers/imap/camel-imap-command.c:234
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP サーバから予期しない応答がありました: %s"
 
-#: camel/providers/imap/camel-imap-command.c:240
+#: camel/providers/imap/camel-imap-command.c:242
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP コマンドは失敗しました: %s"
 
-#: camel/providers/imap/camel-imap-command.c:241 shell/e-storage.c:481
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:481
 msgid "Unknown error"
 msgstr "未知のエラー"
 
-#: camel/providers/imap/camel-imap-command.c:295
+#: camel/providers/imap/camel-imap-command.c:297
 msgid "Server response ended too soon."
 msgstr "サーバレスポンスはあっけなく終わりました"
 
-#: camel/providers/imap/camel-imap-command.c:487
+#: camel/providers/imap/camel-imap-command.c:489
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP サーバの応答は %s 情報を含んでいません"
 
-#: camel/providers/imap/camel-imap-command.c:524
+#: camel/providers/imap/camel-imap-command.c:526
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP サーバから予期しない OK 応答がありました: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:172
+#: camel/providers/imap/camel-imap-folder.c:188
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "ディレクトリ %s を作成出来ませんでした: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:191
+#: camel/providers/imap/camel-imap-folder.c:207
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s のサマリーをロード出来ませんでした"
 
-#: camel/providers/imap/camel-imap-folder.c:364
+#: camel/providers/imap/camel-imap-folder.c:267
+msgid "Folder was destroyed and recreated on server."
+msgstr "フォルダは破壊され再作成されました"
+
+#: camel/providers/imap/camel-imap-folder.c:415
 msgid "Scanning IMAP folder"
 msgstr "IMAP フォルダを走査中"
 
-#: camel/providers/imap/camel-imap-folder.c:1047
-#: camel/providers/imap/camel-imap-folder.c:1281
+#: camel/providers/imap/camel-imap-folder.c:1437
+#: camel/providers/imap/camel-imap-folder.c:1673
 msgid "This message is not currently available"
 msgstr "このメッセージは現在利用出来ません"
 
-#: camel/providers/imap/camel-imap-folder.c:1075
-#: camel/providers/imap/camel-imap-folder.c:1314
+#: camel/providers/imap/camel-imap-folder.c:1465
+#: camel/providers/imap/camel-imap-folder.c:1706
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH 応答にメッセージ本体を見付けることが出来ませんでした"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:13
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:16
 msgid "Checking for new mail"
 msgstr "新着メールのチェック"
 
@@ -3993,7 +4023,7 @@ msgstr "新着メールのチェック"
 msgid "Check for new messages in all folders"
 msgstr "すべてのフォルダの新着メールをチェックします"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:598
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:599
 msgid "Folders"
 msgstr "フォルダ"
 
@@ -4026,28 +4056,28 @@ msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "このオプションはプレインテキストパスワードを使って IMAP サーバに接続します"
 
-#: camel/providers/imap/camel-imap-store.c:456
+#: camel/providers/imap/camel-imap-store.c:465
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP サーバ %s は要求した認証タイプ %s をサポートしていません"
 
-#: camel/providers/imap/camel-imap-store.c:466
+#: camel/providers/imap/camel-imap-store.c:475
 #: camel/providers/smtp/camel-smtp-transport.c:366
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "認証タイプ %s をサポートしていません"
 
-#: camel/providers/imap/camel-imap-store.c:490
+#: camel/providers/imap/camel-imap-store.c:499
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s %s@%s の IMAP パスワードを入力してください"
 
-#: camel/providers/imap/camel-imap-store.c:505
+#: camel/providers/imap/camel-imap-store.c:514
 #: camel/providers/smtp/camel-smtp-transport.c:410
 msgid "You didn't enter a password."
 msgstr "パスワードを入力していません"
 
-#: camel/providers/imap/camel-imap-store.c:531
+#: camel/providers/imap/camel-imap-store.c:540
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -4058,7 +4088,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:803 mail/mail-local.c:334
+#: camel/providers/imap/camel-imap-store.c:829 mail/mail-local.c:333
 #, c-format
 msgid "No such folder %s"
 msgstr "そのようなフォルダ %s はありません"
@@ -4132,20 +4162,18 @@ msgstr ""
 msgid "Unable to add message to summary: unknown reason"
 msgstr "サマリへメッセージを追加することが出来ません: 未知の理由です"
 
-#: camel/providers/local/camel-maildir-folder.c:150
-#: camel/providers/local/camel-maildir-folder.c:158
-#: camel/providers/local/camel-maildir-folder.c:169
+#: camel/providers/local/camel-maildir-folder.c:176
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "maildir 形式のフォルダへメッセージを追加出来ません: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:217
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/local/camel-mh-folder.c:194
-#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -4154,14 +4182,14 @@ msgstr ""
 "メッセージを取得出来ません: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
 msgid "No such message"
 msgstr "そのようなメッセージはありません"
 
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-mh-folder.c:203
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr "メッセージの内容は無効です"
 
@@ -4217,7 +4245,7 @@ msgstr "maildir ディレクトリパスを開くことが出来ません: %s: %s"
 #: camel/providers/local/camel-mbox-folder.c:152
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
-msgstr ""
+msgstr "%s のフォルダロックを作成することが出来ません: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:203
 #, c-format
@@ -4229,9 +4257,9 @@ msgstr "mailboxを開くことが出来ません: %s: %s\n"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "mbox ファイルにメッセージを追加出来ません: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:335
-#: camel/providers/local/camel-mbox-folder.c:367
-#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4240,11 +4268,11 @@ msgstr ""
 "メッセージ %s をフォルダ %s から取得出来ません\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:371
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "フォルダで回復不能なエラーが発生したようです"
 
-#: camel/providers/local/camel-mbox-folder.c:381
+#: camel/providers/local/camel-mbox-folder.c:384
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "メッセージの解釈に失敗しました: 間違ったメールボックスですか?"
 
@@ -4309,7 +4337,7 @@ msgid "Cannot summarise folder: %s: %s"
 msgstr "フォルダをサマライズすることが出来ません: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1397
+#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1598
 msgid "Synchronising folder"
 msgstr "フォルダを同期中"
 
@@ -4362,8 +4390,7 @@ msgstr "フォルダをリネーム出来ませんでした: %s"
 msgid "Unknown error: %s"
 msgstr "未知のエラー: %s"
 
-#: camel/providers/local/camel-mh-folder.c:149
-#: camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "mh フォルダへメッセージを追加出来ません: %s: %s"
@@ -4492,7 +4519,7 @@ msgstr "サーバにメッセージを残す"
 msgid "Delete after %s day(s)"
 msgstr "%s 日後に削除する"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:51
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:58
 msgid "POP"
 msgstr "POP"
 
@@ -4584,7 +4611,7 @@ msgid "No such folder `%s'."
 msgstr "そのようなフォルダ `%s' はありません"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:77
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4638,7 +4665,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "sendmail 経由でメールを配信"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:62
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:70
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4885,54 +4912,53 @@ msgstr "QUIT 要求のタイムアウト: %s: 致命的ではありません"
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUIT レスポンスエラー: %s: 致命的ではありません"
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 バイト"
 
-#: composer/e-msg-composer-attachment-bar.c:97
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u バイト"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:123
+#: composer/e-msg-composer-attachment-bar.c:336 mail/mail-display.c:123
 msgid "attachment"
 msgstr "添付"
 
-#: composer/e-msg-composer-attachment-bar.c:421
+#: composer/e-msg-composer-attachment-bar.c:426
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "ファイルを添付します"
 
-#: composer/e-msg-composer-attachment-bar.c:469
+#: composer/e-msg-composer-attachment-bar.c:474
 msgid "Remove selected items from the attachment list"
 msgstr "添付物リストから選択したアイテムを削除します"
 
-#: composer/e-msg-composer-attachment-bar.c:500
+#: composer/e-msg-composer-attachment-bar.c:505
 msgid "Add attachment..."
 msgstr "添付の追加..."
 
-#: composer/e-msg-composer-attachment-bar.c:501
+#: composer/e-msg-composer-attachment-bar.c:506
 msgid "Attach a file to the message"
 msgstr "メッセージへファイルを添付します"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:9
-#: mail/message-list.c:1082
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:11
 msgid "Attachment"
 msgstr "添付"
 
@@ -4956,26 +4982,7 @@ msgstr "MIME タイプ:"
 msgid "Send as:"
 msgstr "送信先:"
 
-#: composer/e-msg-composer.c:546
-#, c-format
-msgid ""
-"This version of Evolution was not built with support for S/MIME.\n"
-"You may wish to instead use PGP to %s your document."
-msgstr ""
-
-#: composer/e-msg-composer.c:548
-msgid "sign and encrypt"
-msgstr "署名と暗号化"
-
-#: composer/e-msg-composer.c:549
-msgid "sign"
-msgstr "署名"
-
-#: composer/e-msg-composer.c:549
-msgid "encrypt"
-msgstr "暗号化"
-
-#: composer/e-msg-composer.c:601
+#: composer/e-msg-composer.c:621
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -4984,21 +4991,21 @@ msgstr ""
 "署名ファイル %s を開くことが出来ませんでした:\n"
 "%s"
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:794
 msgid "Save as..."
 msgstr "別名で保存..."
 
-#: composer/e-msg-composer.c:785
+#: composer/e-msg-composer.c:805
 #, c-format
 msgid "Error saving file: %s"
 msgstr "ファイルの保存中にエラー: %s"
 
-#: composer/e-msg-composer.c:805
+#: composer/e-msg-composer.c:825
 #, c-format
 msgid "Error loading file: %s"
 msgstr "ファイルのロード中にエラー: %s"
 
-#: composer/e-msg-composer.c:877
+#: composer/e-msg-composer.c:897
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -5006,12 +5013,12 @@ msgstr ""
 "このアカウントの草案フォルダを開くことが出来ません\n"
 "デフォルトの草案フォルダを使ってもよろしいですか?"
 
-#: composer/e-msg-composer.c:935 data/evolution.desktop.in.h:1
+#: composer/e-msg-composer.c:959 data/evolution.desktop.in.h:1
 #: shell/e-shell-view-menu.c:228
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:941
+#: composer/e-msg-composer.c:965
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5021,27 +5028,27 @@ msgstr ""
 "\n"
 "変更を保存しますか?"
 
-#: composer/e-msg-composer.c:966
+#: composer/e-msg-composer.c:990
 msgid "Open file"
 msgstr "ファイルを開く"
 
-#: composer/e-msg-composer.c:1092
+#: composer/e-msg-composer.c:1146
 msgid "That file does not exist."
 msgstr "そのファイルは存在しません"
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1156
 msgid "That is not a regular file."
 msgstr "それは通常のファイルではありません"
 
-#: composer/e-msg-composer.c:1112
+#: composer/e-msg-composer.c:1166
 msgid "That file exists but is not readable."
 msgstr "そのファイルは存在しますが，読み取り可能ではありません"
 
-#: composer/e-msg-composer.c:1122
+#: composer/e-msg-composer.c:1176
 msgid "That file appeared accesible but open(2) failed."
 msgstr "そのファイルはアクセス可能のように見えますが，open(2) は失敗しました"
 
-#: composer/e-msg-composer.c:1144
+#: composer/e-msg-composer.c:1198
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -5049,15 +5056,15 @@ msgstr ""
 "ファイルはとても大きい (100K 以上) です\n"
 "本当にそれを挿入することを望みますか?"
 
-#: composer/e-msg-composer.c:1165
+#: composer/e-msg-composer.c:1219
 msgid "An error occurred while reading the file."
 msgstr "ファイル読込中の間にエラーは発生しました"
 
-#: composer/e-msg-composer.c:1526 composer/e-msg-composer.c:1871
+#: composer/e-msg-composer.c:1582 composer/e-msg-composer.c:1927
 msgid "Compose a message"
 msgstr "メッセージを作成します"
 
-#: composer/e-msg-composer.c:1962
+#: composer/e-msg-composer.c:2021
 msgid "Could not create composer window."
 msgstr "メール作成ウィンドウを作成出来ませんでした"
 
@@ -5148,24 +5155,30 @@ msgstr "%Y/%m/%d"
 #. strptime format for a time of day, in 12-hour format.
 #. If it is not appropriate in the locale set to an empty string.
 #: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
+#: e-util/e-time-utils.c:323
+msgid "%I:%M:%S %p"
+msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
 #: e-util/e-time-utils.c:90 e-util/e-time-utils.c:201
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
+#: e-util/e-time-utils.c:315
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
 #: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
+#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1262
+#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
+msgid "%I:%M %p"
+msgstr "%p %I:%M"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1259
+#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
+msgid "%H:%M"
+msgstr "%H:%M"
 
 #. strftime format of a weekday and a date.
 #: e-util/e-time-utils.c:269
@@ -5186,30 +5199,6 @@ msgstr "%Y/%m/%d (%a) %H:%M"
 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:312 widgets/misc/e-dateedit.c:1259
-#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:315
-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:320 widgets/misc/e-dateedit.c:1262
-#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
-msgid "%I:%M %p"
-msgstr "%p %I:%M"
-
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:323
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p"
-
 #: executive-summary/component/component-factory.c:152
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Evolution 実行サマリーコンポーネントの初期化が出来ません"
@@ -5251,63 +5240,67 @@ msgstr ""
 "\n"
 "デフォルトは空白です"
 
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
+#: executive-summary/component/e-summary-url.c:70
+#: executive-summary/component/e-summary-url.c:75
+#: executive-summary/component/e-summary-url.c:82
 #, c-format
 msgid "Open %s with the default GNOME application"
 msgstr "デフォルトのGNOMEアプリケーションで %s を開く"
 
-#: executive-summary/component/e-summary-url.c:70
+#: executive-summary/component/e-summary-url.c:71
 #, c-format
 msgid "Open %s with the default GNOME web browser"
 msgstr "デフォルトのGNOMEウェブブラウザで %s を開く"
 
-#: executive-summary/component/e-summary-url.c:71
+#: executive-summary/component/e-summary-url.c:72
 #, c-format
 msgid "Send an email to %s"
 msgstr "%s からメールを送信"
 
-#: executive-summary/component/e-summary-url.c:72
+#: executive-summary/component/e-summary-url.c:73
 #, c-format
 msgid "Change the view to %s"
 msgstr "%s へビューを変更"
 
-#: executive-summary/component/e-summary-url.c:73
+#: executive-summary/component/e-summary-url.c:74
 #, c-format
 msgid "Run %s"
 msgstr "%s を実行"
 
-#: executive-summary/component/e-summary-url.c:75
+#: executive-summary/component/e-summary-url.c:76
 #, c-format
 msgid "Close %s"
 msgstr "%s を閉じる"
 
-#: executive-summary/component/e-summary-url.c:76
+#: executive-summary/component/e-summary-url.c:77
 #, c-format
 msgid "Move %s to the left"
 msgstr "左へ %s を移動"
 
-#: executive-summary/component/e-summary-url.c:77
+#: executive-summary/component/e-summary-url.c:78
 #, c-format
 msgid "Move %s to the right"
 msgstr "右へ %s を移動"
 
-#: executive-summary/component/e-summary-url.c:78
+#: executive-summary/component/e-summary-url.c:79
 #, c-format
 msgid "Move %s into the previous row"
 msgstr "前の列の中へ %s を移動"
 
-#: executive-summary/component/e-summary-url.c:79
+#: executive-summary/component/e-summary-url.c:80
 #, c-format
 msgid "Move %s into the next row"
 msgstr "次の列の中へ %s を移動"
 
-#: executive-summary/component/e-summary-url.c:80
+#: executive-summary/component/e-summary-url.c:81
 #, c-format
 msgid "Configure %s"
 msgstr "%s の設定"
 
+#: executive-summary/component/e-summary-url.c:554
+msgid "page"
+msgstr "ページ"
+
 #: executive-summary/component/executive-summary-config.glade.h:1
 msgid "Appearance"
 msgstr "外観"
@@ -5514,7 +5507,7 @@ msgstr ""
 "戻ってメールを配送する有効なフォルダを指定してください"
 
 #: filter/filter-folder.c:225 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:682
+#: mail/mail-account-gui.c:687
 msgid "Select Folder"
 msgstr "フォルダを選択"
 
@@ -5761,10 +5754,9 @@ msgstr "正規表現と一致"
 
 #: filter/libfilter-i18n.h:41
 msgid "Replied to"
-msgstr ""
+msgstr "返信先"
 
 #: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.c:1082
 msgid "Score"
 msgstr "記録"
 
@@ -5796,7 +5788,7 @@ msgstr "が次のもので開始する"
 msgid "Stop Processing"
 msgstr "処理停止"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:767 mail/message-list.c:1083
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:774
 msgid "Subject"
 msgstr "件名"
 
@@ -5826,7 +5818,8 @@ msgstr "スコアルール"
 
 #: importers/elm-importer.c:512 importers/evolution-gnomecard-importer.c:238
 #: importers/netscape-importer.c:780 importers/pine-importer.c:646
-#: shell/e-shell-importer.c:653 shell/importer/import.glade.h:4
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:190
 msgid "Import"
 msgstr "インポート"
 
@@ -5841,6 +5834,7 @@ msgstr "Elm エイリアス"
 
 #: importers/elm-importer.c:528 importers/evolution-gnomecard-importer.c:250
 #: importers/netscape-importer.c:807 importers/pine-importer.c:668
+#: shell/importer/intelligent.c:195
 msgid "Don't ask me again"
 msgstr "このメッセージを二度と表示しない"
 
@@ -5861,19 +5855,18 @@ msgid "Addressbook"
 msgstr "アドレス帳"
 
 #: importers/evolution-gnomecard-importer.c:275
-#, fuzzy
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
-"Evolution は Netscape メールファイルを発見しました\n"
+"Evolution は GnomeCard ファイルを発見しました\n"
 "Evolution へインポートしてもよろしいですか?"
 
 #: importers/netscape-importer.c:790 importers/pine-importer.c:656
 msgid "Settings"
 msgstr "設定"
 
-#: importers/netscape-importer.c:795 mail/mail-callbacks.c:1359
+#: importers/netscape-importer.c:795 mail/mail-callbacks.c:1399
 msgid "Filters"
 msgstr "フィルタ"
 
@@ -5901,97 +5894,97 @@ msgstr ""
 msgid "Pine mail"
 msgstr "Pine メール"
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:401
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolution メールコンポーネントの初期化が出来ません"
 
-#: mail/component-factory.c:410
+#: mail/component-factory.c:527
 msgid "Cannot register storage with shell"
 msgstr "シェルでストレージを登録出来ません"
 
-#: mail/folder-browser.c:329
+#: mail/folder-browser.c:339
 msgid "Store search as vFolder"
 msgstr ""
 
-#: mail/folder-browser.c:653
+#: mail/folder-browser.c:663
 msgid "VFolder on _Subject"
 msgstr "件名の仮想フォルダ(_S)"
 
-#: mail/folder-browser.c:656
+#: mail/folder-browser.c:666
 msgid "VFolder on Se_nder"
 msgstr "送信者の仮想フォルダ(_n)"
 
-#: mail/folder-browser.c:659
+#: mail/folder-browser.c:669
 msgid "VFolder on _Recipients"
 msgstr "受信者の仮想フォルダ(_R)"
 
-#: mail/folder-browser.c:662
+#: mail/folder-browser.c:672
 msgid "VFolder on Mailing _List"
 msgstr "メーリングリストの仮想フォルダ(_L)"
 
-#: mail/folder-browser.c:668
+#: mail/folder-browser.c:678
 msgid "Filter on Sub_ject"
 msgstr "件名のフィルタ(_j)"
 
-#: mail/folder-browser.c:671
+#: mail/folder-browser.c:681
 msgid "Filter on Sen_der"
 msgstr "送信者のフィルタ(_d)"
 
-#: mail/folder-browser.c:674
+#: mail/folder-browser.c:684
 msgid "Filter on Re_cipients"
 msgstr "受信者のフィルタ(_c)"
 
-#: mail/folder-browser.c:677
+#: mail/folder-browser.c:687
 msgid "Filter on _Mailing List"
 msgstr "メーリングリストのフィルタ(_M)"
 
-#: mail/folder-browser.c:686
+#: mail/folder-browser.c:696
 msgid "_Open"
 msgstr "開く(_O)"
 
-#: mail/folder-browser.c:688
+#: mail/folder-browser.c:698
 msgid "Resend"
 msgstr "再送信"
 
-#: mail/folder-browser.c:690 ui/evolution-calendar.xml.h:43
-#: ui/evolution-mail.xml.h:118 ui/evolution-tasks.xml.h:11
+#: mail/folder-browser.c:700 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail.xml.h:123 ui/evolution-tasks.xml.h:11
 msgid "_Save As..."
 msgstr "別名で保存(_S)..."
 
-#: mail/folder-browser.c:692 ui/evolution-event-editor.xml.h:69
+#: mail/folder-browser.c:702 ui/evolution-event-editor.xml.h:69
 #: ui/evolution-task-editor-dialog.xml.h:82 ui/evolution-tasks.xml.h:10
 msgid "_Print"
 msgstr "印刷(_P)"
 
-#: mail/folder-browser.c:697 ui/evolution-mail.xml.h:117
+#: mail/folder-browser.c:707 ui/evolution-mail.xml.h:122
 msgid "_Reply to Sender"
 msgstr "送信者へ返信(_R)"
 
-#: mail/folder-browser.c:699 ui/evolution-mail.xml.h:72
+#: mail/folder-browser.c:709 ui/evolution-mail.xml.h:77
 msgid "Reply to _All"
 msgstr "全員へ返信(_A)"
 
-#: mail/folder-browser.c:701
+#: mail/folder-browser.c:711
 msgid "_Forward"
 msgstr "転送(_F)"
 
-#: mail/folder-browser.c:704
+#: mail/folder-browser.c:714
 msgid "Mar_k as Read"
 msgstr "既読としてマーク(_k)"
 
-#: mail/folder-browser.c:706
+#: mail/folder-browser.c:716
 msgid "Mark as U_nread"
 msgstr "未読としてマーク(_n)"
 
-#: mail/folder-browser.c:711
+#: mail/folder-browser.c:721
 msgid "_Move to Folder..."
 msgstr "フォルダへ移動(_M)..."
 
-#: mail/folder-browser.c:713
+#: mail/folder-browser.c:723
 msgid "_Copy to Folder..."
 msgstr "フォルダへコピー(_C)..."
 
-#: mail/folder-browser.c:717 ui/evolution-mail.xml.h:121
+#: mail/folder-browser.c:727 ui/evolution-mail.xml.h:126
 msgid "_Undelete"
 msgstr "削除取消(_U)"
 
@@ -5999,38 +5992,38 @@ msgstr "削除取消(_U)"
 #. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
 #. { "",                               NULL,
 #. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:727
+#: mail/folder-browser.c:737
 msgid "Apply Filters"
 msgstr "フィルタ適用"
 
-#: mail/folder-browser.c:731
+#: mail/folder-browser.c:741
 msgid "Create Ru_le From Message"
 msgstr "メッセージからルールを作成(_l)"
 
-#: mail/folder-browser.c:870
+#: mail/folder-browser.c:880
 msgid "Filter on Mailing List"
 msgstr "メーリングリストのフィルタ"
 
-#: mail/folder-browser.c:871
+#: mail/folder-browser.c:881
 msgid "VFolder on Mailing List"
 msgstr "メーリングリストの仮想フォルダ"
 
-#: mail/folder-browser.c:873
+#: mail/folder-browser.c:883
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "メーリングリストのフィルタ (%s)"
 
-#: mail/folder-browser.c:874
+#: mail/folder-browser.c:884
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "メーリングリストの仮想フォルダ (%s)"
 
-#: mail/folder-browser-factory.c:196
+#: mail/folder-browser-factory.c:210
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\" のプロパティ"
 
-#: mail/folder-browser-factory.c:198 ui/evolution-event-editor.xml.h:39
+#: mail/folder-browser-factory.c:212 ui/evolution-event-editor.xml.h:39
 #: ui/evolution-task-editor-dialog.xml.h:42
 msgid "Properties"
 msgstr "プロパティ"
@@ -6126,32 +6119,32 @@ msgid "You have not filled in all of the required information."
 msgstr "必要な情報のすべてを埋めていません"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:173
+#: mail/mail-account-editor.c:154
 msgid "Evolution Account Editor"
 msgstr "Evolution アカウントエディタ"
 
-#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
+#: mail/mail-accounts.c:124 mail/mail-accounts.c:175
 msgid " (default)"
 msgstr " (デフォルト)"
 
-#: mail/mail-accounts.c:197
+#: mail/mail-accounts.c:207
 msgid "Disable"
 msgstr "無効"
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:30
+#: mail/mail-accounts.c:209 mail/mail-config.glade.h:35
 msgid "Enable"
 msgstr "有効"
 
-#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
+#: mail/mail-accounts.c:297 mail/mail-accounts.c:301
 msgid "Are you sure you want to delete this account?"
 msgstr "本当にこのアカウントを削除してもよろしいですか?"
 
-#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
+#: mail/mail-accounts.c:435 mail/mail-accounts.c:439
 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:568
+#: mail/mail-accounts.c:597
 msgid "Evolution Account Manager"
 msgstr "Evolution アカウントマネージャ"
 
@@ -6227,29 +6220,29 @@ msgstr "このメッセージを送信する適切な受信者を指定しなければなりません"
 msgid "You must configure an account before you can send this email."
 msgstr "このメールを送信する前にアカウントを設定しなければなりません"
 
-#: mail/mail-callbacks.c:594
+#: mail/mail-callbacks.c:603
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "On %s, %s wrote:"
 
-#: mail/mail-callbacks.c:756
+#: mail/mail-callbacks.c:769
 msgid "Forwarded message:\n"
 msgstr "メッセージを転送:\n"
 
-#: mail/mail-callbacks.c:850
+#: mail/mail-callbacks.c:863
 msgid "Move message(s) to"
 msgstr "メッセージを移動します: "
 
-#: mail/mail-callbacks.c:852
+#: mail/mail-callbacks.c:865
 msgid "Copy message(s) to"
 msgstr "メッセージをコピーします: "
 
-#: mail/mail-callbacks.c:1017
+#: mail/mail-callbacks.c:1031
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "本当に %d メッセージを編集してもよろしいですか?"
 
-#: mail/mail-callbacks.c:1039
+#: mail/mail-callbacks.c:1053
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6257,7 +6250,7 @@ msgstr ""
 "ドラフトフォルダ内に保存された\n"
 "メッセージだけを編集することが出来ます"
 
-#: mail/mail-callbacks.c:1073
+#: mail/mail-callbacks.c:1087
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6265,20 +6258,20 @@ msgstr ""
 "送信フォルダのメッセージだけ\n"
 "再送信することが出来ます"
 
-#: mail/mail-callbacks.c:1085
+#: mail/mail-callbacks.c:1099
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "本当に %d メッセージを再送してもよろしいですか?"
 
-#: mail/mail-callbacks.c:1106
+#: mail/mail-callbacks.c:1120
 msgid "No Message Selected"
 msgstr "選択されたメッセージはありません"
 
-#: mail/mail-callbacks.c:1140 mail/mail-display.c:93
+#: mail/mail-callbacks.c:1154 mail/mail-display.c:93
 msgid "Overwrite file?"
 msgstr "ファイルを上書きしますか?"
 
-#: mail/mail-callbacks.c:1144 mail/mail-display.c:97
+#: mail/mail-callbacks.c:1158 mail/mail-display.c:97
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -6286,15 +6279,15 @@ msgstr ""
 "その名前のファイルはすでに存在します\n"
 "上書きしますか?"
 
-#: mail/mail-callbacks.c:1188
+#: mail/mail-callbacks.c:1202
 msgid "Save Message As..."
 msgstr "メッセージを別名で保存..."
 
-#: mail/mail-callbacks.c:1190
+#: mail/mail-callbacks.c:1204
 msgid "Save Messages As..."
 msgstr "メッセージを別名で保存..."
 
-#: mail/mail-callbacks.c:1349
+#: mail/mail-callbacks.c:1389
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6303,20 +6296,20 @@ msgstr ""
 "フィルタ情報のロード中にエラー:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1407
+#: mail/mail-callbacks.c:1447
 msgid "Print Message"
 msgstr "メッセージを印刷"
 
-#: mail/mail-callbacks.c:1454
+#: mail/mail-callbacks.c:1494
 msgid "Printing of message failed"
 msgstr "メッセージの印刷に失敗しました"
 
-#: mail/mail-callbacks.c:1549
+#: mail/mail-callbacks.c:1589
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "本当に %d メッセージを別ウィンドウで開いてもよろしいですか?"
 
-#: mail/mail-config.c:1227 mail/mail-config.c:1230
+#: mail/mail-config.c:1321 mail/mail-config.c:1324
 msgid "Connecting to server..."
 msgstr "サーバへ接続中..."
 
@@ -6326,6 +6319,9 @@ msgid ""
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 msgstr ""
+"以下にあなたの名前とメールアドレスを入力してください．\"オプション\"\n"
+"フィールド以下は送るメールにこの情報を含みたいないならうめる必要は\n"
+"ありません"
 
 #: mail/mail-config-druid.c:101
 msgid ""
@@ -6333,6 +6329,9 @@ msgid ""
 "know what kind of server you use, contact your system administrator or "
 "Internet Service Provider."
 msgstr ""
+"以下にメールサーバついての情報を入力してください．もしあなたの使うサーバの\n"
+"種類が何かを知らないならばシステム管理者かインターネットプロバイダと\n"
+"連絡をとってみてください"
 
 #: mail/mail-config-druid.c:105
 msgid ""
@@ -6340,6 +6339,9 @@ msgid ""
 "don't know which protocol you use, contact your system administrator or "
 "Internet Service Provider."
 msgstr ""
+"以下に送信プロトコルについての情報を入力してください．もしあなたの使う\n"
+"プロトコルを知らないならば，システム管理者かインターネットプロバイダと\n"
+"連絡をとってみてください"
 
 #: mail/mail-config-druid.c:107
 msgid ""
@@ -6349,6 +6351,13 @@ msgid ""
 "name for this account in the space below. This name will be used for display "
 "purposes only."
 msgstr ""
+"メール設定の処理はだいたい完了しました．あなたが提供した身元，メールサーバ"
+"や\n"
+"送信プロトコルは Evolution メールアカウントを作るために一纏めにされるでしょ"
+"う\n"
+"以下にこのアカウントの空間の名前を入力してください．この名前は表示目的だけ"
+"に\n"
+"使用されます．"
 
 #. set window title
 #: mail/mail-config-druid.c:445
@@ -6380,26 +6389,38 @@ msgid "Accounts"
 msgstr "アカウント"
 
 #: mail/mail-config.glade.h:8
-msgid "Always load images off the net"
-msgstr ""
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr "暗号化したメールを送信する時に常に自分自身に暗号化します"
+
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr "暗号化したメールを送信する時に常に自分自身に暗号化します"
 
 #: mail/mail-config.glade.h:10
+msgid "Always load images off the net"
+msgstr "常に画像を読み込まない"
+
+#: mail/mail-config.glade.h:12
 msgid "Authentication"
 msgstr "認証"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 msgid "Authentication Type: "
 msgstr "認証種別: "
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "Automatically check for new mail every"
 msgstr "新着メールを自動的にチェックする"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:15
+msgid "Certificate ID:"
+msgstr "認証 ID"
+
+#: mail/mail-config.glade.h:17
 msgid "Composer"
 msgstr "メール作成"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:18
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6415,191 +6436,215 @@ msgstr ""
 "\n"
 "\"完了\" をクリックして設定を保存してください"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:24
 msgid "De_fault"
 msgstr "デフォルト(_f)"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:25
 msgid "Default \"Forward\" style is: "
 msgstr "デフォルトの \"転送\" 方法: "
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:26
+msgid "Default character set: "
+msgstr "デフォルトのキャラクタセット: "
+
+#: mail/mail-config.glade.h:28
+msgid "Digital IDs..."
+msgstr "デジタル ID..."
+
+#: mail/mail-config.glade.h:30
 msgid "Done"
 msgstr "完了"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:31
 msgid "Drafts"
 msgstr "草案"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:32
 msgid "Drafts folder:"
 msgstr "草案フォルダ:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:34
 msgid "Email Address:"
 msgstr "メールアドレス:"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:36
 msgid "Full Name:"
 msgstr "フルネーム:"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:37
+msgid "Get Digital ID..."
+msgstr "デジタルID を取得..."
+
+#: mail/mail-config.glade.h:38
 msgid "Highlight citations with"
 msgstr "引用を強調する"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:40
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:41
 msgid "Identity"
 msgstr "身元"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:42
 msgid "In HTML mail"
-msgstr ""
+msgstr "HTML メール"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:43
 msgid "Inline"
 msgstr "インライン"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:44
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:45
 msgid "Load images if sender is in addressbook"
-msgstr ""
+msgstr "送信者がアドレス帳にいれる場合画像を読み込む"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:46
 msgid "Mail Configuration"
 msgstr "メールの設定"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:47
 msgid "Make this my default account"
 msgstr "デフォルトアカウントを作る"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:48
 msgid "Mark messages as \"Read\" after:"
 msgstr "指定時間後にメッセージを \"既読\" としてマーク:"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:50
 msgid "Never load images off the net"
-msgstr ""
+msgstr "二度と画像を読み込まない"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:51
 msgid "News"
 msgstr "ニュース"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:53
 msgid "Optional Information"
 msgstr "付加情報"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:54
 msgid "Organization:"
 msgstr "組織:"
 
-#: mail/mail-config.glade.h:49
-msgid "PGP"
-msgstr "PGP"
+#: mail/mail-config.glade.h:56
+msgid "PGP Key ID:"
+msgstr "PGPキー ID:"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:57
 msgid "PGP binary path:"
 msgstr "PGP プログラムのパス:"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:62
+msgid "Pretty Good Privacy"
+msgstr ""
+
+#: mail/mail-config.glade.h:63
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:64
 msgid "Quoted"
 msgstr "引用"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:65
 msgid "Receiving Email"
 msgstr "メールの受信中"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:66
 msgid "Receiving Mail"
 msgstr "メールの受信"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:67
 msgid "Receiving Options"
 msgstr "受信オプション"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:69
 msgid "Required Information"
 msgstr "必須情報"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:71
+msgid "Secure MIME"
+msgstr "セキュア MIME"
+
+#: mail/mail-config.glade.h:72
+msgid "Security"
+msgstr "セキュリティ"
+
+#: mail/mail-config.glade.h:73
 msgid "Select PGP binary"
 msgstr "PGP プログラムを選択"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:74
 msgid "Send mail in HTML format by default."
 msgstr "デフォルトで HTML 形式のメールを送信する"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:75
 msgid "Sending Email"
 msgstr "メールを送信中"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:76
 msgid "Sending Mail"
 msgstr "メールの送信"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:78
 msgid "Sent"
 msgstr "送信済"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:79
 msgid "Sent and Draft Messages"
 msgstr "送信済と草案メッセージ"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:80
 msgid "Sent messages folder:"
 msgstr "送信済メッセージフォルダ:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:81
 msgid "Server Configuration"
 msgstr "サーバの設定"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:82
 msgid "Server Type: "
 msgstr "サーバ種別:"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:83
 msgid "Server requires authentication"
 msgstr "サーバは認証が必要"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:84
 msgid "Signature file:"
 msgstr "署名ファイル:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:85
 msgid "Sources"
 msgstr "ソース"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:86
 msgid "Special Folders"
 msgstr "特別なフォルダ"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:87
 msgid "Standard Unix mbox"
 msgstr "標準的な UNIX の mbox ファイル"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:88
 msgid "Type"
 msgstr "種別"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:89
 msgid "Use secure connection (SSL)"
 msgstr "セキュア接続 (SSL) を使う"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:90
 msgid "Username:"
 msgstr "ユーザ名:"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:91
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6609,12 +6654,16 @@ msgstr ""
 "\n"
 "\"次\" をクリックして始めてください"
 
-#: mail/mail-config.glade.h:86 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:45 ui/evolution-subscribe.xml.h:10
+#: mail/mail-config.glade.h:96 ui/evolution-event-editor.xml.h:58
+#: ui/evolution-message-composer.xml.h:47 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:48
 msgid "_Edit"
 msgstr "編集(_E)"
 
+#: mail/mail-config.glade.h:98
+msgid "placeholder"
+msgstr ""
+
 #: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr "PGP 署名コンテキストを作成出来ませんでした"
@@ -6631,21 +6680,25 @@ msgstr "PGP 暗号コンテキストを作成出来ませんでした"
 msgid "Could not create a PGP decryption context."
 msgstr "PGP 復号コンテキストを作成出来ませんでした"
 
-#: mail/mail-crypto.c:169
+#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
-msgstr ""
+msgstr "S/MIME 署名コンテキストを作成出来ませんでした"
 
-#: mail/mail-crypto.c:195
-msgid "Could not create a S/MIME verification context."
-msgstr ""
+#: mail/mail-crypto.c:205
+msgid "Could not create a S/MIME certsonly context."
+msgstr "S/MIME コンテキストを作成出来ませんでした"
 
-#: mail/mail-crypto.c:225
+#: mail/mail-crypto.c:236
 msgid "Could not create a S/MIME encryption context."
-msgstr ""
+msgstr "S/MIME 暗号コンテキストを作成出来ませんでした"
 
-#: mail/mail-crypto.c:251
-msgid "Could not create a S/MIME decryption context."
-msgstr ""
+#: mail/mail-crypto.c:267
+msgid "Could not create a S/MIME envelope context."
+msgstr "S/MIME エンベロープコンテキストを作成出来ませんでした"
+
+#: mail/mail-crypto.c:297
+msgid "Could not create a S/MIME decode context."
+msgstr "S/MIME デコードコンテキストを作成出来ませんでした"
 
 #: mail/mail-display.c:197
 msgid "Save Attachment"
@@ -6698,120 +6751,120 @@ msgstr "別名で保存 (FIXME)"
 msgid "Copy location (FIXME)"
 msgstr "場所をコピー (FIXME)"
 
-#: mail/mail-format.c:527
+#: mail/mail-format.c:532
 #, c-format
 msgid "%s attachment"
 msgstr "%s を添付"
 
-#: mail/mail-format.c:573
+#: mail/mail-format.c:580
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME メッセージを解析出来ませんでした, ソースを表示します"
 
-#: mail/mail-format.c:640 mail/message-list.c:1083
+#: mail/mail-format.c:647
 msgid "Date"
 msgstr "日付"
 
-#: mail/mail-format.c:756 mail/message-list.c:1083
+#: mail/mail-format.c:763
 msgid "From"
 msgstr "差出人"
 
-#: mail/mail-format.c:759
+#: mail/mail-format.c:766
 msgid "Reply-To"
 msgstr "返信先"
 
-#: mail/mail-format.c:762 mail/message-list.c:1084
+#: mail/mail-format.c:769
 msgid "To"
 msgstr "宛先"
 
-#: mail/mail-format.c:765
+#: mail/mail-format.c:772
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1075
+#: mail/mail-format.c:1094
 msgid "No GPG/PGP program configured."
 msgstr "GPG/PGP プログラムの設定がありません"
 
-#: mail/mail-format.c:1090
+#: mail/mail-format.c:1109
 msgid "Encrypted message not displayed"
 msgstr "暗号化されたメッセージは表示しません"
 
-#: mail/mail-format.c:1096
+#: mail/mail-format.c:1115
 msgid "Encrypted message"
 msgstr "暗号化されたメッセージ"
 
-#: mail/mail-format.c:1097
+#: mail/mail-format.c:1116
 msgid "Click icon to decrypt."
 msgstr "アイコンをクリックして復号化してください"
 
-#: mail/mail-format.c:1153
+#: mail/mail-format.c:1172
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "このメッセージはデジタル署名され信頼できるものです"
 
-#: mail/mail-format.c:1161
+#: mail/mail-format.c:1180
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "このメッセージはデジタル署名されたものですが, 信頼を証明出来ません"
 
-#: mail/mail-format.c:1787
+#: mail/mail-format.c:1831
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP サイト (%s) を指しています"
 
-#: mail/mail-format.c:1799
+#: mail/mail-format.c:1843
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1803
+#: mail/mail-format.c:1847
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "ローカルファイル (%s) を指しています"
 
-#: mail/mail-format.c:1837
+#: mail/mail-format.c:1881
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "未知の外部データ (\"%s\" タイプ) を指しています"
 
-#: mail/mail-format.c:1842
+#: mail/mail-format.c:1886
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:505
+#: mail/mail-local.c:504
 #, c-format
 msgid "Opening '%s'"
 msgstr "'%s' をオープン中"
 
-#: mail/mail-local.c:785
+#: mail/mail-local.c:784
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "フォルダ \"%s\" を \"%s\" 形式へ変更しています"
 
-#: mail/mail-local.c:789
+#: mail/mail-local.c:788
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "フォルダ \"%s\" を \"%s\" 形式へ変更します"
 
-#: mail/mail-local.c:812
+#: mail/mail-local.c:811
 msgid "Reconfiguring folder"
 msgstr "フォルダの再構成中"
 
 #. first, 'close' the old folder
-#: mail/mail-local.c:841
+#: mail/mail-local.c:840
 msgid "Closing current folder"
 msgstr "現在のフォルダをクローズ中"
 
-#: mail/mail-local.c:873
+#: mail/mail-local.c:872
 msgid "Renaming old folder and opening"
 msgstr "古いフォルダをリネームしてオープン中"
 
-#: mail/mail-local.c:891
+#: mail/mail-local.c:890
 msgid "Creating new folder"
 msgstr "新規フォルダを作成中"
 
-#: mail/mail-local.c:905
+#: mail/mail-local.c:904
 msgid "Copying messages"
 msgstr "メッセージをコピー中"
 
-#: mail/mail-local.c:922
+#: mail/mail-local.c:921
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6820,7 +6873,7 @@ msgstr ""
 "フォルダのメタ情報を保存出来ません; もはやこのフォルダを開く\n"
 "ことが出来ないとたぶん気づいたのでしょう: %s"
 
-#: mail/mail-local.c:961
+#: mail/mail-local.c:960
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6828,10 +6881,10 @@ msgstr ""
 "もしこのメールボックスを開くことはないなら\n"
 "手動で回復させる必要があるかもしれません"
 
-#: mail/mail-local.c:1047
-#, fuzzy, c-format
+#: mail/mail-local.c:1046
+#, c-format
 msgid "Reconfigure %s"
-msgstr "%s の設定"
+msgstr "%s の再設定"
 
 #: mail/mail-mt.c:190
 #, c-format
@@ -6859,93 +6912,112 @@ msgstr "作業中"
 msgid "Evolution progress"
 msgstr "Evolution 進行"
 
-#: mail/mail-ops.c:599
+#: mail/mail-ops.c:607
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" を送信中"
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:611
 msgid "Sending message"
 msgstr "メッセージを送信中"
 
-#: mail/mail-ops.c:718
+#: mail/mail-ops.c:726
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "メッセージ %d / %d を送信中"
 
-#: mail/mail-ops.c:737
+#: mail/mail-ops.c:745
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "メッセージ %d / %d は失敗しました"
 
-#: mail/mail-ops.c:739 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:747 mail/mail-send-recv.c:475
 msgid "Complete."
 msgstr "完了しました"
 
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:833
 msgid "Saving message to folder"
 msgstr "フォルダへメッセージを保存中"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:907
 #, c-format
 msgid "Moving messages to %s"
 msgstr "%s へメッセージを移動中"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:907
 #, c-format
 msgid "Copying messages to %s"
 msgstr "%s へメッセージをコピー中"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:923
 msgid "Moving"
 msgstr "移動中"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:926
 msgid "Copying"
 msgstr "コピー中"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" の中のフォルダを走査中"
 
-#: mail/mail-ops.c:1154
+#: mail/mail-ops.c:1164
 msgid "Forwarded messages"
 msgstr "メッセージを転送"
 
-#: mail/mail-ops.c:1195 mail/mail-ops.c:1333
+#: mail/mail-ops.c:1205 mail/mail-ops.c:1343
 #, c-format
 msgid "Opening folder %s"
 msgstr "フォルダ %s をオープン中"
 
-#: mail/mail-ops.c:1262
+#: mail/mail-ops.c:1272
 #, c-format
 msgid "Opening store %s"
 msgstr "保存された %s をオープン中"
 
-#: mail/mail-ops.c:1449
+#: mail/mail-ops.c:1411
+#, c-format
+msgid "Removing folder %s"
+msgstr "フォルダ %s を削除中"
+
+#: mail/mail-ops.c:1495
+#, c-format
+msgid "Moving folder %s to %s"
+msgstr "%s から %s へフォルダを移動中"
+
+#: mail/mail-ops.c:1497
+#, c-format
+msgid "Copying folder %s to %s"
+msgstr "%s から %s へフォルダをコピー中"
+
+#: mail/mail-ops.c:1650
+msgid "Refreshing folder"
+msgstr "フォルダを更新中"
+
+#: mail/mail-ops.c:1686
 msgid "Expunging folder"
 msgstr "フォルダを削除中"
 
-#: mail/mail-ops.c:1498
+#: mail/mail-ops.c:1735
 #, c-format
 msgid "Retrieving message %s"
 msgstr "メッセージ %s を取得中"
 
-#: mail/mail-ops.c:1565
+#: mail/mail-ops.c:1802
 msgid "Retrieving messages"
 msgstr "メッセージを取得中"
 
-#: mail/mail-ops.c:1575
+#: mail/mail-ops.c:1812
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "メッセージ番号 %d / %d (uid \"%s\") を取得中"
 
-#: mail/mail-ops.c:1649
+#: mail/mail-ops.c:1886
 msgid "Saving messages"
 msgstr "メッセージを保存中"
 
-#: mail/mail-ops.c:1728
+#: mail/mail-ops.c:1965
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6954,12 +7026,12 @@ msgstr ""
 "出力ファイルを作成出来ません: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1741
+#: mail/mail-ops.c:1978
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "メッセージ %d / %d (uid \"%s\") を保存中"
 
-#: mail/mail-ops.c:1755
+#: mail/mail-ops.c:1992
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6968,11 +7040,11 @@ msgstr ""
 "ファイルの保存中にエラー: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1829
+#: mail/mail-ops.c:2066
 msgid "Saving attachment"
 msgstr "添付を保存中"
 
-#: mail/mail-ops.c:1844
+#: mail/mail-ops.c:2081
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6981,12 +7053,12 @@ msgstr ""
 "出力ファイルを作成出来ません: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1872
+#: mail/mail-ops.c:2109
 #, c-format
 msgid "Could not write data: %s"
 msgstr "データを書き出すことが出来ませんでした: %s"
 
-#: mail/mail-ops.c:1939
+#: mail/mail-ops.c:2176
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s との接続を切っています"
@@ -7001,7 +7073,7 @@ msgstr "メッセージを検索"
 
 #: mail/mail-search.c:298
 msgid "Case Sensitive"
-msgstr ""
+msgstr "大文字/小文字を区別する"
 
 #: mail/mail-search.c:299
 msgid "Search Forward"
@@ -7055,30 +7127,30 @@ msgstr "パイプ上に不完全なメッセージが書かれました!"
 msgid "Mail Summary"
 msgstr "メールサマリ"
 
-#: mail/mail-tools.c:145
+#: mail/mail-tools.c:156
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "テンポラリ mbox '%s' を作成できませんでした: %s"
 
-#: mail/mail-tools.c:192
+#: mail/mail-tools.c:203
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (メッセージを転送)"
 
-#: mail/mail-tools.c:202
+#: mail/mail-tools.c:213
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (件名なし)"
 
-#: mail/mail-tools.c:219
+#: mail/mail-tools.c:230
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "メッセージを転送しました - %s"
 
-#: mail/mail-tools.c:221
+#: mail/mail-tools.c:232
 msgid "Forwarded message (no subject)"
 msgstr "メッセージを転送しました (件名なし)"
 
-#: mail/mail-tools.c:428
+#: mail/mail-tools.c:439
 #, c-format
 msgid ""
 "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
@@ -7097,7 +7169,7 @@ msgstr "新規仮想フォルダ"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/message-browser.c:197 ui/evolution-mail.xml.h:70
+#: mail/message-browser.c:197 ui/evolution-mail.xml.h:75
 msgid "Reply"
 msgstr "返信"
 
@@ -7105,7 +7177,7 @@ msgstr "返信"
 msgid "Reply to the sender of this message"
 msgstr "メッセージの送信者へ返信します"
 
-#: mail/message-browser.c:200 ui/evolution-mail.xml.h:71
+#: mail/message-browser.c:200 ui/evolution-mail.xml.h:76
 msgid "Reply to All"
 msgstr "全員へ返信"
 
@@ -7113,7 +7185,7 @@ msgstr "全員へ返信"
 msgid "Reply to all recipients of this message"
 msgstr "このメッセージの受信者全員へ返信します"
 
-#: mail/message-browser.c:203 ui/evolution-mail.xml.h:33
+#: mail/message-browser.c:203 ui/evolution-mail.xml.h:38
 msgid "Forward"
 msgstr "転送"
 
@@ -7130,7 +7202,7 @@ msgid "Delete this message"
 msgstr "このメッセージを削除します"
 
 #: mail/message-browser.c:216 ui/evolution-event-editor.xml.h:33
-#: ui/evolution-mail.xml.h:64 ui/evolution-task-editor-dialog.xml.h:36
+#: ui/evolution-mail.xml.h:69 ui/evolution-task-editor-dialog.xml.h:36
 msgid "Previous"
 msgstr "前"
 
@@ -7139,7 +7211,7 @@ msgid "Previous message"
 msgstr "前のメッセージへ移動します"
 
 #: mail/message-browser.c:219 ui/evolution-calendar.xml.h:18
-#: ui/evolution-event-editor.xml.h:29 ui/evolution-mail.xml.h:57
+#: ui/evolution-event-editor.xml.h:29 ui/evolution-mail.xml.h:62
 #: ui/evolution-task-editor-dialog.xml.h:32
 msgid "Next"
 msgstr "次"
@@ -7148,83 +7220,71 @@ msgstr "次"
 msgid "Next message"
 msgstr "次のメッセージへ移動します"
 
-#: mail/message-list.c:678
+#: mail/message-list.c:684
 msgid "Unseen"
 msgstr "未読"
 
-#: mail/message-list.c:679
+#: mail/message-list.c:685
 msgid "Seen"
 msgstr "既読"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:686
 msgid "Answered"
 msgstr "返答済み"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:687
 msgid "Multiple Unseen Messages"
 msgstr "複数の未読メッセージ"
 
-#: mail/message-list.c:682
+#: mail/message-list.c:688
 msgid "Multiple Messages"
 msgstr "複数のメッセージ"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:692
 msgid "Lowest"
 msgstr "最も低い"
 
-#: mail/message-list.c:687
+#: mail/message-list.c:693
 msgid "Lower"
 msgstr "低い"
 
-#: mail/message-list.c:691
+#: mail/message-list.c:697
 msgid "Higher"
 msgstr "高い"
 
-#: mail/message-list.c:692
+#: mail/message-list.c:698
 msgid "Highest"
 msgstr "最も高い"
 
-#: mail/message-list.c:942
+#: mail/message-list.c:948
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:955
 msgid "Today %l:%M %p"
 msgstr "今日の %p %l:%M"
 
-#: mail/message-list.c:958
+#: mail/message-list.c:964
 msgid "Yesterday %l:%M %p"
 msgstr "昨日の %p %l:%M"
 
-#: mail/message-list.c:970
+#: mail/message-list.c:976
 msgid "%a %l:%M %p"
 msgstr "%p %l:%M (%a)"
 
-#: mail/message-list.c:978
+#: mail/message-list.c:984
 msgid "%b %d %l:%M %p"
 msgstr "%m月 %d日 %p %l:%M"
 
-#: mail/message-list.c:980
+#: mail/message-list.c:986
 msgid "%b %d %Y"
 msgstr "%Y年 %m月 %d日"
 
-#: mail/message-list.c:1082
-msgid "Flagged"
-msgstr "フラグ"
-
-#: mail/message-list.c:1083
-msgid "Received"
-msgstr ""
-
-#: mail/message-list.c:1084
-msgid "Size"
-msgstr "サイズ"
-
 #: mail/mail-session.c:161
 msgid "User canceled operation."
-msgstr ""
+msgstr "ユーザによって操作をキャンセルされました"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:48
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "フォルダ"
 
@@ -7256,11 +7316,11 @@ msgstr "フォルダ \"%s\" の購読解除中"
 msgid "Manage Subscriptions"
 msgstr "購読管理"
 
-#: shell/e-setup.c:118 shell/e-setup.c:191
+#: shell/e-setup.c:124 shell/e-setup.c:197
 msgid "Evolution installation"
 msgstr "Evolution のインストール"
 
-#: shell/e-setup.c:122
+#: shell/e-setup.c:128
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -7268,28 +7328,28 @@ msgstr ""
 "この Evolution の新しいバージョンはあなたのパーソナル Evolution\n"
 "ディレクトリの中に付加ファイルをインストールする必要があります"
 
-#: shell/e-setup.c:123
+#: shell/e-setup.c:129
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr "\"OK\" でファイルをインストール, または \"キャンセル\" で終了します"
 
-#: shell/e-setup.c:163
+#: shell/e-setup.c:169
 msgid "Could not update files correctly"
 msgstr "正しくファイルを更新出来ませんでした"
 
-#: shell/e-setup.c:166 shell/e-setup.c:234
+#: shell/e-setup.c:172 shell/e-setup.c:240
 msgid "Evolution files successfully installed."
 msgstr "Evolution のファイルは正しくインストールされました"
 
-#: shell/e-setup.c:195
+#: shell/e-setup.c:201
 msgid "This seems to be the first time you are running Evolution."
 msgstr "これは Evolution を実行した最初のように思われます"
 
-#: shell/e-setup.c:196
+#: shell/e-setup.c:202
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Evolution ユーザファイルをインストールしますので \"OK\" をクリックして下さい"
 
-#: shell/e-setup.c:215
+#: shell/e-setup.c:221
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -7300,7 +7360,7 @@ msgstr ""
 "\n"
 "エラー: %s"
 
-#: shell/e-setup.c:230
+#: shell/e-setup.c:236
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -7309,7 +7369,7 @@ msgstr ""
 "'%s' の中にファイルを\n"
 "コピー出来ません"
 
-#: shell/e-setup.c:255
+#: shell/e-setup.c:303
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -7320,7 +7380,21 @@ msgstr ""
 "Evolution ユーザファイルのインストールを\n"
 "許容するために移動して下さい"
 
-#: shell/e-setup.c:267
+#: shell/e-setup.c:317
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+"Evolution は古い Evolution-Summary\n"
+"ディレクトリを検出しました\n"
+"これは Evolution が動作する前に\n"
+"削除する必要があります\n"
+"このディレクトリを削除しますか?"
+
+#: shell/e-setup.c:342
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -7331,12 +7405,12 @@ msgstr ""
 "ディレクトリではありません．Evolution ユーザ\n"
 "ファイルのインストールを許容するために移動して下さい"
 
-#: shell/e-shell.c:392
+#: shell/e-shell.c:391
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "局部記憶装置のセットアップが出来ません -- %s"
 
-#: shell/e-shell.c:1272
+#: shell/e-shell.c:1256
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -7345,25 +7419,23 @@ msgstr ""
 "`%s' ビューは突然死亡しました :-(\n"
 "これはたぶん %s コンポーネントがクラッシュしたことを意味します"
 
-#: shell/e-shell-folder-commands.c:238
+#: shell/e-shell-folder-commands.c:239
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr ""
+msgstr "フォルダ \"%s\" をコピーするフォルダを指定します:"
 
-#: shell/e-shell-folder-commands.c:243
-#, fuzzy
+#: shell/e-shell-folder-commands.c:244
 msgid "Copy folder"
-msgstr "フォルダをコピーします"
+msgstr "フォルダのコピー"
 
-#: shell/e-shell-folder-commands.c:280
+#: shell/e-shell-folder-commands.c:281
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
-msgstr ""
+msgstr "フォルダ \"%s\" を移動するフォルダを指定します:"
 
-#: shell/e-shell-folder-commands.c:285
-#, fuzzy
+#: shell/e-shell-folder-commands.c:286
 msgid "Move folder"
-msgstr "フォルダへ移動"
+msgstr "フォルダの移動"
 
 #: shell/e-shell-folder-creation-dialog.c:99
 #, c-format
@@ -7394,7 +7466,7 @@ msgstr ""
 msgid "New..."
 msgstr "新規..."
 
-#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+#: shell/e-shell-folder-title-bar.c:468 shell/e-shell-folder-title-bar.c:469
 msgid "(Untitled)"
 msgstr "(タイトルなし)"
 
@@ -7406,6 +7478,11 @@ msgid ""
 "You can select \"Automatic\" if you do not know, and Evolution will attempt "
 "to work it out."
 msgstr ""
+"Evolution へインポートしたいファイルを選択して，リストからファイル種別を選択"
+"してください．\n"
+"\n"
+"もし分からないなら \"自働\" を選択することが出来，Evolution は解決を試みるで"
+"しょう"
 
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
@@ -7429,7 +7506,7 @@ msgstr ""
 "%s をインポート中\n"
 "アイテム %d をインポート中"
 
-#: shell/e-shell-importer.c:353
+#: shell/e-shell-importer.c:352
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -7438,11 +7515,11 @@ msgstr ""
 "扱うことが出来るインポートがありません\n"
 "%s"
 
-#: shell/e-shell-importer.c:363
+#: shell/e-shell-importer.c:362
 msgid "Importing"
 msgstr "インポート中"
 
-#: shell/e-shell-importer.c:371
+#: shell/e-shell-importer.c:370
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -7451,17 +7528,17 @@ msgstr ""
 "%s をインポート中\n"
 "%s を開始します"
 
-#: shell/e-shell-importer.c:384
+#: shell/e-shell-importer.c:383
 #, c-format
 msgid "Error starting %s"
 msgstr "%s の開始中にエラーが発生しました"
 
-#: shell/e-shell-importer.c:404
+#: shell/e-shell-importer.c:402
 #, c-format
 msgid "Error loading %s"
 msgstr "%s のロード中にエラーが発生しました"
 
-#: shell/e-shell-importer.c:419
+#: shell/e-shell-importer.c:417
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -7470,59 +7547,68 @@ msgstr ""
 "%s をインポート中\n"
 "アイテム 1 をインポート中"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:488
 msgid "Automatic"
 msgstr "自働"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:538
 msgid "Filename:"
 msgstr "ファイル名:"
 
-#: shell/e-shell-importer.c:545 shell/importer/import.glade.h:5
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
 msgid "Select a file"
 msgstr "ファイルを選択"
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:553
 msgid "File type:"
 msgstr "ファイル種別:"
 
-#: shell/e-shell-importer.c:601
+#: shell/e-shell-importer.c:599
 msgid "Select folder"
 msgstr "フォルダを選択"
 
-#: shell/e-shell-importer.c:602
+#: shell/e-shell-importer.c:600
 msgid "Select a destination folder for importing this data"
-msgstr ""
+msgstr "このデータをインポートする送り先のフォルダを選択してください"
 
 #: shell/e-shell-offline-handler.c:554
 msgid "Closing connections..."
 msgstr "接続を閉じています..."
 
-#: shell/e-shell-view.c:166
+#: shell/e-shell-view.c:167
 msgid "(No folder displayed)"
 msgstr "(表示したフォルダはありません)"
 
-#: shell/e-shell-view.c:1317
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1383
+msgid "My Evolution"
+msgstr "My Evolution"
+
+#: shell/e-shell-view.c:1400
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution - %s"
 
-#: shell/e-shell-view.c:1319
+#: shell/e-shell-view.c:1402
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1357
+#: shell/e-shell-view.c:1440
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
+"Evolution は現在オンラインです．オフラインにするにはこのボタンをクリックして"
+"ください"
 
-#: shell/e-shell-view.c:1364
+#: shell/e-shell-view.c:1447
 msgid "Evolution is in the process of going offline."
-msgstr ""
+msgstr "Evolution はオフライン処理中です"
 
-#: shell/e-shell-view.c:1370
+#: shell/e-shell-view.c:1453
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
+"Evolution は現在オフラインです．オンラインにするにはこのボタンをクリックして"
+"ください"
 
 #: shell/e-shell-view-menu.c:179
 msgid "Bug buddy was not found in your $PATH."
@@ -7548,23 +7634,23 @@ msgstr ""
 "グループウェアアプリケーションの\n"
 "パッケージソフトです"
 
-#: shell/e-shell-view-menu.c:421
+#: shell/e-shell-view-menu.c:465
 msgid "Go to folder..."
 msgstr "フォルダへ移動..."
 
-#: shell/e-shell-view-menu.c:422
+#: shell/e-shell-view-menu.c:466
 msgid "Select the folder that you want to open"
-msgstr ""
+msgstr "開きたいフォルダを選択します"
 
-#: shell/e-shell-view-menu.c:602
+#: shell/e-shell-view-menu.c:653
 msgid "Work online"
 msgstr "オンライン作業"
 
-#: shell/e-shell-view-menu.c:614 shell/e-shell-view-menu.c:626
+#: shell/e-shell-view-menu.c:665 shell/e-shell-view-menu.c:677
 msgid "Work offline"
 msgstr "オフライン作業"
 
-#: shell/e-shortcuts.c:381
+#: shell/e-shortcuts.c:382
 msgid "Error saving shortcuts."
 msgstr "ショートカットの保存中にエラーが発生しました"
 
@@ -7729,10 +7815,14 @@ msgstr ""
 "このウィザードでは Evolution の中に外部ファイルをインポート\n"
 "する処理を通して案内します"
 
-#: shell/importer/intelligent.c:186
+#: shell/importer/intelligent.c:187
 msgid "Importers"
 msgstr "インポート"
 
+#: shell/importer/intelligent.c:193
+msgid "Don't import"
+msgstr "インポートしません"
+
 #: shell/main.c:82
 #, no-c-format
 msgid ""
@@ -7793,60 +7883,120 @@ msgstr "すべてのコンポーネントのデバッグ出力をファイルへ送る"
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo コンポーネントシステムを初期化出来ません"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:1 ui/evolution-event-editor.xml.h:6
+#: ui/evolution-task-editor-dialog.xml.h:7
+msgid "C_ut"
+msgstr "切り取り(_u)"
+
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-event-editor.xml.h:13
+#: ui/evolution-mail.xml.h:8 ui/evolution-task-editor-dialog.xml.h:14
+msgid "Copy"
+msgstr "コピー"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:14
+#: ui/evolution-task-editor-dialog.xml.h:15
+msgid "Copy the selection"
+msgstr "選択されたものをコピーします"
+
+#: ui/evolution-addressbook.xml.h:4
 msgid "Create new contact"
 msgstr "新規コンタクトを作成します"
 
-#: ui/evolution-addressbook.xml.h:3
-msgid "Delete a contact"
-msgstr "コンタクトを削除します"
+#: ui/evolution-addressbook.xml.h:5 ui/evolution-event-editor.xml.h:15
+#: ui/evolution-task-editor-dialog.xml.h:16
+msgid "Cut"
+msgstr "切り取り"
 
-#: ui/evolution-addressbook.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-event-editor.xml.h:16
+#: ui/evolution-task-editor-dialog.xml.h:17
+msgid "Cut the selection"
+msgstr "選択されたものを切り取ります"
+
+#: ui/evolution-addressbook.xml.h:8
+msgid "Delete selected contacts"
+msgstr "選択したコンタクトを削除します"
+
+#: ui/evolution-addressbook.xml.h:9
 msgid "New contact"
 msgstr "新規コンタクト"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-mail.xml.h:63
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-event-editor.xml.h:30
+#: ui/evolution-task-editor-dialog.xml.h:33
+msgid "Paste"
+msgstr "貼り付け"
+
+#: ui/evolution-addressbook.xml.h:11 ui/evolution-event-editor.xml.h:31
+#: ui/evolution-task-editor-dialog.xml.h:34
+msgid "Paste the clipboard"
+msgstr "クリップボードへ貼り付けます"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:68
 msgid "Previews the message to be printed"
 msgstr "印刷されるメッセージのプレビューを表示します"
 
-#: ui/evolution-addressbook.xml.h:8
-msgid "Print contacts"
-msgstr "コンタクトを印刷します"
+#: ui/evolution-addressbook.xml.h:15
+msgid "Print selected contacts"
+msgstr "選択したコンタクトを印刷します"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-event-editor.xml.h:48
+#: ui/evolution-task-editor-dialog.xml.h:57
+msgid "Select All"
+msgstr "すべて選択"
+
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:49
+#: ui/evolution-task-editor-dialog.xml.h:58
+msgid "Select everything"
+msgstr "すべてのものを選択します"
+
+#: ui/evolution-addressbook.xml.h:18
 msgid "Stop"
 msgstr "停止"
 
-#: ui/evolution-addressbook.xml.h:10
+#: ui/evolution-addressbook.xml.h:19
 msgid "Stop Loading"
 msgstr "詠み込みを停止します"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:20
 msgid "View All"
 msgstr "すべて表示"
 
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:21
 msgid "View all contacts"
 msgstr "すべてのコンタクトを表示します"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:22
 msgid "_Addressbook Sources..."
 msgstr "アドレス帳のソース(_A)..."
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:23
 msgid "_Contact"
 msgstr "コンタクト(_C)"
 
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:24 ui/evolution-event-editor.xml.h:55
+#: ui/evolution-task-editor-dialog.xml.h:67
+msgid "_Copy"
+msgstr "コピー(_C)"
+
+#: ui/evolution-addressbook.xml.h:25 ui/evolution-event-editor.xml.h:68
+#: ui/evolution-task-editor-dialog.xml.h:81
+msgid "_Paste"
+msgstr "貼り付け(_P)"
+
+#: ui/evolution-addressbook.xml.h:26 ui/evolution-calendar.xml.h:42
 #: ui/evolution-contact-editor.xml.h:15
 msgid "_Print..."
 msgstr "印刷(_P)..."
 
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:27
 msgid "_Search for contacts"
 msgstr "コンタクトの検索(_S)"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:44
+#: ui/evolution-addressbook.xml.h:28 ui/evolution-event-editor.xml.h:72
+#: ui/evolution-task-editor-dialog.xml.h:86
+msgid "_Select All"
+msgstr "すべて選択(_A)"
+
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:44
 #: ui/evolution-event-editor.xml.h:74 ui/evolution-task-editor-dialog.xml.h:88
 #: ui/evolution.xml.h:64
 msgid "_Tools"
@@ -7932,7 +8082,7 @@ msgstr "カレンダの印刷"
 msgid "Print this Calendar"
 msgstr "このカレンダの印刷します"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:18
+#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:19
 msgid "Save As"
 msgstr "別名で保存"
 
@@ -8021,7 +8171,7 @@ msgid "Print..."
 msgstr "印刷..."
 
 #: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-message-composer.xml.h:20
 #: ui/evolution-task-editor-dialog.xml.h:51
 msgid "Save _As..."
 msgstr "別名で保存(_A)..."
@@ -8048,13 +8198,13 @@ msgid "Send _message to contact..."
 msgstr "コンタクトへメッセージを送信(_m)..."
 
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:46 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-message-composer.xml.h:48 ui/evolution-subscribe.xml.h:11
 #: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:49
 msgid "_File"
 msgstr "ファイル(_F)"
 
 #: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-message-composer.xml.h:55
 #: ui/evolution-task-editor-dialog.xml.h:85
 msgid "_Save"
 msgstr "保存(_S)"
@@ -8079,10 +8229,6 @@ msgstr "アドレス帳(_B)... (FIXME)"
 msgid "C_lear"
 msgstr "クリア(_l)"
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "切り取り(_u)"
-
 #: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
 msgid "Chec_k Names (FIXME)"
 msgstr "名前のチェック (_k) (FIXME)"
@@ -8103,23 +8249,6 @@ msgstr "この約束を閉じます"
 msgid "Cop_y to Folder... (FIXME)"
 msgstr "フォルダへコピー(_y)... (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:8
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "コピー"
-
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "選択されたものをコピーします"
-
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "切り取り"
-
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "選択されたものを切り取ります"
-
 #: ui/evolution-event-editor.xml.h:18
 msgid "Delete this appointment"
 msgstr "この約束を削除"
@@ -8164,14 +8293,6 @@ msgstr "ファイルのプロパティを修正します"
 msgid "N_ext"
 msgstr "次(_e)"
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "貼り付け"
-
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "クリップボードへ貼り付けます"
-
 #: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
 msgid "Pre_vious"
 msgstr "前(_v)"
@@ -8188,7 +8309,7 @@ msgstr "プリンタの設定(_e)..."
 msgid "Print Setup"
 msgstr "プリンタの設定"
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:17
+#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:18
 #: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:241
 msgid "Save"
 msgstr "保存"
@@ -8197,7 +8318,7 @@ msgstr "保存"
 msgid "Save the appointment and close the dialog box"
 msgstr "約束を保存してダイアログボックスを閉じます"
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:23
+#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:24
 #: ui/evolution-task-editor-dialog.xml.h:53
 msgid "Save the current file"
 msgstr "現在のファイルを保存します"
@@ -8210,14 +8331,6 @@ msgstr "打合せのスケジュール(_M)"
 msgid "Schedule some sort of a meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "すべて選択"
-
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "すべてのものを選択します"
-
 #: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
 msgid "Setup the page settings for your current printer"
 msgstr "現在のプリンタのページ設定を行います"
@@ -8230,26 +8343,22 @@ msgstr "タスク要求(_R) (FIXME)"
 msgid "_About..."
 msgstr "情報(_A)..."
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:43
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:43
+#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:44
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:44
 msgid "_Close"
 msgstr "閉じる(_C)"
 
 #: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:45
 msgid "_Contact (FIXME)"
 msgstr "コンタクト(_C) (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "コピー(_C)"
-
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:44
+#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:45
 #: ui/evolution-task-editor-dialog.xml.h:68
 msgid "_Debug"
 msgstr "デバッグ(_D)"
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:48
+#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:50
 #: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:53
 msgid "_Help"
 msgstr "ヘルプ(_H)"
@@ -8278,19 +8387,11 @@ msgstr "フォルダへ移動(_M)... (FIXME)"
 msgid "_Note (FIXME)"
 msgstr "ノート(_N) (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "貼り付け(_P)"
-
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:115
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:120
 #: ui/evolution-task-editor-dialog.xml.h:83 ui/evolution.xml.h:60
 msgid "_Properties..."
 msgstr "プロパティ(_P)..."
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "すべて選択(_A)"
-
 #: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
 #: ui/evolution.xml.h:63
 msgid "_Task (FIXME)"
@@ -8300,30 +8401,14 @@ msgstr "タスク(_T) (FIXME)"
 msgid "_Unread Item (FIXME)"
 msgstr "未読アイテム(_U) (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:76 ui/evolution-message-composer.xml.h:55
+#: ui/evolution-event-editor.xml.h:76 ui/evolution-message-composer.xml.h:57
 #: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:65
 msgid "_View"
 msgstr "表示(_V)"
 
 #: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "サービスの追加"
-
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr "実行サマリーへ新規サービスを追加します"
-
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "新規メールを作成します"
-
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr "実行サマリーの設定..."
-
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "新規メール"
+msgid "Customise My Evolution"
+msgstr "My Evolution のカスタマイズ"
 
 #: ui/evolution-mail.xml.h:1
 msgid "Apply filter rules to the selected messages"
@@ -8339,7 +8424,7 @@ msgstr "現在のメール操作をキャンセルします"
 
 #: ui/evolution-mail.xml.h:4
 msgid "Change the properties of this folder"
-msgstr "このフォルダの設定を変更する"
+msgstr "このフォルダの設定を変更します"
 
 #: ui/evolution-mail.xml.h:5
 msgid "Compose"
@@ -8406,350 +8491,367 @@ msgid "Create or edit virtual folder definitions"
 msgstr "仮想フォルダの定義を作成/編集します"
 
 #: ui/evolution-mail.xml.h:23
+msgid "Display the next important message"
+msgstr "次の重要なメッセージを表示します"
+
+#: ui/evolution-mail.xml.h:24
 msgid "Display the next message"
 msgstr "次のメッセージを表示します"
 
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:25
+msgid "Display the next unread message"
+msgstr "次の未読メッセージを表示します"
+
+#: ui/evolution-mail.xml.h:26
+msgid "Display the next unread thread"
+msgstr "次の未読スレッドを表示します"
+
+#: ui/evolution-mail.xml.h:27
+msgid "Display the previous important message"
+msgstr "前の重要なメッセージを表示します"
+
+#: ui/evolution-mail.xml.h:28
 msgid "Display the previous message"
 msgstr "前のメッセージを表示します"
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:29
+msgid "Display the previous unread message"
+msgstr "前の未読メッセージを表示します"
+
+#: ui/evolution-mail.xml.h:30
 msgid "Empty _Trash"
 msgstr "ゴミ箱を空にする(_T)"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:31
 msgid "Filter on Mailing _List"
 msgstr "メーリングリストのフィルタ(_L)"
 
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:32
 msgid "Filter on Se_nder"
 msgstr "送信者のフィルタ(_n)"
 
-#: ui/evolution-mail.xml.h:28
+#: ui/evolution-mail.xml.h:33
 msgid "Filter on _Recipients"
 msgstr "受信者のフィルタ(_R)"
 
-#: ui/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:34
 msgid "Filter on _Subject"
 msgstr "件名のフィルタ(_S)"
 
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:35
 msgid "Force images in HTML mail to be loaded"
 msgstr "強制的に HTML メールの画像を読み込む"
 
-#: ui/evolution-mail.xml.h:31
+#: ui/evolution-mail.xml.h:36
 msgid "Forget _Passwords"
 msgstr "パスワードの紛失(_P)"
 
-#: ui/evolution-mail.xml.h:32
+#: ui/evolution-mail.xml.h:37
 msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr ""
+msgstr "記憶したパスワードを忘れた場合に再び表示します"
 
-#: ui/evolution-mail.xml.h:34
+#: ui/evolution-mail.xml.h:39
 msgid "Forward As"
 msgstr "転送"
 
-#: ui/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:40
 msgid "Forward _Attached"
 msgstr "添付して転送(_A)"
 
-#: ui/evolution-mail.xml.h:36
+#: ui/evolution-mail.xml.h:41
 msgid "Forward _Inline"
 msgstr "インラインで転送(_I)"
 
-#: ui/evolution-mail.xml.h:37
+#: ui/evolution-mail.xml.h:42
 msgid "Forward _Quoted"
 msgstr "引用して転送(_Q)"
 
-#: ui/evolution-mail.xml.h:38
+#: ui/evolution-mail.xml.h:43
 msgid "Forward the selected message in the body of a new message"
 msgstr "新規メッセージの本文の中に選択されたメッセージを転送します"
 
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:44
 msgid "Forward the selected message quoted like a reply"
 msgstr "引用して選択されたメッセージを転送します"
 
-#: ui/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:45
 msgid "Forward the selected message to someone"
 msgstr "誰かへ選択されたメッセージを転送します"
 
-#: ui/evolution-mail.xml.h:41
+#: ui/evolution-mail.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
 msgstr "添付として誰かへ選択されたメッセージを転送します"
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:47
 msgid "Hide S_elected Messages"
 msgstr "選択されたメッセージを隠す(_e)"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:48
 msgid "Hide _Deleted Messages"
 msgstr "削除されたメッセージを隠す(_D)"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:49
 msgid "Hide _Read messages"
 msgstr "既読メッセージを隠す(_R)"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:50
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
-msgstr ""
+msgstr "表示しているメッセージではなく削除されたメッセージを隠します"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:51
 msgid "Load _Images"
 msgstr "画像を読み込む(_I)"
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:52
 msgid "Manage _Subscriptions..."
 msgstr "定期購読管理(_S)..."
 
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail.xml.h:53
 msgid "Mar_k As Read"
 msgstr "既読としてマーク(_k)"
 
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:54
 msgid "Mark All as R_ead"
 msgstr "既読としてすべてマーク(_e)"
 
-#: ui/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:55
 msgid "Mark As U_nread"
 msgstr "未読としてマーク(_n)"
 
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:56
 msgid "Mark all visible messages as read"
 msgstr "既読としてすべてのメッセージをマークします"
 
-#: ui/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:57
 msgid "Mark the selected messages as having been read"
 msgstr "既読として選択されたメッセージをマークします"
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:58
 msgid "Mark the selected messages as not having been read"
 msgstr "未読として選択されたメッセージをマークします"
 
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:59
 msgid "Mark the selected messages for deletion"
 msgstr "選択されたメッセージに削除マークをします"
 
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:60
 msgid "Move"
 msgstr "移動"
 
-#: ui/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:61
 msgid "Move selected messages to another folder"
 msgstr "別のフォルダへ選択されたメッセージを移動します"
 
-#: ui/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:63
 msgid "Open a window for composing a mail message"
-msgstr ""
+msgstr "メールを作成するためにウィンドウを開きます"
 
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:64
 msgid "Open the selected message in a new window"
 msgstr "新規ウィンドウで選択されたメッセージを開きます"
 
-#: ui/evolution-mail.xml.h:60
-#, fuzzy
+#: ui/evolution-mail.xml.h:65
 msgid "Open the selected message in the composer to re-send it"
-msgstr "既読として選択されたメッセージをマークします"
+msgstr "選択されたメッセージをコンポーザで開き再送します"
 
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:66
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "すべてのフォルダから削除マークされたメッセージを永久的に削除します"
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:67
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "このフォルダから削除マークされたメッセージを永久的に削除します"
 
-#: ui/evolution-mail.xml.h:66
+#: ui/evolution-mail.xml.h:71
 msgid "Print Message..."
 msgstr "メッセージを印刷..."
 
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail.xml.h:72
 msgid "Print Preview..."
 msgstr "印刷プレビュー..."
 
-#: ui/evolution-mail.xml.h:68
+#: ui/evolution-mail.xml.h:73
 msgid "Print message to the printer"
 msgstr "メッセージをプリンタへ印刷します"
 
-#: ui/evolution-mail.xml.h:69
+#: ui/evolution-mail.xml.h:74
 msgid "Redirect (FIXME: implement me)"
 msgstr "宛名を書き換える (FIXME: 実装してください)"
 
-#: ui/evolution-mail.xml.h:73
+#: ui/evolution-mail.xml.h:78
 msgid "S_earch Message"
 msgstr "メッセージを検索(_e)"
 
-#: ui/evolution-mail.xml.h:74
+#: ui/evolution-mail.xml.h:79
 msgid "Save the message as a text file"
 msgstr "テキストファイルへメッセージを保存します"
 
-#: ui/evolution-mail.xml.h:75
+#: ui/evolution-mail.xml.h:80
 msgid "Search for text in the body of the displayed message"
-msgstr ""
+msgstr "表示されたメッセージ本体の含まれるテキストを検索します"
 
-#: ui/evolution-mail.xml.h:76 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:81 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "すべて選択(_A)"
 
-#: ui/evolution-mail.xml.h:77
+#: ui/evolution-mail.xml.h:82
 msgid "Select _Thread"
 msgstr "スレッドを選択(_T)"
 
-#: ui/evolution-mail.xml.h:78
+#: ui/evolution-mail.xml.h:83
 msgid "Select all and only the messages that are not currently selected"
 msgstr "現在選択されていないメッセージだけをすべて選択します"
 
-#: ui/evolution-mail.xml.h:79
+#: ui/evolution-mail.xml.h:84
 msgid "Select all messages in the same thread as the selected message"
 msgstr "選択されたメッセージと同じスレッドのメッセージをすべて選択します"
 
-#: ui/evolution-mail.xml.h:80
+#: ui/evolution-mail.xml.h:85
 msgid "Select all visible messages"
 msgstr "すべてのメッセージを選択します"
 
-#: ui/evolution-mail.xml.h:81
+#: ui/evolution-mail.xml.h:86
 msgid "Send / Receive"
 msgstr "送受信"
 
-#: ui/evolution-mail.xml.h:82
+#: ui/evolution-mail.xml.h:87
 msgid "Send queued mail and retrieve new mail"
 msgstr "キューにあるメールを送信して新規メールを取得します"
 
-#: ui/evolution-mail.xml.h:83
+#: ui/evolution-mail.xml.h:88
 msgid "Show Email _Source"
 msgstr "メールのソースを表示(_S)"
 
-#: ui/evolution-mail.xml.h:84
+#: ui/evolution-mail.xml.h:89
 msgid "Show Full _Headers"
 msgstr "すべてのヘッダを表示(_H)"
 
-#: ui/evolution-mail.xml.h:85
+#: ui/evolution-mail.xml.h:90
 msgid "Show _All"
 msgstr "すべて表示(_A)"
 
-#: ui/evolution-mail.xml.h:86
+#: ui/evolution-mail.xml.h:91
 msgid "Show message in the normal style"
 msgstr "通常のメッセージを表示します"
 
-#: ui/evolution-mail.xml.h:87
+#: ui/evolution-mail.xml.h:92
 msgid "Show message with all email headers"
 msgstr "すべてのメールヘッダも含めてメッセージを表示します"
 
-#: ui/evolution-mail.xml.h:88
+#: ui/evolution-mail.xml.h:93
 msgid "Show messages that have been temporarily hidden"
-msgstr ""
+msgstr "一時的に隠したメッセージを表示します"
 
-#: ui/evolution-mail.xml.h:89
+#: ui/evolution-mail.xml.h:94
 msgid "Show the raw email source of the message"
-msgstr ""
+msgstr "メッセージのソースを表示します"
 
-#: ui/evolution-mail.xml.h:90
+#: ui/evolution-mail.xml.h:95
 msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr ""
+msgstr "サーバ上のフォルダの購読/購読解除をします"
 
-#: ui/evolution-mail.xml.h:91
-#, fuzzy
+#: ui/evolution-mail.xml.h:96
 msgid "Temporarily hide all messages that have already been read"
-msgstr "既読として選択されたメッセージをマークします"
+msgstr "すべての既読メッセージを一時的に隠します"
 
-#: ui/evolution-mail.xml.h:92
-#, fuzzy
+#: ui/evolution-mail.xml.h:97
 msgid "Temporarily hide the selected messages"
-msgstr "選択されたメッセージを削除します"
+msgstr "選択されたメッセージを一時的に隠します"
 
-#: ui/evolution-mail.xml.h:93
+#: ui/evolution-mail.xml.h:98
 msgid "Threaded Message list"
 msgstr "メッセージリストをスレッド化します"
 
-#: ui/evolution-mail.xml.h:94
+#: ui/evolution-mail.xml.h:99
 msgid "Un-delete the selected messages"
 msgstr "選択されたメッセージ削除を取り消します"
 
-#: ui/evolution-mail.xml.h:95
+#: ui/evolution-mail.xml.h:100
 msgid "VFolder on Mailing _List..."
 msgstr "メーリングリストの仮想フォルダ(_L)..."
 
-#: ui/evolution-mail.xml.h:96
+#: ui/evolution-mail.xml.h:101
 msgid "VFolder on Se_nder..."
 msgstr "送信者の仮想フォルダ(_n)..."
 
-#: ui/evolution-mail.xml.h:97
+#: ui/evolution-mail.xml.h:102
 msgid "VFolder on _Recipients..."
 msgstr "受信者の仮想フォルダ(_R)..."
 
-#: ui/evolution-mail.xml.h:98
+#: ui/evolution-mail.xml.h:103
 msgid "VFolder on _Subject..."
 msgstr "件名の仮想フォルダ(_S)..."
 
-#: ui/evolution-mail.xml.h:99
+#: ui/evolution-mail.xml.h:104
 msgid "Virtual Folder _Editor..."
 msgstr "仮想フォルダエディタ(_E)..."
 
-#: ui/evolution-mail.xml.h:100
+#: ui/evolution-mail.xml.h:105
 msgid "_Apply Filters"
 msgstr "フィルタ適用(_A)"
 
-#: ui/evolution-mail.xml.h:101
+#: ui/evolution-mail.xml.h:106
 msgid "_Copy to Folder"
 msgstr "フォルダへコピー(_C)"
 
-#: ui/evolution-mail.xml.h:102
+#: ui/evolution-mail.xml.h:107
 msgid "_Create Filter From Message"
 msgstr "メッセージからフィルタを作成(_C)"
 
-#: ui/evolution-mail.xml.h:104
+#: ui/evolution-mail.xml.h:109
 msgid "_Expunge"
 msgstr "抹消(_E)"
 
-#: ui/evolution-mail.xml.h:105
+#: ui/evolution-mail.xml.h:110
 msgid "_Filters..."
 msgstr "フィルタ(_F)..."
 
-#: ui/evolution-mail.xml.h:106 ui/evolution.xml.h:50
+#: ui/evolution-mail.xml.h:111 ui/evolution.xml.h:50
 msgid "_Folder"
 msgstr "フォルダ(_F)"
 
-#: ui/evolution-mail.xml.h:107
+#: ui/evolution-mail.xml.h:112
 msgid "_Forward Message"
 msgstr "メッセージを転送(_F)"
 
-#: ui/evolution-mail.xml.h:108 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:113 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "選択を反転(_I)"
 
-#: ui/evolution-mail.xml.h:109
+#: ui/evolution-mail.xml.h:114
 msgid "_Mail Message"
 msgstr "メッセージをメール(_M)"
 
-#: ui/evolution-mail.xml.h:110
+#: ui/evolution-mail.xml.h:115
 msgid "_Mail Settings..."
 msgstr "メール設定(_M)..."
 
-#: ui/evolution-mail.xml.h:111
+#: ui/evolution-mail.xml.h:116
 msgid "_Message Display"
 msgstr "メッセージ表示(_M)"
 
-#: ui/evolution-mail.xml.h:112
+#: ui/evolution-mail.xml.h:117
 msgid "_Move to Folder"
 msgstr "フォルダへ移動(_M)"
 
-#: ui/evolution-mail.xml.h:113
+#: ui/evolution-mail.xml.h:118
 msgid "_Normal Display"
 msgstr "通常表示(_N)"
 
-#: ui/evolution-mail.xml.h:114
+#: ui/evolution-mail.xml.h:119
 msgid "_Open Message"
 msgstr "メッセージを開く(_O)"
 
-#: ui/evolution-mail.xml.h:116
+#: ui/evolution-mail.xml.h:121
 msgid "_Re-send Message"
 msgstr "メッセージを再送信(_R)"
 
-#: ui/evolution-mail.xml.h:119
+#: ui/evolution-mail.xml.h:124
 msgid "_Send / Receive"
 msgstr "送受信(_S)"
 
-#: ui/evolution-mail.xml.h:120
+#: ui/evolution-mail.xml.h:125
 msgid "_Threaded Message List"
 msgstr "メッセージリストをスレッド化(_T)"
 
@@ -8763,158 +8865,166 @@ msgid "Close the current file"
 msgstr "現在のファイルを閉じます"
 
 #: ui/evolution-message-composer.xml.h:5
+msgid "Delete all but signature"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "PGP でこのメッセージを暗号化します"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:7
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
-msgstr ""
+msgstr "このメッセージを S/MIME 暗号認証を用いて暗号化します"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
 msgstr "フォーマット(_o)"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:10
 msgid "Insert a file as text into the message"
 msgstr "メッセージへテキストとしてファイルを挿入します"
 
-#: ui/evolution-message-composer.xml.h:10
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert text file..."
 msgstr "テキストファイルの挿入..."
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "ファイルを開く"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 msgid "PGP Encrypt"
 msgstr "PGP による暗号化"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Sign"
 msgstr "PGP サイン"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:16
 msgid "S/MIME Encrypt"
 msgstr "S/MIME による暗号化"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Sign"
 msgstr "S/MIME 署名"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _Draft"
 msgstr "草案を保存(_D)"
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save in _folder... (FIXME)"
 msgstr "フォルダへ保存... (FIXME)"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "フォルダへ保存..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "現在のファイルを別名で保存します"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "指定のフォルダへメッセージを保存します"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "送信"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "後で送信(_L)"
 
-#: ui/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "後で送信(_l)"
 
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "HTML形式でメールを送信します"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "後でメッセージを送信します"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "今すぐこのメッセージを送信します"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "添付の表示/非表示"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "添付を表示(_a)"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "添付を表示"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr "PGP鍵でこのメッセージにサインします"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:37
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "S/MIME 署名証明書でこのメッセージにサインします"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr "BCC フィールドを表示するかどうか切替えます"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr "CC フィールドを表示するかどうか切替えます"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
 msgstr "差出人の選択を表示するかどうか切替えます"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "返信先フィールドを表示するかどうか切替えます"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:42
 msgid "_Bcc Field"
 msgstr "Bcc フィールド(_B)"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Cc Field"
 msgstr "Cc フィールド(_C)"
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:46
+msgid "_Delete all"
+msgstr "すべて削除(_D)"
+
+#: ui/evolution-message-composer.xml.h:49
 msgid "_From Field"
 msgstr "差出人フィールド(_F)"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:51
 msgid "_Insert"
 msgstr "挿入(_I)"
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Insert text file... (FIXME)"
 msgstr "テキストファイルの挿入(_I)... (FIXME)"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Open..."
 msgstr "開く(_O)..."
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:54
 msgid "_Reply-To Field"
 msgstr "返信先フィールド(_R)"
 
-#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-message-composer.xml.h:56
 msgid "_Security"
 msgstr "セキュリティ(_S)"
 
@@ -9010,7 +9120,7 @@ msgstr "元に戻す"
 msgid "Undo the last action"
 msgstr "最後の動作を元に戻します"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:42
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:43
 msgid "_Appointment (FIXME)"
 msgstr "約束(_A) (FIXME)"
 
@@ -9091,125 +9201,125 @@ msgid "Customize toolbars"
 msgstr "ツールバーをカスタマイズします"
 
 #: ui/evolution.xml.h:14
+msgid "Delete this folder"
+msgstr "このフォルダを削除します"
+
+#: ui/evolution.xml.h:15
 msgid "Display a different folder"
 msgstr "別のフォルダを表示します"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:16
 msgid "E_xit"
 msgstr "終了(_x)"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:17
 msgid "Evolution _FAQ"
 msgstr "Evolution FAQ(_F)"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:18
 msgid "Evolution _Window"
 msgstr "Evolution ウィンドウ(_W)"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Evolution bar _shortcut"
 msgstr "Evolution バーショートカット(_s)"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:20
 msgid "Exit the program"
 msgstr "プログラムを終了します"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Getting _Started"
 msgstr "始めに(_S)"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "Import an external file format"
 msgstr "外部ファイル形式をインポートします"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:23
 msgid "Main toolbar"
 msgstr "メインツールバー"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:24
 msgid "Move this folder to another place"
 msgstr "別の場所へこのフォルダを移動します"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "Open in New Window"
 msgstr "新規ウィンドウで開く"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "Open in New _Window"
 msgstr "新規ウィンドウで開く(_W)"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "Open this folder in an other window"
 msgstr "別のウィンドウでこのフォルダを開きます"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "Show information about Evolution"
 msgstr "Evolution についての情報を表示します"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:29
 msgid "Submit Bug Report"
 msgstr "不具合報告の提出"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:30
 msgid "Submit _Bug Report"
 msgstr "不具合報告の提出(_B)"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:31
 msgid "Submit bug report using Bug Buddy."
 msgstr "Bug Buddyを使って不具合報告を提出します"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:32
 msgid "Toggle"
 msgstr "切替え"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:33
 msgid "Toggle whether to show the folder bar"
 msgstr "フォルダバーを表示するかどうか切替えます"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:34
 msgid "Toggle whether to show the shortcut bar"
 msgstr "ショートカットバーを表示するかどうか切替えます"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:35
 msgid "Toggle whether we are working offline."
 msgstr "オフライン作業かどうかを切替えます"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:36
 msgid "Using the C_ontact Manager"
 msgstr "コンタクトマネージャを使う(_o)"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:37
 msgid "Using the _Calendar"
 msgstr "カレンダを使う(_C)"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:38
 msgid "Using the _Mailer"
 msgstr "メーラを使う(_M)"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:39
 msgid "View the selected folder"
 msgstr "選択されたフォルダを表示します"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:40
 msgid "Work Offline"
 msgstr "オフライン作業"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:41
 msgid "_About Evolution..."
 msgstr "Evolution について(_A)..."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "動作(_A)"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:46
 msgid "_Copy..."
 msgstr "コピー(_C)..."
 
-#: ui/evolution.xml.h:47
-msgid "_Delete this folder"
-msgstr "このフォルダを削除します"
-
 #: ui/evolution.xml.h:51
 msgid "_Folder Bar"
 msgstr "フォルダバー(_F)"
@@ -9251,7 +9361,6 @@ msgid "_Work Offline"
 msgstr "オフライン作業(_W)"
 
 #: views/addressbook/galview.xml.h:1
-#, fuzzy
 msgid "Address Cards"
 msgstr "アドレスカード"
 
@@ -9366,11 +9475,11 @@ msgstr "すべての付き添い"
 msgid "%A, %B %d, %Y"
 msgstr "%Y年 %m月 %d日 %A"
 
-#: widgets/menus/gal-view-menus.c:207
+#: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "現在の表示(_C)"
 
-#: widgets/menus/gal-view-menus.c:248
+#: widgets/menus/gal-view-menus.c:259
 msgid "Define Views"
 msgstr "表示を定義"
 
@@ -9470,12 +9579,3 @@ msgstr "init_corba(): GNOME を初期化することが出来ませんでした"
 #: wombat/wombat.c:198
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo を初期化することが出来ませんでした"
-
-#~ msgid "As _Minicards"
-#~ msgstr "ミニカード"
-
-#~ msgid "As _Table"
-#~ msgstr "テーブル(_T)"
-
-#~ msgid "Find a contact"
-#~ msgstr "コンタクトを検索します"
author	Akira TAGOH <tagoh@gnome.gr.jp>	2001-06-12 18:57:17 +0800
committer	Akira Tagoh <tagoh@src.gnome.org>	2001-06-12 18:57:17 +0800
commit	fc20441fe388a89b5c5d61fa6ab5307e9d21dc89 (patch)
tree	ac864bbbec5404c006e7f92d4aeaf062728e441a /po/ja.po
parent	a138eedbcbc0799de590d900400d1047deb5ab9f (diff)
download	gsoc2013-evolution-fc20441fe388a89b5c5d61fa6ab5307e9d21dc89.tar gsoc2013-evolution-fc20441fe388a89b5c5d61fa6ab5307e9d21dc89.tar.gz gsoc2013-evolution-fc20441fe388a89b5c5d61fa6ab5307e9d21dc89.tar.bz2 gsoc2013-evolution-fc20441fe388a89b5c5d61fa6ab5307e9d21dc89.tar.lz gsoc2013-evolution-fc20441fe388a89b5c5d61fa6ab5307e9d21dc89.tar.xz gsoc2013-evolution-fc20441fe388a89b5c5d61fa6ab5307e9d21dc89.tar.zst gsoc2013-evolution-fc20441fe388a89b5c5d61fa6ab5307e9d21dc89.zip