0.99.0.

svn path=/trunk/; revision=14605

1 files changed, 288 insertions, 268 deletions

diff --git a/po/ja.po b/po/ja.po
index 3e6b7fd152..b3f524eba9 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution CVS-20010612\n"
-"POT-Creation-Date: 2001-10-31 17:21-0500\n"
+"POT-Creation-Date: 2001-11-05 19:49-0500\n"
 "PO-Revision-Date: 2001-23-01 00:28+0900\n"
 "Last-Translator: Takuo KITAME <kitame@debian.org>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -48,7 +48,7 @@ msgid "Email"
 msgstr "メール"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1630
+#: addressbook/gui/contact-editor/e-contact-editor.c:1651
 msgid "Primary"
 msgstr "プライマリ"
 
@@ -58,15 +58,15 @@ msgstr "プライマリ"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1615
+#: addressbook/gui/contact-editor/e-contact-editor.c:1636
 #: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Assistant"
 msgstr "アシスタント"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1616
-#: addressbook/gui/contact-editor/e-contact-editor.c:1683
+#: addressbook/gui/contact-editor/e-contact-editor.c:1637
+#: addressbook/gui/contact-editor/e-contact-editor.c:1704
 msgid "Business"
 msgstr "仕事"
 
@@ -76,12 +76,12 @@ msgid "Bus"
 msgstr "仕事"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1619
+#: addressbook/gui/contact-editor/e-contact-editor.c:1640
 msgid "Callback"
 msgstr "呼び戻し"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1621
+#: addressbook/gui/contact-editor/e-contact-editor.c:1642
 msgid "Company"
 msgstr "会社"
 
@@ -91,8 +91,8 @@ msgstr "会社"
 
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1622
-#: addressbook/gui/contact-editor/e-contact-editor.c:1684
+#: addressbook/gui/contact-editor/e-contact-editor.c:1643
+#: addressbook/gui/contact-editor/e-contact-editor.c:1705
 msgid "Home"
 msgstr "家"
 
@@ -106,17 +106,17 @@ msgid "Org"
 msgstr "会社"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1626
+#: addressbook/gui/contact-editor/e-contact-editor.c:1647
 msgid "Mobile"
 msgstr "モバイル"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1620
+#: addressbook/gui/contact-editor/e-contact-editor.c:1641
 msgid "Car"
 msgstr "車"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1618
+#: addressbook/gui/contact-editor/e-contact-editor.c:1639
 #: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Business Fax"
 msgstr "仕事の FAX"
@@ -126,13 +126,13 @@ msgid "Bus Fax"
 msgstr "仕事の FAX"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1624
+#: addressbook/gui/contact-editor/e-contact-editor.c:1645
 #: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Home Fax"
 msgstr "家の FAX"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1617
+#: addressbook/gui/contact-editor/e-contact-editor.c:1638
 msgid "Business 2"
 msgstr "仕事 2"
 
@@ -141,44 +141,44 @@ msgid "Bus 2"
 msgstr "仕事 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1623
+#: addressbook/gui/contact-editor/e-contact-editor.c:1644
 msgid "Home 2"
 msgstr "家 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: addressbook/gui/contact-editor/e-contact-editor.c:1646
 #: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1627
-#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1648
+#: addressbook/gui/contact-editor/e-contact-editor.c:1706
 #: mail/mail-config.glade.h:49
 msgid "Other"
 msgstr "その他"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1628
+#: addressbook/gui/contact-editor/e-contact-editor.c:1649
 #: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Other Fax"
 msgstr "その他の FAX"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/contact-editor/e-contact-editor.c:1650
 #: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Pager"
 msgstr "ポケベル"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: addressbook/gui/contact-editor/e-contact-editor.c:1652
 #: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Radio"
 msgstr "ラジオ"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1632
+#: addressbook/gui/contact-editor/e-contact-editor.c:1653
 #: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Telex"
 msgstr "テレックス"
@@ -190,14 +190,14 @@ msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/gui/contact-editor/e-contact-editor.c:1679
 #: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Email 2"
 msgstr "メール2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/contact-editor/e-contact-editor.c:1680
 #: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Email 3"
 msgstr "メール3"
@@ -313,7 +313,7 @@ msgstr "カテゴリ"
 msgid "Family Name"
 msgstr "姓"
 
-#: addressbook/backend/ebook/e-card-simple.c:787
+#: addressbook/backend/ebook/e-card-simple.c:788
 #, fuzzy, c-format
 msgid "%x"
 msgstr "x"
@@ -617,7 +617,7 @@ msgstr "%s の VCard"
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1537
+#: addressbook/conduit/address-conduit.c:1533
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1449
 #: calendar/conduits/todo/todo-conduit.c:1128
@@ -673,28 +673,28 @@ msgstr "LDAP 検索の結果を受信中..."
 msgid "Restarting search."
 msgstr "検索を再実行中"
 
-#: addressbook/conduit/address-conduit.c:284
+#: addressbook/conduit/address-conduit.c:294
 msgid "Cursor could not be loaded\n"
 msgstr "カーソルは読み込まれることが出来ませんでした\n"
 
-#: addressbook/conduit/address-conduit.c:297
+#: addressbook/conduit/address-conduit.c:307
 msgid "EBook not loaded\n"
 msgstr "EBook はロードされていません\n"
 
-#: addressbook/conduit/address-conduit.c:1093
+#: addressbook/conduit/address-conduit.c:1089
 #: calendar/conduits/calendar/calendar-conduit.c:981
 #: calendar/conduits/todo/todo-conduit.c:692
 msgid "Could not start wombat server"
 msgstr "wombat サーバを開始することが出来ませんでした"
 
-#: addressbook/conduit/address-conduit.c:1094
+#: addressbook/conduit/address-conduit.c:1090
 #: calendar/conduits/calendar/calendar-conduit.c:982
 #: calendar/conduits/todo/todo-conduit.c:693
 msgid "Could not start wombat"
 msgstr "wombat を開始することが出来ませんでした"
 
-#: addressbook/conduit/address-conduit.c:1124
-#: addressbook/conduit/address-conduit.c:1127
+#: addressbook/conduit/address-conduit.c:1120
+#: addressbook/conduit/address-conduit.c:1123
 msgid "Could not read pilot's Address application block"
 msgstr ""
 "パイロットのアドレスアプリケーションブロックを読み込むことが出来ませんでした"
@@ -980,8 +980,8 @@ msgid "Category is"
 msgstr "カテゴリは"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:98
-#: widgets/misc/e-filter-bar.h:105
+#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "詳細..."
 
@@ -1006,7 +1006,7 @@ msgstr "(なし)"
 
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1657
+#: addressbook/gui/contact-editor/e-contact-editor.c:1678
 msgid "Primary Email"
 msgstr "主要なメール"
 
@@ -1176,7 +1176,7 @@ msgstr "協力者"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1264
+#: addressbook/gui/contact-editor/e-contact-editor.c:1285
 msgid "Contact Editor"
 msgstr "連絡先エディタ"
 
@@ -1251,7 +1251,7 @@ msgstr "連絡先(_C)..."
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:704 filter/filter.glade.h:8
-#: mail/folder-browser.c:1496 mail/mail-config.glade.h:96
+#: mail/folder-browser.c:1505 mail/mail-config.glade.h:96
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
@@ -1325,11 +1325,11 @@ msgstr "連絡先を削除しますか?"
 msgid "This contact belongs to these categories:"
 msgstr "この連絡先はこれらのカテゴリに所属しています:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1633
+#: addressbook/gui/contact-editor/e-contact-editor.c:1654
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2255
+#: addressbook/gui/contact-editor/e-contact-editor.c:2276
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "フィールド`%s'のウィジェットが見つかりませんでした"
@@ -2430,7 +2430,7 @@ msgid "contact-list-editor"
 msgstr "連絡先リストエディタ"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:230
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:231
 msgid "Contact List Editor"
 msgstr "連絡先リストエディタ"
 
@@ -2542,7 +2542,7 @@ msgstr "表紙を印刷"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
 #: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:282 ui/evolution-addressbook.xml.h:8
+#: mail/mail-accounts.c:296 ui/evolution-addressbook.xml.h:8
 #: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:17
 #: ui/evolution-tasks.xml.h:8
@@ -2918,27 +2918,27 @@ msgstr "封筒を印刷"
 msgid "Untitled appointment"
 msgstr "アポイントの編集(_E)"
 
-#: calendar/cal-util/cal-util.c:495 calendar/cal-util/cal-util.c:517
+#: calendar/cal-util/cal-util.c:498 calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
 msgid "High"
 msgstr "高い"
 
-#: calendar/cal-util/cal-util.c:497 calendar/cal-util/cal-util.c:519
+#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/calendar-model.c:1703
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
 msgid "Normal"
 msgstr "普通"
 
-#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
+#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
 msgid "Low"
 msgstr "低い"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:515
+#: calendar/cal-util/cal-util.c:518
 #: calendar/gui/dialogs/task-details-page.glade.h:13
 #: calendar/gui/e-calendar-table.c:408
 msgid "Undefined"
@@ -3173,7 +3173,7 @@ msgid "Free"
 msgstr "空き"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
-#: calendar/gui/e-meeting-time-sel.c:409
+#: calendar/gui/e-meeting-time-sel.c:427
 #: shell/evolution-shell-component.c:1029
 msgid "Busy"
 msgstr "ビジー"
@@ -3209,12 +3209,12 @@ msgstr ""
 
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1482
-#: mail/mail-accounts.c:143 mail/mail-accounts.c:391
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1485
+#: mail/mail-accounts.c:148 mail/mail-accounts.c:405
 #: mail/mail-config.glade.h:47
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:452
-#: widgets/misc/e-dateedit.c:1459 widgets/misc/e-dateedit.c:1574
+#: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
+#: widgets/misc/e-dateedit.c:1487 widgets/misc/e-dateedit.c:1602
 msgid "None"
 msgstr "ノート"
 
@@ -3855,12 +3855,12 @@ msgstr "仕訳記入 - %s"
 msgid "No summary"
 msgstr "サマリはありません"
 
-#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1876
+#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1891
 #: mail/mail-display.c:102
 msgid "Overwrite file?"
 msgstr "ファイルを上書きしますか?"
 
-#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1883
+#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1898
 #: mail/mail-display.c:106
 msgid ""
 "A file by that name already exists.\n"
@@ -3870,7 +3870,7 @@ msgstr ""
 "上書きしますか?"
 
 #: calendar/gui/dialogs/comp-editor.c:1109 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "別名で保存..."
 
@@ -4097,7 +4097,7 @@ msgid "_Change Organizer"
 msgstr "主催者を変更(_C)"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:427
+#: calendar/gui/e-meeting-time-sel.c:445
 msgid "_Invite Others..."
 msgstr "他の招待(_I)..."
 
@@ -4310,7 +4310,7 @@ msgid "Deleting selected objects"
 msgstr "選択した連絡先を削除します"
 
 #: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
-#: calendar/gui/e-week-view.c:3395 mail/folder-browser.c:1475
+#: calendar/gui/e-week-view.c:3395 mail/folder-browser.c:1484
 #: shell/e-shortcuts-view.c:384
 msgid "_Open"
 msgstr "開く(_O)"
@@ -4389,8 +4389,8 @@ msgstr ""
 msgid "Alarms"
 msgstr "アラーム"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:721
-#: camel/camel-filter-driver.c:835
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:723
+#: camel/camel-filter-driver.c:837
 msgid "Complete"
 msgstr "完了しました"
 
@@ -4422,7 +4422,7 @@ msgstr "開始日"
 #. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
 #: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
-#: shell/e-storage-set-view.c:1465 shell/e-summary-storage.c:79
+#: shell/e-storage-set-view.c:1483 shell/e-summary-storage.c:79
 msgid "Summary"
 msgstr "サマリ"
 
@@ -4576,7 +4576,7 @@ msgstr "タスクを更新"
 #: calendar/gui/e-itip-control.c:780 calendar/gui/e-itip-control.c:799
 #: calendar/gui/e-itip-control.c:812 calendar/gui/e-itip-control.c:825
 #: calendar/gui/e-itip-control.c:839 calendar/gui/e-itip-control.c:853
-#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:254
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
@@ -4943,7 +4943,7 @@ msgid "Declined"
 msgstr "辞退した"
 
 #: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
-#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:408
+#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:426
 msgid "Tentative"
 msgstr "暫定"
 
@@ -4958,83 +4958,83 @@ msgstr "処理中"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:472
-#: calendar/gui/e-meeting-time-sel.c:2023
+#: calendar/gui/e-meeting-time-sel-item.c:471
+#: calendar/gui/e-meeting-time-sel.c:2083
 msgid "%A, %B %d, %Y"
 msgstr "%Y年 %m月 %d日 %A"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:476
-#: calendar/gui/e-meeting-time-sel.c:2053 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel-item.c:475
+#: calendar/gui/e-meeting-time-sel.c:2113 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1583
+#: calendar/gui/e-meeting-time-sel-item.c:479 e-util/e-time-utils.c:221
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1611
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
-#: calendar/gui/e-meeting-time-sel.c:410
+#: calendar/gui/e-meeting-time-sel.c:428
 msgid "Out of Office"
 msgstr "オフィスの外"
 
-#: calendar/gui/e-meeting-time-sel.c:411
+#: calendar/gui/e-meeting-time-sel.c:429
 msgid "No Information"
 msgstr "情報なし"
 
-#: calendar/gui/e-meeting-time-sel.c:447
+#: calendar/gui/e-meeting-time-sel.c:465
 msgid "_Options"
 msgstr "オプション(_O)"
 
-#: calendar/gui/e-meeting-time-sel.c:464
+#: calendar/gui/e-meeting-time-sel.c:482
 msgid "Show _Only Working Hours"
 msgstr "仕事中の時間だけ表示(_O)"
 
-#: calendar/gui/e-meeting-time-sel.c:477
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Zoomed Out"
 msgstr "縮小して表示(_Z)"
 
-#: calendar/gui/e-meeting-time-sel.c:495
+#: calendar/gui/e-meeting-time-sel.c:513
 msgid "_Update Free/Busy"
 msgstr "フリー/ビジー の更新(_U)"
 
-#: calendar/gui/e-meeting-time-sel.c:513
+#: calendar/gui/e-meeting-time-sel.c:531
 msgid "_<<"
 msgstr "<<(_<)"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:548
 msgid "_Autopick"
 msgstr "自動ピックアップ(_A)"
 
-#: calendar/gui/e-meeting-time-sel.c:544
+#: calendar/gui/e-meeting-time-sel.c:562
 msgid ">_>"
 msgstr ">>(_>)"
 
-#: calendar/gui/e-meeting-time-sel.c:561
+#: calendar/gui/e-meeting-time-sel.c:579
 msgid "_All People and Resources"
 msgstr "すべての人々とリソース(_A)"
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "All _People and One Resource"
 msgstr "すべての人々とひとつのリソース(_P)"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "_Required People"
 msgstr "人々が必要(_R)"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "Required People and _One Resource"
 msgstr "人々とひとつのリソースが必要(_O)"
 
-#: calendar/gui/e-meeting-time-sel.c:623
+#: calendar/gui/e-meeting-time-sel.c:641
 msgid "Meeting _start time:"
 msgstr "会議開始時間(_S):"
 
-#: calendar/gui/e-meeting-time-sel.c:642
+#: calendar/gui/e-meeting-time-sel.c:660
 msgid "Meeting _end time:"
 msgstr "会議終了時間(_E):"
 
@@ -5371,7 +5371,7 @@ msgid "Print Calendar"
 msgstr "カレンダの印刷"
 
 #: calendar/gui/print.c:2477 calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2337 my-evolution/e-summary.c:614
+#: mail/mail-callbacks.c:2352 my-evolution/e-summary.c:614
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
 msgid "Print Preview"
 msgstr "印刷プレビュー"
@@ -5585,52 +5585,52 @@ msgstr ""
 msgid "You must be working online to complete this operation"
 msgstr "この動作を完了するためにオンラインで作業しなければなりません"
 
-#: camel/camel-filter-driver.c:551 camel/camel-filter-driver.c:560
+#: camel/camel-filter-driver.c:553 camel/camel-filter-driver.c:562
 msgid "Syncing folders"
 msgstr "フォルダを同期中"
 
-#: camel/camel-filter-driver.c:662
+#: camel/camel-filter-driver.c:664
 msgid "Unable to open spool folder"
 msgstr "スプールフォルダを開くことが出来ません"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:673
 msgid "Unable to process spool folder"
 msgstr "スプールフォルダを処理することが出来ません"
 
-#: camel/camel-filter-driver.c:686
+#: camel/camel-filter-driver.c:688
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "メッセージ %d を取得中 (%d%%)"
 
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:703
+#: camel/camel-filter-driver.c:692
+msgid "Cannot open message"
+msgstr "メッセージを開くことが出来ません"
+
+#: camel/camel-filter-driver.c:693 camel/camel-filter-driver.c:705
 #, c-format
 msgid "Failed on message %d"
 msgstr "メッセージ %d で失敗しました"
 
-#: camel/camel-filter-driver.c:691
-msgid "Cannot open message"
-msgstr "メッセージを開くことが出来ません"
-
-#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:830
+#: camel/camel-filter-driver.c:719 camel/camel-filter-driver.c:832
 msgid "Syncing folder"
 msgstr "フォルダを同期中"
 
-#: camel/camel-filter-driver.c:787
+#: camel/camel-filter-driver.c:789
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "メッセージ %d / %d を取得中"
 
-#: camel/camel-filter-driver.c:792 camel/camel-filter-driver.c:810
+#: camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "メッセージ %d / %d は失敗しました"
 
-#: camel/camel-filter-driver.c:919
+#: camel/camel-filter-driver.c:921
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "フィルタの構文解析中にエラー: %s: %s"
 
-#: camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:927
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "フィルタ実行中にエラー: %s: %s"
@@ -6511,7 +6511,7 @@ msgstr "maildir 形式のフォルダへメッセージを追加出来ません: %s: %s"
 
 #: camel/providers/local/camel-maildir-folder.c:209
 #: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:229
+#: camel/providers/local/camel-maildir-folder.c:230
 #: camel/providers/local/camel-mbox-folder.c:331
 #: camel/providers/local/camel-mh-folder.c:198
 #: camel/providers/local/camel-mh-folder.c:207
@@ -6532,7 +6532,7 @@ msgstr ""
 msgid "No such message"
 msgstr "そのようなメッセージはありません"
 
-#: camel/providers/local/camel-maildir-folder.c:230
+#: camel/providers/local/camel-maildir-folder.c:231
 #: camel/providers/local/camel-mh-folder.c:216
 msgid "Invalid message contents"
 msgstr "メッセージの内容は無効です"
@@ -6615,10 +6615,10 @@ msgstr "mbox ファイルにメッセージを追加出来ません: %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:347
 #: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:392
+#: camel/providers/local/camel-mbox-folder.c:391
 #: camel/providers/local/camel-spool-folder.c:595
 #: camel/providers/local/camel-spool-folder.c:627
-#: camel/providers/local/camel-spool-folder.c:640
+#: camel/providers/local/camel-spool-folder.c:639
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6632,8 +6632,8 @@ msgstr ""
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "フォルダで回復不能なエラーが発生したようです"
 
-#: camel/providers/local/camel-mbox-folder.c:393
-#: camel/providers/local/camel-spool-folder.c:641
+#: camel/providers/local/camel-mbox-folder.c:392
+#: camel/providers/local/camel-spool-folder.c:640
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "メッセージの解釈に失敗しました: 間違ったメールボックスですか?"
 
@@ -7490,7 +7490,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "ファイルを添付します"
 
-#: composer/e-msg-composer.c:690
+#: composer/e-msg-composer.c:696
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -7499,29 +7499,29 @@ msgstr ""
 "ファイルの読み込み中にエラー: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:873
+#: composer/e-msg-composer.c:879
 msgid "Save as..."
 msgstr "別名で保存..."
 
-#: composer/e-msg-composer.c:882
+#: composer/e-msg-composer.c:888
 msgid "Warning!"
 msgstr "警告!"
 
-#: composer/e-msg-composer.c:886
+#: composer/e-msg-composer.c:892
 msgid "File exists, overwrite?"
 msgstr "ファイルは存在します。上書きしますか?"
 
-#: composer/e-msg-composer.c:908
+#: composer/e-msg-composer.c:914
 #, c-format
 msgid "Error saving file: %s"
 msgstr "ファイルの保存中にエラー: %s"
 
-#: composer/e-msg-composer.c:927
+#: composer/e-msg-composer.c:933
 #, c-format
 msgid "Error loading file: %s"
 msgstr "ファイルのロード中にエラー: %s"
 
-#: composer/e-msg-composer.c:998
+#: composer/e-msg-composer.c:1004
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -7529,16 +7529,16 @@ msgstr ""
 "このアカウントの草稿フォルダを開くことが出来ません\n"
 "デフォルトの草稿フォルダを使ってもよろしいですか?"
 
-#: composer/e-msg-composer.c:1048
+#: composer/e-msg-composer.c:1054
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "ファイルのアクセス中にエラー: %s"
 
-#: composer/e-msg-composer.c:1056
+#: composer/e-msg-composer.c:1062
 msgid "Unable to retrieve message from editor"
 msgstr "エディタからメッセージを取得出来ませんでした"
 
-#: composer/e-msg-composer.c:1063
+#: composer/e-msg-composer.c:1069
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7547,7 +7547,7 @@ msgstr ""
 "ファイルを走査できません: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1070
+#: composer/e-msg-composer.c:1076
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -7556,7 +7556,7 @@ msgstr ""
 "ファイルを切り詰めることが出来ません: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1079
+#: composer/e-msg-composer.c:1085
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7565,7 +7565,7 @@ msgstr ""
 "メッセージの自動保存中にエラー: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1181
+#: composer/e-msg-composer.c:1187
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -7573,7 +7573,7 @@ msgstr ""
 "Evolution は 前回のセッションで保存されていないファイルを発見しました。\n"
 "これらをリカバリしてみますか?"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1341
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7583,29 +7583,29 @@ msgstr ""
 "\n"
 "変更を保存しますか?"
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1348
 msgid "Warning: Modified Message"
 msgstr "警告: 変更されたメッセージ"
 
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1371
 msgid "Open file"
 msgstr "ファイルを開く"
 
-#: composer/e-msg-composer.c:1513
+#: composer/e-msg-composer.c:1520
 msgid "Insert File"
 msgstr "ファイルの挿入"
 
-#: composer/e-msg-composer.c:1888 composer/e-msg-composer.c:2329
+#: composer/e-msg-composer.c:1895 composer/e-msg-composer.c:2336
 msgid "Compose a message"
 msgstr "メッセージを作成します"
 
-#: composer/e-msg-composer.c:2346
+#: composer/e-msg-composer.c:2353
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2369
+#: composer/e-msg-composer.c:2376
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -7754,13 +7754,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
-#: widgets/misc/e-dateedit.c:1391 widgets/misc/e-dateedit.c:1618
+#: widgets/misc/e-dateedit.c:1419 widgets/misc/e-dateedit.c:1646
 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:316 e-util/e-time-utils.c:391
-#: widgets/misc/e-dateedit.c:1388 widgets/misc/e-dateedit.c:1615
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1643
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -7910,7 +7910,7 @@ msgstr ""
 "戻ってメールを配送する有効なフォルダを指定してください"
 
 #: filter/filter-folder.c:242 filter/vfolder-rule.c:356
-#: mail/mail-account-gui.c:834
+#: mail/mail-account-gui.c:837
 msgid "Select Folder"
 msgstr "フォルダを選択"
 
@@ -8160,7 +8160,7 @@ msgstr "返信先"
 msgid "Score"
 msgstr "記録"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1383
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1398
 msgid "Sender"
 msgstr "送信者"
 
@@ -8192,7 +8192,7 @@ msgstr "が次のもので開始する"
 msgid "Stop Processing"
 msgstr "処理停止"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:901
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:904
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "件名"
@@ -8429,159 +8429,159 @@ msgstr "プロパティ"
 msgid "Could not create temporary directory: %s"
 msgstr "作業ディレクトリを作成出来ませんでした: %s"
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d new"
 msgstr "新規%d通"
 
-#: mail/folder-browser.c:772 mail/folder-browser.c:777
-#: mail/folder-browser.c:799
+#: mail/folder-browser.c:771 mail/folder-browser.c:776
+#: mail/folder-browser.c:798
 msgid ", "
 msgstr ","
 
-#: mail/folder-browser.c:773
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:778
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d selected"
 msgstr "%d 選択済"
 
-#: mail/folder-browser.c:801
+#: mail/folder-browser.c:800
 #, c-format
 msgid "%d unsent"
 msgstr "%d 未送信"
 
-#: mail/folder-browser.c:803
+#: mail/folder-browser.c:802
 #, c-format
 msgid "%d sent"
 msgstr "%d 送信済"
 
-#: mail/folder-browser.c:805
+#: mail/folder-browser.c:804
 #, c-format
 msgid "%d total"
 msgstr "合計%d通"
 
-#: mail/folder-browser.c:1077
+#: mail/folder-browser.c:1086
 msgid "Create vFolder from Search"
 msgstr "検索から仮想フォルダを構築"
 
-#: mail/folder-browser.c:1458
+#: mail/folder-browser.c:1467
 msgid "VFolder on _Subject"
 msgstr "件名の仮想フォルダ(_S)"
 
-#: mail/folder-browser.c:1459
+#: mail/folder-browser.c:1468
 msgid "VFolder on Se_nder"
 msgstr "送信者の仮想フォルダ(_N)"
 
-#: mail/folder-browser.c:1460
+#: mail/folder-browser.c:1469
 msgid "VFolder on _Recipients"
 msgstr "受信者の仮想フォルダ(_R)"
 
-#: mail/folder-browser.c:1461
+#: mail/folder-browser.c:1470
 msgid "VFolder on Mailing _List"
 msgstr "メーリングリストの仮想フォルダ(_L)"
 
-#: mail/folder-browser.c:1465
+#: mail/folder-browser.c:1474
 msgid "Filter on Sub_ject"
 msgstr "件名のフィルタ(_J)"
 
-#: mail/folder-browser.c:1466
+#: mail/folder-browser.c:1475
 msgid "Filter on Sen_der"
 msgstr "送信者のフィルタ(_D)"
 
-#: mail/folder-browser.c:1467
+#: mail/folder-browser.c:1476
 msgid "Filter on Re_cipients"
 msgstr "受信者のフィルタ(_C)"
 
-#: mail/folder-browser.c:1468
+#: mail/folder-browser.c:1477
 msgid "Filter on _Mailing List"
 msgstr "メーリングリストのフィルタ(_M)"
 
-#: mail/folder-browser.c:1476 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1485 ui/evolution-mail-message.xml.h:95
 msgid "_Edit as New Message..."
 msgstr "新規メッセージとして編集..."
 
-#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:104
+#: mail/folder-browser.c:1486 ui/evolution-mail-message.xml.h:104
 msgid "_Save As..."
 msgstr "別名で保存(_S)..."
 
-#: mail/folder-browser.c:1478
+#: mail/folder-browser.c:1487
 msgid "_Print"
 msgstr "印刷(_P)"
 
-#: mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:103
+#: mail/folder-browser.c:1491 ui/evolution-mail-message.xml.h:103
 msgid "_Reply to Sender"
 msgstr "送信者へ返信(_R)"
 
-#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1492 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _List"
 msgstr "リストへ返信(_L)"
 
-#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:71
+#: mail/folder-browser.c:1493 ui/evolution-mail-message.xml.h:71
 msgid "Reply to _All"
 msgstr "全員へ返信(_A)"
 
-#: mail/folder-browser.c:1485
+#: mail/folder-browser.c:1494
 msgid "_Forward"
 msgstr "転送(_F)"
 
-#: mail/folder-browser.c:1487 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1496 ui/evolution-mail-message.xml.h:42
 msgid "Mar_k as Read"
 msgstr "開封済みとしてマーク(_K)"
 
-#: mail/folder-browser.c:1488 ui/evolution-mail-message.xml.h:44
+#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:44
 msgid "Mark as U_nread"
 msgstr "未読としてマーク(_N)"
 
-#: mail/folder-browser.c:1489
+#: mail/folder-browser.c:1498
 msgid "Mark as _Important"
 msgstr "重要としてマーク(_I)"
 
-#: mail/folder-browser.c:1490
+#: mail/folder-browser.c:1499
 msgid "Mark as Unim_portant"
 msgstr "非重要としてマーク(_P)"
 
-#: mail/folder-browser.c:1494
+#: mail/folder-browser.c:1503
 msgid "_Move to Folder..."
 msgstr "フォルダへ移動(_M)..."
 
-#: mail/folder-browser.c:1495
+#: mail/folder-browser.c:1504
 msgid "_Copy to Folder..."
 msgstr "フォルダへコピー(_C)..."
 
-#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:106
+#: mail/folder-browser.c:1506 ui/evolution-mail-message.xml.h:106
 msgid "_Undelete"
 msgstr "削除取消(_U)"
 
-#: mail/folder-browser.c:1501
+#: mail/folder-browser.c:1510
 msgid "Add Sender to Address Book"
 msgstr "送信者をアドレス帳に追加"
 
-#: mail/folder-browser.c:1504
+#: mail/folder-browser.c:1513
 msgid "Apply Filters"
 msgstr "フィルタ適用"
 
-#: mail/folder-browser.c:1506
+#: mail/folder-browser.c:1515
 msgid "Create Ru_le From Message"
 msgstr "メッセージからルールを作成(_L)"
 
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1665
 msgid "Filter on Mailing List"
 msgstr "メーリングリストのフィルタ"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1666
 msgid "VFolder on Mailing List"
 msgstr "メーリングリストの仮想フォルダ"
 
-#: mail/folder-browser.c:1659
+#: mail/folder-browser.c:1668
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "メーリングリストのフィルタ (%s)"
 
-#: mail/folder-browser.c:1660
+#: mail/folder-browser.c:1669
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "メーリングリストの仮想フォルダ (%s)"
@@ -8664,19 +8664,19 @@ msgid "Evolution News Editor"
 msgstr "Evolution ニュースエディタ"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:163
+#: mail/mail-account-editor.c:160
 msgid "Evolution Account Editor"
 msgstr "Evolution アカウントエディタ"
 
-#: mail/mail-account-gui.c:959
+#: mail/mail-account-gui.c:962
 msgid "Could not save signature file."
 msgstr "署名ファイルを保存出来ませんでした"
 
-#: mail/mail-account-gui.c:1036
+#: mail/mail-account-gui.c:1039
 msgid "Save signature"
 msgstr "署名を保存"
 
-#: mail/mail-account-gui.c:1042
+#: mail/mail-account-gui.c:1045
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -8686,40 +8686,40 @@ msgstr ""
 "\n"
 "変更を保存しますか?"
 
-#: mail/mail-account-gui.c:1651
+#: mail/mail-account-gui.c:1654
 msgid "You may not create two accounts with the same name."
 msgstr "同じ名前のアカウントを2つ作成できません。"
 
-#: mail/mail-accounts.c:144
+#: mail/mail-accounts.c:149
 msgid " (default)"
 msgstr " (デフォルト)"
 
-#: mail/mail-accounts.c:189
+#: mail/mail-accounts.c:194
 msgid "Disable"
 msgstr "無効"
 
-#: mail/mail-accounts.c:191
+#: mail/mail-accounts.c:196
 msgid "Enable"
 msgstr "有効"
 
-#: mail/mail-accounts.c:279
+#: mail/mail-accounts.c:293
 msgid "Are you sure you want to delete this account?"
 msgstr "本当にこのアカウントを削除してもよろしいですか?"
 
-#: mail/mail-accounts.c:283
+#: mail/mail-accounts.c:297
 msgid "Don't delete"
 msgstr "削除しない"
 
-#: mail/mail-accounts.c:286
+#: mail/mail-accounts.c:300
 msgid "Really delete account?"
 msgstr "本当にアカウントを削除しますか?"
 
-#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+#: mail/mail-accounts.c:532 mail/mail-accounts.c:536
 msgid "Are you sure you want to delete this news account?"
 msgstr "本当に news アカウントを削除してもよろしいですか?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:770 mail/mail-config.glade.h:42
+#: mail/mail-accounts.c:790 mail/mail-config.glade.h:42
 msgid "Mail Settings"
 msgstr "メール設定"
 
@@ -8815,40 +8815,40 @@ msgid ""
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:468
+#: mail/mail-callbacks.c:469
 msgid "This message contains invalid recipients:"
 msgstr "このメッセージは不適切な受信者を含んでいます:"
 
-#: mail/mail-callbacks.c:503
+#: mail/mail-callbacks.c:504
 msgid "You must specify recipients in order to send this message."
 msgstr "このメッセージを送信する適切な受信者を指定しなければなりません"
 
-#: mail/mail-callbacks.c:599
+#: mail/mail-callbacks.c:600
 msgid "You must configure an account before you can send this email."
 msgstr "このメールを送信する前にアカウントを設定しなければなりません"
 
-#: mail/mail-callbacks.c:836
+#: mail/mail-callbacks.c:838
 msgid "an unknown sender"
 msgstr "不明な送信者"
 
-#: mail/mail-callbacks.c:841
+#: mail/mail-callbacks.c:843
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%Y年%m月%d日(%a)の%H時%M分に %%s 曰く:"
 
-#: mail/mail-callbacks.c:1263
+#: mail/mail-callbacks.c:1275 mail/message-browser.c:130
 msgid "Move message(s) to"
 msgstr "メッセージを移動します: "
 
-#: mail/mail-callbacks.c:1265
+#: mail/mail-callbacks.c:1277 mail/message-browser.c:132
 msgid "Copy message(s) to"
 msgstr "メッセージをコピーします: "
 
-#: mail/mail-callbacks.c:1732
+#: mail/mail-callbacks.c:1747
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "本当に %d メッセージを編集してもよろしいですか?"
 
-#: mail/mail-callbacks.c:1757
+#: mail/mail-callbacks.c:1772
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8856,7 +8856,7 @@ msgstr ""
 "ドラフトフォルダ内に保存された\n"
 "メッセージだけを編集することが出来ます"
 
-#: mail/mail-callbacks.c:1796
+#: mail/mail-callbacks.c:1811
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8864,28 +8864,28 @@ msgstr ""
 "送信フォルダのメッセージだけ\n"
 "再送信することが出来ます"
 
-#: mail/mail-callbacks.c:1810
+#: mail/mail-callbacks.c:1825
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "本当に %d メッセージを再送してもよろしいですか?"
 
-#: mail/mail-callbacks.c:1836
+#: mail/mail-callbacks.c:1851
 msgid "No Message Selected"
 msgstr "選択されたメッセージはありません"
 
-#: mail/mail-callbacks.c:1930
+#: mail/mail-callbacks.c:1945
 msgid "Save Message As..."
 msgstr "メッセージを別名で保存..."
 
-#: mail/mail-callbacks.c:1932
+#: mail/mail-callbacks.c:1947
 msgid "Save Messages As..."
 msgstr "メッセージを別名で保存..."
 
-#: mail/mail-callbacks.c:2101 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2116 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "警告"
 
-#: mail/mail-callbacks.c:2108
+#: mail/mail-callbacks.c:2123
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8897,11 +8897,11 @@ msgstr ""
 "\n"
 "本当にこれらのメッセージを消去しますか?"
 
-#: mail/mail-callbacks.c:2115
+#: mail/mail-callbacks.c:2130
 msgid "Do not ask me again."
 msgstr "二度と質問しない"
 
-#: mail/mail-callbacks.c:2223
+#: mail/mail-callbacks.c:2238
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8910,19 +8910,19 @@ msgstr ""
 "フィルタ情報のロード中にエラー:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2235
+#: mail/mail-callbacks.c:2250
 msgid "Filters"
 msgstr "フィルタ"
 
-#: mail/mail-callbacks.c:2298
+#: mail/mail-callbacks.c:2313
 msgid "Print Message"
 msgstr "メッセージを印刷"
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2359
 msgid "Printing of message failed"
 msgstr "メッセージの印刷に失敗しました"
 
-#: mail/mail-callbacks.c:2446
+#: mail/mail-callbacks.c:2461
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "本当に %d メッセージを別ウィンドウで開いてもよろしいですか?"
@@ -9005,7 +9005,7 @@ msgstr "%s: 受信箱"
 msgid "Checking Service"
 msgstr "サービスをチェック中"
 
-#: mail/mail-config.c:1967 mail/mail-config.c:1970
+#: mail/mail-config.c:1967 mail/mail-config.c:1971
 msgid "Connecting to server..."
 msgstr "サーバへ接続中..."
 
@@ -9124,8 +9124,8 @@ msgstr "草稿"
 msgid "E_nable"
 msgstr "有効(_E)"
 
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "編集..."
 
@@ -9522,107 +9522,107 @@ msgstr "隠す"
 msgid "External Viewer"
 msgstr "外部ビューア"
 
-#: mail/mail-display.c:1135
+#: mail/mail-display.c:1133
 msgid "Loading message content"
 msgstr "メッセージの内容を読み込み中"
 
-#: mail/mail-display.c:1617
+#: mail/mail-display.c:1592
 msgid "Open Link in Browser"
 msgstr "ブラウザでリンクを開く"
 
-#: mail/mail-display.c:1619
+#: mail/mail-display.c:1594
 msgid "Copy Link Location"
 msgstr "場所をコピー"
 
-#: mail/mail-display.c:1622
+#: mail/mail-display.c:1597
 msgid "Save Link as (FIXME)"
 msgstr "リンクを別名で保存"
 
-#: mail/mail-display.c:1625
+#: mail/mail-display.c:1600
 msgid "Save Image as..."
 msgstr "画像の保存..."
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:635
 #, c-format
 msgid "%s attachment"
 msgstr "%s を添付"
 
-#: mail/mail-format.c:676
+#: mail/mail-format.c:680
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME メッセージを解析出来ませんでした, ソースを表示します"
 
-#: mail/mail-format.c:760
+#: mail/mail-format.c:763
 msgid "Date"
 msgstr "日付"
 
-#: mail/mail-format.c:843
+#: mail/mail-format.c:846
 msgid "Bad Address"
 msgstr "悪いアドレス:"
 
-#: mail/mail-format.c:883 mail/message-list.etspec.h:3
+#: mail/mail-format.c:886 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "差出人"
 
-#: mail/mail-format.c:886
+#: mail/mail-format.c:889
 msgid "Reply-To"
 msgstr "返信先"
 
-#: mail/mail-format.c:890 mail/message-list.etspec.h:10
+#: mail/mail-format.c:893 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "宛先"
 
-#: mail/mail-format.c:894
+#: mail/mail-format.c:897
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:898
+#: mail/mail-format.c:901
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:1799
+#: mail/mail-format.c:1812
 #, fuzzy
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr "このメッセージはデジタル署名され信頼できるものです"
 
-#: mail/mail-format.c:1822
+#: mail/mail-format.c:1835
 msgid "Evolution does not recognize this type of signed message."
 msgstr ""
 
-#: mail/mail-format.c:1830
+#: mail/mail-format.c:1843
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "このメッセージはデジタル署名され信頼できるものです"
 
-#: mail/mail-format.c:1838
+#: mail/mail-format.c:1851
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "このメッセージはデジタル署名されたものですが, 信頼を証明出来ません"
 
-#: mail/mail-format.c:2054
+#: mail/mail-format.c:2067
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP サイト (%s) を指しています"
 
-#: mail/mail-format.c:2068
+#: mail/mail-format.c:2081
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2073
+#: mail/mail-format.c:2086
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "ローカルファイル (%s) を指しています"
 
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2115
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "リモートデータ (%s) を指しています"
 
-#: mail/mail-format.c:2110
+#: mail/mail-format.c:2123
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "未知の外部データ (\"%s\" タイプ) を指しています"
 
-#: mail/mail-format.c:2115
+#: mail/mail-format.c:2128
 msgid "Malformed external-body part."
 msgstr ""
 
@@ -9942,16 +9942,16 @@ msgstr "%s のためのパスワードを入力してください"
 msgid "Enter Password"
 msgstr "パスワードを入力してください"
 
-#: mail/mail-tools.c:248
+#: mail/mail-tools.c:255
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "メッセージを転送しました - %s"
 
-#: mail/mail-tools.c:252
+#: mail/mail-tools.c:259
 msgid "Forwarded message"
 msgstr "転送されたメッセージ"
 
-#: mail/mail-tools.c:386
+#: mail/mail-tools.c:393
 msgid "Forwarded Message"
 msgstr "転送されたメッセージ"
 
@@ -9991,11 +9991,11 @@ msgstr ""
 msgid "New VFolder"
 msgstr "新規仮想フォルダ"
 
-#: mail/message-browser.c:123
+#: mail/message-browser.c:212
 msgid "(No subject)"
 msgstr "(件名なし)"
 
-#: mail/message-browser.c:125
+#: mail/message-browser.c:214
 #, c-format
 msgid "%s - Message"
 msgstr "%s - メッセージ"
@@ -10056,7 +10056,7 @@ msgstr "%p %l:%M (%a)"
 msgid "%b %d %Y"
 msgstr "%Y年 %m月 %d日"
 
-#: mail/message-list.c:2330
+#: mail/message-list.c:2334
 msgid "Generating message list"
 msgstr "メッセージリストを作成中"
 
@@ -11783,7 +11783,7 @@ msgid "(Untitled)"
 msgstr "(タイトルなし)"
 
 #: shell/e-shell-importer.c:142
-msgid "Choose the type of importer to run"
+msgid "Choose the type of importer to run:"
 msgstr ""
 
 #: shell/e-shell-importer.c:145
@@ -11800,8 +11800,8 @@ msgstr ""
 "もし分からないなら \"自働\" を選択することが出来，Evolution は解決を試みるで"
 "しょう"
 
-#: shell/e-shell-importer.c:151
-msgid "Please select the information that you would like to import"
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:757
+msgid "Please select the information that you would like to import:"
 msgstr ""
 
 #. Importer isn't ready yet.
@@ -11915,15 +11915,15 @@ msgstr ""
 msgid "From %s:"
 msgstr "%s から:"
 
-#: shell/e-shell-importer.c:1011
+#: shell/e-shell-importer.c:1014
 msgid "Select folder"
 msgstr "フォルダを選択"
 
-#: shell/e-shell-importer.c:1012
+#: shell/e-shell-importer.c:1015
 msgid "Select a destination folder for importing this data"
 msgstr "このデータをインポートする送り先のフォルダを選択してください"
 
-#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1127 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "インポート"
 
@@ -11943,12 +11943,6 @@ msgstr "Evolution メールウィザードインターフェースの初期化が出来ません"
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Evolution メールウィザードインターフェースの初期化が出来ません"
 
-#: shell/e-shell-startup-wizard.c:754
-msgid ""
-"Please select the information\n"
-"that you would like to import"
-msgstr ""
-
 #: shell/e-shell-utils.c:114
 msgid "No folder name specified."
 msgstr "指定されたフォルダはありません"
@@ -12198,7 +12192,7 @@ msgstr "ショートカットの保存中にエラーが発生しました"
 msgid "Shortcuts"
 msgstr "ショートカット"
 
-#: shell/e-storage-set-view.c:644
+#: shell/e-storage-set-view.c:658
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -12400,34 +12394,39 @@ msgid "Specify where to create the folder:"
 msgstr "フォルダを作成する場所を指定してください:"
 
 #: shell/glade/evolution-startup-wizard.glade.h:3
-msgid "First Run Setup Assistant"
-msgstr "初回起動時のセットアップアシスタント"
+#, fuzzy
+msgid "Evolution Setup Assistant"
+msgstr "Evolution インポートアシスタント"
 
 #: shell/glade/evolution-startup-wizard.glade.h:5
-msgid "Importing Data"
-msgstr "データをインポート中"
+#, fuzzy
+msgid "Importing Files"
+msgstr "インポート中"
 
 #: shell/glade/evolution-startup-wizard.glade.h:8
-msgid "Setup Assistant"
-msgstr "アシスタントのセットアップ"
-
-#: shell/glade/evolution-startup-wizard.glade.h:9
 msgid "Timezone "
 msgstr "タイムゾーン "
 
+#: shell/glade/evolution-startup-wizard.glade.h:9
+msgid "Welcome"
+msgstr ""
+
 #: shell/glade/evolution-startup-wizard.glade.h:10
 msgid ""
-"Welcome to the Evolution first run setup assistant\n"
+"Welcome to Evolution. The next few screens will allow\n"
+"Evolution to connect to your email accounts, and to import\n"
+"files from other applications. \n"
 "\n"
-"This assistant will help you get started"
+"Please click the \"Next\" button to continue. "
 msgstr ""
-"Evolutionのセットアップアシスタントへようこそ\n"
-"\n"
-"Evolutionをはじめるお手伝いをします"
 
-#: shell/glade/evolution-startup-wizard.glade.h:13
-msgid "Your configuration is complete."
-msgstr "設定は完了しました"
+#: shell/glade/evolution-startup-wizard.glade.h:15
+msgid ""
+"You have successfully entered all of the information\n"
+"needed to setup Evolution. \n"
+"\n"
+"Click the \"Finish\" button to save your settings. "
+msgstr ""
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -14002,15 +14001,15 @@ msgstr "MTWTFSS"
 msgid "%B %Y"
 msgstr "%Y %B"
 
-#: widgets/misc/e-cell-date-edit.c:230 widgets/misc/e-dateedit.c:438
+#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:438
 msgid "Now"
 msgstr "今"
 
-#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:444
+#: widgets/misc/e-cell-date-edit.c:242 widgets/misc/e-dateedit.c:444
 msgid "Today"
 msgstr "今日"
 
-#: widgets/misc/e-cell-date-edit.c:769
+#: widgets/misc/e-cell-date-edit.c:797
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "時間はフォーマットに入れなければなりません: %s"
@@ -14104,15 +14103,15 @@ msgstr "検索の編集"
 msgid "Save Search"
 msgstr "検索を保存"
 
-#: widgets/misc/e-filter-bar.h:95
+#: widgets/misc/e-filter-bar.h:94
 msgid "Add to Saved Searches"
 msgstr "保存した検索を追加"
 
-#: widgets/misc/e-filter-bar.h:96
+#: widgets/misc/e-filter-bar.h:95
 msgid "Clear"
 msgstr "クリア"
 
-#: widgets/misc/e-filter-bar.h:103
+#: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "すべて表示"
 
@@ -14167,6 +14166,27 @@ msgstr "init_corba(): GNOME を初期化することが出来ませんでした"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo を初期化することが出来ませんでした"
 
+#~ msgid "First Run Setup Assistant"
+#~ msgstr "初回起動時のセットアップアシスタント"
+
+#~ msgid "Importing Data"
+#~ msgstr "データをインポート中"
+
+#~ msgid "Setup Assistant"
+#~ msgstr "アシスタントのセットアップ"
+
+#~ msgid ""
+#~ "Welcome to the Evolution first run setup assistant\n"
+#~ "\n"
+#~ "This assistant will help you get started"
+#~ msgstr ""
+#~ "Evolutionのセットアップアシスタントへようこそ\n"
+#~ "\n"
+#~ "Evolutionをはじめるお手伝いをします"
+
+#~ msgid "Your configuration is complete."
+#~ msgstr "設定は完了しました"
+
 #~ msgid "Notification about your appointment starting on %s and ending on %s"
 #~ msgstr "%s から始まり、%s に終わるアポイントについての通知"