From a73c3fbef6c5089593c63b557498e780b5693a98 Mon Sep 17 00:00:00 2001
From: "Updated ja.po. T.Aihana" <aihana@gnome.gr.jp>
Date: Mon, 10 Jan 2005 15:12:49 +0000
Subject: svn path=/trunk/; revision=28324

2005-01-10 Updated ja.po. T.Aihana <aihana@gnome.gr.jp>

svn path=/trunk/; revision=28324
---
 po/ja.po | 11574 +++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 6363 insertions(+), 5211 deletions(-)

(limited to 'po/ja.po')

diff --git a/po/ja.po b/po/ja.po
index 0690672299..c81ec18071 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,16 +1,16 @@
 # evolution ja.po.
-# Copyright (C) 2000-2004 Free Software Foundation, Inc.
+# Copyright (C) 2000-2005 Free Software Foundation, Inc.
 # Akira TAGOH <tagoh@gnome.gr.jp>, 2000-2001.
 # Yukihiro Nakai <nakai@gnome.gr.jp>, 2001.
 # Takuo KITAME <kitame@debian.org>, 2001.
-# Takeshi AIHANA <aihana@gnome.gr.jp>, 2001-2004.
+# Takeshi AIHANA <aihana@gnome.gr.jp>, 2001-2005.
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-19 00:23+0900\n"
-"PO-Revision-Date: 2004-08-19 00:21+0900\n"
+"POT-Creation-Date: 2005-01-11 00:12+0900\n"
+"PO-Revision-Date: 2005-01-11 00:11+0900\n"
 "Last-Translator: Takeshi AIHANA <aihana@gnome.gr.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
 "MIME-Version: 1.0\n"
@@ -20,37 +20,238 @@ msgstr ""
 
 #: a11y/addressbook/ea-addressbook-view.c:94
 #: a11y/addressbook/ea-addressbook-view.c:103
-#: a11y/addressbook/ea-minicard-view.c:119
+#: a11y/addressbook/ea-minicard-view.c:172
 msgid "evolution addressbook"
 msgstr "evolution アドレス帳"
 
-#: a11y/addressbook/ea-minicard-view.c:101
+#: a11y/addressbook/ea-minicard.c:31
+#: calendar/gui/alarm-notify/alarm-queue.c:863
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "開く"
+
+#: a11y/addressbook/ea-minicard.c:138
+msgid "Contact List: "
+msgstr "連絡先の一覧:"
+
+#: a11y/addressbook/ea-minicard.c:139
+msgid "Contact: "
+msgstr "連絡先: "
+
+#: a11y/addressbook/ea-minicard.c:165
+msgid "evolution minicard"
+msgstr "evolution ミニカード"
+
+#: a11y/addressbook/ea-minicard-view.c:34
+#: addressbook/gui/component/addressbook-component.c:97
+msgid "New Contact"
+msgstr "新しい連絡先"
+
+#: a11y/addressbook/ea-minicard-view.c:35
+#: addressbook/gui/component/addressbook-component.c:105
+msgid "New Contact List"
+msgstr "新しい連絡先一覧"
+
+#: a11y/addressbook/ea-minicard-view.c:153
 msgid "current addressbook folder "
 msgstr "現在のアドレス帳フォルダには"
 
-#: a11y/addressbook/ea-minicard-view.c:102
+#: a11y/addressbook/ea-minicard-view.c:154
 msgid "have "
 msgstr "いくつかの"
 
-#: a11y/addressbook/ea-minicard-view.c:102
+#: a11y/addressbook/ea-minicard-view.c:154
 msgid "has "
 msgstr "一つの"
 
-#: a11y/addressbook/ea-minicard-view.c:104
+#: a11y/addressbook/ea-minicard-view.c:156
 msgid " cards"
 msgstr "カードがあります"
 
-#: a11y/addressbook/ea-minicard-view.c:104
+#: a11y/addressbook/ea-minicard-view.c:156
 msgid " card"
 msgstr "カードがあります"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "連絡先のヘッダ: "
+#: a11y/calendar/ea-cal-view.c:306
+msgid "New Appointment"
+msgstr "新しい予定"
 
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "evolution ミニカード"
+#: a11y/calendar/ea-cal-view.c:307
+msgid "New All Day Event"
+msgstr "新しい終日のイベント"
+
+#: a11y/calendar/ea-cal-view.c:308 calendar/gui/e-calendar-view.c:1366
+msgid "New Meeting"
+msgstr "新しい会議"
+
+#: a11y/calendar/ea-cal-view.c:309
+msgid "Go to Today"
+msgstr "今日へ移動"
+
+#: a11y/calendar/ea-cal-view.c:310
+msgid "Go to Date"
+msgstr "指定日へ移動"
+
+#: a11y/calendar/ea-cal-view-event.c:235
+msgid "alarm "
+msgstr "アラームを鳴らす "
+
+#: a11y/calendar/ea-cal-view-event.c:241
+msgid "recurrence "
+msgstr "繰り返し "
+
+#: a11y/calendar/ea-cal-view-event.c:247
+msgid "time-zone "
+msgstr "タイムゾーン "
+
+#: a11y/calendar/ea-cal-view-event.c:253
+msgid "meeting "
+msgstr "会議 "
+
+#: a11y/calendar/ea-cal-view-event.c:258
+msgid "event. Summary is "
+msgstr "イベント。サマリは "
+
+#: a11y/calendar/ea-cal-view-event.c:269
+msgid "empty"
+msgstr "空です"
+
+#: a11y/calendar/ea-cal-view-event.c:288
+msgid "calendar view event"
+msgstr "カレンダの表示イベント"
+
+#: a11y/calendar/ea-cal-view-event.c:505
+msgid "Grab Focus"
+msgstr "フォーカスの取得"
+
+#: a11y/calendar/ea-day-view.c:147 a11y/calendar/ea-week-view.c:148
+#, c-format
+msgid ", %d event"
+msgstr ", %d 個のイベント"
+
+#: a11y/calendar/ea-day-view.c:147 a11y/calendar/ea-week-view.c:148
+#, c-format
+msgid ", %d events"
+msgstr ", %d 個のイベント"
+
+#: a11y/calendar/ea-day-view.c:150
+msgid "work week view :"
+msgstr "平日ビュー :"
+
+#: a11y/calendar/ea-day-view.c:154
+msgid "day view :"
+msgstr "日間ビュー :"
+
+#: a11y/calendar/ea-day-view.c:181
+msgid "calendar view for a work week"
+msgstr "平日のカレンダ表示"
+
+#: a11y/calendar/ea-day-view.c:183
+msgid "calendar view for one or more days"
+msgstr "一日以上のカレンダ表示"
+
+#: a11y/calendar/ea-day-view-main-item.c:299
+#: a11y/calendar/ea-week-view-main-item.c:301
+msgid "a table to view and select the current time range"
+msgstr "現在時刻の範囲を表示/選択するためのテーブル"
+
+#: a11y/calendar/ea-gnome-calendar.c:187 calendar/gui/calendar-component.c:520
+msgid "%A %d %b %Y"
+msgstr "%Y年 %B%e日 %A"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. %d = day of month, %b = abbreviated month name.
+#. You can change the order but don't change the
+#. specifiers or add anything.
+#: a11y/calendar/ea-gnome-calendar.c:190 calendar/gui/calendar-component.c:523
+#: calendar/gui/e-day-view.c:1511 calendar/gui/e-day-view-top-item.c:719
+#: calendar/gui/e-week-view-main-item.c:321
+msgid "%a %d %b"
+msgstr "%m/%d (%a)"
+
+#: a11y/calendar/ea-gnome-calendar.c:192 a11y/calendar/ea-gnome-calendar.c:197
+#: a11y/calendar/ea-gnome-calendar.c:199 calendar/gui/calendar-component.c:525
+#: calendar/gui/calendar-component.c:530 calendar/gui/calendar-component.c:532
+msgid "%a %d %b %Y"
+msgstr "%Y/%m/%d (%a)"
+
+#: a11y/calendar/ea-gnome-calendar.c:216 a11y/calendar/ea-gnome-calendar.c:222
+#: a11y/calendar/ea-gnome-calendar.c:228 a11y/calendar/ea-gnome-calendar.c:230
+#: calendar/gui/calendar-component.c:544 calendar/gui/calendar-component.c:551
+#: calendar/gui/calendar-component.c:557 calendar/gui/calendar-component.c:559
+msgid "%d %b %Y"
+msgstr "%Y年 %B%e日"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: a11y/calendar/ea-gnome-calendar.c:220 calendar/gui/calendar-component.c:549
+#: calendar/gui/e-day-view.c:1527 calendar/gui/e-day-view-top-item.c:723
+#: calendar/gui/e-week-view-main-item.c:335
+msgid "%d %b"
+msgstr "%B%e日"
+
+#: a11y/calendar/ea-gnome-calendar.c:247 a11y/calendar/ea-gnome-calendar.c:255
+#: calendar/importers/icalendar-importer.c:734
+msgid "Gnome Calendar"
+msgstr "GNOME カレンダ"
+
+#: a11y/calendar/ea-gnome-calendar.c:290
+msgid "search bar"
+msgstr "検索バー"
+
+#: a11y/calendar/ea-gnome-calendar.c:291
+msgid "evolution calendar search bar"
+msgstr "Evolution カレンダの検索バー"
+
+#: a11y/calendar/ea-jump-button.c:149
+msgid "Jump button"
+msgstr "ジャンプ・ボタン"
+
+#: a11y/calendar/ea-jump-button.c:158
+msgid "Click here, you can find more events."
+msgstr "ここをクリックすると、他のイベントを検索できます"
+
+#: a11y/calendar/ea-week-view.c:153
+msgid "month view :"
+msgstr "月間ビュー :"
+
+#: a11y/calendar/ea-week-view.c:158
+msgid "week view :"
+msgstr "週間ビュー :"
+
+#: a11y/calendar/ea-week-view.c:185
+msgid "calendar view for a month"
+msgstr "一ヶ月のカレンダ表示"
+
+#: a11y/calendar/ea-week-view.c:187
+msgid "calendar view for one or more weeks"
+msgstr "一週間以上のカレンダ表示"
+
+#: a11y/widgets/ea-calendar-item.c:293 a11y/widgets/ea-calendar-item.c:299
+msgid " %d %B %Y"
+msgstr "%Y年 %B%e日"
+
+#: a11y/widgets/ea-calendar-item.c:301
+msgid "calendar (from "
+msgstr "カレンダ ("
+
+#: a11y/widgets/ea-calendar-item.c:303
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2261
+msgid " to "
+msgstr " から "
+
+#: a11y/widgets/ea-calendar-item.c:305
+msgid ")"
+msgstr "まで)"
+
+#: a11y/widgets/ea-calendar-item.c:337
+msgid "evolution calendar item"
+msgstr "Evolution カレンダのアイテム"
 
 #. addressbook:ldap-init primary
 #: addressbook/addressbook-errors.xml.h:2
@@ -60,7 +261,7 @@ msgstr "このアドレス帳を開けませんでした。"
 #. addressbook:ldap-init secondary
 #: addressbook/addressbook-errors.xml.h:4
 msgid ""
-"This addressbook server might unreachable or the server name may be "
+"This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
 msgstr ""
 "このアドレス帳サーバとは通信できないか、またはサーバ名が間違っているか、ある"
@@ -118,7 +319,21 @@ msgstr "LDAP サーバが妥当なスキーマ情報を返しませんでした
 msgid "Could not remove addressbook."
 msgstr "アドレス帳を削除できませんでした。"
 
-#. addressbook:remove-addressbook secondary
+#. addressbook:ask-delete-addressbook primary
+#: addressbook/addressbook-errors.xml.h:22
+msgid "Delete address book '{0}'?"
+msgstr "アドレス帳 '{0}' を削除しますか？"
+
+#. addressbook:ask-delete-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "This address book will be removed permanently."
+msgstr "このアドレス帳は完全に削除されます。"
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:26
+msgid "Category editor not available."
+msgstr "カテゴリ・エディタは利用できません。"
+
 #. addressbook:generic-error primary
 #. addressbook:load-error secondary
 #. addressbook:search-error secondary
@@ -130,10 +345,9 @@ msgstr "アドレス帳を削除できませんでした。"
 #. mail:session-message-error-cancel secondary
 #. mail:ask-session-password secondary
 #. mail:filter-load-error secondary
-#: addressbook/addressbook-errors.xml.h:22
-#: addressbook/addressbook-errors.xml.h:26
-#: addressbook/addressbook-errors.xml.h:34
-#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: addressbook/addressbook-errors.xml.h:28
+#: addressbook/addressbook-errors.xml.h:36
+#: addressbook/addressbook-errors.xml.h:40 mail/mail-errors.xml.h:70
 #: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
 #: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
 #: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
@@ -141,57 +355,52 @@ msgstr "アドレス帳を削除できませんでした。"
 msgid "{0}"
 msgstr "{0}"
 
-#. addressbook:edit-categories primary
-#: addressbook/addressbook-errors.xml.h:24
-msgid "Category editor not available."
-msgstr "カテゴリ・エディタは利用できません。"
-
 #. addressbook:generic-error secondary
 #. mail-composer:no-attach secondary
 #. mail:no-save-path secondary
-#: addressbook/addressbook-errors.xml.h:28
+#: addressbook/addressbook-errors.xml.h:30
 #: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
 msgid "{1}"
 msgstr "{1}"
 
 #. addressbook:load-error title
-#: addressbook/addressbook-errors.xml.h:30
+#: addressbook/addressbook-errors.xml.h:32
 msgid "Unable to open addressbook"
 msgstr "アドレス帳を開けません"
 
 #. addressbook:load-error primary
-#: addressbook/addressbook-errors.xml.h:32
+#: addressbook/addressbook-errors.xml.h:34
 msgid "Error loading addressbook."
 msgstr "アドレス帳を読み込む際にエラーが発生しました。"
 
 #. addressbook:search-error primary
-#: addressbook/addressbook-errors.xml.h:36
+#: addressbook/addressbook-errors.xml.h:38
 msgid "Unable to perform search."
 msgstr "検索を実施できません。"
 
 #. addressbook:prompt-save primary
-#: addressbook/addressbook-errors.xml.h:40
+#: addressbook/addressbook-errors.xml.h:42
 msgid "Would you like to save your changes?"
 msgstr "変更した部分を保存しますか？"
 
 #. addressbook:prompt-save secondary
-#: addressbook/addressbook-errors.xml.h:42
+#: addressbook/addressbook-errors.xml.h:44
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "この連絡先を変更しています。これらの変更を保存しますか？"
 
-#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/addressbook-errors.xml.h:45
 msgid "_Discard"
-msgstr "破棄(_D)"
+msgstr "破棄する(_D)"
 
 #. addressbook:prompt-move primary
-#: addressbook/addressbook-errors.xml.h:45
+#: addressbook/addressbook-errors.xml.h:47
 msgid "Cannot move contact."
 msgstr "連絡先を移動できません。"
 
 #. addressbook:prompt-move secondary
-#: addressbook/addressbook-errors.xml.h:47
+#: addressbook/addressbook-errors.xml.h:49
 msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -200,147 +409,173 @@ msgstr ""
 "除できませんでした。連絡先を移動する代わりにコピーでよろしいですか？"
 
 #. addressbook:save-error primary
-#: addressbook/addressbook-errors.xml.h:49
+#: addressbook/addressbook-errors.xml.h:51
 msgid "Unable to save contact(s)."
 msgstr "連絡先を保存できません。"
 
 #. addressbook:save-error secondary
-#: addressbook/addressbook-errors.xml.h:51
+#: addressbook/addressbook-errors.xml.h:53
 msgid "Error saving contacts to {0}: {1}"
 msgstr "連絡先を{0}へ保存する際にエラーが発生しました: {1}"
 
 #. addressbook:backend-died primary
-#: addressbook/addressbook-errors.xml.h:53
+#: addressbook/addressbook-errors.xml.h:55
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "突然 Evolution アドレス帳が終了しました。"
 
 #. addressbook:backend-died secondary
-#: addressbook/addressbook-errors.xml.h:55
+#: addressbook/addressbook-errors.xml.h:57
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "Evolution を再起動するまで、{0}の連絡先は利用できません。"
 
+#. addressbook:ask-list-add-exists primary
+#: addressbook/addressbook-errors.xml.h:59
+msgid "Address '{0}' already exists."
+msgstr "住所 '{0}' が重複しています。"
+
+#. addressbook:ask-list-add-exists secondary
+#: addressbook/addressbook-errors.xml.h:61
+msgid ""
+"A contact already exists with this address.  Would you like to add a new "
+"card with the same address anyway?"
+msgstr ""
+"既に、この住所の連絡先が存在します。とにかく同じ住所で新しい連絡先を追加しま"
+"すか？"
+
+#: addressbook/addressbook-errors.xml.h:62 mail/em-vfolder-rule.c:494
+#: plugins/shared-folder/properties.glade.h:17
+msgid "_Add"
+msgstr "追加する(_A)"
+
 #: addressbook/conduit/address-conduit.c:298
 msgid "Default Sync Address:"
 msgstr "デフォルトで同期するアドレス:"
 
-#: addressbook/conduit/address-conduit.c:1181
-#: addressbook/conduit/address-conduit.c:1182
+#: addressbook/conduit/address-conduit.c:1183
+#: addressbook/conduit/address-conduit.c:1184
 msgid "Could not load addressbook"
 msgstr "アドレス帳を読み込めませんでした"
 
-#: addressbook/conduit/address-conduit.c:1250
-#: addressbook/conduit/address-conduit.c:1253
+#: addressbook/conduit/address-conduit.c:1252
+#: addressbook/conduit/address-conduit.c:1255
 msgid "Could not read pilot's Address application block"
 msgstr "パイロットのアドレス・アプリケーション・ブロックを読み込めませんでした"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr "[CTRL]+[F2]"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr "自動補完"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "C_ontacts"
-msgstr "連絡先(_O)"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "証明書"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure autocomplete here"
-msgstr "ここで自動補完を設定します"
-
-#. Create the contacts group
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/gui/component/addressbook-view.c:1104
-#: calendar/gui/migration.c:377
-msgid "Contacts"
-msgstr "連絡先"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Evolution アドレス帳"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolutoin アドレス帳アドレス・ポップアップ"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution アドレス帳アドレス・ビューア"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution アドレス帳カード・ビューア"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Evolution アドレス帳コンポーネント"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/MIME 証明書管理コントロール"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution フォルダ設定コントロール"
+#: addressbook/gui/component/addressbook.c:98
+msgid "Accessing LDAP Server anonymously"
+msgstr "匿名で LDAP サーバにアクセスします"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr "ここでお使いの S/MIME 型の証明書を管理します"
+#: addressbook/gui/component/addressbook.c:185
+#: camel/providers/groupwise/camel-gw-listener.c:494
+#: plugins/groupwise-account-setup/camel-gw-listener.c:494
+msgid "Failed to authenticate.\n"
+msgstr "認証に失敗しました。\n"
 
-#: addressbook/gui/component/addressbook-component.c:93
-msgid "New Contact"
-msgstr "新しい連絡先"
+#: addressbook/gui/component/addressbook.c:192
+#: camel/providers/groupwise/camel-gw-listener.c:483
+#: plugins/groupwise-account-setup/camel-gw-listener.c:483
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%s%s (ユーザ %s) のパスワードを入力して下さい"
 
-#: addressbook/gui/component/addressbook-component.c:94
+#: addressbook/gui/component/addressbook-component.c:98
 msgid "_Contact"
 msgstr "連絡先(_C)"
 
-#: addressbook/gui/component/addressbook-component.c:95
+#: addressbook/gui/component/addressbook-component.c:99
 msgid "Create a new contact"
 msgstr "新しい連絡先を作成します"
 
-#: addressbook/gui/component/addressbook-component.c:101
-msgid "New Contact List"
-msgstr "新しい連絡先一覧"
-
-#: addressbook/gui/component/addressbook-component.c:102
+#: addressbook/gui/component/addressbook-component.c:106
 msgid "Contact _List"
 msgstr "連絡先の一覧(_L)"
 
-#: addressbook/gui/component/addressbook-component.c:103
+#: addressbook/gui/component/addressbook-component.c:107
 msgid "Create a new contact list"
 msgstr "新しい連絡先一覧を作成します"
 
-#: addressbook/gui/component/addressbook-component.c:109
-#: addressbook/gui/component/addressbook-view.c:773
+#: addressbook/gui/component/addressbook-component.c:113
+#: addressbook/gui/component/addressbook-config.c:1116
+#: addressbook/gui/component/addressbook-view.c:757
 msgid "New Address Book"
 msgstr "新しいアドレス帳"
 
-#: addressbook/gui/component/addressbook-component.c:110
+#: addressbook/gui/component/addressbook-component.c:114
 msgid "Address _Book"
 msgstr "アドレス帳(_B)"
 
-#: addressbook/gui/component/addressbook-component.c:111
+#: addressbook/gui/component/addressbook-component.c:115
 msgid "Create a new address book"
 msgstr "新しいアドレス帳を作成します"
 
-#: addressbook/gui/component/addressbook-component.c:184
+#: addressbook/gui/component/addressbook-component.c:188
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr "アドレス帳の設定または関連フォルダのアップグレードに失敗しました"
 
+#: addressbook/gui/component/addressbook-config.c:315
+msgid "Base"
+msgstr "ベース"
+
+#: addressbook/gui/component/addressbook-config.c:510
+#: calendar/gui/dialogs/calendar-setup.c:191
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+msgid "_Type:"
+msgstr "種類(_T):"
+
+#: addressbook/gui/component/addressbook-config.c:609
+msgid "Copy book content locally for offline operation"
+msgstr "オフライン操作用にアドレス帳の内容をローカルへコピーする"
+
+#: addressbook/gui/component/addressbook-config.c:904
+#: addressbook/gui/component/ldap-config.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.c:361
+#: calendar/gui/dialogs/calendar-setup.c:372
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: mail/em-folder-properties.c:213 mail/mail-config.glade.h:85
+#: smime/gui/smime-ui.glade.h:27
+msgid "General"
+msgstr "全般"
+
+#: addressbook/gui/component/addressbook-config.c:905
+#: mail/importers/pine-importer.c:479
+msgid "Addressbook"
+msgstr "アドレス帳"
+
+#: addressbook/gui/component/addressbook-config.c:909
+msgid "Server Information"
+msgstr "サーバの情報"
+
+#: addressbook/gui/component/addressbook-config.c:911
+msgid "Authentication"
+msgstr "認証"
+
+#: addressbook/gui/component/addressbook-config.c:914
+#: addressbook/gui/component/ldap-config.glade.h:18
+#: mail/mail-dialogs.glade.h:12 smime/gui/smime-ui.glade.h:19
+msgid "Details"
+msgstr "詳細"
+
+#: addressbook/gui/component/addressbook-config.c:915
+msgid "Searching"
+msgstr "検索"
+
+#: addressbook/gui/component/addressbook-config.c:917
+msgid "Downloading"
+msgstr "ダウンロード"
+
+#: addressbook/gui/component/addressbook-config.c:1114
+#: addressbook/gui/component/ldap-config.glade.h:14
+msgid "Address Book Properties"
+msgstr "アドレス帳のプロパティ"
+
 #: addressbook/gui/component/addressbook-migrate.c:72
-#: calendar/gui/migration.c:141 mail/em-migrate.c:1160
+#: calendar/gui/migration.c:142 mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr "移行中..."
 
 #: addressbook/gui/component/addressbook-migrate.c:124
-#: calendar/gui/migration.c:188 mail/em-migrate.c:1201
+#: calendar/gui/migration.c:189 mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr "'%s' の移行中:"
@@ -348,9 +583,9 @@ msgstr "'%s' の移行中:"
 #. create the local source group
 #. On This Computer is always first and VFolders is always last
 #: addressbook/gui/component/addressbook-migrate.c:493
-#: calendar/gui/migration.c:450 calendar/gui/migration.c:532
+#: calendar/gui/migration.c:452 calendar/gui/migration.c:545
 #: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-component.c:245 mail/mail-vfolder.c:218
+#: mail/mail-component.c:270 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "このコンピュータ"
 
@@ -360,9 +595,9 @@ msgstr "このコンピュータ"
 #. orange
 #: addressbook/gui/component/addressbook-migrate.c:501
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: calendar/gui/migration.c:458 calendar/gui/migration.c:540
+#: calendar/gui/migration.c:460 calendar/gui/migration.c:553
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:102
 msgid "Personal"
 msgstr "プライベート"
 
@@ -421,77 +656,136 @@ msgstr ""
 "\n"
 "Evolution がお使いのパイロット同期データを移行している間、少々お待ち下さい..."
 
-#: addressbook/gui/component/addressbook-view.c:671
-#, c-format
-msgid "Address book '%s' will be removed. Are you sure you want to continue?"
-msgstr "アドレス帳 '%s' を削除します。続行してもよろしいですか？"
-
-#: addressbook/gui/component/addressbook-view.c:774
-#: addressbook/gui/widgets/e-addressbook-view.c:1124
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:376
+#: addressbook/gui/component/addressbook-view.c:758
+#: addressbook/gui/widgets/e-addressbook-view.c:934
+#: calendar/gui/calendar-component.c:386 calendar/gui/tasks-component.c:330
 #: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: ui/evolution-calendar.xml.h:5 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
-msgstr "削除"
+msgstr "削除する"
 
-#: addressbook/gui/component/addressbook-view.c:775
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:378
+#: addressbook/gui/component/addressbook-view.c:760
+#: calendar/gui/calendar-component.c:387 calendar/gui/tasks-component.c:331
 msgid "Properties..."
 msgstr "プロパティ..."
 
-#: addressbook/gui/component/addressbook.c:98
-msgid "Accessing LDAP Server anonymously"
-msgstr "匿名で LDAP サーバにアクセスします"
-
-#: addressbook/gui/component/addressbook.c:184
-#: camel/providers/groupwise/camel-gw-listener.c:420
-msgid "Failed to authenticate.\n"
-msgstr "認証に失敗しました。\n"
-
-#: addressbook/gui/component/addressbook.c:191
-#: camel/providers/groupwise/camel-gw-listener.c:409
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%s%s (ユーザ %s) のパスワードを入力して下さい"
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:1118
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: calendar/gui/migration.c:378
+msgid "Contacts"
+msgstr "連絡先"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
-msgid "EFolderList xml for the list of completion uris"
-msgstr "URI の補完に使用する EFolderList (XML 形式) の一覧"
+msgid "EFolderList XML for the list of completion URIs"
+msgstr "URI の補完に使用する EFolderList (XML 形式)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
-msgid "Position of the vertical pane in main view"
-msgstr "メイン表示の垂直ペインの位置"
+msgid "EFolderList XML for the list of completion URIs."
+msgstr "URI の補完に使用する EFolderList (XML 形式) の一覧です。"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
-msgid ""
-"The number of characters that must be typed before evolution will attempt to "
-"autocomplete"
-msgstr "Evolution が自動補完を行う前に入力しておく文字数"
+msgid "Position of the vertical pane in main view"
+msgstr "メイン表示の垂直ペインの位置"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
-msgid "URI for the folder last used in the select names dialog"
-msgstr "名前選択ダイアログで使用する最後のフォルダの URI"
+msgid "Position of the vertical pane in main view."
+msgstr "メイン表示の垂直ペインの位置です。"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Show the \"Preview\" pane"
+msgstr "\"プレビュー\" ウィンドウの表示可否"
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Show the \"Preview\" pane."
+msgstr "\"プレビュー\" ペインを表示します。"
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete"
+msgstr "自動補完に必要な文字数"
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
+msgstr "Evolution が自動補完を行う前に入力しておく必要のある文字数です。"
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
+msgid "URI for the folder last used in the select names dialog"
+msgstr "名前選択ダイアログで最後に使用したフォルダの URI"
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
+msgid "URI for the folder last used in the select names dialog."
+msgstr "名前選択ダイアログで最後に使用したフォルダの URI です。"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Autocompletion"
+msgstr "自動補完"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "C_ontacts"
+msgstr "連絡先(_O)"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Certificates"
+msgstr "証明書"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Configure autocomplete here"
+msgstr "ここで自動補完を設定します"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook"
+msgstr "Evolution アドレス帳"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolutoin アドレス帳アドレス・ポップアップ"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution アドレス帳アドレス・ビューア"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution アドレス帳カード・ビューア"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook component"
+msgstr "Evolution アドレス帳コンポーネント"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution S/MIME 証明書管理コントロール"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution フォルダ設定コントロール"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manage your S/MIME certificates here"
+msgstr "ここでお使いの S/MIME 型の証明書を管理します"
+
+#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
 #: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
-#: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
 #: calendar/gui/dialogs/new-task-list.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
+#: plugins/shared-folder/properties.glade.h:3
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -545,12 +839,8 @@ msgstr "<b>種類:</b>"
 msgid "Add Address Book"
 msgstr "アドレス帳の追加"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
-msgid "Address Book Properties"
-msgstr "アドレス帳のプロパティ"
-
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:15
+#: mail/em-account-editor.c:292
 msgid "Always"
 msgstr "常に"
 
@@ -562,11 +852,6 @@ msgstr "匿名"
 msgid "Basic"
 msgstr "基本"
 
-#: addressbook/gui/component/ldap-config.glade.h:18
-#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
-msgid "Details"
-msgstr "詳細"
-
 #: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
 msgstr "識別名"
@@ -585,18 +870,12 @@ msgstr ""
 msgid "Find Possible Search Bases"
 msgstr "利用可能な検索ベースを検索します"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
-msgid "General"
-msgstr "全般"
-
 #: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Lo_gin:"
 msgstr "ログイン(_G):"
 
-#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:25
+#: mail/em-account-editor.c:290
 msgid "Never"
 msgstr "しない"
 
@@ -684,12 +963,12 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
-"This is the method evolution will use to authenticate you.  Note that "
+"This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
-"これは Evolution があなたを識別する方法です。\"E-メール・アドレス\" に対する"
-"この設定には、LDAP サーバに対する匿名アクセスが必要となります。"
+"これは Evolution があなたを認証する際に使用する方法です。\"E-メール・アドレス"
+"\" に対するこの設定には、LDAP サーバへの匿名アクセスが必要となります。"
 
 #: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
@@ -717,8 +996,8 @@ msgstr "使用する識別名 (DN)"
 msgid "Using email address"
 msgstr "使用する E-メール・アドレス"
 
-#: addressbook/gui/component/ldap-config.glade.h:42 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:156
+#: addressbook/gui/component/ldap-config.glade.h:42
+#: mail/em-account-editor.c:291
 msgid "Whenever Possible"
 msgstr "可能ならば"
 
@@ -739,7 +1018,8 @@ msgid "_Log in method:"
 msgstr "ログイン方式(_L):"
 
 #: addressbook/gui/component/ldap-config.glade.h:47
-#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
+#: calendar/gui/dialogs/calendar-setup.c:243
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "名前(_N):"
 
@@ -768,89 +1048,13 @@ msgid "cards"
 msgstr "カード"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:12
 #: calendar/gui/dialogs/alarm-dialog.glade.h:27
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
-#: mail/mail-config.glade.h:183
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:16
+#: mail/em-account-editor.c:1816 plugins/calendar-http/calendar-http.c:263
 msgid "minutes"
 msgstr "分"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution アドレス帳の名前選択インターフェース"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "全て削除"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:215
-#: addressbook/gui/component/select-names/e-select-names.c:702
-#: calendar/gui/dialogs/cal-prefs-dialog.c:724
-msgid "Remove"
-msgstr "削除する"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:222
-msgid "View Contact List"
-msgstr "連絡先一覧の表示"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:222
-msgid "View Contact Info"
-msgstr "連絡先情報の表示"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:229
-#: addressbook/gui/component/select-names/e-select-names-popup.c:330
-msgid "Send HTML Mail?"
-msgstr "HTML メールを送信しますか？"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
-msgid "Add to Contacts"
-msgstr "連絡先へ追加"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:348
-msgid "Unnamed Contact"
-msgstr "名前なしの連絡先"
-
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "名前"
-
-#: addressbook/gui/component/select-names/e-select-names-table-model.c:351
-#: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:228
-msgid "Source"
-msgstr "情報ソース"
-
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "アドレス帳から連絡先の選択"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "<b>Contacts</b>"
-msgstr "<b>連絡先</b> "
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "<b>Show Contacts</b>"
-msgstr "<b>連絡先の表示</b>"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Address _Book:"
-msgstr "アドレス帳(_B):"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-msgid "C_ategory:"
-msgstr "カテゴリ(_A):"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
-msgid "_Find"
-msgstr "検索(_F)"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "_Search:"
-msgstr "検索(_S):"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>E-メール</b>"
@@ -889,7 +1093,7 @@ msgstr "<b>仕事</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "AIM"
 msgstr "AIM"
 
@@ -923,14 +1127,14 @@ msgstr "会社:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: addressbook/gui/contact-editor/e-contact-editor.c:272
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:172
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "連絡先"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:526
+#: addressbook/gui/contact-editor/e-contact-editor.c:533
 msgid "Contact Editor"
 msgstr "連絡先エディタ"
 
@@ -1022,10 +1226,10 @@ msgstr "ブログ:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:244
 #: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:235
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:147
 msgid "Work"
 msgstr "仕事"
 
@@ -1042,27 +1246,43 @@ msgid "_File under:"
 msgstr "ファイルのグループ(_F);"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
 msgid "_Where:"
 msgstr "ファイルの場所(_W):"
 
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"この連絡先を\n"
+"本当に削除してもよろしいですか？"
+
+#: addressbook/gui/contact-editor/eab-editor.c:322
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"この連絡先を\n"
+"本当に削除してもよろしいですか？"
+
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:352
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Address"
 msgstr "住所"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:293
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:186
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:182
 #: addressbook/gui/widgets/e-addressbook-model.c:309
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
+#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
+#: addressbook/gui/widgets/e-minicard-view.c:519
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: addressbook/gui/widgets/e-minicard-view.c:498
-#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "編集可"
 
@@ -1803,8 +2023,8 @@ msgid "Saint Lucia"
 msgstr "セントルシア"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:320
-msgid "Saint Vincent And The Grena-dines"
-msgstr "セントビンセント・グレナディーン諸島"
+msgid "Saint Vincent And The Grenadines"
+msgstr "セント・ビンセント・グレナディーン諸島"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Samoa"
@@ -2034,65 +2254,43 @@ msgstr "ザンビア"
 msgid "Zimbabwe"
 msgstr "ジンバブエ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL インスタント・メッセンジャ"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
 #: addressbook/gui/contact-editor/e-contact-editor.c:185
-#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/widgets/eab-contact-display.c:349
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo メッセンジャ"
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:351
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "MSN"
+msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
 #: addressbook/gui/contact-editor/e-contact-editor.c:188
-#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/widgets/eab-contact-display.c:348
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "サービス"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Location"
-msgstr "場所"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "ユーザ名"
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "GroupWise"
+msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
 #: addressbook/gui/contact-editor/e-contact-editor.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:231
 msgid "Home"
 msgstr "自宅"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
 #: addressbook/gui/contact-editor/e-contact-editor.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:239
 msgid "Other"
 msgstr "その他"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:338
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:337
-msgid "MSN"
-msgstr "MSN"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
-#: addressbook/gui/widgets/eab-contact-display.c:334
-msgid "GroupWise"
-msgstr "GroupWise"
-
 #: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "元のアドレス帳"
@@ -2109,24 +2307,27 @@ msgstr "新しい連絡先です"
 msgid "Writable Fields"
 msgstr "書き込み可能な項目"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:300
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+msgid "Required Fields"
+msgstr "必須の項目"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:307
 msgid "Changed"
 msgstr "変更済"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2428
+#: addressbook/gui/contact-editor/e-contact-editor.c:2463
 msgid "This contact belongs to these categories:"
 msgstr "この連絡先が属しているカテゴリ:"
 
-#. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2505
+#: addressbook/gui/contact-editor/e-contact-editor.c:2556
 msgid "Please select an image for this contact"
 msgstr "この連絡先の画像を選択して下さい"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2509
+#: addressbook/gui/contact-editor/e-contact-editor.c:2557
 msgid "No image"
 msgstr "画像なし"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2712
+#: addressbook/gui/contact-editor/e-contact-editor.c:2833
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2134,10 +2335,38 @@ msgstr ""
 "連絡先データが間違っています:\n"
 "\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2740
+#: addressbook/gui/contact-editor/e-contact-editor.c:2885
 msgid "Invalid contact."
 msgstr "連絡先が正しくありません。"
 
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+#: plugins/plugin-manager/plugin-manager.c:44
+#: plugins/save-attachments/save-attachments.c:362
+msgid "Name"
+msgstr "名前"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL インスタント・メッセンジャ"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo メッセンジャ"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "サービス"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:587
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Location"
+msgstr "場所"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "ユーザ名"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "連絡先の簡易追加"
@@ -2147,7 +2376,7 @@ msgid "_Edit Full"
 msgstr "全て編集(_E)"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:156
 msgid "_Full Name:"
 msgstr "氏名(_F):"
 
@@ -2155,22 +2384,6 @@ msgstr "氏名(_F):"
 msgid "E-_mail:"
 msgstr "E-メール(_M):"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"この連絡先を\n"
-"本当に削除してもよろしいですか？"
-
-#: addressbook/gui/contact-editor/eab-editor.c:322
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"この連絡先を\n"
-"本当に削除してもよろしいですか？"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "住所２(_2):"
@@ -2297,62 +2510,56 @@ msgid "Add an email to the List"
 msgstr "E-メールを一覧へ追加する"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:819
+msgid "Contact List Editor"
+msgstr "連絡先一覧エディタ"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Insert email adresses from Adress Book"
 msgstr "アドレス帳から E-メール・アドレスを挿入する"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:714
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:709
 msgid "Members"
 msgstr "メンバー"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "Remove an email address from the List"
 msgstr "一覧から E-メール・アドレスを削除する"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "Select"
 msgstr "選択"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_Hide addresses when sending mail to this list"
 msgstr "メールをこの一覧に送付したらアドレスを隠す(_H)"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_List name:"
 msgstr "一覧の名前(_L):"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 "E-メール・アドレスを入力するか、連絡先を下の一覧の中にドラッグして下さい:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
-#: smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr "dialog1"
-
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:165
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:161
 #: addressbook/gui/widgets/e-addressbook-model.c:295
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:221
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:377
+#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-minicard-view.c:505
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
-#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "書籍"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:179
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:175
 msgid "Is New List"
 msgstr "新しい一覧です"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:736
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr "必須の参加者"
-
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:813
-msgid "Contact List Editor"
-msgstr "連絡先一覧エディタ"
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:712
+msgid "Contact List Members"
+msgstr "連絡先一覧のメンバ"
 
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
@@ -2392,800 +2599,802 @@ msgstr ""
 "既にこのフォルダにあります。追加してもよろしいですか？"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:170
+#: addressbook/gui/search/e-addressbook-search-dialog.c:160
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "拡張検索"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
-msgid "No contacts"
-msgstr "連絡先なし"
+#: addressbook/gui/widgets/eab-contact-display.c:133
+#: addressbook/gui/widgets/eab-contact-display.c:196
+msgid "(map)"
+msgstr "(マップ)"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:151
-#, c-format
-msgid "%d contact"
-msgid_plural "%d contacts"
-msgstr[0] "連絡先 %d個"
-msgstr[1] "連絡先 %d個"
+#: addressbook/gui/widgets/eab-contact-display.c:143
+#: addressbook/gui/widgets/eab-contact-display.c:209
+msgid "map"
+msgstr "マップ"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:302
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:235
-#: addressbook/gui/widgets/e-minicard-view-widget.c:112
-#: addressbook/gui/widgets/e-minicard-view.c:491
-msgid "Query"
-msgstr "問い合わせ"
+#: addressbook/gui/widgets/eab-contact-display.c:274
+#: addressbook/gui/widgets/eab-contact-display.c:541
+msgid "List Members"
+msgstr "メンバーのリスト化"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:445
-msgid "Error getting book view"
-msgstr "ブックビューの取得でエラーが発生しました"
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:339
+msgid "E-mail"
+msgstr "E-メール"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
-msgid "Model"
-msgstr "モデル"
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "組織"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
-msgid "Error modifying card"
-msgstr "カードの修正中にエラーが発生しました"
+#: addressbook/gui/widgets/eab-contact-display.c:361
+msgid "Position"
+msgstr "役職"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-msgid "Name begins with"
-msgstr "名前が次のもので始まる"
+#: addressbook/gui/widgets/eab-contact-display.c:362
+msgid "Video Conferencing"
+msgstr "ビデオ会議"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:168
-msgid "Email begins with"
-msgstr "E-メールが次のもので始まる"
+#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:378
+msgid "Phone"
+msgstr "電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:169
-#: calendar/gui/cal-search-bar.c:54
-msgid "Category is"
-msgstr "カテゴリが次のものを含む"
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Fax"
+msgstr "FAX"
 
-#. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:170
-#: calendar/gui/cal-search-bar.c:49
-msgid "Any field contains"
-msgstr "項目が次のものを含む"
+#: addressbook/gui/widgets/eab-contact-display.c:368
+msgid "work"
+msgstr "仕事"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:171
-#: addressbook/gui/widgets/e-addressbook-view.c:176
-msgid "Advanced..."
-msgstr "拡張..."
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "WWW"
+msgstr "ウェブ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:242
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
-#: calendar/gui/e-meeting-list-view.c:227
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
-msgid "Type"
-msgstr "種類"
+#: addressbook/gui/widgets/eab-contact-display.c:376
+#: addressbook/gui/widgets/eab-contact-display.c:595
+msgid "Blog"
+msgstr "Blog"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:544
-msgid "Address Book"
-msgstr "アドレス帳"
+#: addressbook/gui/widgets/eab-contact-display.c:379
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "携帯電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1108
-#: addressbook/gui/widgets/e-addressbook-view.c:2098
-#: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard..."
-msgstr "vCard 形式で保存..."
+#: addressbook/gui/widgets/eab-contact-display.c:383
+msgid "personal"
+msgstr "プライベート"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1095
-msgid "New Contact..."
-msgstr "新しい連絡先..."
+#: addressbook/gui/widgets/eab-contact-display.c:390
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "ノート"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1096
-msgid "New Contact List..."
-msgstr "新しい連絡先一覧..."
+#: addressbook/gui/widgets/eab-contact-display.c:556
+msgid "Job Title"
+msgstr "職業"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1099
-msgid "Go to Folder..."
-msgstr "フォルダへ移動..."
+#: addressbook/gui/widgets/eab-contact-display.c:560
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "メール"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1100
-msgid "Import..."
-msgstr "インポート..."
+#: addressbook/gui/widgets/eab-contact-display.c:587
+msgid "Home page"
+msgstr "ホームページ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1102
-msgid "Search for Contacts..."
-msgstr "連絡先の検索..."
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr "成功"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1103
-msgid "Address Book Sources..."
-msgstr "アドレス帳のソース..."
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr "バックエンドが動作中です"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1105
-msgid "Pilot Settings..."
-msgstr "パイロットの設定..."
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr "オフライン・リポジトリ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1109
-#: ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr "この連絡先の転送"
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Address Book does not exist"
+msgstr "アドレス帳がありません"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1110
-msgid "Send Message to Contact"
-msgstr "この連絡先へメッセージの送信"
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+msgid "No Self Contact defined"
+msgstr "自分の連絡先が定義されていません"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1111 calendar/gui/print.c:2480
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
-#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "印刷"
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr "権限がありません"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1113
-msgid "Print Envelope"
-msgstr "宛名の印刷"
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Contact not found"
+msgstr "連絡先が見つかりません"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1117
-msgid "Copy to Address Book..."
-msgstr "アドレス帳へコピー..."
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact ID already exists"
+msgstr "既に連絡先 ID があります"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1118
-msgid "Move to Address Book..."
-msgstr "アドレス帳へ移動..."
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr "プロトコルがサポートされていません"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1121
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "切り取り"
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:232
+#: calendar/gui/e-calendar-table.c:457 calendar/gui/e-cal-model-tasks.c:347
+#: calendar/gui/e-cal-model-tasks.c:660 calendar/gui/print.c:2352
+#: camel/camel-net-utils.c:446 camel/camel-net-utils.c:608
+#: camel/camel-net-utils.c:739 camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:520
+msgid "Cancelled"
+msgstr "キャンセル済み"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1122
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:374
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "コピー"
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+msgid "Could not cancel"
+msgstr "キャンセルできませんでした"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1123
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "貼り付け"
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#: calendar/gui/comp-editor-factory.c:431
+msgid "Authentication Failed"
+msgstr "認証に失敗しました"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1128
-#: calendar/gui/e-calendar-view.c:1418
-msgid "Current View"
-msgstr "現在の表示"
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Required"
+msgstr "認証を必要としています"
 
-#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1683
-#: calendar/gui/cal-search-bar.c:358
-msgid "Any Category"
-msgstr "任意のカテゴリ"
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr "TLS は無効です"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "Assistant"
-msgstr "アシスタント"
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+msgid "No such source"
+msgstr "そのようなソースはありません"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant Phone"
-msgstr "アシスタントの電話"
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr "その他のエラー"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
-msgid "Business Fax"
-msgstr "仕事の FAX"
+#: addressbook/gui/widgets/eab-gui-util.c:90
+msgid ""
+"We were unable to open this addressbook. This either means this book is not "
+"marked for offline usage or not yet downloaded for offline usage. Please "
+"load the addressbook once in online mode to download its contents"
+msgstr ""
+"このアドレス帳を開けませんでした。その原因は、このアドレス帳がオフライン用と"
+"してマークされていないか、オフライン用に未だダウンロードしていないかのどちら"
+"かです。オンラインでアドレス帳を一回読み込んでアドレス帳の内容をダウンロード"
+"して下さい。"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Phone"
-msgstr "仕事の電話"
+#: addressbook/gui/widgets/eab-gui-util.c:98
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+"このアドレス帳を開けませんでした。パスの存在とアクセス権をチェックして下さ"
+"い。"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-msgid "Business Phone 2"
-msgstr "仕事の電話２"
+#: addressbook/gui/widgets/eab-gui-util.c:105
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"このアドレス帳を開けませんでした。これは誤った URI を指定したか、または LDAP "
+"サーバがダウンしていることをを意味します。"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-msgid "Callback Phone"
-msgstr "得意先の電話"
+#: addressbook/gui/widgets/eab-gui-util.c:110
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"このバージョンの Evolution は LDAP サポート無しでコンパイルされています。"
+"Evolution で LDAP を利用するには、LDAP を有効にした Evolution パッケージをイ"
+"ンストールする必要があります。"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
-msgid "Car Phone"
-msgstr "車載電話"
+#: addressbook/gui/widgets/eab-gui-util.c:117
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"このアドレス帳を開けませんでした。これは誤った URI を指定したか、またはサーバ"
+"がダウンしていることを意味します。"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:3
-msgid "Categories"
-msgstr "カテゴリ"
+#: addressbook/gui/widgets/eab-gui-util.c:137
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+"検索結果を返す側のサーバか表示する側の Evolution のどちらかを越えて、\n"
+"複数のカードがこの問い合わせに一致しました。\n"
+"更にキーワードを指定して絞り込み検索するか、このアドレス帳の\n"
+"ディレクトリ・サーバの設定で検索結果の制限を上げて下さい。"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-msgid "Company Phone"
-msgstr "会社の電話"
+#: addressbook/gui/widgets/eab-gui-util.c:143
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+"この検索にかかった所要時間が、サーバの制限時間または\n"
+"このアドレス帳に対して設定した制限時間を越えました。\n"
+"更にキーワードを指定して絞り込み検索するか、このアドレス帳の\n"
+"ディレクトリ・サーバの設定で検索結果の制限を上げて下さい。"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:547 smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "メール"
+#: addressbook/gui/widgets/eab-gui-util.c:149
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr "このアドレス帳のバックエンドは、この問い合わせを解析できませんでした。"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "メール２"
+#: addressbook/gui/widgets/eab-gui-util.c:152
+msgid "The backend for this addressbook refused to perform this query."
+msgstr "このアドレス帳のバックエンドは、この問い合わせの実行を拒否しました。"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "メール３"
+#: addressbook/gui/widgets/eab-gui-util.c:155
+msgid "This query did not complete successfully."
+msgstr "この問い合わせは完全に終了しませんでした。"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
-msgid "Family Name"
-msgstr "苗字"
+#: addressbook/gui/widgets/eab-gui-util.c:177
+msgid "Error adding list"
+msgstr "一覧を追加する際にエラーが発生しました"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
-msgid "File As"
-msgstr "別名"
+#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:650
+msgid "Error adding contact"
+msgstr "連絡先を追加する際にエラーが発生しました"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Given Name"
-msgstr "ファーストネーム"
+#: addressbook/gui/widgets/eab-gui-util.c:188
+msgid "Error modifying list"
+msgstr "一覧を修正する際にエラーが発生しました"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Home Fax"
-msgstr "自宅の FAX"
+#: addressbook/gui/widgets/eab-gui-util.c:188
+msgid "Error modifying contact"
+msgstr "連絡先を修正する際にエラーが発生しました"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-msgid "Home Phone"
-msgstr "自宅の電話"
+#: addressbook/gui/widgets/eab-gui-util.c:200
+msgid "Error removing list"
+msgstr "一覧を削除する際にエラーが発生しました"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
-msgid "Home Phone 2"
-msgstr "自宅の電話２"
+#: addressbook/gui/widgets/eab-gui-util.c:200
+#: addressbook/gui/widgets/eab-gui-util.c:608
+msgid "Error removing contact"
+msgstr "連絡先を削除する際にエラーが発生しました"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-msgid "ISDN Phone"
-msgstr "ISDN 電話"
+#: addressbook/gui/widgets/eab-gui-util.c:282
+#, c-format
+msgid ""
+"Opening %d contact will open %d new window as well.\n"
+"Do you really want to display this contact?"
+msgid_plural ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr[0] ""
+"%d 個の連絡先を %d 個の新しいウィンドウで開くことになります。\n"
+"本当にこの連絡先を表示してもよろしいですか？"
+msgstr[1] ""
+"%d 個の連絡先を %d 個の新しいウィンドウで開くことになります。\n"
+"本当に全ての連絡先を表示してもよろしいですか？"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
-msgid "Journal"
-msgstr "ジャーナル"
+#: addressbook/gui/widgets/eab-gui-util.c:311
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"既に %s があります。\n"
+"上書きしてもよろしいですか？"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "Manager"
-msgstr "マネージャ"
+#: addressbook/gui/widgets/eab-gui-util.c:315
+msgid "Overwrite"
+msgstr "上書き"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:366
-msgid "Mobile Phone"
-msgstr "携帯電話"
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:393
+msgid "card.vcf"
+msgstr "card.vcf"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-msgid "Nickname"
-msgstr "あだ名"
+#: addressbook/gui/widgets/eab-gui-util.c:555
+msgid "list"
+msgstr "一覧"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:377
-msgid "Note"
-msgstr "ノート"
+#: addressbook/gui/widgets/eab-gui-util.c:704
+msgid "Move contact to"
+msgstr "連絡先の移動先"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Office"
-msgstr "事務所"
+#: addressbook/gui/widgets/eab-gui-util.c:706
+msgid "Copy contact to"
+msgstr "連絡先のコピー先"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:347
-msgid "Organization"
-msgstr "組織"
+#: addressbook/gui/widgets/eab-gui-util.c:709
+msgid "Move contacts to"
+msgstr "複数の連絡先の移動先"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Other Fax"
-msgstr "その他の FAX"
+#: addressbook/gui/widgets/eab-gui-util.c:711
+msgid "Copy contacts to"
+msgstr "複数の連絡先のコピー先"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-msgid "Other Phone"
-msgstr "その他の電話"
+#: addressbook/gui/widgets/eab-gui-util.c:714
+msgid "Select target addressbook."
+msgstr "アドレス帳の選択"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
-msgid "Pager"
-msgstr "ポケベル"
+#: addressbook/gui/widgets/eab-gui-util.c:937
+msgid "Multiple VCards"
+msgstr "複数の vCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
-msgid "Primary Phone"
-msgstr "電話"
+#: addressbook/gui/widgets/eab-gui-util.c:940
+#, c-format
+msgid "VCard for %s"
+msgstr "%s の vCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
-msgid "Radio"
-msgstr "ラジオ"
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * contact.
+#.
+#: addressbook/gui/widgets/eab-popup-control.c:198
+msgid "(none)"
+msgstr "(なし)"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:234
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "役割"
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr "E-メール"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Spouse"
-msgstr "配偶者"
+#: addressbook/gui/widgets/eab-popup-control.c:441
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "メール２"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
-msgid "TTYTDD"
-msgstr "TTYTDD"
+#: addressbook/gui/widgets/eab-popup-control.c:451
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "メール３"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Telex"
-msgstr "テレックス"
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr "操作の選択"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "Title"
-msgstr "敬称 (前つけ)"
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "新しい連絡先 \"%s\" の生成"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-msgid "Unit"
-msgstr "単位"
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "既存の連絡先 \"%s\" へのアドレスの追加"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Web Site"
-msgstr "ウェブ・サイト"
+#: addressbook/gui/widgets/eab-popup-control.c:869
+msgid "Querying Address Book..."
+msgstr "アドレス帳の問い合わせ中..."
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:137
-msgid "Width"
-msgstr "幅"
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr "連絡先情報の編集"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:144
-msgid "Height"
-msgstr "高さ"
+#: addressbook/gui/widgets/eab-popup-control.c:982
+msgid "Add to Contacts"
+msgstr "連絡先へ追加"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:152
-msgid "Has Focus"
-msgstr "フォーカスあり"
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr "E-メール・アドレスの結合"
 
-#: addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "項目"
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "と他に %d 個の連絡先"
+msgstr[1] "と他に %d 個の連絡先"
 
-#: addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "項目名"
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:272
+msgid "Show Full VCard"
+msgstr "全ての vCard の表示"
 
-#: addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "テキスト・モデル"
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "コンパクト vCard の表示"
 
-#: addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "項目名の最大長"
+#: addressbook/gui/widgets/eab-vcard-control.c:277
+msgid "Save in addressbook"
+msgstr "アドレス帳に保存"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "カラムの幅"
+#: addressbook/gui/widgets/e-addressbook-model.c:148
+msgid "No contacts"
+msgstr "連絡先なし"
 
-#: addressbook/gui/widgets/e-minicard-view.c:164
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view.\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"このビューの中に表示できるアイテムはありません。\n"
-"\n"
-"ダブルクリックをして新しい連絡先を作成して下さい。"
+#: addressbook/gui/widgets/e-addressbook-model.c:151
+#, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "連絡先 %d個"
+msgstr[1] "連絡先 %d個"
 
-#: addressbook/gui/widgets/e-minicard-view.c:167
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view."
-msgstr ""
-"\n"
-"\n"
-"このビューの中に表示できるアイテムはありません。"
+#: addressbook/gui/widgets/e-addressbook-model.c:302
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
+#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-minicard-view.c:512
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+msgid "Query"
+msgstr "問い合わせ"
 
-#: addressbook/gui/widgets/e-minicard-view.c:477
-msgid "Adapter"
-msgstr "アダプタ"
+#: addressbook/gui/widgets/e-addressbook-model.c:445
+msgid "Error getting book view"
+msgstr "ブックビューの取得でエラーが発生しました"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "選択済"
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
+msgid "Model"
+msgstr "モデル"
 
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "カーソルあり"
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+msgid "Error modifying card"
+msgstr "カードの修正中にエラーが発生しました"
 
-#: addressbook/gui/widgets/eab-contact-display.c:133
-#: addressbook/gui/widgets/eab-contact-display.c:196
-msgid "(map)"
-msgstr "(マップ)"
+#: addressbook/gui/widgets/e-addressbook-view.c:168
+msgid "Name begins with"
+msgstr "名前が次のもので始まる"
 
-#: addressbook/gui/widgets/eab-contact-display.c:143
-#: addressbook/gui/widgets/eab-contact-display.c:209
-msgid "map"
-msgstr "マップ"
+#: addressbook/gui/widgets/e-addressbook-view.c:169
+msgid "Email begins with"
+msgstr "E-メールが次のもので始まる"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
-#: addressbook/gui/widgets/eab-contact-display.c:528
-msgid "List Members"
-msgstr "メンバーのリスト化"
+#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: calendar/gui/cal-search-bar.c:53
+msgid "Category is"
+msgstr "カテゴリが次のものを含む"
 
-#: addressbook/gui/widgets/eab-contact-display.c:324
-#: addressbook/gui/widgets/eab-contact-display.c:326
-msgid "E-mail"
-msgstr "E-メール"
+#. We attach subitems below
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: calendar/gui/cal-search-bar.c:48
+msgid "Any field contains"
+msgstr "項目が次のものを含む"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
-msgid "Position"
-msgstr "役職"
+#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:177
+msgid "Advanced..."
+msgstr "拡張..."
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-msgid "Video Conferencing"
-msgstr "ビデオ会議"
+#: addressbook/gui/widgets/e-addressbook-view.c:229
+msgid "Source"
+msgstr "情報ソース"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
-#: addressbook/gui/widgets/eab-contact-display.c:365
-msgid "Phone"
-msgstr "電話"
+#: addressbook/gui/widgets/e-addressbook-view.c:243
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-meeting-list-view.c:244
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+msgid "Type"
+msgstr "種類"
 
-#: addressbook/gui/widgets/eab-contact-display.c:351
-msgid "Fax"
-msgstr "FAX"
+#: addressbook/gui/widgets/e-addressbook-view.c:540
+#: plugins/shared-folder/properties.glade.h:6
+msgid "Address Book"
+msgstr "アドレス帳"
 
-#: addressbook/gui/widgets/eab-contact-display.c:355
-msgid "work"
-msgstr "仕事"
+#: addressbook/gui/widgets/e-addressbook-view.c:803
+#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:1972
+#: ui/evolution-addressbook.xml.h:19
+msgid "Save as VCard..."
+msgstr "vCard 形式で保存..."
 
-#: addressbook/gui/widgets/eab-contact-display.c:362
-msgid "WWW"
-msgstr "ウェブ"
+#: addressbook/gui/widgets/e-addressbook-view.c:917
+msgid "New Contact..."
+msgstr "新しい連絡先..."
 
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/eab-contact-display.c:582
-msgid "Blog"
-msgstr "Blog"
+#: addressbook/gui/widgets/e-addressbook-view.c:918
+msgid "New Contact List..."
+msgstr "新しい連絡先一覧..."
 
-#: addressbook/gui/widgets/eab-contact-display.c:370
-msgid "personal"
-msgstr "プライベート"
+#: addressbook/gui/widgets/e-addressbook-view.c:922
+#: ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr "この連絡先の転送"
 
-#: addressbook/gui/widgets/eab-contact-display.c:543
-msgid "Job Title"
-msgstr "職業"
+#: addressbook/gui/widgets/e-addressbook-view.c:923
+msgid "Send Message to Contact"
+msgstr "この連絡先へメッセージの送信"
 
-#: addressbook/gui/widgets/eab-contact-display.c:574
-msgid "Home page"
-msgstr "ホームページ"
+#: addressbook/gui/widgets/e-addressbook-view.c:924 calendar/gui/print.c:2483
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "印刷"
 
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "成功"
+#: addressbook/gui/widgets/e-addressbook-view.c:927
+msgid "Copy to Address Book..."
+msgstr "アドレス帳へコピー..."
 
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr "バックエンドが動作中です"
+#: addressbook/gui/widgets/e-addressbook-view.c:928
+msgid "Move to Address Book..."
+msgstr "アドレス帳へ移動..."
 
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "オフライン・リポジトリ"
+#: addressbook/gui/widgets/e-addressbook-view.c:931
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "切り取り"
 
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-msgid "Address Book does not exist"
-msgstr "アドレス帳がありません"
+#: addressbook/gui/widgets/e-addressbook-view.c:932
+#: calendar/gui/calendar-component.c:385 calendar/gui/tasks-component.c:329
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "コピー"
 
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
-msgid "No Self Contact defined"
-msgstr "自分の連絡先が定義されていません"
+#: addressbook/gui/widgets/e-addressbook-view.c:933
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "貼り付け"
 
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Permission denied"
-msgstr "権限がありません"
+#. All, unmatched, separator
+#: addressbook/gui/widgets/e-addressbook-view.c:1526
+#: calendar/gui/cal-search-bar.c:346
+msgid "Any Category"
+msgstr "任意のカテゴリ"
 
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact not found"
-msgstr "連絡先が見つかりません"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "Assistant"
+msgstr "アシスタント"
 
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Contact ID already exists"
-msgstr "既に連絡先 ID があります"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant Phone"
+msgstr "アシスタントの電話"
 
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr "プロトコルがサポートされていません"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Business Fax"
+msgstr "仕事の FAX"
 
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
-#: calendar/gui/e-calendar-table.c:473 calendar/gui/print.c:2349
-#: camel/camel-service.c:724 camel/camel-service.c:762
-#: camel/camel-service.c:846 camel/camel-service.c:886
-#: camel/providers/pop3/camel-pop3-store.c:456
-#: camel/providers/pop3/camel-pop3-store.c:537
-msgid "Cancelled"
-msgstr "キャンセル済み"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Phone"
+msgstr "仕事の電話"
 
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Could not cancel"
-msgstr "キャンセルできませんでした"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Business Phone 2"
+msgstr "仕事の電話２"
 
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Failed"
-msgstr "認証に失敗しました"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Callback Phone"
+msgstr "得意先の電話"
 
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr "認証を必要としています"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Car Phone"
+msgstr "車載電話"
 
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-msgid "TLS not Available"
-msgstr "TLS は無効です"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "Categories"
+msgstr "カテゴリ"
 
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "No such source"
-msgstr "そのようなソースはありません"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Company Phone"
+msgstr "会社の電話"
 
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "その他のエラー"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "苗字"
 
-#: addressbook/gui/widgets/eab-gui-util.c:91
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"このアドレス帳を開けませんでした。パスの存在とアクセス権をチェックして下さ"
-"い。"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+msgid "File As"
+msgstr "別名"
 
-#: addressbook/gui/widgets/eab-gui-util.c:98
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"このアドレス帳を開けませんでした。これは誤った URI を指定したか、または LDAP "
-"サーバがダウンしていることをを意味します。"
-
-#: addressbook/gui/widgets/eab-gui-util.c:103
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-"このバージョンの Evolution は LDAP サポート無しでコンパイルされています。"
-"Evolution で LDAP を利用するには、LDAP を有効にした Evolution パッケージをイ"
-"ンストールする必要があります。"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+msgid "Given Name"
+msgstr "ファーストネーム"
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"このアドレス帳を開けませんでした。これは誤った URI を指定したか、またはサーバ"
-"がダウンしていることを意味します。"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Home Fax"
+msgstr "自宅の FAX"
 
-#: addressbook/gui/widgets/eab-gui-util.c:130
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-"検索結果を返す側のサーバか表示する側の Evolution のどちらかを越えて、\n"
-"複数のカードがこの問い合わせに一致しました。\n"
-"更にキーワードを指定して絞り込み検索するか、このアドレス帳の\n"
-"ディレクトリ・サーバの設定で検索結果の制限を上げて下さい。"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Phone"
+msgstr "自宅の電話"
 
-#: addressbook/gui/widgets/eab-gui-util.c:136
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-"この検索にかかった所要時間が、サーバの制限時間または\n"
-"このアドレス帳に対して設定した制限時間を越えました。\n"
-"更にキーワードを指定して絞り込み検索するか、このアドレス帳の\n"
-"ディレクトリ・サーバの設定で検索結果の制限を上げて下さい。"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+msgid "Home Phone 2"
+msgstr "自宅の電話２"
 
-#: addressbook/gui/widgets/eab-gui-util.c:142
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr "このアドレス帳のバックエンドは、この問い合わせを解析できませんでした。"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "ISDN Phone"
+msgstr "ISDN 電話"
 
-#: addressbook/gui/widgets/eab-gui-util.c:145
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "このアドレス帳のバックエンドは、この問い合わせの実行を拒否しました。"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Journal"
+msgstr "ジャーナル"
 
-#: addressbook/gui/widgets/eab-gui-util.c:148
-msgid "This query did not complete successfully."
-msgstr "この問い合わせは完全に終了しませんでした。"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+msgid "Manager"
+msgstr "マネージャ"
 
-#: addressbook/gui/widgets/eab-gui-util.c:170
-msgid "Error adding list"
-msgstr "一覧を追加する際にエラーが発生しました"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Nickname"
+msgstr "あだ名"
 
-#: addressbook/gui/widgets/eab-gui-util.c:170
-#: addressbook/gui/widgets/eab-gui-util.c:643
-msgid "Error adding contact"
-msgstr "連絡先を追加する際にエラーが発生しました"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Office"
+msgstr "事務所"
 
-#: addressbook/gui/widgets/eab-gui-util.c:181
-msgid "Error modifying list"
-msgstr "一覧を修正する際にエラーが発生しました"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Other Fax"
+msgstr "その他の FAX"
 
-#: addressbook/gui/widgets/eab-gui-util.c:181
-msgid "Error modifying contact"
-msgstr "連絡先を修正する際にエラーが発生しました"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Phone"
+msgstr "その他の電話"
 
-#: addressbook/gui/widgets/eab-gui-util.c:193
-msgid "Error removing list"
-msgstr "一覧を削除する際にエラーが発生しました"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+msgid "Pager"
+msgstr "ポケベル"
 
-#: addressbook/gui/widgets/eab-gui-util.c:193
-#: addressbook/gui/widgets/eab-gui-util.c:601
-msgid "Error removing contact"
-msgstr "連絡先を削除する際にエラーが発生しました"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Primary Phone"
+msgstr "電話"
 
-#: addressbook/gui/widgets/eab-gui-util.c:275
-#, c-format
-msgid ""
-"Opening %d contact will open %d new window as well.\n"
-"Do you really want to display this contact?"
-msgid_plural ""
-"Opening %d contacts will open %d new windows as well.\n"
-"Do you really want to display all of these contacts?"
-msgstr[0] ""
-"%d 個の連絡先を %d 個の新しいウィンドウで開くことになります。\n"
-"本当にこの連絡先を表示してもよろしいですか？"
-msgstr[1] ""
-"%d 個の連絡先を %d 個の新しいウィンドウで開くことになります。\n"
-"本当に全ての連絡先を表示してもよろしいですか？"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+msgid "Radio"
+msgstr "ラジオ"
 
-#: addressbook/gui/widgets/eab-gui-util.c:304
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"既に %s があります。\n"
-"上書きしてもよろしいですか？"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:251
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "役割"
 
-#: addressbook/gui/widgets/eab-gui-util.c:308
-msgid "Overwrite"
-msgstr "上書き"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+msgid "Spouse"
+msgstr "配偶者"
 
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:386
-msgid "card.vcf"
-msgstr "card.vcf"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+msgid "TTYTDD"
+msgstr "TTYTDD"
 
-#: addressbook/gui/widgets/eab-gui-util.c:548
-msgid "list"
-msgstr "一覧"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Telex"
+msgstr "テレックス"
 
-#: addressbook/gui/widgets/eab-gui-util.c:697
-msgid "Move contact to"
-msgstr "連絡先の移動先"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
+msgid "Title"
+msgstr "敬称 (前つけ)"
 
-#: addressbook/gui/widgets/eab-gui-util.c:699
-msgid "Copy contact to"
-msgstr "連絡先のコピー先"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+msgid "Unit"
+msgstr "単位"
 
-#: addressbook/gui/widgets/eab-gui-util.c:702
-msgid "Move contacts to"
-msgstr "複数の連絡先の移動先"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Web Site"
+msgstr "ウェブ・サイト"
 
-#: addressbook/gui/widgets/eab-gui-util.c:704
-msgid "Copy contacts to"
-msgstr "複数の連絡先のコピー先"
+#: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
+msgid "Width"
+msgstr "幅"
 
-#: addressbook/gui/widgets/eab-gui-util.c:707
-msgid "Select target addressbook."
-msgstr "アドレス帳の選択"
+#: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
+msgid "Height"
+msgstr "高さ"
 
-#: addressbook/gui/widgets/eab-gui-util.c:930
-msgid "Multiple VCards"
-msgstr "複数の vCard"
+#: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
+msgid "Has Focus"
+msgstr "フォーカスあり"
 
-#: addressbook/gui/widgets/eab-gui-util.c:933
-#, c-format
-msgid "VCard for %s"
-msgstr "%s の vCard"
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "選択済"
 
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * contact.
-#.
-#: addressbook/gui/widgets/eab-popup-control.c:199
-msgid "(none)"
-msgstr "(なし)"
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "カーソルあり"
 
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "E-メール"
+#: addressbook/gui/widgets/e-minicard-label.c:136
+msgid "Field"
+msgstr "項目"
 
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "操作の選択"
+#: addressbook/gui/widgets/e-minicard-label.c:143
+msgid "Field Name"
+msgstr "項目名"
 
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "新しい連絡先 \"%s\" の生成"
+#: addressbook/gui/widgets/e-minicard-label.c:150
+msgid "Text Model"
+msgstr "テキスト・モデル"
 
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "既存の連絡先 \"%s\" へのアドレスの追加"
+#: addressbook/gui/widgets/e-minicard-label.c:157
+msgid "Max field name length"
+msgstr "項目名の最大長"
 
-#: addressbook/gui/widgets/eab-popup-control.c:870
-msgid "Querying Address Book..."
-msgstr "アドレス帳の問い合わせ中..."
+#: addressbook/gui/widgets/e-minicard-view.c:171
+msgid ""
+"\n"
+"\n"
+"Search for the Contact\n"
+"\n"
+"or double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"連絡先の検索\n"
+"\n"
+"または、ダブル・クリックして新しい連絡先を作成して下さい。"
 
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "連絡先情報の編集"
+#: addressbook/gui/widgets/e-minicard-view.c:174
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view.\n"
+"\n"
+"Double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"このビューの中に表示できるアイテムはありません。\n"
+"\n"
+"ダブルクリックをして新しい連絡先を作成して下さい。"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "E-メール・アドレスの結合"
+#: addressbook/gui/widgets/e-minicard-view.c:179
+msgid ""
+"\n"
+"\n"
+"Search for the Contact."
+msgstr ""
+"\n"
+"\n"
+"連絡先の検索です。"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "と他に %d 個の連絡先"
-msgstr[1] "と他に %d 個の連絡先"
+#: addressbook/gui/widgets/e-minicard-view.c:181
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"このビューの中に表示できるアイテムはありません。"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:272
-msgid "Show Full VCard"
-msgstr "全ての vCard の表示"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "コンパクト vCard の表示"
+#: addressbook/gui/widgets/e-minicard-view.c:498
+msgid "Adapter"
+msgstr "アダプタ"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:277
-msgid "Save in addressbook"
-msgstr "アドレス帳に保存"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "カラムの幅"
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:24
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
 msgid "Card View"
 msgstr "カード表示"
 
-#: addressbook/gui/widgets/gal-view-factory-treeview.c:25
+#: addressbook/gui/widgets/gal-view-factory-treeview.c:26
 msgid "GTK Tree View"
 msgstr "GTK+ ツリー表示"
 
-#: addressbook/gui/widgets/test-reflow.c:119
-msgid "Reflow Test"
-msgstr "リフローのテスト"
-
-#: addressbook/gui/widgets/test-reflow.c:120
-#: addressbook/printing/test-contact-print-style-editor.c:54
-#: addressbook/printing/test-print.c:53
-msgid "Copyright (C) 2000, Ximian, Inc."
-msgstr "Copyright (C) 2000, Ximian, Inc."
-
-#: addressbook/gui/widgets/test-reflow.c:122
-msgid "This should test the reflow canvas item"
-msgstr "キャンバスのアイテムのリフローをテストします"
-
 #: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF インポータ"
@@ -3199,18 +3408,9 @@ msgid "Evolution VCard Importer"
 msgstr "Evolution vCard インポータ"
 
 #: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-msgid "Evolution VCard importer"
-msgstr "Evolution vCard インポータ"
-
-#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "宛名の印刷"
-
 #: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "複数の連絡先の印刷"
@@ -3220,6 +3420,11 @@ msgstr "複数の連絡先の印刷"
 msgid "Print contact"
 msgstr "連絡先の印刷"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "宛名の印刷"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3309,10 +3514,16 @@ msgid "Number of columns:"
 msgstr "列数:"
 
 #: addressbook/printing/e-contact-print.glade.h:23
+#: camel/providers/groupwise/camel-groupwise-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:49
+#: camel/providers/imap/camel-imap-provider.c:64
+#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:79
+#: camel/providers/local/camel-local-provider.c:99
 msgid "Options"
 msgstr "オプション"
 
-#: addressbook/printing/e-contact-print.glade.h:24
+#: addressbook/printing/e-contact-print.glade.h:24 e-util/eggtrayicon.c:118
 msgid "Orientation"
 msgstr "方向"
 
@@ -3377,6 +3588,7 @@ msgid "Top:"
 msgstr "上:"
 
 #: addressbook/printing/e-contact-print.glade.h:40
+#: calendar/gui/dialogs/calendar-setup.c:175
 msgid "Type:"
 msgstr "種別:"
 
@@ -3392,6 +3604,11 @@ msgstr "フォント(_F)..."
 msgid "Contact Print Style Editor Test"
 msgstr "連絡先印刷スタイル・エディタのテスト"
 
+#: addressbook/printing/test-contact-print-style-editor.c:54
+#: addressbook/printing/test-print.c:53
+msgid "Copyright (C) 2000, Ximian, Inc."
+msgstr "Copyright (C) 2000, Ximian, Inc."
+
 #: addressbook/printing/test-contact-print-style-editor.c:56
 msgid "This should test the contact print style editor widget"
 msgstr "連絡先印刷スタイル・エディタ・ウィジットをテストします"
@@ -3404,20 +3621,6 @@ msgstr "連絡先印刷のテスト"
 msgid "This should test the contact print code"
 msgstr "連絡先印刷コードをテストします"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr "ファイルを開けません"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-msgid "Couldn't get list of addressbooks"
-msgstr "アドレス帳の一覧を取得できませんでした"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-msgid "failed to open book"
-msgstr "アドレス帳を開けませんでした"
-
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "標準出力のかわりに出力するファイルの指定"
@@ -3439,13 +3642,14 @@ msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
 #: addressbook/tools/evolution-addressbook-export.c:61
-msgid "Export in asynchronous mode "
+msgid "Export in asynchronous mode"
 msgstr "非同期モードでエキスポート"
 
 #: addressbook/tools/evolution-addressbook-export.c:63
 msgid ""
-"The number of cards in one output file in asychronous mode,default size 100."
-msgstr "非同期モードでの一つの出力ファイルにあるカードの数 (デフォルト: 100)"
+"The number of cards in one output file in asychronous mode, default size 100."
+msgstr ""
+"非同期モードでの一つの出力ファイルにあるカードの数です (デフォルト: 100)。"
 
 #: addressbook/tools/evolution-addressbook-export.c:63
 msgid "NUMBER"
@@ -3467,12 +3671,26 @@ msgid "In async mode, output must be file."
 msgstr "非同期モードでは、ファイルに出力して下さい。"
 
 #: addressbook/tools/evolution-addressbook-export.c:122
-msgid "In normal mode, there should not need size option."
+msgid "In normal mode, there is no need for the size option."
 msgstr "標準モードでは、サイズ・オプションを指定する必要はありません。"
 
 #: addressbook/tools/evolution-addressbook-export.c:153
-msgid "Impossible internal error."
-msgstr "致命的な内部エラーです。"
+msgid "Unhandled error"
+msgstr "特定できないエラー"
+
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "ファイルを開けません"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+msgid "Couldn't get list of addressbooks"
+msgstr "アドレス帳の一覧を取得できませんでした"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+msgid "failed to open book"
+msgstr "アドレス帳を開けませんでした"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3486,10 +3704,6 @@ msgstr "ファイルの入力"
 msgid "No filename provided."
 msgstr "ファイル名が指定されていません。"
 
-#: addressbook/util/e-destination.c:577
-msgid "Unnamed List"
-msgstr "名前なしの一覧"
-
 #. calendar:prompt-cancel-meeting primary
 #. calendar:prompt-cancel-task primary
 #: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
@@ -3663,7 +3877,6 @@ msgid "You have made changes to this appointment, but not yet saved them."
 msgstr "この予定を変更していますが、まだ保存していません。"
 
 #: calendar/calendar-errors.xml.h:73 calendar/calendar-errors.xml.h:81
-#: composer/mail-composer-errors.xml.h:33
 msgid "Discard Changes"
 msgstr "変更を破棄する"
 
@@ -3766,7 +3979,61 @@ msgstr "突然 Evolution カレンダが終了しました。"
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Evolution を再起動するまでカレンダ情報は利用できません。"
 
-#: calendar/common/authentication.c:48 calendar/gui/e-pub-utils.c:301
+#. calendar:prompt-delete-calendar primary
+#: calendar/calendar-errors.xml.h:116
+msgid "Delete calendar '{0}'?"
+msgstr "カレンダ '{0}' を削除しますか？"
+
+#. calendar:prompt-delete-calendar secondary
+#: calendar/calendar-errors.xml.h:118
+msgid "This calendar will be removed permanently."
+msgstr "このカレンダは完全に削除されます。"
+
+#. calendar:prompt-delete-task-list primary
+#: calendar/calendar-errors.xml.h:120
+msgid "Delete task list '{0}'?"
+msgstr "このタスク一覧 '{0}' を削除しますか？"
+
+#. calendar:prompt-delete-task-list secondary
+#: calendar/calendar-errors.xml.h:122
+msgid "This task list will be removed permanently."
+msgstr "このタスク一覧は完全に削除されます。"
+
+#. calendar:prompt-send-no-subject-calendar primary
+#: calendar/calendar-errors.xml.h:124
+msgid "Are you sure you want to send the appointment without a summary?"
+msgstr "件名を付けずに予定を送信してもよろしいですか？"
+
+#. calendar:prompt-send-no-subject-calendar secondary
+#: calendar/calendar-errors.xml.h:126
+msgid ""
+"Adding a meaningful Summary to your appointment will give your recipients an "
+"idea of what your appointment is about."
+msgstr ""
+"意味のある件名を記述しておくと、メッセージを受信する人が予定の内容を理解しや"
+"すくなります。"
+
+#: calendar/calendar-errors.xml.h:127 calendar/calendar-errors.xml.h:132
+#: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
+#: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+msgid "_Send"
+msgstr "送信する(_S)"
+
+#. calendar:prompt-send-no-subject-task primary
+#: calendar/calendar-errors.xml.h:129
+msgid "Are you sure you want to send the task without a summary?"
+msgstr "件名を付けずにタスクを送信してもよろしいですか？"
+
+#. calendar:prompt-send-no-subject-task secondary
+#: calendar/calendar-errors.xml.h:131
+msgid ""
+"Adding a meaningful Summary to your task will give your recipients an idea "
+"of what your appointment is about."
+msgstr ""
+"意味のある件名を記述しておくと、メッセージを受信する人がタスクの内容を理解し"
+"やすくなります。"
+
+#: calendar/common/authentication.c:49 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "パスワードの入力"
@@ -3775,15 +4042,15 @@ msgstr "パスワードの入力"
 msgid "Split Multi-Day Events:"
 msgstr "複数日のイベントに分割:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1356
-#: calendar/conduits/calendar/calendar-conduit.c:1357
+#: calendar/conduits/calendar/calendar-conduit.c:1359
+#: calendar/conduits/calendar/calendar-conduit.c:1360
 #: calendar/conduits/todo/todo-conduit.c:879
 #: calendar/conduits/todo/todo-conduit.c:880
 msgid "Could not start evolution-data-server"
 msgstr "evolution-data-server を起動できませんでした"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
 #: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1471
 msgid "Could not read pilot's Calendar application block"
 msgstr "パイロットのカレンダ・アプリケーション・ブロックを読み込めませんでした"
 
@@ -3796,119 +4063,97 @@ msgstr "デフォルトの優先度:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "パイロットの ToDo アプリケーション・ブロックを読み込めませんでした"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr "[CTRL]+[F3]"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr "[CTRL]+[F4]"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "カレンダとタスク"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#: calendar/gui/calendar-component.c:1079
-msgid "Calendars"
-msgstr "カレンダ"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "ここでお使いのタイムゾーンやカレンダ、タスク一覧を設定します"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution カレンダとタスク"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution カレンダの設定コントロール"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution カレンダ設定メッセージのビューア"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution カレンダ/タスクのエディタ"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Evolution カレンダのコンポーネント"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Evolution タスクのコンポーネント"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:79
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "分"
+msgstr[1] "分間"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1198 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:419 calendar/gui/tasks-component.c:889
-#: calendar/gui/tasks-control.c:408 calendar/importers/icalendar-importer.c:83
-#: calendar/importers/icalendar-importer.c:709
-msgid "Tasks"
-msgstr "タスク"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: calendar/gui/dialogs/event-editor.c:138 calendar/gui/print.c:2298
+msgid "Appointment"
+msgstr "予定"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-msgid "_Calendars"
-msgstr "カレンダ(_C)"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+msgid "Appointment Title"
+msgstr "予定の題名"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "タスク(_T)"
+#. End time
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#: plugins/itip-formatter/itip-view.c:830
+msgid "End time:"
+msgstr "終了時刻:"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution カレンダ・アラーム通知サービス"
+#. Location
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/e-itip-control.c:1118 plugins/itip-formatter/itip-view.c:813
+msgid "Location:"
+msgstr "場所:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
-msgid "Starting:"
-msgstr "開始:"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:5
+msgid "Snooze _time:"
+msgstr "アラーム停止時間(_T):"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
-msgid "Ending:"
-msgstr "終了:"
+#. Start time
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: plugins/itip-formatter/itip-view.c:821
+msgid "Start time:"
+msgstr "開始時刻:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
-msgid "Evolution Alarm"
-msgstr "Evolution アラーム"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:11
+#: mail/mail-config.glade.h:153 ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:22 ui/evolution.xml.h:38
+msgid "_Edit"
+msgstr "編集(_E)"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
-#, c-format
-msgid "Alarm on %s"
-msgstr "%s にアラーム"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:8
+msgid "_Snooze"
+msgstr "アラーム停止(_S)"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-msgid "Snooze _time (minutes):"
-msgstr "アラーム停止時間 (分)(_T):"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:9
+msgid "description of appointment"
+msgstr "予定の内容"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "_Edit appointment"
-msgstr "予定の編集(_E)"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:10
+msgid "end-time"
+msgstr "end-time"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "_Snooze"
-msgstr "アラーム停止(_S)"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:11
+msgid "location"
+msgstr "location"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "開く"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:13
+msgid "start-time"
+msgstr "start-time"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:887
+#: calendar/gui/alarm-notify/alarm-queue.c:864
 msgid "Dismiss"
 msgstr "却下"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:889
+#: calendar/gui/alarm-notify/alarm-queue.c:865
 msgid "Dismiss All"
 msgstr "全て却下"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:954
+#: calendar/gui/alarm-notify/alarm-queue.c:947
+msgid "No summary available."
+msgstr "サマリはありません。"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:956
+#: calendar/gui/alarm-notify/alarm-queue.c:958
 msgid "No description available."
-msgstr "無効な説明です。"
+msgstr "説明はありません。"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:974
+#: calendar/gui/alarm-notify/alarm-queue.c:966
+msgid "No location information available."
+msgstr "場所の情報はありません。"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:982
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3921,12 +4166,12 @@ msgstr ""
 "起動: %s\n"
 "終了: %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1074
-#: calendar/gui/alarm-notify/alarm-queue.c:1098
+#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1108
 msgid "Warning"
 msgstr "警告"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
+#: calendar/gui/alarm-notify/alarm-queue.c:1088
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3938,7 +4183,7 @@ msgstr ""
 "の設定がされていました。その代わりに Evolution は\n"
 "通常のリマインダ・ダイアログを表示します。"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1114
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3955,10 +4200,14 @@ msgstr ""
 "\n"
 "本当に、このプログラムを起動してもよろしいですか？"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1118
+#: calendar/gui/alarm-notify/alarm-queue.c:1128
 msgid "Do not ask me about this program again."
 msgstr "このメッセージを二度と表示しない"
 
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution カレンダ・アラーム通知サービス"
+
 #: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo を初期化できませんでした"
@@ -4056,78 +4305,63 @@ msgid "Show where events end in week and month views"
 msgstr "週間と月間ビューの中に予定の期日を表示する"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "The url template to use as a free/busy data fallback"
+msgstr "予定の有無のデータに戻す際に使用する URI のテンプレート"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Time last alarm ran"
 msgstr "最後にアラームを鳴らした時間"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "Units for determining when to hide tasks"
 msgstr "いつタスクを隠すかを決定する単位"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Units of default reminder"
 msgstr "デフォルトのリマインダの単位"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Weekday the week starts on"
 msgstr "一週間の始まりの曜日"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Whether or not to use the notification tray for display alarms"
 msgstr "警告を表示する際に \"パネルの通知エリア\" を利用するかどうか"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Whether to ask for confirmation on appointment deletion"
 msgstr "予定を削除する際に確認するかどうか"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "フォルダを完全削除する際に確認するかどうか"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Whether to hide completed tasks"
 msgstr "完了したタスクを隠すかどうか"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to set a default reminder for events"
 msgstr "イベントにデフォルトのリマインダをセットするかどうか"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr "時刻を午前/午後の代わりに 24時間制で表示するかどうか"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Whether to show week numbers in date navigator"
 msgstr "期日ナビゲータの中に週番号を表示するかどうか"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "サマリが次のものを含む"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "説明が次のものを含む"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "コメントが次のものを含む"
-
-#: calendar/gui/cal-search-bar.c:53
-msgid "Location contains"
-msgstr "場所が次のものを含む"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "該当しないもの"
-
-#: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:564
-#: calendar/gui/dialogs/select-source-dialog.c:112
-#: calendar/gui/gnome-cal.c:1860
-#: camel/providers/groupwise/camel-gw-listener.c:331
-#: camel/providers/groupwise/camel-gw-listener.c:361
+#: calendar/gui/calendar-commands.c:120 calendar/gui/calendar-component.c:568
+#: calendar/gui/dialogs/calendar-setup.c:362 calendar/gui/gnome-cal.c:1925
+#: camel/providers/groupwise/camel-gw-listener.c:405
+#: camel/providers/groupwise/camel-gw-listener.c:435
+#: plugins/groupwise-account-setup/camel-gw-listener.c:405
+#: plugins/groupwise-account-setup/camel-gw-listener.c:435
 msgid "Calendar"
 msgstr "カレンダ"
 
-#: calendar/gui/calendar-commands.c:352
+#: calendar/gui/calendar-commands.c:355
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -4136,187 +4370,153 @@ msgstr ""
 "この操作は選択したイベントより古いイベントを全て完全に削除します。続行する"
 "と、これらのイベントを復旧できなくなります。"
 
-#: calendar/gui/calendar-commands.c:358
+#: calendar/gui/calendar-commands.c:361
 msgid "Purge events older than"
 msgstr "次より古いイベントを抹消する"
 
-#: calendar/gui/calendar-commands.c:363
+#: calendar/gui/calendar-commands.c:366
 #: calendar/gui/dialogs/alarm-dialog.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:14
+#: plugins/calendar-http/calendar-http.c:265
 msgid "days"
 msgstr "日"
 
-#: calendar/gui/calendar-commands.c:432
-msgid "%A %d %B %Y"
-msgstr "%Y年 %B%e日 %A"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
-#: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:519
-#: calendar/gui/e-day-view-top-item.c:714 calendar/gui/e-day-view.c:1588
-#: calendar/gui/e-week-view-main-item.c:329
-msgid "%a %d %b"
-msgstr "%m/%d (%a)"
-
-#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:442
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-component.c:521
-#: calendar/gui/calendar-component.c:526 calendar/gui/calendar-component.c:528
-msgid "%a %d %b %Y"
-msgstr "%Y/%m/%d (%a)"
-
-#: calendar/gui/calendar-commands.c:461 calendar/gui/calendar-commands.c:467
-#: calendar/gui/calendar-commands.c:473 calendar/gui/calendar-commands.c:475
-msgid "%d %B %Y"
-msgstr "%Y年 %B%e日"
-
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:465
-#: calendar/gui/e-week-view-main-item.c:337 calendar/gui/print.c:1498
-msgid "%d %B"
-msgstr "%B%e日"
-
-#: calendar/gui/calendar-component.c:370
-#, c-format
-msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
-msgstr "カレンダ '%s' を削除します。続行してもよろしいですか？"
-
-#: calendar/gui/calendar-component.c:426
+#: calendar/gui/calendar-component.c:384
+#: calendar/gui/dialogs/calendar-setup.c:442
 msgid "New Calendar"
 msgstr "新しいカレンダ"
 
-#: calendar/gui/calendar-component.c:516
-msgid "%A %d %b %Y"
-msgstr "%Y年 %B%e日 %A"
-
-#: calendar/gui/calendar-component.c:540 calendar/gui/calendar-component.c:547
-#: calendar/gui/calendar-component.c:553 calendar/gui/calendar-component.c:555
-msgid "%d %b %Y"
-msgstr "%Y年 %B%e日"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/calendar-component.c:545
-#: calendar/gui/e-day-view-top-item.c:718 calendar/gui/e-day-view.c:1604
-#: calendar/gui/e-week-view-main-item.c:343
-msgid "%d %b"
-msgstr "%B%e日"
-
-#: calendar/gui/calendar-component.c:635
+#: calendar/gui/calendar-component.c:701
 msgid "Failed upgrading calendars."
 msgstr "カレンダのアップグレードに失敗しました。"
 
-#: calendar/gui/calendar-component.c:931
+#: calendar/gui/calendar-component.c:997
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "イベントと会議を生成するためのカレンダ '%s' を開けません"
 
-#: calendar/gui/calendar-component.c:947
+#: calendar/gui/calendar-component.c:1013
 msgid "There is no calendar available for creating events and meetings"
 msgstr "イベントと会議を生成するために利用可能なカレンダがありません"
 
-#: calendar/gui/calendar-component.c:1245
+#: calendar/gui/calendar-component.c:1123
+msgid "Calendar Source Selector"
+msgstr "カレンダの格納場所の選択"
+
+#: calendar/gui/calendar-component.c:1148
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Calendars"
+msgstr "カレンダ"
+
+#: calendar/gui/calendar-component.c:1314
 msgid "New appointment"
 msgstr "新しい予定"
 
-#: calendar/gui/calendar-component.c:1246
+#: calendar/gui/calendar-component.c:1315
 msgid "_Appointment"
 msgstr "予定(_A)"
 
-#: calendar/gui/calendar-component.c:1247
+#: calendar/gui/calendar-component.c:1316
 msgid "Create a new appointment"
 msgstr "新しい予定を作成します"
 
-#: calendar/gui/calendar-component.c:1253
+#: calendar/gui/calendar-component.c:1322
 msgid "New meeting"
 msgstr "新規の会議"
 
-#: calendar/gui/calendar-component.c:1254
+#: calendar/gui/calendar-component.c:1323
 msgid "M_eeting"
 msgstr "会議(_E)"
 
-#: calendar/gui/calendar-component.c:1255
+#: calendar/gui/calendar-component.c:1324
 msgid "Create a new meeting request"
 msgstr "新しい会議を召集します"
 
-#: calendar/gui/calendar-component.c:1261
+#: calendar/gui/calendar-component.c:1330
 msgid "New all day appointment"
 msgstr "新しい終日の予定"
 
-#: calendar/gui/calendar-component.c:1262
+#: calendar/gui/calendar-component.c:1331
 msgid "All Day A_ppointment"
 msgstr "終日の予定(_P)"
 
-#: calendar/gui/calendar-component.c:1263
+#: calendar/gui/calendar-component.c:1332
 msgid "Create a new all-day appointment"
 msgstr "新しい終日の予定を作成します"
 
-#: calendar/gui/calendar-component.c:1269
+#: calendar/gui/calendar-component.c:1338
 msgid "New calendar"
 msgstr "新しいカレンダ"
 
-#: calendar/gui/calendar-component.c:1270
+#: calendar/gui/calendar-component.c:1339
 msgid "Cale_ndar"
 msgstr "カレンダ(_N)"
 
-#: calendar/gui/calendar-component.c:1271
+#: calendar/gui/calendar-component.c:1340
 msgid "Create a new calendar"
 msgstr "新しいカレンダを作成します"
 
-#: calendar/gui/calendar-offline-handler.c:192
-#, c-format
-msgid "backend_go_offline(): %s"
-msgstr "backend_go_offline(): %s"
-
-#: calendar/gui/calendar-offline-handler.c:215
-#, c-format
-msgid "backend_go_online(): %s"
-msgstr "backend_go_online(): %s"
-
-#: calendar/gui/calendar-view-factory.c:118
+#: calendar/gui/calendar-view-factory.c:109
 msgid "Day View"
 msgstr "日間ビュー"
 
-#: calendar/gui/calendar-view-factory.c:121
+#: calendar/gui/calendar-view-factory.c:112
 msgid "Work Week View"
 msgstr "平日ビュー"
 
-#: calendar/gui/calendar-view-factory.c:124
+#: calendar/gui/calendar-view-factory.c:115
 msgid "Week View"
 msgstr "週間ビュー"
 
-#: calendar/gui/calendar-view-factory.c:127
+#: calendar/gui/calendar-view-factory.c:118
 msgid "Month View"
 msgstr "月間ビュー"
 
-#: calendar/gui/comp-editor-factory.c:409
+#: calendar/gui/cal-search-bar.c:49
+msgid "Summary contains"
+msgstr "サマリが次のものを含む"
+
+#: calendar/gui/cal-search-bar.c:50
+msgid "Description contains"
+msgstr "説明が次のものを含む"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Comment contains"
+msgstr "コメントが次のものを含む"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Location contains"
+msgstr "場所が次のものを含む"
+
+#: calendar/gui/cal-search-bar.c:350 camel/camel-vee-store.c:343
+msgid "Unmatched"
+msgstr "該当しないもの"
+
+#: calendar/gui/comp-editor-factory.c:413
 msgid "Error while opening the calendar"
 msgstr "カレンダをオープンする際にエラーが発生しました"
 
-#: calendar/gui/comp-editor-factory.c:420
+#: calendar/gui/comp-editor-factory.c:419
 msgid "Method not supported when opening the calendar"
 msgstr "カレンダをオープンする際の方法がサポートされていません"
 
-#: calendar/gui/comp-editor-factory.c:426
+#: calendar/gui/comp-editor-factory.c:425
 msgid "Permission denied to open the calendar"
 msgstr "カレンダをオープンする権限がありません"
 
-#: calendar/gui/comp-editor-factory.c:474
-#, c-format
-msgid "open_client(): %s"
-msgstr "open_client(): %s"
+#: calendar/gui/comp-editor-factory.c:437
+#: camel/providers/imap4/camel-imap4-store.c:288
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/pop3/camel-pop3-store.c:526
+#: camel/providers/pop3/camel-pop3-store.c:533
+#: camel/providers/pop3/camel-pop3-store.c:539 shell/e-shell.c:1259
+msgid "Unknown error"
+msgstr "特定できないエラー"
 
 #: calendar/gui/dialogs/alarm-dialog.glade.h:2
-msgid "<b>Alarm</b>\t"
-msgstr "<b>警告</b>\t"
+msgid "<b>Alarm</b>"
+msgstr "<b>警告</b>"
 
 #: calendar/gui/dialogs/alarm-dialog.glade.h:3
 msgid "<b>Options</b>"
@@ -4407,7 +4607,8 @@ msgid "hour(s)"
 msgstr "時間"
 
 #: calendar/gui/dialogs/alarm-dialog.glade.h:25
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:15
+#: plugins/calendar-http/calendar-http.c:264
 msgid "hours"
 msgstr "時"
 
@@ -4416,10 +4617,26 @@ msgid "minute(s)"
 msgstr "分"
 
 #: calendar/gui/dialogs/alarm-dialog.glade.h:28
+msgid "option menu to choose alarm action"
+msgstr "アラーム時のアクションを選択するためのオプション・メニューです"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:29
+msgid "option menu to choose alarm relative"
+msgstr "アラームを鳴らすタイミングを選択するオプション・メニューです"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:30
+msgid "option menu to choose alarm time"
+msgstr "アラームを鳴らす時期を選択するオプション・メニューです"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:31
+msgid "option menu to choose alarm value units"
+msgstr "アラームを鳴らす時間の単位を選択するオプション・メニューです"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:32
 msgid "start of appointment"
 msgstr "予定を開始した時"
 
-#: calendar/gui/dialogs/alarm-list-dialog.c:192
+#: calendar/gui/dialogs/alarm-list-dialog.c:199
 msgid "Action/Trigger"
 msgstr "アクション/トリガ"
 
@@ -4431,36 +4648,98 @@ msgstr "追加(_D)"
 msgid "Alarms"
 msgstr "アラーム"
 
+#: calendar/gui/dialogs/calendar-setup.c:284
+msgid "Copy calendar contents locally for offline operation"
+msgstr "オフライン用にフォルダの内容をローカルへコピーする"
+
+#: calendar/gui/dialogs/calendar-setup.c:336
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid "C_olor:"
+msgstr "色(_O):"
+
+#: calendar/gui/dialogs/calendar-setup.c:373
+msgid "Tasks List"
+msgstr "タスク一覧"
+
+#: calendar/gui/dialogs/calendar-setup.c:440
+msgid "Calendar Properties"
+msgstr "カレンダのプロパティ"
+
+#: calendar/gui/dialogs/calendar-setup.c:506
+msgid "Task List Properties"
+msgstr "タスク一覧のプロパティ"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+msgid "Add Calendar"
+msgstr "カレンダの追加"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Task List"
+msgstr "タスク一覧の追加"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:103
+msgid "Pick a color"
+msgstr "色の選択"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+msgid "_Add Calendar"
+msgstr "カレンダの追加(_A)"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+msgid "_Add Task List"
+msgstr "タスク一覧の追加(_A)"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#: plugins/calendar-http/calendar-http.c:248
+msgid "_Refresh:"
+msgstr "更新(_R):"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: plugins/calendar-http/calendar-http.c:120
+msgid "_URL:"
+msgstr "_URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:21
+#: plugins/calendar-http/calendar-http.c:266
+msgid "weeks"
+msgstr "週"
+
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: calendar/gui/dialogs/cal-prefs-dialog.c:567 mail/em-account-prefs.c:466
-#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:905
+#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
+#: calendar/gui/dialogs/cal-prefs-dialog.c:576 mail/em-account-prefs.c:470
+#: mail/em-composer-prefs.c:678 mail/em-composer-prefs.c:945
+#: plugins/plugin-manager/plugin-manager.c:213
 msgid "Enabled"
 msgstr "有効"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:721
+#: calendar/gui/dialogs/cal-prefs-dialog.c:730
 msgid "Are you sure you want to remove this URL?"
 msgstr "本当にこの URL を削除してもよろしいですか？"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:729
+#: calendar/gui/dialogs/cal-prefs-dialog.c:733
+msgid "Remove"
+msgstr "削除する"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.c:738
 msgid "Don't Remove"
 msgstr "削除しない"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:778
-#: calendar/gui/dialogs/cal-prefs-dialog.c:811
-#: calendar/gui/dialogs/cal-prefs-dialog.c:844 mail/em-account-prefs.c:288
-#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:372
-#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
-#: mail/em-composer-prefs.c:684
+#: calendar/gui/dialogs/cal-prefs-dialog.c:787
+#: calendar/gui/dialogs/cal-prefs-dialog.c:820
+#: calendar/gui/dialogs/cal-prefs-dialog.c:853 mail/em-account-prefs.c:317
+#: mail/em-account-prefs.c:345 mail/em-account-prefs.c:376
+#: mail/em-composer-prefs.c:597 mail/em-composer-prefs.c:655
+#: mail/em-composer-prefs.c:685
 msgid "Disable"
 msgstr "無効"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:778
-#: calendar/gui/dialogs/cal-prefs-dialog.c:811
-#: calendar/gui/dialogs/cal-prefs-dialog.c:846 mail/em-account-prefs.c:288
-#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:374
-#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
-#: mail/em-composer-prefs.c:684
+#: calendar/gui/dialogs/cal-prefs-dialog.c:787
+#: calendar/gui/dialogs/cal-prefs-dialog.c:820
+#: calendar/gui/dialogs/cal-prefs-dialog.c:855 mail/em-account-prefs.c:317
+#: mail/em-account-prefs.c:345 mail/em-account-prefs.c:378
+#: mail/em-composer-prefs.c:597 mail/em-composer-prefs.c:655
+#: mail/em-composer-prefs.c:685
 msgid "Enable"
 msgstr "有効"
 
@@ -4489,280 +4768,231 @@ msgid "<b>Alerts</b>"
 msgstr "<b>警告</b>"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+msgid "<b>Default Free/Busy Server</b>"
+msgstr "<b>デフォルトの予定有無のサーバ</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "<b>General</b>"
 msgstr "<b>全般</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+msgid "<b>Publishing</b>"
+msgstr "<b>公開する場所</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "<b>Task List</b>"
 msgstr "<b>タスク一覧</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "<b>Time</b>"
 msgstr "<b>時刻</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<b>Work Week</b>"
 msgstr "<b>平日</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#, no-c-format
+msgid ""
+"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgstr ""
+"<i>%u と %d を指定すると、E-メール・アドレスのユーザ名とドメイン名で置き換え"
+"られます。</i>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Calendar and Tasks Settings"
 msgstr "カレンダとタスクの設定"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Color for overdue tasks"
 msgstr "期限が過ぎたタスクの色"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Color for tasks due today"
 msgstr "今日が期限のタスクの色"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Day _ends:"
 msgstr "一日の終了(_E):"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Days"
 msgstr "日"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Display"
 msgstr "表示"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:76
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "有効(_N)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Free/Busy Publishing"
-msgstr "予定の有無の公開"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+msgid "Free/Busy"
+msgstr "予定の有無"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1038
-#: calendar/gui/e-itip-control.c:581
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/recurrence-page.c:1031
+#: calendar/gui/e-itip-control.c:732
 msgid "Friday"
 msgstr "金曜日"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Hours"
 msgstr "時"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Minutes"
 msgstr "分"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1034
-#: calendar/gui/e-itip-control.c:577
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/recurrence-page.c:1027
+#: calendar/gui/e-itip-control.c:728
 msgid "Monday"
 msgstr "月曜日"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "S_un"
 msgstr "日(_U)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1039
-#: calendar/gui/e-itip-control.c:582
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/recurrence-page.c:1032
+#: calendar/gui/e-itip-control.c:733
 msgid "Saturday"
 msgstr "土曜日"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "Sh_ow a reminder"
 msgstr "リマインダの表示(_O):"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "Show week _numbers in date navigator"
 msgstr "期日ナビゲータの中に週番号を表示する(_N)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:576
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/recurrence-page.c:1033
+#: calendar/gui/e-itip-control.c:727
 msgid "Sunday"
 msgstr "日曜日"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "T_asks due today:"
 msgstr "今日が期限のタスクの色(_A):"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "T_hu"
 msgstr "木(_H)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1037
-#: calendar/gui/e-itip-control.c:580
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+msgid "Template:"
+msgstr "テンプレート:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/recurrence-page.c:1030
+#: calendar/gui/e-itip-control.c:731
 msgid "Thursday"
 msgstr "木曜日"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Time _zone:"
 msgstr "タイムゾーン(_Z):"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Time format:"
 msgstr "時刻の書式:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1035
-#: calendar/gui/e-itip-control.c:578
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:1028
+#: calendar/gui/e-itip-control.c:729
 msgid "Tuesday"
 msgstr "火曜日"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "W_eek starts:"
 msgstr "週の開始(_E):"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1036
-#: calendar/gui/e-itip-control.c:579
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/recurrence-page.c:1029
+#: calendar/gui/e-itip-control.c:730
 msgid "Wednesday"
 msgstr "水曜日"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Work days:"
 msgstr "勤務日:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_12 hour (AM/PM)"
 msgstr "12 時間制 (午前/午後)(_1)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_24 hour"
 msgstr "24 時間制(_2)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Add URL"
 msgstr "URL の追加(_A)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Ask for confirmation when deleting items"
 msgstr "アイテムを削除する時に確認する(_A)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Compress weekends in month view"
 msgstr "月間ビューで週末を短縮する(_C)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Day begins:"
 msgstr "一日の開始(_D):"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
-#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:43
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:22
-msgid "_Edit"
-msgstr "編集(_E)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Fri"
 msgstr "金(_F)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Hide completed tasks after"
 msgstr "完了したタスクを隠す期間(_H)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Mon"
 msgstr "月(_M)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Overdue tasks:"
 msgstr "期限を過ぎたタスクの色(_O):"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Sat"
 msgstr "土(_S)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Show appointment end times in week and month views"
 msgstr "週間と月間ビューの中に予定の期日を表示する(_S)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Time divisions:"
 msgstr "時間を分割する単位(_T):"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Tue"
 msgstr "火(_T)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Wed"
 msgstr "水(_W)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "before every appointment"
 msgstr "前に表示する"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr "カレンダを取得する場所を指定して下さい。"
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "ソースの格納場所 '%s' は well-formed ではありません。"
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "ソースの格納場所 '%s' は webcal のソースではありません。"
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "既に '%s' というソースが指定したグループの中にあります"
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr "グループ '%s' はリモートです。カレンダを取得する場所を指定して下さい。"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Calendar"
-msgstr "カレンダの追加"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Task List"
-msgstr "タスク一覧の追加"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "色(_O):"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "色の選択"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Calendar"
-msgstr "カレンダの追加(_A)"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-msgid "_Add Task List"
-msgstr "タスク一覧の追加(_A)"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "_Refresh:"
-msgstr "更新(_R):"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-msgid "_Type:"
-msgstr "種類(_T):"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_URL:"
-msgstr "_URL:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+msgid "option menu to choose reminder units"
+msgstr "リマインダの時刻の単位を選択するオプション・メニューです"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
-msgid "weeks"
-msgstr "週"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+msgid "option menu to choose time units"
+msgstr "タスクを隠す時間の単位を選択するオプション・メニューです"
 
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
@@ -4808,73 +5038,99 @@ msgstr "%s  変更しました。この変更を無視してエディタを更
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  何も変更していませんが、エディタを更新しますか？"
 
-#: calendar/gui/dialogs/comp-editor-page.c:464
+#: calendar/gui/dialogs/comp-editor.c:279
+msgid "Could not update object"
+msgstr "オブジェクトを更新できませんでした"
+
+#: calendar/gui/dialogs/comp-editor.c:417 composer/e-msg-composer.c:2315
 #, c-format
-msgid "Validation error: %s"
-msgstr "整合性のエラー: %s"
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "添付ファイルが <b>%d</b> 個あります"
+msgstr[1] "添付ファイルが <b>%d</b> 個あります"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " から "
+#: calendar/gui/dialogs/comp-editor.c:470 composer/e-msg-composer.c:2344
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "添付ファイル・バーを隠す (ここに添付ファイルをドロップして下さい)(_A)"
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr "(完了 "
+#: calendar/gui/dialogs/comp-editor.c:473
+#: calendar/gui/dialogs/comp-editor.c:517 composer/e-msg-composer.c:2347
+#: composer/e-msg-composer.c:3468
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+"添付ファイル・バーを表示する (ここに添付ファイルをドロップして下さい)(_A)"
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "完了しました"
+#: calendar/gui/dialogs/comp-editor.c:1046
+#: calendar/gui/dialogs/comp-editor.c:1089
+msgid "Edit Appointment"
+msgstr "予定の編集"
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (期日 "
+#: calendar/gui/dialogs/comp-editor.c:1052
+#: calendar/gui/dialogs/comp-editor.c:1095
+#, c-format
+msgid "Meeting - %s"
+msgstr "会議 - %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "期日 "
-
-#: calendar/gui/dialogs/comp-editor.c:264
-msgid "Could not update object"
-msgstr "オブジェクトを更新できませんでした"
-
-#: calendar/gui/dialogs/comp-editor.c:878
-#: calendar/gui/dialogs/comp-editor.c:915
-msgid "Edit Appointment"
-msgstr "予定の編集"
-
-#: calendar/gui/dialogs/comp-editor.c:883
-#: calendar/gui/dialogs/comp-editor.c:920
+#: calendar/gui/dialogs/comp-editor.c:1054
+#: calendar/gui/dialogs/comp-editor.c:1097
 #, c-format
 msgid "Appointment - %s"
 msgstr "予定 - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:886
-#: calendar/gui/dialogs/comp-editor.c:923
+#: calendar/gui/dialogs/comp-editor.c:1058
+#: calendar/gui/dialogs/comp-editor.c:1101
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "タスクの割当て - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:1060
+#: calendar/gui/dialogs/comp-editor.c:1103
 #, c-format
 msgid "Task - %s"
 msgstr "タスク - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:889
-#: calendar/gui/dialogs/comp-editor.c:926
+#: calendar/gui/dialogs/comp-editor.c:1063
+#: calendar/gui/dialogs/comp-editor.c:1106
 #, c-format
 msgid "Journal entry - %s"
 msgstr "ジャーナル・エントリ - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:900
-#: calendar/gui/dialogs/comp-editor.c:936
+#: calendar/gui/dialogs/comp-editor.c:1074
+#: calendar/gui/dialogs/comp-editor.c:1116
 msgid "No summary"
 msgstr "サマリ無し"
 
-#: calendar/gui/dialogs/comp-editor.c:1302
-#: calendar/gui/dialogs/comp-editor.c:1335
-#: calendar/gui/dialogs/comp-editor.c:1359
+#: calendar/gui/dialogs/comp-editor.c:1551
+#: calendar/gui/dialogs/comp-editor.c:1584
+#: calendar/gui/dialogs/comp-editor.c:1608
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "更新が届いたらこのアイテムに対する変更を破棄する"
 
-#: calendar/gui/dialogs/comp-editor.c:1383
+#: calendar/gui/dialogs/comp-editor.c:1632
 msgid "Unable to use current version!"
 msgstr "現在のバージョンを使用できません！"
 
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "整合性のエラー: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2265
+msgid " (Completed "
+msgstr "(完了 "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2267
+msgid "Completed "
+msgstr "完了しました"
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2272
+msgid " (Due "
+msgstr " (期日 "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2274
+msgid "Due "
+msgstr "期日 "
+
 #: calendar/gui/dialogs/copy-source-dialog.c:61
 msgid "Could not open source"
 msgstr "送信元ソースを開けませんでした"
@@ -4947,211 +5203,222 @@ msgstr "委任先:"
 msgid "Enter Delegate"
 msgstr "委任先の入力"
 
-#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
-msgid "Appointment"
-msgstr "予定"
-
-#: calendar/gui/dialogs/event-editor.c:162
+#: calendar/gui/dialogs/event-editor.c:147
 msgid "Recurrence"
 msgstr "繰り返し"
 
-#: calendar/gui/dialogs/event-editor.c:169
-#: calendar/gui/dialogs/event-editor.c:239
-#: calendar/gui/dialogs/event-editor.c:381
+#: calendar/gui/dialogs/event-editor.c:159
+#: calendar/gui/dialogs/event-editor.c:231
+#: calendar/gui/dialogs/event-editor.c:376
 msgid "Scheduling"
 msgstr "スケジュール"
 
-#: calendar/gui/dialogs/event-editor.c:176
-#: calendar/gui/dialogs/event-editor.c:242
-#: calendar/gui/dialogs/event-editor.c:384
+#: calendar/gui/dialogs/event-editor.c:166
+#: calendar/gui/dialogs/event-editor.c:234
+#: calendar/gui/dialogs/event-editor.c:379
 msgid "Invitations"
 msgstr "招待"
 
-#: calendar/gui/dialogs/event-page.c:692
+#: calendar/gui/dialogs/event-page.c:716
 msgid "Event with no start date"
 msgstr "開始日のないイベント"
 
-#: calendar/gui/dialogs/event-page.c:695
+#: calendar/gui/dialogs/event-page.c:719
 msgid "Event with no end date"
 msgstr "終了日のないイベント"
 
-#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
+#: calendar/gui/dialogs/event-page.c:885 calendar/gui/dialogs/task-page.c:551
 msgid "Start date is wrong"
 msgstr "開始日が間違っています"
 
-#: calendar/gui/dialogs/event-page.c:865
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End date is wrong"
 msgstr "終了日が間違っています"
 
-#: calendar/gui/dialogs/event-page.c:888
+#: calendar/gui/dialogs/event-page.c:918
 msgid "Start time is wrong"
 msgstr "開始時刻が間違っています"
 
-#: calendar/gui/dialogs/event-page.c:895
+#: calendar/gui/dialogs/event-page.c:925
 msgid "End time is wrong"
 msgstr "終了時刻が間違っています"
 
-#: calendar/gui/dialogs/event-page.c:1605
+#: calendar/gui/dialogs/event-page.c:1666
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "カレンダ '%s' を開けません。"
 
-#: calendar/gui/dialogs/event-page.c:1804
+#: calendar/gui/dialogs/event-page.c:1872
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "予定の %d 日前"
 
-#: calendar/gui/dialogs/event-page.c:1812
+#: calendar/gui/dialogs/event-page.c:1880
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "予定の %d 時間前"
 
-#: calendar/gui/dialogs/event-page.c:1820
+#: calendar/gui/dialogs/event-page.c:1888
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "予定の %d 分前"
 
-#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/event-page.glade.h:1
 msgid "1 day before appointment"
 msgstr "予定の 1 日前"
 
-#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/event-page.glade.h:2
 msgid "1 hour before appointment"
 msgstr "予定の 1 時間前"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:3
 msgid "15 minutes before appointment"
 msgstr "予定の 15 分前"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:4
 msgid "<b>Basics</b>"
 msgstr "<b>基本情報</b>"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/event-page.glade.h:5
 msgid "<b>Date and Time</b>"
 msgstr "<b>日付と時刻</b>"
 
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:1
+msgid "<b>Send Options</b>"
+msgstr "<b>送信オプション</b>"
+
 #: calendar/gui/dialogs/event-page.glade.h:7
 msgid "A_ll day event"
 msgstr "終日のイベントにする(_L)"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
+msgid "Ad_vanced  send options"
+msgstr "送信用の拡張オプション(_V)"
+
+#: calendar/gui/dialogs/event-page.glade.h:9
 msgid "C_ustomize..."
 msgstr "カスタマイズ(_U)..."
 
-#: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/task-page.glade.h:5
 msgid "Ca_tegories..."
 msgstr "カテゴリ(_T)..."
 
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:11
 msgid "Cale_ndar:"
 msgstr "カレンダ(_N):"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Classi_fication:"
 msgstr "区分(_F):"
 
-#: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:355 calendar/gui/e-calendar-table.c:377
+#: calendar/gui/dialogs/event-page.glade.h:13
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:361 calendar/gui/e-cal-list-view.c:255
+#: calendar/gui/e-cal-model.c:305
 msgid "Confidential"
 msgstr "極秘"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
+#: calendar/gui/dialogs/event-page.glade.h:14
+msgid "Event Description"
+msgstr "イベントの内容"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "Locat_ion:"
 msgstr "場所(_I):"
 
-#: calendar/gui/dialogs/event-page.glade.h:14
-#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:353 calendar/gui/e-calendar-table.c:376
+#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:360 calendar/gui/e-cal-list-view.c:254
+#: calendar/gui/e-cal-model.c:303
 msgid "Private"
 msgstr "非公開"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
-#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:344 calendar/gui/e-cal-model.c:351
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/dialogs/event-page.glade.h:17
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:359 calendar/gui/e-cal-list-view.c:253
+#: calendar/gui/e-cal-model.c:294 calendar/gui/e-cal-model.c:301
 msgid "Public"
 msgstr "公開"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:18
 msgid "Show time as _busy"
 msgstr "\"予定あり\" として表示する(_B)"
 
-#: calendar/gui/dialogs/event-page.glade.h:17
-#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:19
+#: calendar/gui/dialogs/task-page.glade.h:13
 msgid "Su_mmary:"
 msgstr "サマリ(_M):"
 
-#: calendar/gui/dialogs/event-page.glade.h:18
+#: calendar/gui/dialogs/event-page.glade.h:20
 msgid "This appointment has customized alarms"
 msgstr "この予定のアラームはカスタマイズされています"
 
-#: calendar/gui/dialogs/event-page.glade.h:19
+#: calendar/gui/dialogs/event-page.glade.h:21
 msgid "_Alarm"
 msgstr "アラームを鳴らす(_A)"
 
-#: calendar/gui/dialogs/event-page.glade.h:20
+#: calendar/gui/dialogs/event-page.glade.h:22
 msgid "_Description:"
 msgstr "説明(_D):"
 
-#: calendar/gui/dialogs/event-page.glade.h:21
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/dialogs/event-page.glade.h:23
+#: calendar/gui/e-meeting-time-sel.c:642
 msgid "_End time:"
 msgstr "終了時刻(_E):"
 
-#: calendar/gui/dialogs/event-page.glade.h:22
-#: calendar/gui/e-meeting-time-sel.c:594
+#: calendar/gui/dialogs/event-page.glade.h:24
+#: calendar/gui/e-meeting-time-sel.c:615
 msgid "_Start time:"
 msgstr "開始時刻(_S):"
 
 #. an empty string is the same as 'None'
-#. add a "None" option to the stores menu
 #. Put the "None" and "UTC" entries at the top of the combo's list.
 #. When "None" is selected we want the field to be cleared.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: calendar/gui/dialogs/meeting-page.c:316
+#: calendar/gui/dialogs/meeting-page.c:296
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:953
-#: composer/e-msg-composer.c:2097 filter/filter-rule.c:877
-#: mail/em-account-prefs.c:427 mail/em-folder-view.c:933
-#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
-#: mail/mail-config.glade.h:103
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:192
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
-#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
+#: calendar/gui/e-cal-model-tasks.c:652 calendar/gui/e-itip-control.c:1104
+#: composer/e-msg-composer.c:2122 filter/filter-rule.c:878
+#: mail/em-account-editor.c:675 mail/em-account-editor.c:1267
+#: mail/em-account-prefs.c:431 mail/em-folder-view.c:961
+#: plugins/itip-formatter/itip-formatter.c:1273
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:190
+#: widgets/misc/e-cell-date-edit.c:248 widgets/misc/e-dateedit.c:458
+#: widgets/misc/e-dateedit.c:1497 widgets/misc/e-dateedit.c:1651
 msgid "None"
 msgstr "なし"
 
-#: calendar/gui/dialogs/meeting-page.c:449
+#: calendar/gui/dialogs/meeting-page.c:432
 msgid "The organizer selected no longer has an account."
 msgstr "指定した主催者のアカウントがありません。"
 
-#: calendar/gui/dialogs/meeting-page.c:455
+#: calendar/gui/dialogs/meeting-page.c:438
 msgid "An organizer is required."
 msgstr "主催者が必要です。"
 
-#: calendar/gui/dialogs/meeting-page.c:470
+#: calendar/gui/dialogs/meeting-page.c:453
 msgid "At least one attendee is required."
 msgstr "最低一名の出席者が必要です。"
 
-#: calendar/gui/dialogs/meeting-page.c:793
+#: calendar/gui/dialogs/meeting-page.c:778
 msgid "_Delegate To..."
 msgstr "委任先(_D)..."
 
-#: calendar/gui/dialogs/meeting-page.c:797
-#: composer/e-msg-composer-attachment-bar.c:453
+#: calendar/gui/dialogs/meeting-page.c:781
+#: composer/e-msg-composer-attachment-bar.c:440
+#: plugins/shared-folder/properties.glade.h:19
 msgid "_Remove"
 msgstr "削除(_R)"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:218
+#: calendar/gui/e-meeting-list-view.c:235
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "出席者"
@@ -5187,16 +5454,16 @@ msgid "Member"
 msgstr "メンバー"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1085 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-meeting-list-view.c:258
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "返信の有無"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/dialogs/task-editor.c:145
 #: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: calendar/gui/e-meeting-list-view.c:265
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:63
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "ステータス"
@@ -5210,7 +5477,7 @@ msgid "C_hange Organizer"
 msgstr "主催者の変更(_G)"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:415
+#: calendar/gui/e-meeting-time-sel.c:428
 msgid "Con_tacts..."
 msgstr "連絡先(_T)..."
 
@@ -5219,6 +5486,10 @@ msgid "Or_ganizer:"
 msgstr "主催者(_G):"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:7
+msgid "Organizer"
+msgstr "主催者"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:8
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "主催者:"
@@ -5272,71 +5543,71 @@ msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr "繰り返しのエントリを修正中です。何を修正しますか？"
 
-#: calendar/gui/dialogs/recur-comp.c:85
+#: calendar/gui/dialogs/recur-comp.c:87
 msgid "This Instance Only"
 msgstr "このインスタンスのみ"
 
-#: calendar/gui/dialogs/recur-comp.c:89
+#: calendar/gui/dialogs/recur-comp.c:91
 msgid "This and Prior Instances"
 msgstr "これと以前のインスタンス"
 
-#: calendar/gui/dialogs/recur-comp.c:95
+#: calendar/gui/dialogs/recur-comp.c:97
 msgid "This and Future Instances"
 msgstr "これと将来のインスタンス"
 
-#: calendar/gui/dialogs/recur-comp.c:100
+#: calendar/gui/dialogs/recur-comp.c:102
 msgid "All Instances"
 msgstr "全てのインスタンス"
 
-#: calendar/gui/dialogs/recurrence-page.c:511
+#: calendar/gui/dialogs/recurrence-page.c:493
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "この予定には Evolution が編集できない繰り返しがあります。"
 
-#: calendar/gui/dialogs/recurrence-page.c:806
+#: calendar/gui/dialogs/recurrence-page.c:799
 msgid "Recurrence date is invalid"
 msgstr "繰り返しの日付が間違っています"
 
-#: calendar/gui/dialogs/recurrence-page.c:917
+#: calendar/gui/dialogs/recurrence-page.c:910
 msgid "on"
 msgstr "の"
 
-#: calendar/gui/dialogs/recurrence-page.c:978
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "first"
 msgstr "最初の"
 
-#: calendar/gui/dialogs/recurrence-page.c:979
+#: calendar/gui/dialogs/recurrence-page.c:972
 msgid "second"
 msgstr "二番目の"
 
-#: calendar/gui/dialogs/recurrence-page.c:980
+#: calendar/gui/dialogs/recurrence-page.c:973
 msgid "third"
 msgstr "三番目の"
 
-#: calendar/gui/dialogs/recurrence-page.c:981
+#: calendar/gui/dialogs/recurrence-page.c:974
 msgid "fourth"
 msgstr "四番目の"
 
-#: calendar/gui/dialogs/recurrence-page.c:982
+#: calendar/gui/dialogs/recurrence-page.c:975
 msgid "last"
 msgstr "最後の"
 
-#: calendar/gui/dialogs/recurrence-page.c:1005
+#: calendar/gui/dialogs/recurrence-page.c:998
 msgid "Other Date"
 msgstr "その他の日"
 
-#: calendar/gui/dialogs/recurrence-page.c:1033
+#: calendar/gui/dialogs/recurrence-page.c:1026
 msgid "day"
 msgstr "日"
 
-#: calendar/gui/dialogs/recurrence-page.c:1170
+#: calendar/gui/dialogs/recurrence-page.c:1163
 msgid "on the"
 msgstr "の"
 
-#: calendar/gui/dialogs/recurrence-page.c:1356
+#: calendar/gui/dialogs/recurrence-page.c:1349
 msgid "occurrences"
 msgstr "くりかえす"
 
-#: calendar/gui/dialogs/recurrence-page.c:2309
+#: calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "日付/時刻"
 
@@ -5384,25 +5655,14 @@ msgstr "週"
 msgid "year(s)"
 msgstr "年"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
-msgid "Select destination"
-msgstr "転送先の選択"
-
-#: calendar/gui/dialogs/select-source-dialog.c:110
-msgid "_Destination"
-msgstr "転送先(_D)"
-
-#: calendar/gui/dialogs/select-source-dialog.c:112
-msgid "Task List"
-msgstr "タスク一覧"
-
-#: calendar/gui/dialogs/task-details-page.c:427
+#: calendar/gui/dialogs/task-details-page.c:410
+#: calendar/gui/dialogs/task-details-page.c:429
 msgid "Completed date is wrong"
 msgstr "完了日が間違っています"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:1
-msgid "<span weight=\"bold\">Miscellaneous\t</span>"
-msgstr "<span weight=\"bold\">その他\t</span>"
+msgid "<span weight=\"bold\">Miscellaneous</span>"
+msgstr "<span weight=\"bold\">その他</span>"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 msgid "<span weight=\"bold\">Status</span>"
@@ -5411,44 +5671,45 @@ msgstr "<span weight=\"bold\">状態</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
-#: calendar/gui/e-calendar-table.c:472 calendar/gui/e-itip-control.c:745
-#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
-#: calendar/gui/print.c:2346
+#: calendar/gui/e-cal-component-preview.c:229
+#: calendar/gui/e-calendar-table.c:456 calendar/gui/e-cal-model-tasks.c:345
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-meeting-store.c:196 calendar/gui/e-meeting-store.c:219
+#: calendar/gui/print.c:2349
 msgid "Completed"
 msgstr "完了"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:397 mail/message-list.c:1012
+#: calendar/gui/e-cal-component-preview.c:248
+#: calendar/gui/e-calendar-table.c:381 mail/message-list.c:1011
 msgid "High"
 msgstr "高い"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
-#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:471
-#: calendar/gui/print.c:2343
+#: calendar/gui/e-cal-component-preview.c:226
+#: calendar/gui/e-calendar-table.c:455 calendar/gui/e-cal-model-tasks.c:343
+#: calendar/gui/e-cal-model-tasks.c:656 calendar/gui/e-cal-model-tasks.c:731
+#: calendar/gui/print.c:2346
 msgid "In Progress"
 msgstr "進行中"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:399 mail/message-list.c:1010
+#: calendar/gui/e-cal-component-preview.c:252
+#: calendar/gui/e-calendar-table.c:383 mail/message-list.c:1009
 msgid "Low"
 msgstr "低い"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:943
-#: calendar/gui/e-calendar-table.c:398 mail/message-list.c:1011
+#: calendar/gui/e-cal-component-preview.c:250
+#: calendar/gui/e-calendar-table.c:382 calendar/gui/e-cal-model.c:899
+#: mail/message-list.c:1010
 msgid "Normal"
 msgstr "普通"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
-#: calendar/gui/e-calendar-table.c:470 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-component-preview.c:236
+#: calendar/gui/e-calendar-table.c:454 calendar/gui/e-cal-model-tasks.c:341
+#: calendar/gui/e-cal-model-tasks.c:654 calendar/gui/print.c:2343
 msgid "Not Started"
 msgstr "開始していない"
 
@@ -5457,7 +5718,7 @@ msgid "P_ercent complete:"
 msgstr "達成率(_E):"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:400
+#: calendar/gui/e-calendar-table.c:384
 msgid "Undefined"
 msgstr "未定義"
 
@@ -5477,21 +5738,21 @@ msgstr "ステータス(_S):"
 msgid "_Web Page:"
 msgstr "ウェブ・ページ(_W):"
 
-#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+#: calendar/gui/dialogs/task-editor.c:136 calendar/gui/print.c:2300
 msgid "Task"
 msgstr "タスク"
 
-#: calendar/gui/dialogs/task-editor.c:165
-#: calendar/gui/dialogs/task-editor.c:225
-#: calendar/gui/dialogs/task-editor.c:361
+#: calendar/gui/dialogs/task-editor.c:156
+#: calendar/gui/dialogs/task-editor.c:218
+#: calendar/gui/dialogs/task-editor.c:357
 msgid "Assignment"
 msgstr "割当て"
 
-#: calendar/gui/dialogs/task-page.c:496
+#: calendar/gui/dialogs/task-page.c:524
 msgid "Due date is wrong"
 msgstr "期日が間違っています"
 
-#: calendar/gui/dialogs/task-page.c:831
+#: calendar/gui/dialogs/task-page.c:868
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "'%s' のタスクを開けません。"
@@ -5504,19 +5765,27 @@ msgstr "<span weight=\"bold\">基本情報</span>"
 msgid "<span weight=\"bold\">Date and Time</span>"
 msgstr "<span weight=\"bold\">日付と時刻</span>"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ad_vanced send options"
+msgstr "送信用の拡張オプション(_V)"
+
+#: calendar/gui/dialogs/task-page.glade.h:9
 msgid "D_escription:"
 msgstr "説明(_E):"
 
-#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/dialogs/task-page.glade.h:12
 msgid "Sta_rt date:"
 msgstr "開始日(_R):"
 
-#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:14
+msgid "Task Description"
+msgstr "タスクの内容"
+
+#: calendar/gui/dialogs/task-page.glade.h:15
 msgid "_Due date:"
 msgstr "期日(_D):"
 
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: calendar/gui/dialogs/task-page.glade.h:16
 msgid "_Group:"
 msgstr "グループ(_G):"
 
@@ -5639,275 +5908,188 @@ msgstr "%2$sの時点で%1$s"
 msgid "%s for an unknown trigger type"
 msgstr "トリガーの種類が不明な %s"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2385
+#: calendar/gui/e-cal-component-preview.c:70 mail/em-folder-view.c:2467
 #, c-format
 msgid "Click to open %s"
 msgstr "クリックすると %s を開きます"
 
-#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+#: calendar/gui/e-cal-component-preview.c:155 filter/filter-rule.c:795
 msgid "Untitled"
 msgstr "タイトルなし"
 
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:957 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-cal-component-preview.c:186
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "サマリ:"
 
-#: calendar/gui/e-cal-component-preview.c:194
-#: calendar/gui/e-cal-component-preview.c:205
+#: calendar/gui/e-cal-component-preview.c:193
+#: calendar/gui/e-cal-component-preview.c:204
 msgid "Start Date:"
 msgstr "開始日:"
 
-#: calendar/gui/e-cal-component-preview.c:216
+#: calendar/gui/e-cal-component-preview.c:215
 msgid "Due Date:"
 msgstr "期日:"
 
 #. write status
-#: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:981
+#. Status
+#: calendar/gui/e-cal-component-preview.c:222
+#: calendar/gui/e-itip-control.c:1132 plugins/itip-formatter/itip-view.c:838
 msgid "Status:"
 msgstr "ステータス:"
 
-#: calendar/gui/e-cal-component-preview.c:247
+#: calendar/gui/e-cal-component-preview.c:246
 msgid "Priority:"
 msgstr "優先度:"
 
-#: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
+#: calendar/gui/e-cal-component-preview.c:267
+#: calendar/gui/e-itip-control.c:1164 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
 msgid "Description:"
 msgstr "説明:"
 
-#: calendar/gui/e-cal-component-preview.c:300
+#: calendar/gui/e-cal-component-preview.c:299
 msgid "Web Page:"
 msgstr "ウェブ・ページ:"
 
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "End Date"
-msgstr "終了日"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-msgid "Start Date"
-msgstr "開始日"
-
-#: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
-msgid "Summary"
-msgstr "サマリ"
-
-#: calendar/gui/e-cal-model-calendar.c:175 calendar/gui/e-calendar-table.c:449
-msgid "Free"
-msgstr "予定なし"
-
-#: calendar/gui/e-cal-model-calendar.c:178 calendar/gui/e-calendar-table.c:450
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "予定あり"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "北"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "南"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "東"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "西"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"地理的な位置は書式に合わせて入力して下さい: \n"
-"\n"
-"45.436845,125.862501"
-
-#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:949
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "はい"
-
-#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:949
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "いいえ"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:357 calendar/gui/e-cal-model.c:360
-#: calendar/gui/e-itip-control.c:998 calendar/gui/e-itip-control.c:1212
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
-#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1763 camel/camel-gpg-context.c:1814
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1402
-#: camel/providers/imap4/camel-imap4-engine.c:1432
-#: camel/providers/imap4/camel-imap4-engine.c:1464
-#: camel/providers/imap4/camel-imap4-engine.c:1506
-#: camel/providers/imap4/camel-imap4-store.c:1223
-#: camel/providers/imap4/camel-imap4-utils.c:457
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1155
-#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "不明"
-
-#: calendar/gui/e-cal-model.c:945
-msgid "Recurring"
-msgstr "繰り返し"
-
-#: calendar/gui/e-cal-model.c:947
-msgid "Assigned"
-msgstr "割当て済み"
-
-#: calendar/gui/e-calendar-table.c:419
+#: calendar/gui/e-calendar-table.c:403
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:420
+#: calendar/gui/e-calendar-table.c:404
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/gui/e-calendar-table.c:405
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:422
+#: calendar/gui/e-calendar-table.c:406
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:423
+#: calendar/gui/e-calendar-table.c:407
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:424
+#: calendar/gui/e-calendar-table.c:408
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:409
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:410
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:411
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:412
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:413
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:703 calendar/gui/e-calendar-view.c:658
+#: calendar/gui/e-calendar-table.c:433 calendar/gui/e-cal-model-calendar.c:179
+msgid "Free"
+msgstr "予定なし"
+
+#: calendar/gui/e-calendar-table.c:434 calendar/gui/e-cal-model-calendar.c:182
+#: calendar/gui/e-meeting-time-sel.c:412
+msgid "Busy"
+msgstr "予定あり"
+
+#: calendar/gui/e-calendar-table.c:689 calendar/gui/e-calendar-view.c:652
 msgid "Deleting selected objects"
 msgstr "指定したオブジェクトを削除します"
 
-#: calendar/gui/e-calendar-table.c:867 calendar/gui/e-calendar-view.c:762
+#: calendar/gui/e-calendar-table.c:868 calendar/gui/e-calendar-view.c:756
 msgid "Updating objects"
 msgstr "オブジェクトの更新"
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1084
-#: calendar/gui/e-calendar-view.c:1431 calendar/gui/e-calendar-view.c:1512
-#: mail/em-folder-view.c:899 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1009 calendar/gui/e-calendar-view.c:1064
+#: composer/e-msg-composer.c:1201
+msgid "Save as..."
+msgstr "別名で保存..."
+
+#: calendar/gui/e-calendar-table.c:1151 calendar/gui/e-calendar-view.c:1389
+#: mail/em-folder-view.c:927 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "開く(_O)"
 
-#: calendar/gui/e-calendar-table.c:1044
+#: calendar/gui/e-calendar-table.c:1152
 msgid "Open _Web Page"
 msgstr "ウェブ・ページを開く(_W)"
 
-#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1090
-#: calendar/gui/e-calendar-view.c:1432 calendar/gui/e-calendar-view.c:1518
-#: mail/em-folder-view.c:901 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1153 calendar/gui/e-calendar-view.c:1390
+#: mail/em-folder-view.c:929 mail/em-popup.c:498
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "別名で保存(_S)..."
 
-#: calendar/gui/e-calendar-table.c:1046 calendar/gui/e-calendar-table.c:1088
-#: calendar/gui/e-calendar-view.c:1410 calendar/gui/e-calendar-view.c:1433
-#: calendar/gui/e-calendar-view.c:1516 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
+#: calendar/gui/e-calendar-table.c:1154 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1391 ui/evolution-addressbook.xml.h:40
+#: ui/evolution-calendar.xml.h:44 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "印刷(_P)..."
 
-#: calendar/gui/e-calendar-table.c:1050 calendar/gui/e-calendar-table.c:1079
-#: calendar/gui/e-calendar-view.c:1438 calendar/gui/e-calendar-view.c:1482
+#: calendar/gui/e-calendar-table.c:1158 calendar/gui/e-calendar-view.c:1395
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "切り取り(_U)"
 
-#: calendar/gui/e-calendar-table.c:1051 calendar/gui/e-calendar-table.c:1077
-#: calendar/gui/e-calendar-view.c:1439 calendar/gui/e-calendar-view.c:1480
-#: mail/em-folder-tree.c:965 mail/message-list.c:1702
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
-#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
-#: ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1159 calendar/gui/e-calendar-view.c:1396
+#: composer/e-msg-composer.c:2903 mail/em-folder-tree.c:1028
+#: mail/message-list.c:1712 ui/evolution-addressbook.xml.h:31
+#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "コピー(_C)"
 
-#: calendar/gui/e-calendar-table.c:1052 calendar/gui/e-calendar-table.c:1086
-#: calendar/gui/e-calendar-view.c:1414 calendar/gui/e-calendar-view.c:1440
-#: calendar/gui/e-calendar-view.c:1514 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1160 calendar/gui/e-calendar-view.c:1373
+#: calendar/gui/e-calendar-view.c:1397 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "貼り付け(_P)"
 
-#: calendar/gui/e-calendar-table.c:1056
+#: calendar/gui/e-calendar-table.c:1164
 msgid "_Assign Task"
 msgstr "タスクの割当て(_A)"
 
-#: calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1165
 msgid "_Forward as iCalendar"
 msgstr "iCalender 形式で転送(_F)"
 
-#: calendar/gui/e-calendar-table.c:1058
+#: calendar/gui/e-calendar-table.c:1166
 msgid "_Mark as Complete"
 msgstr "完了としてマーク(_M)"
 
-#: calendar/gui/e-calendar-table.c:1059
+#: calendar/gui/e-calendar-table.c:1167
 msgid "_Mark Selected Tasks as Complete"
 msgstr "選択したタスクに完了マークを付与(_M)"
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/e-calendar-table.c:1063 calendar/gui/e-calendar-table.c:1081
-#: calendar/gui/e-calendar-view.c:1451 calendar/gui/e-calendar-view.c:1484
-#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:924
+#: calendar/gui/e-calendar-table.c:1171 calendar/gui/e-calendar-view.c:1408
+#: mail/em-folder-tree.c:2746 mail/em-folder-view.c:952
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "削除(_D)"
 
-#: calendar/gui/e-calendar-table.c:1064 calendar/gui/e-calendar-table.c:1082
+#: calendar/gui/e-calendar-table.c:1172
 msgid "_Delete Selected Tasks"
 msgstr "指定したタスクの削除(_D)"
 
-#: calendar/gui/e-calendar-table.c:1196 calendar/gui/e-calendar-view.c:1060
-#: composer/e-msg-composer.c:1178
-msgid "Save as..."
-msgstr "別名で保存..."
-
-#: calendar/gui/e-calendar-table.c:1374
+#: calendar/gui/e-calendar-table.c:1323
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "<ここをクリックしてタスクを追加して下さい>"
@@ -5918,7 +6100,7 @@ msgid "% Complete"
 msgstr "完了 (%)"
 
 #: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
-#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:611
 msgid "Complete"
 msgstr "完了しました"
 
@@ -5938,92 +6120,163 @@ msgstr "優先度"
 msgid "Start date"
 msgstr "開始日"
 
+#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-cal-list-view.etspec.h:5 mail/mail-dialogs.glade.h:21
+msgid "Summary"
+msgstr "サマリ"
+
 #: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "タスクの並び替え"
 
-#: calendar/gui/e-calendar-view.c:1176
+#: calendar/gui/e-calendar-view.c:1179
 msgid "Moving items"
 msgstr "アイテムの移動中"
 
-#: calendar/gui/e-calendar-view.c:1178
+#: calendar/gui/e-calendar-view.c:1181
 msgid "Copying items"
 msgstr "アイテムのコピー中"
 
-#: calendar/gui/e-calendar-view.c:1403 calendar/gui/e-calendar-view.c:1492
+#: calendar/gui/e-calendar-view.c:1364
 msgid "New _Appointment..."
 msgstr "新しい予定(_A)..."
 
-#: calendar/gui/e-calendar-view.c:1404 calendar/gui/e-calendar-view.c:1497
+#: calendar/gui/e-calendar-view.c:1365
 msgid "New All Day _Event"
 msgstr "新しい終日のイベント(_E)"
 
-#: calendar/gui/e-calendar-view.c:1405 calendar/gui/e-calendar-view.c:1502
-msgid "New Meeting"
-msgstr "新しい会議"
-
-#: calendar/gui/e-calendar-view.c:1406 calendar/gui/e-calendar-view.c:1507
+#: calendar/gui/e-calendar-view.c:1367
 msgid "New Task"
 msgstr "新しいタスク"
 
-#: calendar/gui/e-calendar-view.c:1420 ui/evolution-calendar.xml.h:26
+#. FIXME: hook in this somehow
+#: calendar/gui/e-calendar-view.c:1377
+msgid "Current View"
+msgstr "現在の表示"
+
+#: calendar/gui/e-calendar-view.c:1379 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "今日にする(_T)"
 
-#: calendar/gui/e-calendar-view.c:1421
+#: calendar/gui/e-calendar-view.c:1380
 msgid "_Select Date..."
 msgstr "日付の選択(_S)..."
 
-#: calendar/gui/e-calendar-view.c:1425 ui/evolution-calendar.xml.h:45
+#. TODO: Why is this in a context menu when it applies globally?
+#: calendar/gui/e-calendar-view.c:1385 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "予定の有無の公開(_P)"
 
-#: calendar/gui/e-calendar-view.c:1444
+#: calendar/gui/e-calendar-view.c:1401
 msgid "Cop_y to Calendar..."
 msgstr "カレンダへコピー(_Y)..."
 
-#: calendar/gui/e-calendar-view.c:1445
+#: calendar/gui/e-calendar-view.c:1402
 msgid "Mo_ve to Calendar..."
 msgstr "カレンダへ移動(_V)..."
 
-#: calendar/gui/e-calendar-view.c:1446
+#: calendar/gui/e-calendar-view.c:1403
 msgid "_Schedule Meeting..."
 msgstr "会議のスケジュール(_S)..."
 
-#: calendar/gui/e-calendar-view.c:1447
+#: calendar/gui/e-calendar-view.c:1404
 msgid "_Forward as iCalendar..."
 msgstr "iCalender 形式で転送(_F)..."
 
-#: calendar/gui/e-calendar-view.c:1452
+#: calendar/gui/e-calendar-view.c:1409
 msgid "Make this Occurrence _Movable"
 msgstr "このイベントを移動可能にする(_M)"
 
-#: calendar/gui/e-calendar-view.c:1453 calendar/gui/e-calendar-view.c:1485
+#: calendar/gui/e-calendar-view.c:1410
 msgid "Delete this _Occurrence"
 msgstr "このイベントの削除(_O)"
 
-#: calendar/gui/e-calendar-view.c:1454 calendar/gui/e-calendar-view.c:1486
+#: calendar/gui/e-calendar-view.c:1411
 msgid "Delete _All Occurrences"
 msgstr "全てのイベントの削除(_A)"
 
-#: calendar/gui/e-calendar-view.c:1488
-msgid "Go to _Today"
-msgstr "今日へ移動(_T)"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "終了日"
+
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "開始日"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:307 calendar/gui/e-cal-model.c:310
+#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-meeting-list-view.c:139
+#: calendar/gui/e-meeting-list-view.c:153 calendar/gui/e-meeting-store.c:124
+#: calendar/gui/e-meeting-store.c:159 calendar/gui/e-meeting-store.c:224
+#: camel/camel-gpg-context.c:1767 camel/camel-gpg-context.c:1818
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1465
+#: camel/providers/imap4/camel-imap4-engine.c:1504
+#: camel/providers/imap4/camel-imap4-engine.c:1549
+#: camel/providers/imap4/camel-imap4-engine.c:1605
+#: camel/providers/imap4/camel-imap4-store.c:1241
+#: camel/providers/imap4/camel-imap4-utils.c:575
+#: camel/providers/smtp/camel-smtp-transport.c:163
+#: camel/providers/smtp/camel-smtp-transport.c:218 mail/em-utils.c:1157
+#: plugins/itip-formatter/itip-formatter.c:247
+#: plugins/itip-formatter/itip-formatter.c:1295
+#: plugins/plugin-manager/plugin-manager.c:72 shell/e-component-registry.c:202
+#: shell/e-component-registry.c:206 widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "不明"
+
+#: calendar/gui/e-cal-model.c:901
+msgid "Recurring"
+msgstr "繰り返し"
+
+#: calendar/gui/e-cal-model.c:903
+msgid "Assigned"
+msgstr "割当て済み"
+
+#: calendar/gui/e-cal-model.c:905 calendar/gui/e-cal-model-tasks.c:1017
+#: calendar/gui/e-meeting-list-view.c:163 calendar/gui/e-meeting-store.c:168
+#: calendar/gui/e-meeting-store.c:178 calendar/gui/e-meeting-store.c:808
+msgid "Yes"
+msgstr "はい"
+
+#: calendar/gui/e-cal-model.c:905 calendar/gui/e-cal-model-tasks.c:1017
+#: calendar/gui/e-meeting-list-view.c:164 calendar/gui/e-meeting-store.c:180
+msgid "No"
+msgstr "いいえ"
+
+#: calendar/gui/e-cal-model-tasks.c:297
+msgid "N"
+msgstr "北"
+
+#: calendar/gui/e-cal-model-tasks.c:297
+msgid "S"
+msgstr "南"
+
+#: calendar/gui/e-cal-model-tasks.c:299 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "東"
 
-#: calendar/gui/e-calendar-view.c:1490
-msgid "_Go to Date..."
-msgstr "指定日へ移動(_G)..."
+#: calendar/gui/e-cal-model-tasks.c:299
+msgid "W"
+msgstr "西"
 
-#: calendar/gui/e-calendar-view.c:1520 ui/evolution.xml.h:35
-msgid "_Settings..."
-msgstr "設定(_S)..."
+#: calendar/gui/e-cal-model-tasks.c:606
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"地理的な位置は書式に合わせて入力して下さい: \n"
+"\n"
+"45.436845,125.862501"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:115 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %H:%M:%S"
@@ -6033,12 +6286,12 @@ msgstr "%Y/%m/%d (%a) %H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 
-#: calendar/gui/e-cell-date-edit-text.c:125
+#: calendar/gui/e-cell-date-edit-text.c:123
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -6049,10 +6302,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i 分分割"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:748 calendar/gui/e-week-view.c:513
+#: calendar/gui/print.c:841
+msgid "am"
+msgstr "午前"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:751 calendar/gui/e-week-view.c:516
+#: calendar/gui/print.c:843
+msgid "pm"
+msgstr "午後"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
@@ -6060,115 +6320,112 @@ msgstr "%02i 分分割"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: calendar/gui/e-day-view-top-item.c:710 calendar/gui/e-day-view.c:1571
-#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
+#: calendar/gui/e-day-view.c:1494 calendar/gui/e-day-view-top-item.c:715
+#: calendar/gui/e-week-view-main-item.c:312 calendar/gui/print.c:1517
 msgid "%A %d %B"
 msgstr "%B%e日 %A"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:583
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "午前"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:586
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "午後"
+#: calendar/gui/e-day-view-time-item.c:527
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i 分分割"
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:761
 msgid "Yes. (Complex Recurrence)"
 msgstr "はい (複合的な繰り返し)"
 
-#: calendar/gui/e-itip-control.c:621
+#: calendar/gui/e-itip-control.c:772
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "毎日"
 msgstr[1] "%d 日間毎"
 
-#: calendar/gui/e-itip-control.c:626
+#: calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "毎週"
 msgstr[1] "%d 週間毎"
 
-#: calendar/gui/e-itip-control.c:628
+#: calendar/gui/e-itip-control.c:779
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "次の毎週 "
 msgstr[1] "次の %d 週間毎 "
 
-#: calendar/gui/e-itip-control.c:636
+#: calendar/gui/e-itip-control.c:787
 msgid " and "
 msgstr " と "
 
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/e-itip-control.c:794
 #, c-format
 msgid "The %s day of "
 msgstr "次の %s 日 "
 
-#: calendar/gui/e-itip-control.c:656
+#: calendar/gui/e-itip-control.c:807
 #, c-format
 msgid "The %s %s of "
 msgstr "次の %s %s "
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:814
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "毎月"
 msgstr[1] "%d ヶ月毎"
 
-#: calendar/gui/e-itip-control.c:667
+#: calendar/gui/e-itip-control.c:818
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "毎年"
 msgstr[1] "%d 年毎"
 
-#: calendar/gui/e-itip-control.c:678
+#: calendar/gui/e-itip-control.c:829
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] " %d 回の合計"
 msgstr[1] " %d 回の合計"
 
-#: calendar/gui/e-itip-control.c:687
+#: calendar/gui/e-itip-control.c:838
 msgid ", ending on "
 msgstr ", 次の終わり "
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:862
 msgid "Starts"
 msgstr "ステータス"
 
-#: calendar/gui/e-itip-control.c:724
+#: calendar/gui/e-itip-control.c:875
 msgid "Ends"
 msgstr "終了"
 
-#: calendar/gui/e-itip-control.c:758
+#: calendar/gui/e-itip-control.c:909
 msgid "Due"
 msgstr "期日"
 
-#: calendar/gui/e-itip-control.c:798 calendar/gui/e-itip-control.c:855
+#: calendar/gui/e-itip-control.c:949 calendar/gui/e-itip-control.c:1006
 msgid "iCalendar Information"
 msgstr "iCalendar 情報"
 
 #. Title
-#: calendar/gui/e-itip-control.c:815
+#: calendar/gui/e-itip-control.c:966
 msgid "iCalendar Error"
 msgstr "iCalendar エラー"
 
-#: calendar/gui/e-itip-control.c:887 calendar/gui/e-itip-control.c:903
-#: calendar/gui/e-itip-control.c:914 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:1038 calendar/gui/e-itip-control.c:1054
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/e-itip-control.c:1082
+#: plugins/itip-formatter/itip-view.c:285
+#: plugins/itip-formatter/itip-view.c:286
+#: plugins/itip-formatter/itip-view.c:353
+#: plugins/itip-formatter/itip-view.c:354
 msgid "An unknown person"
 msgstr "身元不明な人"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:938
+#: calendar/gui/e-itip-control.c:1089
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -6176,301 +6433,293 @@ msgstr ""
 "<br> 次の情報を再表示して下さい。それから下にあるメニューから行動を選択して下"
 "さい。"
 
-#: calendar/gui/e-itip-control.c:967
-msgid "Location:"
-msgstr "場所:"
-
-#: calendar/gui/e-itip-control.c:986 calendar/gui/e-meeting-list-view.c:158
-#: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
-#: calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1137 calendar/gui/e-meeting-list-view.c:175
+#: calendar/gui/e-meeting-store.c:188 calendar/gui/e-meeting-store.c:211
+#: calendar/gui/itip-utils.c:422 plugins/itip-formatter/itip-formatter.c:1286
 msgid "Accepted"
 msgstr "受諾済"
 
-#: calendar/gui/e-itip-control.c:990 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:1141 calendar/gui/itip-utils.c:425
+#: plugins/itip-formatter/itip-formatter.c:1289
 msgid "Tentatively Accepted"
 msgstr "暫定的に受諾済"
 
-#: calendar/gui/e-itip-control.c:994 calendar/gui/e-meeting-list-view.c:159
-#: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
+#: calendar/gui/e-itip-control.c:1145 calendar/gui/e-meeting-list-view.c:176
+#: calendar/gui/e-meeting-store.c:190 calendar/gui/e-meeting-store.c:213
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
+#: plugins/itip-formatter/itip-formatter.c:1292
 msgid "Declined"
 msgstr "辞退済"
 
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1081
-#: calendar/gui/e-itip-control.c:1107 calendar/gui/e-itip-control.c:1120
-#: calendar/gui/e-itip-control.c:1133 calendar/gui/e-itip-control.c:1158
-msgid "Choose an action:"
-msgstr "アクションの選択:"
+#: calendar/gui/e-itip-control.c:1229
+msgid ""
+"The meeting has been cancelled, however it could not be found in your "
+"calendars"
+msgstr ""
+"会議がキャンセルされましたが、お使いのカレンダの中に見つかりませんでした"
 
-#: calendar/gui/e-itip-control.c:1054
-msgid "Update"
-msgstr "更新"
+#: calendar/gui/e-itip-control.c:1231
+msgid ""
+"The task has been cancelled, however it could not be found in your task lists"
+msgstr ""
+"タスクがキャンセルされましたが、お使いのタスク一覧の中に見つかりませんでした"
 
-#: calendar/gui/e-itip-control.c:1055 calendar/gui/e-itip-control.c:1086
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/e-itip-control.c:1122
-#: calendar/gui/e-itip-control.c:1135 calendar/gui/e-itip-control.c:1160
-#: shell/e-shell.c:1210 widgets/misc/e-cell-date-edit.c:265
-msgid "OK"
-msgstr "OK"
-
-#: calendar/gui/e-itip-control.c:1082
-msgid "Accept"
-msgstr "受諾"
-
-#: calendar/gui/e-itip-control.c:1083
-msgid "Tentatively accept"
-msgstr "暫定的に受諾"
-
-#: calendar/gui/e-itip-control.c:1084
-msgid "Decline"
-msgstr "辞退"
-
-#: calendar/gui/e-itip-control.c:1108
-msgid "Send Free/Busy Information"
-msgstr "予定の有無の送信"
-
-#: calendar/gui/e-itip-control.c:1121
-msgid "Update respondent status"
-msgstr "応答者ステータスの更新"
-
-#: calendar/gui/e-itip-control.c:1134
-msgid "Send Latest Information"
-msgstr "最新情報の送信"
-
-#: calendar/gui/e-itip-control.c:1144
-msgid ""
-"The meeting has been cancelled, however it could not be found in your "
-"calendars"
-msgstr ""
-"会議がキャンセルされましたが、お使いのカレンダの中に見つかりませんでした"
-
-#: calendar/gui/e-itip-control.c:1146
-msgid ""
-"The task has been cancelled, however it could not be found in your task lists"
-msgstr ""
-"タスクがキャンセルされましたが、お使いのタスク一覧の中に見つかりませんでした"
-
-#: calendar/gui/e-itip-control.c:1159 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "キャンセル"
-
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1310
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> さんが会議の情報を公開しました。"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1311
 msgid "Meeting Information"
 msgstr "会議の情報"
 
-#: calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1317
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> さんが %s の会議への出席を要求してきました。"
 
-#: calendar/gui/e-itip-control.c:1243
+#: calendar/gui/e-itip-control.c:1319
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> さんが貴方の会議への出席を要求してきました。"
 
-#: calendar/gui/e-itip-control.c:1244
+#: calendar/gui/e-itip-control.c:1320
 msgid "Meeting Proposal"
 msgstr "会議の提案"
 
-#: calendar/gui/e-itip-control.c:1265
+#. FIXME Whats going on here?
+#: calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> さんは既存の会議への参加を希望しています。"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1327
 msgid "Meeting Update"
 msgstr "会議の更新"
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1331
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> さんは会議の最新情報を希望しています。"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1332
 msgid "Meeting Update Request"
 msgstr "会議の更新要求"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1339
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> さんが会議開催要求に対して返信してきました。"
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1340
 msgid "Meeting Reply"
 msgstr "会議への返信"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1347
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> さんが会議をキャンセルしました。"
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1348
 msgid "Meeting Cancellation"
 msgstr "会議のキャンセル"
 
-#: calendar/gui/e-itip-control.c:1294 calendar/gui/e-itip-control.c:1362
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1358 calendar/gui/e-itip-control.c:1435
+#: calendar/gui/e-itip-control.c:1475
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> さんが意味不明なメッセージを送信してきました。"
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1359
 msgid "Bad Meeting Message"
 msgstr "おかしな会議メッセージ"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1386
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> さんがタスク情報を公開しました。"
 
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1387
 msgid "Task Information"
 msgstr "タスク情報"
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1394
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> さんが %s のタスクを実行に移すよう要求してきました。"
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1396
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> さんがタスクを実行に移すよう要求してきました。"
 
-#: calendar/gui/e-itip-control.c:1329
+#: calendar/gui/e-itip-control.c:1397
 msgid "Task Proposal"
 msgstr "タスクの提案"
 
-#: calendar/gui/e-itip-control.c:1333
+#. FIXME Whats going on here?
+#: calendar/gui/e-itip-control.c:1403
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> さんは既存のタスクへの追加を希望しています。"
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1404
 msgid "Task Update"
 msgstr "タスクの更新"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1408
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> さんはタスクの最新情報を希望しています。"
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1409
 msgid "Task Update Request"
 msgstr "タスクの更新要求"
 
-#: calendar/gui/e-itip-control.c:1346
+#: calendar/gui/e-itip-control.c:1416
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> さんはタスクの割り当てに対して返信してきました。"
 
-#: calendar/gui/e-itip-control.c:1347
+#: calendar/gui/e-itip-control.c:1417
 msgid "Task Reply"
 msgstr "タスクへの返信"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1424
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> さんはタスクをキャンセルしました。"
 
-#: calendar/gui/e-itip-control.c:1355
+#: calendar/gui/e-itip-control.c:1425
 msgid "Task Cancellation"
 msgstr "タスクの取り消し"
 
-#: calendar/gui/e-itip-control.c:1363
+#: calendar/gui/e-itip-control.c:1436
 msgid "Bad Task Message"
 msgstr "おかしなタスクメッセージ"
 
-#: calendar/gui/e-itip-control.c:1382
+#: calendar/gui/e-itip-control.c:1460
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> さんが予定を公開しました。"
 
-#: calendar/gui/e-itip-control.c:1383
+#: calendar/gui/e-itip-control.c:1461
 msgid "Free/Busy Information"
 msgstr "予定の有無"
 
-#: calendar/gui/e-itip-control.c:1387
+#: calendar/gui/e-itip-control.c:1465
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> さんが予定を要求してきました。"
 
-#: calendar/gui/e-itip-control.c:1388
+#: calendar/gui/e-itip-control.c:1466
 msgid "Free/Busy Request"
 msgstr "予定の有無の要求"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1470
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "予定の有無の要求に対して <b>%s</s> さんが返信してきました。"
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1471
 msgid "Free/Busy Reply"
 msgstr "予定の有無の返信"
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1476
 msgid "Bad Free/Busy Message"
 msgstr "予定の有無のメッセージが間違っています"
 
-#: calendar/gui/e-itip-control.c:1473
+#: calendar/gui/e-itip-control.c:1551
 msgid "The message does not appear to be properly formed"
 msgstr "メッセージが正しい形式になっていません"
 
-#: calendar/gui/e-itip-control.c:1532
+#: calendar/gui/e-itip-control.c:1610
 msgid "The message contains only unsupported requests."
 msgstr "メッセージの中に未サポートの要求だけあります。"
 
-#: calendar/gui/e-itip-control.c:1563
+#: calendar/gui/e-itip-control.c:1643
 msgid "The attachment does not contain a valid calendar message"
 msgstr "添付した内容に含まれるカレンダ・メッセージは正しくありません"
 
-#: calendar/gui/e-itip-control.c:1595
+#: calendar/gui/e-itip-control.c:1675
 msgid "The attachment has no viewable calendar items"
 msgstr "添付した内容には表示可能なカレンダ情報がありません"
 
-#: calendar/gui/e-itip-control.c:1829
+#: calendar/gui/e-itip-control.c:1909
 msgid "Update complete\n"
 msgstr "更新が完了しました\n"
 
-#: calendar/gui/e-itip-control.c:1857
+#: calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr "オブジェクトが不正なので更新できません\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1947
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "これは現在の出席者からの応答ではありません。出席者として追加しますか？"
 
-#: calendar/gui/e-itip-control.c:1879
+#: calendar/gui/e-itip-control.c:1959
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "不正なステータスのため出席状況が更新できませんでした！\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1976
 msgid "Attendee status updated\n"
 msgstr "出席状況が更新されました\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1979
+#: plugins/itip-formatter/itip-formatter.c:762
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "アイテムがまだ存在していないので出席状況を更新できませんでした"
 
-#: calendar/gui/e-itip-control.c:1926
+#: calendar/gui/e-itip-control.c:2006
 msgid "Removal Complete"
 msgstr "削除が完了しました"
 
-#: calendar/gui/e-itip-control.c:1949 calendar/gui/e-itip-control.c:1997
+#: calendar/gui/e-itip-control.c:2029 calendar/gui/e-itip-control.c:2077
 msgid "Item sent!\n"
 msgstr "アイテムが送信されました！\n"
 
-#: calendar/gui/e-itip-control.c:1951 calendar/gui/e-itip-control.c:2001
+#: calendar/gui/e-itip-control.c:2031 calendar/gui/e-itip-control.c:2081
 msgid "The item could not be sent!\n"
 msgstr "そのアイテムは送信できませんでした！\n"
 
+#: calendar/gui/e-itip-control.c:2161
+msgid "Choose an action:"
+msgstr "アクションの選択:"
+
+#: calendar/gui/e-itip-control.c:2232
+msgid "Update"
+msgstr "更新"
+
+#: calendar/gui/e-itip-control.c:2260
+msgid "Accept"
+msgstr "受諾"
+
+#: calendar/gui/e-itip-control.c:2261
+msgid "Tentatively accept"
+msgstr "暫定的に受諾"
+
+#: calendar/gui/e-itip-control.c:2262
+msgid "Decline"
+msgstr "辞退"
+
+#: calendar/gui/e-itip-control.c:2291
+msgid "Send Free/Busy Information"
+msgstr "予定の有無の送信"
+
+#: calendar/gui/e-itip-control.c:2319
+msgid "Update respondent status"
+msgstr "応答者ステータスの更新"
+
+#: calendar/gui/e-itip-control.c:2347
+msgid "Send Latest Information"
+msgstr "最新情報の送信"
+
+#: calendar/gui/e-itip-control.c:2375 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:408 mail/mail-send-recv.c:460
+#: ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "キャンセル"
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -6512,6 +6761,11 @@ msgstr "開始日"
 msgid "Chair Persons"
 msgstr "議長"
 
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:124
+msgid "Required Participants"
+msgstr "必須の参加者"
+
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "任意の参加者"
@@ -6520,153 +6774,153 @@ msgstr "任意の参加者"
 msgid "Resources"
 msgstr "リソース"
 
-#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
-#: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:99
+#: calendar/gui/e-meeting-store.c:116 calendar/gui/e-meeting-store.c:802
 msgid "Individual"
 msgstr "個人"
 
-#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
-#: calendar/gui/e-meeting-store.c:109
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:101
+#: calendar/gui/e-meeting-store.c:118
 msgid "Group"
 msgstr "グループ"
 
-#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
-#: calendar/gui/e-meeting-store.c:111
+#: calendar/gui/e-meeting-list-view.c:137 calendar/gui/e-meeting-store.c:103
+#: calendar/gui/e-meeting-store.c:120
 msgid "Resource"
 msgstr "リソース"
 
-#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
-#: calendar/gui/e-meeting-store.c:113
+#: calendar/gui/e-meeting-list-view.c:138 calendar/gui/e-meeting-store.c:105
+#: calendar/gui/e-meeting-store.c:122
 msgid "Room"
 msgstr "ルーム"
 
-#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
-#: calendar/gui/e-meeting-store.c:142
+#: calendar/gui/e-meeting-list-view.c:149 calendar/gui/e-meeting-store.c:134
+#: calendar/gui/e-meeting-store.c:151
 msgid "Chair"
 msgstr "議長"
 
-#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
-#: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
+#: calendar/gui/e-meeting-list-view.c:150 calendar/gui/e-meeting-store.c:136
+#: calendar/gui/e-meeting-store.c:153 calendar/gui/e-meeting-store.c:805
 msgid "Required Participant"
 msgstr "必須の参加者"
 
-#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
-#: calendar/gui/e-meeting-store.c:146
+#: calendar/gui/e-meeting-list-view.c:151 calendar/gui/e-meeting-store.c:138
+#: calendar/gui/e-meeting-store.c:155
 msgid "Optional Participant"
 msgstr "任意の参加者"
 
-#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
-#: calendar/gui/e-meeting-store.c:148
+#: calendar/gui/e-meeting-list-view.c:152 calendar/gui/e-meeting-store.c:140
+#: calendar/gui/e-meeting-store.c:157
 msgid "Non-Participant"
 msgstr "不参加者"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
-#: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
+#: calendar/gui/e-meeting-list-view.c:174 calendar/gui/e-meeting-store.c:186
+#: calendar/gui/e-meeting-store.c:209 calendar/gui/e-meeting-store.c:815
 msgid "Needs Action"
 msgstr "要アクション"
 
-#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
-#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
+#: calendar/gui/e-meeting-list-view.c:177 calendar/gui/e-meeting-store.c:192
+#: calendar/gui/e-meeting-store.c:215 calendar/gui/e-meeting-time-sel.c:411
 msgid "Tentative"
 msgstr "暫定"
 
-#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
-#: calendar/gui/e-meeting-store.c:208
+#: calendar/gui/e-meeting-list-view.c:178 calendar/gui/e-meeting-store.c:194
+#: calendar/gui/e-meeting-store.c:217
 msgid "Delegated"
 msgstr "委任済"
 
-#: calendar/gui/e-meeting-store.c:189 calendar/gui/e-meeting-store.c:212
+#: calendar/gui/e-meeting-store.c:198 calendar/gui/e-meeting-store.c:221
 msgid "In Process"
 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:452
-#: calendar/gui/e-meeting-time-sel.c:2069
-msgid "%A, %B %d, %Y"
-msgstr "%Y年 %B%e日 %A"
-
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
-#: calendar/gui/e-meeting-time-sel-item.c:456
-#: calendar/gui/e-meeting-time-sel.c:2102 e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
-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.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
-#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
-msgid "%m/%d/%Y"
-msgstr "%Y/%m/%d"
-
-#: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-time-sel.c:413 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "外出中"
 
-#: calendar/gui/e-meeting-time-sel.c:401
+#: calendar/gui/e-meeting-time-sel.c:414
 msgid "No Information"
 msgstr "情報なし"
 
-#: calendar/gui/e-meeting-time-sel.c:432
+#: calendar/gui/e-meeting-time-sel.c:445
 msgid "O_ptions"
 msgstr "オプション(_P)"
 
-#: calendar/gui/e-meeting-time-sel.c:449
+#: calendar/gui/e-meeting-time-sel.c:462
 msgid "Show _only working hours"
 msgstr "仕事中の時間だけ表示する(_O)"
 
-#: calendar/gui/e-meeting-time-sel.c:459
+#: calendar/gui/e-meeting-time-sel.c:472
 msgid "Show _zoomed out"
 msgstr "縮小して表示する(_Z)"
 
-#: calendar/gui/e-meeting-time-sel.c:474
+#: calendar/gui/e-meeting-time-sel.c:487
 msgid "_Update free/busy"
 msgstr "予定の有無の更新(_U)"
 
-#: calendar/gui/e-meeting-time-sel.c:489
+#: calendar/gui/e-meeting-time-sel.c:502
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:507
+#: calendar/gui/e-meeting-time-sel.c:520
 msgid "_Autopick"
 msgstr "自動ピックアップ(_A)"
 
-#: calendar/gui/e-meeting-time-sel.c:522
+#: calendar/gui/e-meeting-time-sel.c:535
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:552
 msgid "_All people and resources"
 msgstr "全ての人達とリソース(_A)"
 
-#: calendar/gui/e-meeting-time-sel.c:548
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "All _people and one resource"
 msgstr "全ての人達とひとつのリソース(_P)"
 
-#: calendar/gui/e-meeting-time-sel.c:557
+#: calendar/gui/e-meeting-time-sel.c:570
 msgid "_Required people"
 msgstr "必須な人達(_R)"
 
-#: calendar/gui/e-meeting-time-sel.c:566
+#: calendar/gui/e-meeting-time-sel.c:579
 msgid "Required people and _one resource"
 msgstr "必須な人達とひとつのリソース(_O)"
 
+#. 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.c:2104
+#: calendar/gui/e-meeting-time-sel-item.c:444
+msgid "%A, %B %d, %Y"
+msgstr "%Y年 %B%e日 %A"
+
+#. This is a strftime() format string %a = abbreviated weekday name,
+#. %m = month number, %d = month day, %Y = full year.
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#. strptime format of a weekday and a date.
+#. strftime format of a weekday and a date.
+#: calendar/gui/e-meeting-time-sel.c:2137
+#: calendar/gui/e-meeting-time-sel-item.c:448 e-util/e-time-utils.c:203
+#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
+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.
+#. strptime format of a weekday and a date.
+#. This is the preferred date format for the locale.
+#. This is a strftime() format for a short date. %m = month,
+#. %d = day of month, %Y = year (all digits).
+#: calendar/gui/e-meeting-time-sel-item.c:452 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1660
+msgid "%m/%d/%Y"
+msgstr "%Y/%m/%d"
+
 #: calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
 msgstr "%s のパスワードを入力して下さい"
 
-#: calendar/gui/e-tasks.c:744 calendar/gui/gnome-cal.c:2263
+#: calendar/gui/e-tasks.c:734 calendar/gui/gnome-cal.c:2429
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6675,50 +6929,126 @@ msgstr ""
 "%s でエラー:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:792
+#: calendar/gui/e-tasks.c:782
 msgid "Loading tasks"
 msgstr "タスクの読み込み"
 
-#: calendar/gui/e-tasks.c:873
+#: calendar/gui/e-tasks.c:864
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s のタスクを開きます"
 
-#: calendar/gui/e-tasks.c:1070
+#: calendar/gui/e-tasks.c:1061
 msgid "Completing tasks..."
 msgstr "タスクの完了..."
 
-#: calendar/gui/e-tasks.c:1093
+#: calendar/gui/e-tasks.c:1084
 msgid "Deleting selected objects..."
 msgstr "指定したオブジェクトの削除..."
 
-#: calendar/gui/e-tasks.c:1120
+#: calendar/gui/e-tasks.c:1111
 msgid "Expunging"
 msgstr "抹消"
 
-#: calendar/gui/gnome-cal.c:705
+#: calendar/gui/e-tasks.c:1189
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#: calendar/gui/print.c:1822 calendar/gui/tasks-component.c:408
+#: calendar/gui/tasks-component.c:881 calendar/gui/tasks-control.c:410
+#: calendar/importers/icalendar-importer.c:83
+#: calendar/importers/icalendar-importer.c:709
+#: camel/providers/groupwise/camel-gw-listener.c:406
+#: plugins/groupwise-account-setup/camel-gw-listener.c:406
+msgid "Tasks"
+msgstr "タスク"
+
+#: calendar/gui/e-timezone-entry.c:133
+msgid "Timezone Button"
+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:329 calendar/gui/print.c:1501
+msgid "%d %B"
+msgstr "%B%e日"
+
+#: calendar/gui/gnome-cal.c:718
 msgid "Updating query"
 msgstr "クエリの更新中"
 
-#: calendar/gui/gnome-cal.c:2040
+#. bonobo displays this string so it must be in locale
+#: calendar/gui/gnome-cal.c:2040 widgets/menus/gal-view-menus.c:351
+msgid "Custom View"
+msgstr "カスタム表示"
+
+#: calendar/gui/gnome-cal.c:2041
+msgid "Save Custom View"
+msgstr "カスタム表示の保存"
+
+#: calendar/gui/gnome-cal.c:2046 widgets/menus/gal-view-menus.c:373
+msgid "Define Views..."
+msgstr "ビューの定義..."
+
+#: calendar/gui/gnome-cal.c:2206
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "%s の予定の読み込み"
 
-#: calendar/gui/gnome-cal.c:2059
+#: calendar/gui/gnome-cal.c:2225
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "%s のタスクの読み込み"
 
-#: calendar/gui/gnome-cal.c:2152
+#: calendar/gui/gnome-cal.c:2318
 #, c-format
 msgid "Opening %s"
 msgstr "%s を開きます"
 
-#: calendar/gui/gnome-cal.c:3122
+#: calendar/gui/gnome-cal.c:3286
 msgid "Purging"
 msgstr "抹消中"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "カレンダとタスク"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "ここでお使いのタイムゾーンやカレンダ、タスク一覧を設定します"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution カレンダとタスク"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution カレンダの設定コントロール"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution カレンダ設定メッセージのビューア"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution カレンダ/タスクのエディタ"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution's Calendar component"
+msgstr "Evolution カレンダのコンポーネント"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution's Tasks component"
+msgstr "Evolution タスクのコンポーネント"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "_Calendars"
+msgstr "カレンダ(_C)"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "タスク(_T)"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "4 月"
@@ -6829,7 +7159,7 @@ msgstr "iCalendar 情報"
 msgid "You must be an attendee of the event."
 msgstr "イベントの出席しなければなりません。"
 
-#: calendar/gui/migration.c:150
+#: calendar/gui/migration.c:151
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6841,7 +7171,7 @@ msgstr ""
 "\n"
 "Evolution がお使いのフォルダを移行している間、少々お待ち下さい..."
 
-#: calendar/gui/migration.c:154
+#: calendar/gui/migration.c:155
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6853,332 +7183,331 @@ msgstr ""
 "\n"
 "Evolution がお使いのフォルダを移行している間、少々お待ち下さい..."
 
-#: calendar/gui/migration.c:380
+#: calendar/gui/migration.c:381
 msgid "Birthdays & Anniversaries"
 msgstr "誕生日と記念日"
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:466 calendar/gui/migration.c:548
+#: calendar/gui/migration.c:479 calendar/gui/migration.c:572
 msgid "On The Web"
 msgstr "ウェブ"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:712 calendar/gui/migration.c:864
+#: calendar/gui/migration.c:738 calendar/gui/migration.c:905
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "${HOME}/evolution/config.xmldb から古い設定を移行できません"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:741
+#: calendar/gui/migration.c:767
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "カレンダ '%s' を移行できません"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:893
+#: calendar/gui/migration.c:934
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "タスク '%s' を移行できません"
 
-#: calendar/gui/print.c:489
+#: calendar/gui/print.c:492
 msgid "1st"
 msgstr "1 日"
 
-#: calendar/gui/print.c:489
+#: calendar/gui/print.c:492
 msgid "2nd"
 msgstr "2 日"
 
-#: calendar/gui/print.c:489
+#: calendar/gui/print.c:492
 msgid "3rd"
 msgstr "3 日"
 
-#: calendar/gui/print.c:489
+#: calendar/gui/print.c:492
 msgid "4th"
 msgstr "4 日"
 
-#: calendar/gui/print.c:489
+#: calendar/gui/print.c:492
 msgid "5th"
 msgstr "5 日"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:493
 msgid "6th"
 msgstr "6 日"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:493
 msgid "7th"
 msgstr "7 日"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:493
 msgid "8th"
 msgstr "8 日"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:493
 msgid "9th"
 msgstr "9 日"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:493
 msgid "10th"
 msgstr "10 日"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:494
 msgid "11th"
 msgstr "11 日"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:494
 msgid "12th"
 msgstr "12 日"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:494
 msgid "13th"
 msgstr "13 日"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:494
 msgid "14th"
 msgstr "14 日"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:494
 msgid "15th"
 msgstr "15 日"
 
-#: calendar/gui/print.c:492
+#: calendar/gui/print.c:495
 msgid "16th"
 msgstr "16 日"
 
-#: calendar/gui/print.c:492
+#: calendar/gui/print.c:495
 msgid "17th"
 msgstr "17 日"
 
-#: calendar/gui/print.c:492
+#: calendar/gui/print.c:495
 msgid "18th"
 msgstr "18 日"
 
-#: calendar/gui/print.c:492
+#: calendar/gui/print.c:495
 msgid "19th"
 msgstr "19 日"
 
-#: calendar/gui/print.c:492
+#: calendar/gui/print.c:495
 msgid "20th"
 msgstr "20 日"
 
-#: calendar/gui/print.c:493
+#: calendar/gui/print.c:496
 msgid "21st"
 msgstr "21 日"
 
-#: calendar/gui/print.c:493
+#: calendar/gui/print.c:496
 msgid "22nd"
 msgstr "22 日"
 
-#: calendar/gui/print.c:493
+#: calendar/gui/print.c:496
 msgid "23rd"
 msgstr "23 日"
 
-#: calendar/gui/print.c:493
+#: calendar/gui/print.c:496
 msgid "24th"
 msgstr "24 日"
 
-#: calendar/gui/print.c:493
+#: calendar/gui/print.c:496
 msgid "25th"
 msgstr "25 日"
 
-#: calendar/gui/print.c:494
+#: calendar/gui/print.c:497
 msgid "26th"
 msgstr "26 日"
 
-#: calendar/gui/print.c:494
+#: calendar/gui/print.c:497
 msgid "27th"
 msgstr "27 日"
 
-#: calendar/gui/print.c:494
+#: calendar/gui/print.c:497
 msgid "28th"
 msgstr "28 日"
 
-#: calendar/gui/print.c:494
+#: calendar/gui/print.c:497
 msgid "29th"
 msgstr "29 日"
 
-#: calendar/gui/print.c:494
+#: calendar/gui/print.c:497
 msgid "30th"
 msgstr "30 日"
 
-#: calendar/gui/print.c:495
+#: calendar/gui/print.c:498
 msgid "31st"
 msgstr "31 日"
 
-#: calendar/gui/print.c:570
+#: calendar/gui/print.c:573
 msgid "Su"
 msgstr "日"
 
-#: calendar/gui/print.c:570
+#: calendar/gui/print.c:573
 msgid "Mo"
 msgstr "月"
 
-#: calendar/gui/print.c:570
+#: calendar/gui/print.c:573
 msgid "Tu"
 msgstr "火"
 
-#: calendar/gui/print.c:570
+#: calendar/gui/print.c:573
 msgid "We"
 msgstr "水"
 
-#: calendar/gui/print.c:571
+#: calendar/gui/print.c:574
 msgid "Th"
 msgstr "木"
 
-#: calendar/gui/print.c:571
+#: calendar/gui/print.c:574
 msgid "Fr"
 msgstr "金"
 
-#: calendar/gui/print.c:571
+#: calendar/gui/print.c:574
 msgid "Sa"
 msgstr "土"
 
 #. Day
-#: calendar/gui/print.c:1914
+#: calendar/gui/print.c:1917
 msgid "Selected day (%a %b %d %Y)"
 msgstr "日の指定 (%Y年 %B%e日 %a)"
 
-#: calendar/gui/print.c:1939 calendar/gui/print.c:1943
+#: calendar/gui/print.c:1942 calendar/gui/print.c:1946
 msgid "%a %b %d"
 msgstr "%B%e日 (%a)"
 
-#: calendar/gui/print.c:1940
+#: calendar/gui/print.c:1943
 msgid "%a %d %Y"
 msgstr "%Y/%d (%a)"
 
-#: calendar/gui/print.c:1944 calendar/gui/print.c:1946
-#: calendar/gui/print.c:1947
+#: calendar/gui/print.c:1947 calendar/gui/print.c:1949
+#: calendar/gui/print.c:1950
 msgid "%a %b %d %Y"
 msgstr "%Y/%m/%d (%a)"
 
-#: calendar/gui/print.c:1951
+#: calendar/gui/print.c:1954
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "週の指定 (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1959
+#: calendar/gui/print.c:1962
 msgid "Selected month (%b %Y)"
 msgstr "月の指定 (%Y年 %B)"
 
 #. Year
-#: calendar/gui/print.c:1966
+#: calendar/gui/print.c:1969
 msgid "Selected year (%Y)"
 msgstr "年の指定 (%Y年)"
 
-#: calendar/gui/print.c:2356
+#: calendar/gui/print.c:2359
 #, c-format
 msgid "Status: %s"
 msgstr "状態: %s"
 
-#: calendar/gui/print.c:2373
+#: calendar/gui/print.c:2376
 #, c-format
 msgid "Priority: %s"
 msgstr "優先度: %s"
 
-#: calendar/gui/print.c:2385
+#: calendar/gui/print.c:2388
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "達成率: %i"
 
-#: calendar/gui/print.c:2397
+#: calendar/gui/print.c:2400
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2411
+#: calendar/gui/print.c:2414
 #, c-format
 msgid "Categories: %s"
 msgstr "カテゴリ: %s"
 
-#: calendar/gui/print.c:2422
+#: calendar/gui/print.c:2425
 msgid "Contacts: "
 msgstr "連絡先: "
 
-#: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
+#: calendar/gui/print.c:2562 calendar/gui/print.c:2648
+#: calendar/gui/print.c:2740 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "印刷プレビュー"
 
-#: calendar/gui/print.c:2593
+#: calendar/gui/print.c:2596
 msgid "Print Item"
 msgstr "アイテムの印刷"
 
-#: calendar/gui/print.c:2759
+#: calendar/gui/print.c:2762
 msgid "Print Setup"
 msgstr "プリンタの設定"
 
-#: calendar/gui/tasks-component.c:314
-#, c-format
-msgid "Task List '%s' will be removed. Are you sure you want to continue?"
-msgstr "タスク一覧 '%s' を削除します。続行してもよろしいですか？"
-
-#: calendar/gui/tasks-component.c:372
+#: calendar/gui/tasks-component.c:328
 msgid "New Task List"
 msgstr "新しいタスク一覧"
 
-#: calendar/gui/tasks-component.c:415
+#: calendar/gui/tasks-component.c:404
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d 個のタスク"
 msgstr[1] "%d 個のタスク"
 
-#: calendar/gui/tasks-component.c:417 mail/mail-component.c:498
+#: calendar/gui/tasks-component.c:406 mail/mail-component.c:523
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", 選択済 %d 個"
 msgstr[1] ", 選択済 %d 個"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:453
 msgid "Failed upgrading tasks."
 msgstr "タスクの移行に失敗しました。"
 
-#: calendar/gui/tasks-component.c:758
+#: calendar/gui/tasks-component.c:747
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "イベントと会議の作成に必要なタスク一覧 '%s' を開けません"
 
-#: calendar/gui/tasks-component.c:773
+#: calendar/gui/tasks-component.c:762
 msgid "There is no calendar available for creating tasks"
 msgstr "タスクを作成できるカレンダがありません"
 
-#: calendar/gui/tasks-component.c:1047
+#: calendar/gui/tasks-component.c:856
+msgid "Task Source Selector"
+msgstr "タスクの格納場所の選択"
+
+#: calendar/gui/tasks-component.c:1039
 msgid "New task"
 msgstr "新規のタスク"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1040
 msgid "_Task"
 msgstr "タスク(_T)"
 
-#: calendar/gui/tasks-component.c:1049
+#: calendar/gui/tasks-component.c:1041
 msgid "Create a new task"
 msgstr "新しいタスクを作成します"
 
-#: calendar/gui/tasks-component.c:1055
+#: calendar/gui/tasks-component.c:1047
 msgid "New assigned task"
 msgstr "新しいタスクの割当て"
 
-#: calendar/gui/tasks-component.c:1056
+#: calendar/gui/tasks-component.c:1048
 msgid "Assigne_d Task"
 msgstr "タスクの割当て(_D)"
 
-#: calendar/gui/tasks-component.c:1057
+#: calendar/gui/tasks-component.c:1049
 msgid "Create a new assigned task"
 msgstr "新しいタスクの割り当てを作成します"
 
-#: calendar/gui/tasks-component.c:1063
+#: calendar/gui/tasks-component.c:1055
 msgid "New task list"
 msgstr "新しいタスク一覧"
 
-#: calendar/gui/tasks-component.c:1064
+#: calendar/gui/tasks-component.c:1056
 msgid "Task l_ist"
 msgstr "タスク一覧(_I)"
 
-#: calendar/gui/tasks-component.c:1065
+#: calendar/gui/tasks-component.c:1057
 msgid "Create a new task list"
 msgstr "新しいタスク一覧を作成します"
 
-#: calendar/gui/tasks-control.c:370
+#: calendar/gui/tasks-control.c:372
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -7190,15 +7519,15 @@ msgstr ""
 "\n"
 "本当にこれらのタスクを削除しますか？"
 
-#: calendar/gui/tasks-control.c:373
+#: calendar/gui/tasks-control.c:375
 msgid "Do not ask me again."
 msgstr "このメッセージを二度と表示しない。"
 
-#: calendar/gui/tasks-control.c:431
+#: calendar/gui/tasks-control.c:433
 msgid "Print Tasks"
 msgstr "タスクの印刷"
 
-#: calendar/gui/weekday-picker.c:326
+#: calendar/gui/weekday-picker.c:318
 msgid "SMTWTFS"
 msgstr "SMTWTFS"
 
@@ -7242,10 +7571,6 @@ msgstr ""
 "Evolution は GNOME カレンダ・ファイルを検出しました。\n"
 "Evolution へインポートしますか？"
 
-#: calendar/importers/icalendar-importer.c:734
-msgid "Gnome Calendar"
-msgstr "GNOME カレンダ"
-
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -7776,7 +8101,7 @@ msgstr "アメリカ/モントセラト"
 msgid "America/Nassau"
 msgstr "アメリカ/ナッサウ"
 
-#: calendar/zones.h:138
+#: calendar/zones.h:138 widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid "America/New_York"
 msgstr "アメリカ/ニューヨーク"
 
@@ -8776,56 +9101,56 @@ msgstr "太平洋/ウォーリス"
 msgid "Pacific/Yap"
 msgstr "太平洋/ヤップ"
 
-#: camel/camel-cipher-context.c:102
+#: camel/camel-cipher-context.c:103
 msgid "Signing is not supported by this cipher"
 msgstr "サインはこの暗号をサポートしていません"
 
-#: camel/camel-cipher-context.c:128
+#: camel/camel-cipher-context.c:129
 msgid "Signing message"
 msgstr "メッセージの署名中"
 
-#: camel/camel-cipher-context.c:145
+#: camel/camel-cipher-context.c:146
 msgid "Verifying is not supported by this cipher"
 msgstr "ベリファイはこの暗号をサポートしていません"
 
-#: camel/camel-cipher-context.c:171
+#: camel/camel-cipher-context.c:172
 msgid "Verifying message"
 msgstr "メッセージの検証中"
 
-#: camel/camel-cipher-context.c:189
+#: camel/camel-cipher-context.c:190
 msgid "Encryption is not supported by this cipher"
 msgstr "符号化はこの暗号をサポートしていません"
 
-#: camel/camel-cipher-context.c:215
+#: camel/camel-cipher-context.c:216
 msgid "Encrypting message"
 msgstr "メッセージの暗号化中"
 
-#: camel/camel-cipher-context.c:232
+#: camel/camel-cipher-context.c:233
 msgid "Decryption is not supported by this cipher"
 msgstr "復号化はこの暗号をサポートしていません"
 
-#: camel/camel-cipher-context.c:254
+#: camel/camel-cipher-context.c:255
 msgid "Decrypting message"
 msgstr "メッセージの暗号の解除中"
 
-#: camel/camel-cipher-context.c:271
+#: camel/camel-cipher-context.c:272
 msgid "You may not import keys with this cipher"
 msgstr "この暗号で鍵をインポートできません"
 
-#: camel/camel-cipher-context.c:301
+#: camel/camel-cipher-context.c:302
 msgid "You may not export keys with this cipher"
 msgstr "この暗号で鍵をエキスポートできません"
 
-#: camel/camel-data-cache.c:133
+#: camel/camel-data-cache.c:134
 msgid "Unable to create cache path"
 msgstr "キャッシュファイルを生成できません"
 
-#: camel/camel-data-cache.c:375
+#: camel/camel-data-cache.c:376
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "キャッシュ・エントリを開けませんでした: %s: %s"
 
-#: camel/camel-disco-diary.c:194
+#: camel/camel-disco-diary.c:195
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -8836,7 +9161,7 @@ msgstr ""
 "ネットワークに再接続しても、このサーバにおける\n"
 "それ以降の操作を再現しません。"
 
-#: camel/camel-disco-diary.c:257
+#: camel/camel-disco-diary.c:258
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -8847,28 +9172,28 @@ msgstr ""
 "%s\n"
 "このフォルダに対する変更は再同期されません。"
 
-#: camel/camel-disco-diary.c:293
+#: camel/camel-disco-diary.c:294
 msgid "Resynchronizing with server"
 msgstr "サーバの再同期"
 
-#: camel/camel-disco-folder.c:41
+#: camel/camel-disco-folder.c:42 camel/providers/imap4/camel-imap4-folder.c:61
 msgid "Copy folder content locally for offline operation"
 msgstr "フォルダの内容をローカルへコピーする (オフライン用)"
 
-#: camel/camel-disco-folder.c:103
+#: camel/camel-disco-folder.c:104
 msgid "Downloading new messages for offline mode"
 msgstr "オフライン・モードでの新しいメッセージのダウンロード"
 
-#: camel/camel-disco-folder.c:466
+#: camel/camel-disco-folder.c:467
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "オフライン用の準備フォルダ '%s'"
 
-#: camel/camel-disco-store.c:404
+#: camel/camel-disco-store.c:405
 msgid "You must be working online to complete this operation"
 msgstr "この動作を完了するためにオンラインで作業して下さい"
 
-#: camel/camel-filter-driver.c:669 camel/camel-filter-search.c:513
+#: camel/camel-filter-driver.c:669 camel/camel-filter-search.c:512
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
@@ -8893,7 +9218,7 @@ msgstr "フォルダを同期中"
 msgid "Error parsing filter: %s: %s"
 msgstr "フィルタの構文解析中にエラー: %s: %s"
 
-#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1429
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "フィルタ実行中にエラー: %s: %s"
@@ -8934,107 +9259,107 @@ msgstr "メッセージ %d / %d の取得中"
 msgid "Failed at message %d of %d"
 msgstr "メッセージ %d / %d で失敗しました"
 
-#: camel/camel-filter-search.c:136
+#: camel/camel-filter-search.c:135
 msgid "Failed to retrieve message"
 msgstr "メッセージの取得に失敗しました"
 
-#: camel/camel-filter-search.c:386
+#: camel/camel-filter-search.c:385
 msgid "Invalid arguments to (system-flag)"
 msgstr "(system-flag) に対する不正な引数"
 
-#: camel/camel-filter-search.c:401
+#: camel/camel-filter-search.c:400
 msgid "Invalid arguments to (user-tag)"
 msgstr "(user-tag) に対する不正な引数"
 
-#: camel/camel-filter-search.c:549
+#: camel/camel-filter-search.c:548
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "子プロセス '%s' の生成に失敗しました: %s"
 
 #. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: camel/camel-filter-search.c:671 camel/camel-filter-search.c:679
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "フィルタ検索実行中にエラー: %s: %s"
 
-#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#: camel/camel-folder.c:610
 #, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"正規表現の構文を解析できません: %s:\n"
-"%s"
+msgid "Unsupported operation: append message: for %s"
+msgstr "サポートしていない操作: %s のメッセージの追加"
 
-#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"正規表現での検索を実行中にエラー: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
-msgid "(match-all) requires a single bool result"
-msgstr "(match-all) は一つの論理結果を必要とします。"
-
-#: camel/camel-folder-search.c:755
-msgid "(match-threads) not allowed inside match-all"
-msgstr "(match-threads) は match-all 内では実行できません。"
-
-#: camel/camel-folder-search.c:758 camel/camel-folder-search.c:762
-msgid "(match-threads) requires a match type string"
-msgstr "(match-threads) には一致する文字列を一つ必要とします。"
-
-#: camel/camel-folder-search.c:784
-msgid "(match-threads) expects an array result"
-msgstr "(match-threads) は配列の結果を期待します"
-
-#: camel/camel-folder-search.c:790
-msgid "(match-threads) requires the folder set"
-msgstr "(match-threads) にはフォルダの組を必要とします"
-
-#: camel/camel-folder-search.c:879
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "特定できないヘッダでクエリを実行しています: %s"
-
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "サポートしていない操作: %s のメッセージの追加"
-
-#: camel/camel-folder.c:1262
+#: camel/camel-folder.c:1200
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "サポートしていない操作: 式 %s による検索"
 
-#: camel/camel-folder.c:1302
+#: camel/camel-folder.c:1240
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "サポートしていない操作: UID %s による検索"
 
-#: camel/camel-folder.c:1416
+#: camel/camel-folder.c:1352
 msgid "Moving messages"
 msgstr "メッセージの移動中"
 
-#: camel/camel-folder.c:1416
+#: camel/camel-folder.c:1352
 msgid "Copying messages"
 msgstr "メッセージのコピー中"
 
-#: camel/camel-folder.c:1665
+#: camel/camel-folder.c:1601
 msgid "Learning junk"
 msgstr "ジャンクの学習中"
 
-#: camel/camel-folder.c:1682
+#: camel/camel-folder.c:1618
 msgid "Learning non-junk"
 msgstr "非ジャンクの学習中"
 
-#: camel/camel-folder.c:1701
+#: camel/camel-folder.c:1637
 msgid "Filtering new message(s)"
 msgstr "新しいメッセージのフィルタリング中"
 
+#: camel/camel-folder-search.c:357 camel/camel-folder-search.c:478
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"正規表現の構文を解析できません: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:367 camel/camel-folder-search.c:488
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"正規表現での検索を実行中にエラー: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:674 camel/camel-folder-search.c:707
+msgid "(match-all) requires a single bool result"
+msgstr "(match-all) は一つの論理結果を必要とします。"
+
+#: camel/camel-folder-search.c:757
+msgid "(match-threads) not allowed inside match-all"
+msgstr "(match-threads) は match-all 内では実行できません。"
+
+#: camel/camel-folder-search.c:760 camel/camel-folder-search.c:764
+msgid "(match-threads) requires a match type string"
+msgstr "(match-threads) には一致する文字列を一つ必要とします。"
+
+#: camel/camel-folder-search.c:786
+msgid "(match-threads) expects an array result"
+msgstr "(match-threads) は配列の結果を期待します"
+
+#: camel/camel-folder-search.c:792
+msgid "(match-threads) requires the folder set"
+msgstr "(match-threads) にはフォルダの組を必要とします"
+
+#: camel/camel-folder-search.c:881
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "特定できないヘッダでクエリを実行しています: %s"
+
 #: camel/camel-gpg-context.c:735
 #, c-format
 msgid ""
@@ -9065,9 +9390,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:804 camel/camel-gpg-context.c:1314
 #: camel/camel-gpg-context.c:1498 camel/camel-gpg-context.c:1589
-#: camel/camel-gpg-context.c:1697 camel/providers/nntp/camel-nntp-store.c:1231
-#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
-#: mail/mail-send-recv.c:611
+#: camel/camel-gpg-context.c:1701 camel/providers/nntp/camel-nntp-store.c:1262
+#: mail/mail-ops.c:720 mail/mail-send-recv.c:607
 msgid "Cancelled."
 msgstr "キャンセルしました"
 
@@ -9100,21 +9424,21 @@ msgstr ""
 msgid "Failed to GPG %s: %s\n"
 msgstr " %s の GPG 化に失敗しました: %s\n"
 
-#: camel/camel-gpg-context.c:1275 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1275 camel/camel-smime-context.c:389
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "署名データを生成できませんでした: %s"
 
-#: camel/camel-gpg-context.c:1307 camel/camel-gpg-context.c:1762
-#: camel/camel-gpg-context.c:1813
+#: camel/camel-gpg-context.c:1307 camel/camel-gpg-context.c:1766
+#: camel/camel-gpg-context.c:1817
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "GPG の実行に失敗しました: %s"
 
 #: camel/camel-gpg-context.c:1331 camel/camel-gpg-context.c:1491
 #: camel/camel-gpg-context.c:1582 camel/camel-gpg-context.c:1605
-#: camel/camel-gpg-context.c:1690 camel/camel-gpg-context.c:1714
-#: camel/camel-gpg-context.c:1784 camel/camel-gpg-context.c:1835
+#: camel/camel-gpg-context.c:1694 camel/camel-gpg-context.c:1718
+#: camel/camel-gpg-context.c:1788 camel/camel-gpg-context.c:1839
 msgid "Failed to execute gpg."
 msgstr "GPG の実行に失敗しました"
 
@@ -9123,8 +9447,8 @@ msgid "This is a digitally signed message part"
 msgstr "このメッセージにはデジタル署名された部分があります"
 
 #: camel/camel-gpg-context.c:1431 camel/camel-gpg-context.c:1437
-#: camel/camel-gpg-context.c:1443 camel/camel-smime-context.c:721
-#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1443 camel/camel-smime-context.c:692
+#: camel/camel-smime-context.c:703 camel/camel-smime-context.c:710
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 "このメッセージ署名の整合性を確認できません: メッセージの書式が正しくありませ"
@@ -9146,34 +9470,18 @@ msgstr "暗号化したデータを生成できませんでした: %s"
 msgid "This is a digitally encrypted message part"
 msgstr "これはデジタル署名された部分です"
 
-#: camel/camel-gpg-context.c:1721 camel/camel-smime-context.c:995
+#: camel/camel-gpg-context.c:1674
+msgid "Failed to decrypt MIME part: protocol error"
+msgstr "MIME 型の暗号解読に失敗しました: プロトコル・エラー"
+
+#: camel/camel-gpg-context.c:1725 camel/camel-smime-context.c:966
 msgid "Encrypted content"
 msgstr "暗号化された内容"
 
-#: camel/camel-gpg-context.c:1740
+#: camel/camel-gpg-context.c:1744
 msgid "Unable to parse message content"
 msgstr "メッセージの内容を解析できません"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "ロッキング・ヘルパー・パイプが構築できません: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "ロッキング・ヘルパーのプロセスを作成できません: %s"
-
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "'%s' をロックできませんでした: lock-helper のプロトコル・エラーです"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "'%s' をロックできません"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -9195,72 +9503,115 @@ msgstr "fcntl(2) を使ったロックに失敗しました: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2) を使ったロックに失敗しました: %s"
 
-#: camel/camel-movemail.c:107
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "ロッキング・ヘルパー・パイプが構築できません: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "ロッキング・ヘルパーのプロセスを作成できません: %s"
+
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "'%s' をロックできませんでした: lock-helper のプロトコル・エラーです"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "'%s' をロックできません"
+
+#: camel/camel-movemail.c:104
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "メール・ファイル %s をチェックできませんでした: %s"
 
-#: camel/camel-movemail.c:120
+#: camel/camel-movemail.c:117
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "メール・ファイル %s を開けませんでした: %s"
 
-#: camel/camel-movemail.c:128
+#: camel/camel-movemail.c:125
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "メール・ファイル %s のテンポラリを開けませんでした: %s"
 
-#: camel/camel-movemail.c:157
+#: camel/camel-movemail.c:154
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "作業ファイル %s へメールの保存に失敗しました: %s"
 
-#: camel/camel-movemail.c:187
+#: camel/camel-movemail.c:184
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "パイプが作成できませんでした: %s"
 
-#: camel/camel-movemail.c:199
+#: camel/camel-movemail.c:196
 #, c-format
 msgid "Could not fork: %s"
 msgstr "fork(2) できませんでした: %s"
 
-#: camel/camel-movemail.c:237
+#: camel/camel-movemail.c:234
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail プログラムは失敗しました: %s"
 
-#: camel/camel-movemail.c:238
+#: camel/camel-movemail.c:235
 msgid "(Unknown error)"
 msgstr "(特定できないエラー)"
 
-#: camel/camel-movemail.c:261
+#: camel/camel-movemail.c:258
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "メール・ファイルの読み込み中にエラー: %s"
 
-#: camel/camel-movemail.c:272
+#: camel/camel-movemail.c:269
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "メール作業ファイルの書き込み中にエラー: %s"
 
-#: camel/camel-movemail.c:465 camel/camel-movemail.c:532
+#: camel/camel-movemail.c:462 camel/camel-movemail.c:529
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "メール作業ファイルのコピー中にエラー: %s"
 
-#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
-msgid "Failed to decrypt MIME part: protocol error"
-msgstr "MIME 型の暗号解読に失敗しました: プロトコル・エラー"
-
-#: camel/camel-multipart-encrypted.c:257
-msgid "Failed to decrypt MIME part: invalid structure"
-msgstr "MIME 型の暗号解読に失敗しました: おかしな構造"
-
-#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
+#: camel/camel-multipart-signed.c:559
 msgid "parse error"
 msgstr "解析エラー"
 
+#: camel/camel-net-utils.c:465
+msgid "cannot create thread"
+msgstr "スレッドを生成できません"
+
+#: camel/camel-net-utils.c:612
+#, c-format
+msgid "Resolving: %s"
+msgstr "解決中: %s"
+
+#: camel/camel-net-utils.c:634
+msgid "Host lookup failed"
+msgstr "ホストの検索に失敗しました"
+
+#: camel/camel-net-utils.c:636
+#, c-format
+msgid "Host lookup failed: %s: %s"
+msgstr "ホストの検索に失敗しました: %s: %s"
+
+#: camel/camel-net-utils.c:743
+msgid "Resolving address"
+msgstr "アドレスの解決中"
+
+#: camel/camel-net-utils.c:763
+msgid "Name lookup failed"
+msgstr "名前の検索に失敗しました"
+
+#: camel/camel-net-utils.c:766
+#, c-format
+msgid "Name lookup failed: %s"
+msgstr "名前の検索に失敗しました: %s"
+
 #: camel/camel-provider.c:59
 msgid "Virtual folder email provider"
 msgstr "仮想フォルダ・メール・プロバイダ"
@@ -9269,24 +9620,24 @@ msgstr "仮想フォルダ・メール・プロバイダ"
 msgid "For reading mail as a query of another set of folders"
 msgstr "その他のフォルダ・セットのクエリとしてメールを読む"
 
-#: camel/camel-provider.c:172
+#: camel/camel-provider.c:185
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "%s を読み込めませんでした: このシステムではモジュールの読み込みをサポートして"
 "いません。"
 
-#: camel/camel-provider.c:181
+#: camel/camel-provider.c:194
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s を読み込めませんでした: %s"
 
-#: camel/camel-provider.c:189
+#: camel/camel-provider.c:202
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s を読み込めませんでした: モジュールのコードが初期化されていません。"
 
-#: camel/camel-provider.c:356 camel/camel-session.c:160
+#: camel/camel-provider.c:374 camel/camel-session.c:161
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "プロトコル '%s' を利用できるプロバイダはありません"
@@ -9299,7 +9650,7 @@ msgstr "匿名"
 msgid "This option will connect to the server using an anonymous login."
 msgstr "このオプションは匿名ログインを使ってサーバへ接続します。"
 
-#: camel/camel-sasl-anonymous.c:112 camel/camel-sasl-plain.c:87
+#: camel/camel-sasl-anonymous.c:112 camel/camel-sasl-plain.c:88
 msgid "Authentication failed."
 msgstr "認証に失敗しました"
 
@@ -9330,11 +9681,11 @@ msgstr ""
 "無効なトレース情報:\n"
 "%s"
 
-#: camel/camel-sasl-cram-md5.c:35
+#: camel/camel-sasl-cram-md5.c:36
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: camel/camel-sasl-cram-md5.c:37
+#: camel/camel-sasl-cram-md5.c:38
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -9342,11 +9693,11 @@ msgstr ""
 "サーバがサポートしている場合、このオプションはセキュリティ保護された CRAM-"
 "MD5 認証を使ってサーバへ接続します。"
 
-#: camel/camel-sasl-digest-md5.c:48
+#: camel/camel-sasl-digest-md5.c:49
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:50
+#: camel/camel-sasl-digest-md5.c:51
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -9354,39 +9705,39 @@ msgstr ""
 "サーバがサポートしている場合、このオプションはセキュリティ保護された DIGEST-"
 "MD5 を使ってサーバへ接続します。"
 
-#: camel/camel-sasl-digest-md5.c:813
+#: camel/camel-sasl-digest-md5.c:814
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr "長すぎます (2048バイト以上です)\n"
 
-#: camel/camel-sasl-digest-md5.c:822
+#: camel/camel-sasl-digest-md5.c:823
 msgid "Server challenge invalid\n"
 msgstr "無効です\n"
 
-#: camel/camel-sasl-digest-md5.c:828
+#: camel/camel-sasl-digest-md5.c:829
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr "無効なトークン \"Quality of Protection\" があります\n"
 
-#: camel/camel-sasl-digest-md5.c:850
+#: camel/camel-sasl-digest-md5.c:859
 msgid "Server response did not contain authorization data\n"
 msgstr "サーバの応答に認証データがありません\n"
 
-#: camel/camel-sasl-digest-md5.c:868
+#: camel/camel-sasl-digest-md5.c:877
 msgid "Server response contained incomplete authorization data\n"
 msgstr "サーバの応答に不完全な認証データがあります\n"
 
-#: camel/camel-sasl-digest-md5.c:878
+#: camel/camel-sasl-digest-md5.c:887
 msgid "Server response does not match\n"
 msgstr "サーバの応答が一致しません\n"
 
-#: camel/camel-sasl-gssapi.c:52
+#: camel/camel-sasl-gssapi.c:53
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: camel/camel-sasl-gssapi.c:54
+#: camel/camel-sasl-gssapi.c:55
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "このオプションは Kerberos 5 認証を使ってサーバに接続します。"
 
-#: camel/camel-sasl-gssapi.c:152
+#: camel/camel-sasl-gssapi.c:153
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -9394,18 +9745,18 @@ msgstr ""
 "指定したメカニズムが提供された証明書ではサポートされていないか、その実装で認"
 "識されていません。"
 
-#: camel/camel-sasl-gssapi.c:157
+#: camel/camel-sasl-gssapi.c:158
 msgid "The provided target_name parameter was ill-formed."
 msgstr "指定した引数 target_name の形式が間違っています。"
 
-#: camel/camel-sasl-gssapi.c:160
+#: camel/camel-sasl-gssapi.c:161
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 msgstr ""
 "指定した引数 target_name に不正なあるいは未サポートの名前の種類があります。"
 
-#: camel/camel-sasl-gssapi.c:164
+#: camel/camel-sasl-gssapi.c:165
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -9413,13 +9764,13 @@ msgstr ""
 "input_token に引数 input_chan_bindigs を介して指定された別のチャンネルのビン"
 "ディングがあります。"
 
-#: camel/camel-sasl-gssapi.c:169
+#: camel/camel-sasl-gssapi.c:170
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 msgstr "input_token に不正な署名があるか、またはその署名が正しくありません。"
 
-#: camel/camel-sasl-gssapi.c:173
+#: camel/camel-sasl-gssapi.c:174
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -9427,48 +9778,43 @@ msgstr ""
 "指定した証明書でコンテキストの初期化はできないか、または証明書のハンドルが任"
 "意の証明書を参照していませんでした。"
 
-#: camel/camel-sasl-gssapi.c:178
+#: camel/camel-sasl-gssapi.c:179
 msgid "The supplied context handle did not refer to a valid context."
 msgstr ""
 "指定したコンテキストのハンドルが正しいコンテキストを参照していませんでした。"
 
-#: camel/camel-sasl-gssapi.c:181
+#: camel/camel-sasl-gssapi.c:182
 msgid "The consistency checks performed on the input_token failed."
 msgstr "input_token で実施した整合性のチェックが失敗しました。"
 
-#: camel/camel-sasl-gssapi.c:184
+#: camel/camel-sasl-gssapi.c:185
 msgid "The consistency checks performed on the credential failed."
 msgstr "証明書で実施した整合性のチェックが失敗しました。"
 
-#: camel/camel-sasl-gssapi.c:187
+#: camel/camel-sasl-gssapi.c:188
 msgid "The referenced credentials have expired."
 msgstr "参照している証明書の期限が過ぎています。"
 
-#: camel/camel-sasl-gssapi.c:193 camel/camel-sasl-gssapi.c:242
+#: camel/camel-sasl-gssapi.c:194 camel/camel-sasl-gssapi.c:242
 #: camel/camel-sasl-gssapi.c:278 camel/camel-sasl-gssapi.c:293
-#: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1236
+#: camel/camel-sasl-kerberos4.c:226
+#: camel/providers/imap/camel-imap-store.c:1213
 msgid "Bad authentication response from server."
 msgstr "サーバから間違った認証応答がありました。"
 
-#: camel/camel-sasl-gssapi.c:217
-#, c-format
-msgid "Failed to resolve host `%s': %s"
-msgstr "ホスト '%s' の名前解決に失敗しました: %s"
-
 #: camel/camel-sasl-gssapi.c:303
 msgid "Unsupported security layer."
 msgstr "サポートしていないセキュリティ・レイヤです。"
 
-#: camel/camel-sasl-kerberos4.c:41
+#: camel/camel-sasl-kerberos4.c:42
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/camel-sasl-kerberos4.c:43
+#: camel/camel-sasl-kerberos4.c:44
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr "このオプションは Kerberos 4 認証を使ってサーバに接続します"
 
-#: camel/camel-sasl-kerberos4.c:162
+#: camel/camel-sasl-kerberos4.c:169
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -9477,23 +9823,23 @@ msgstr ""
 "Kerberos チケットを取得できませんでした:\n"
 "%s"
 
-#: camel/camel-sasl-login.c:32
+#: camel/camel-sasl-login.c:33
 msgid "Login"
 msgstr "ログイン"
 
-#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
+#: camel/camel-sasl-login.c:35 camel/camel-sasl-plain.c:35
 msgid "This option will connect to the server using a simple password."
 msgstr "このオプションは簡単なパスワードを使ってサーバへ接続します"
 
-#: camel/camel-sasl-login.c:127
+#: camel/camel-sasl-login.c:128
 msgid "Unknown authentication state."
 msgstr "特定できない認証状態です"
 
-#: camel/camel-sasl-ntlm.c:31
+#: camel/camel-sasl-ntlm.c:32
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: camel/camel-sasl-ntlm.c:33
+#: camel/camel-sasl-ntlm.c:34
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
@@ -9501,88 +9847,51 @@ msgstr ""
 "このオプションは NTLM/セキュリティ保護されたパスワード認証を使って Windows "
 "サーバに接続します。"
 
-#: camel/camel-sasl-plain.c:32
+#: camel/camel-sasl-plain.c:33
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: camel/camel-sasl-popb4smtp.c:36
+#: camel/camel-sasl-popb4smtp.c:37
 msgid "POP before SMTP"
 msgstr "SMTP の前に POP"
 
-#: camel/camel-sasl-popb4smtp.c:38
+#: camel/camel-sasl-popb4smtp.c:39
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "このオプションは SMTP 接続を試す前に POP 接続の認証を行います"
 
-#: camel/camel-sasl-popb4smtp.c:103
+#: camel/camel-sasl-popb4smtp.c:104
 msgid "POP Source URI"
 msgstr "POP ソース URI"
 
-#: camel/camel-sasl-popb4smtp.c:106
+#: camel/camel-sasl-popb4smtp.c:107
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr "不明な転送を利用して SMTP 認証の前に POP"
 
-#: camel/camel-sasl-popb4smtp.c:111
+#: camel/camel-sasl-popb4smtp.c:112
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "POP でないソースを利用して SMTP 認証の前に POP"
 
-#: camel/camel-search-private.c:114
+#: camel/camel-search-private.c:151
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "正規表現の編集に失敗: %s: %s"
 
-#: camel/camel-service.c:271
+#: camel/camel-service.c:272
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' はユーザ名コンポーネントが必要です"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:276
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' はホスト・コンポーネントが必要です"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:280
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' はパス・コンポーネントが必要です"
 
-#: camel/camel-service.c:729
-#, c-format
-msgid "Resolving: %s"
-msgstr "解決中: %s"
-
-#: camel/camel-service.c:760 camel/camel-service.c:884
-#, c-format
-msgid "Failure in name lookup: %s"
-msgstr "名前の検索に失敗しました: %s"
-
-#: camel/camel-service.c:781 camel/camel-service.c:905
-#, c-format
-msgid "Host lookup failed: cannot create thread: %s"
-msgstr "ホストの検索に失敗しました: スレッドを生成できません: %s"
-
-#: camel/camel-service.c:794
-#, c-format
-msgid "Host lookup failed: %s: host not found"
-msgstr "ホストの検索に失敗しました: %s: ホストが見つかりません"
-
-#: camel/camel-service.c:797
-#, c-format
-msgid "Host lookup failed: %s: unknown reason"
-msgstr "ホストの検索に失敗しました: %s: 原因は不明です"
-
-#: camel/camel-service.c:851
-msgid "Resolving address"
-msgstr "アドレスの解決中"
-
-#: camel/camel-service.c:920
-msgid "Host lookup failed: host not found"
-msgstr "ホストの検索に失敗しました: ホストが見つかりません"
-
-#: camel/camel-service.c:923
-msgid "Host lookup failed: unknown reason"
-msgstr "ホストの検索に失敗しました: 原因は不明です"
-
-#: camel/camel-session.c:282
+#: camel/camel-session.c:283
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9591,252 +9900,247 @@ msgstr ""
 "フォルダ %s を作成できませんでした:\n"
 "%s"
 
-#: camel/camel-smime-context.c:104
-#, c-format
-msgid "Enter security pass-phrase for `%s'"
-msgstr "'%s' 用のセキュリティ・パスフレーズを入力して下さい"
-
-#: camel/camel-smime-context.c:261
+#: camel/camel-smime-context.c:231
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "'%s' の証明書が見つかりません"
 
-#: camel/camel-smime-context.c:267
+#: camel/camel-smime-context.c:237
 msgid "Cannot create CMS message"
 msgstr "CMS メッセージを作成できません"
 
-#: camel/camel-smime-context.c:272
-msgid "Cannot create CMS signedData"
-msgstr "CMS singedData を作成できません"
+#: camel/camel-smime-context.c:242
+msgid "Cannot create CMS signed data"
+msgstr "CMS 署名データを作成できません"
 
-#: camel/camel-smime-context.c:278
-msgid "Cannot attach CMS signedData"
-msgstr "CMS signedData を添付できません"
+#: camel/camel-smime-context.c:248
+msgid "Cannot attach CMS signed data"
+msgstr "CMS 署名データを添付できません"
 
-#: camel/camel-smime-context.c:285
+#: camel/camel-smime-context.c:255
 msgid "Cannot attach CMS data"
 msgstr "CMS データを添付できません"
 
-#: camel/camel-smime-context.c:291
-msgid "Cannot create CMS SignerInfo"
-msgstr "CMS SignerInfo を作成できません"
+#: camel/camel-smime-context.c:261
+msgid "Cannot create CMS Signer information"
+msgstr "CMS 署名者の情報を作成できません"
 
-#: camel/camel-smime-context.c:297
-msgid "Cannot find cert chain"
-msgstr "CERT 鍵が見つかりません"
+#: camel/camel-smime-context.c:267
+msgid "Cannot find certificate chain"
+msgstr "証明書のチェーンが見つかりません"
 
-#: camel/camel-smime-context.c:303
-msgid "Cannot add CMS SigningTime"
-msgstr "CMS SigningTime を追加できません"
+#: camel/camel-smime-context.c:273
+msgid "Cannot add CMS Signing time"
+msgstr "CMS 署名時の時刻を追加できません"
 
-#: camel/camel-smime-context.c:325 camel/camel-smime-context.c:337
+#: camel/camel-smime-context.c:295 camel/camel-smime-context.c:307
 #, c-format
-msgid "Encryption cert for '%s' does not exist"
-msgstr "'%s' の暗号化証明書が終了しません"
+msgid "Encryption certificate for '%s' does not exist"
+msgstr "'%s' の暗号化した証明書が存在しません"
 
-#: camel/camel-smime-context.c:344
+#: camel/camel-smime-context.c:314
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "属性 SMIMEEncKeyPrefs を追加できません"
 
-#: camel/camel-smime-context.c:349
+#: camel/camel-smime-context.c:319
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "属性 MS SMIMEEncKeyPrefs を追加できません"
 
-#: camel/camel-smime-context.c:354
+#: camel/camel-smime-context.c:324
 msgid "Cannot add encryption certificate"
 msgstr "暗号化証明書を追加できません"
 
-#: camel/camel-smime-context.c:360
-msgid "Cannot add CMS SignerInfo"
-msgstr "CMS SignerInfo を追加できません"
+#: camel/camel-smime-context.c:330
+msgid "Cannot add CMS Signer information"
+msgstr "CMS 署名者の情報を追加できません"
 
-#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
+#: camel/camel-smime-context.c:400 camel/camel-smime-context.c:848
 msgid "Cannot create encoder context"
 msgstr "エンコーダのコンテキストを作成できません"
 
-#: camel/camel-smime-context.c:436
+#: camel/camel-smime-context.c:406
 msgid "Failed to add data to CMS encoder"
 msgstr "CMS エンコーダへのデータの追加が失敗しました"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
+#: camel/camel-smime-context.c:411 camel/camel-smime-context.c:865
 msgid "Failed to encode data"
 msgstr "データのエンコードに失敗しました"
 
-#: camel/camel-smime-context.c:514
+#: camel/camel-smime-context.c:484
 msgid "Unverified"
 msgstr "未検証"
 
-#: camel/camel-smime-context.c:516
+#: camel/camel-smime-context.c:486
 msgid "Good signature"
 msgstr "良い署名"
 
-#: camel/camel-smime-context.c:518
+#: camel/camel-smime-context.c:488
 msgid "Bad signature"
 msgstr "悪い署名"
 
-#: camel/camel-smime-context.c:520
+#: camel/camel-smime-context.c:490
 msgid "Content tampered with or altered in transit"
 msgstr "データの転送中に不当に改竄された内容です"
 
-#: camel/camel-smime-context.c:522
+#: camel/camel-smime-context.c:492
 msgid "Signing certificate not found"
 msgstr "署名付き証明書がみつかりません"
 
-#: camel/camel-smime-context.c:524
+#: camel/camel-smime-context.c:494
 msgid "Signing certificate not trusted"
 msgstr "署名付き証明書は信頼できません"
 
-#: camel/camel-smime-context.c:526
+#: camel/camel-smime-context.c:496
 msgid "Signature algorithm unknown"
 msgstr "署名アルゴリズムが不明です"
 
-#: camel/camel-smime-context.c:528
+#: camel/camel-smime-context.c:498
 msgid "Signature algorithm unsupported"
 msgstr "署名アルゴリズムは未サポートです"
 
-#: camel/camel-smime-context.c:530
+#: camel/camel-smime-context.c:500
 msgid "Malformed signature"
 msgstr "おかしな署名です"
 
-#: camel/camel-smime-context.c:532
+#: camel/camel-smime-context.c:502
 msgid "Processing error"
 msgstr "処理エラーです"
 
-#: camel/camel-smime-context.c:569
-msgid "No signedData in signature"
-msgstr "署名の中に signedData がありません"
+#: camel/camel-smime-context.c:539
+msgid "No signed data in signature"
+msgstr "署名の中にデータが存在しません"
 
-#: camel/camel-smime-context.c:576
+#: camel/camel-smime-context.c:546
 msgid "Digests missing from enveloped data"
 msgstr "EnvelopedData からのダイジェストがありません"
 
-#: camel/camel-smime-context.c:589 camel/camel-smime-context.c:599
+#: camel/camel-smime-context.c:559 camel/camel-smime-context.c:569
 msgid "Cannot calculate digests"
 msgstr "ダイジェストを計算できません"
 
-#: camel/camel-smime-context.c:604
+#: camel/camel-smime-context.c:574
 msgid "Cannot set message digests"
 msgstr "メッセージ・ダイジェストをセットできません"
 
-#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
+#: camel/camel-smime-context.c:584 camel/camel-smime-context.c:589
 msgid "Certificate import failed"
 msgstr "証明書のインポートに失敗しました"
 
-#: camel/camel-smime-context.c:628
-msgid "Certificate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:599
+msgid "Certificate is the only message, cannot verify certificates"
 msgstr "メッセージのみ認証しますが、妥当性を検証できません"
 
-#: camel/camel-smime-context.c:631
-msgid "Certificate only message, certificates imported and verified"
-msgstr "メッセージ、インポート済で検証済みの証明書のみ認証します"
+#: camel/camel-smime-context.c:602
+msgid "Certificate is the only message, certificates imported and verified"
+msgstr "メッセージのみ認証して、証明書をインポートし検証します"
 
-#: camel/camel-smime-context.c:635
+#: camel/camel-smime-context.c:606
 msgid "Cannot find signature digests"
 msgstr "証明書のダイジェストが見つかりません"
 
-#: camel/camel-smime-context.c:651
+#: camel/camel-smime-context.c:622
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "署名者: %s <%s>: %s\n"
 
-#: camel/camel-smime-context.c:752
+#: camel/camel-smime-context.c:723
 msgid "Decoder failed"
 msgstr "デコーダのエラーです"
 
-#: camel/camel-smime-context.c:804
+#: camel/camel-smime-context.c:775
 #, c-format
 msgid "Cannot find certificate for `%s'"
 msgstr "'%s' の証明書が見つかりません"
 
-#: camel/camel-smime-context.c:811
+#: camel/camel-smime-context.c:782
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "共通なバルク暗号化アルゴリズムが見つかりません"
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:820
+#: camel/camel-smime-context.c:791
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "暗号化バルク鍵のスロットを確保できません"
 
-#: camel/camel-smime-context.c:831
+#: camel/camel-smime-context.c:802
 msgid "Cannot create CMS Message"
 msgstr "CMS メッセージを作成できません"
 
-#: camel/camel-smime-context.c:837
-msgid "Cannot create CMS EnvelopedData"
-msgstr "CMS EnvelopedData を作成できません"
+#: camel/camel-smime-context.c:808
+msgid "Cannot create CMS Enveloped data"
+msgstr "CMS Enveloped データを作成できません"
 
-#: camel/camel-smime-context.c:843
-msgid "Cannot attach CMS EnvelopedData"
-msgstr "CMS EnvelopedData を添付できません"
+#: camel/camel-smime-context.c:814
+msgid "Cannot attach CMS Enveloped data"
+msgstr "CMS Enveloped  データを添付できません"
 
-#: camel/camel-smime-context.c:849
+#: camel/camel-smime-context.c:820
 msgid "Cannot attach CMS data object"
 msgstr "CMS データ・オブジェクトを添付できません"
 
-#: camel/camel-smime-context.c:858
-msgid "Cannot create CMS RecipientInfo"
-msgstr "CMS RecipientInfo を作成できません"
+#: camel/camel-smime-context.c:829
+msgid "Cannot create CMS Recipient information"
+msgstr "CMS 受領情報を作成できません"
 
-#: camel/camel-smime-context.c:863
-msgid "Cannot add CMS RecipientInfo"
-msgstr "CMS RecipientInfo を追加できません"
+#: camel/camel-smime-context.c:834
+msgid "Cannot add CMS Recipient information"
+msgstr "CMS 受領情報を追加できません"
 
-#: camel/camel-smime-context.c:888
+#: camel/camel-smime-context.c:859
 msgid "Failed to add data to encoder"
 msgstr "データのエンコーダへの追加に失敗しました"
 
-#: camel/camel-smime-context.c:975
+#: camel/camel-smime-context.c:946
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr "デコーダのエラー %d"
 
-#: camel/camel-smime-context.c:982
+#: camel/camel-smime-context.c:953
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME 復号化: 暗号化された内容がありません"
 
-#: camel/camel-smime-context.c:1009
+#: camel/camel-smime-context.c:980
 msgid "import keys: unimplemented"
 msgstr "鍵のインポート: 未だ実装されていません"
 
-#: camel/camel-smime-context.c:1017
+#: camel/camel-smime-context.c:988
 msgid "export keys: unimplemented"
 msgstr "鍵のエキスポート: 未だ実装されていません"
 
-#: camel/camel-store.c:213
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "フォルダを取得できません: この格納場所で不正な操作です"
 
-#: camel/camel-store.c:243
+#: camel/camel-store.c:244
 #, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "フォルダ '%s' を作成できません: フォルダが存在します"
 
-#: camel/camel-store.c:297
+#: camel/camel-store.c:298
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "フォルダを作成できません: この格納場所で不正な操作です"
 
-#: camel/camel-store.c:325
+#: camel/camel-store.c:326
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "フォルダを作成できません: %s: フォルダが存在します"
 
-#: camel/camel-store.c:389 camel/camel-vee-store.c:351
+#: camel/camel-store.c:390 camel/camel-vee-store.c:367
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "フォルダを削除できません: %s: 不正な操作です"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:388
-#: camel/providers/local/camel-maildir-store.c:232
+#: camel/camel-store.c:440 camel/camel-vee-store.c:404
+#: camel/providers/local/camel-maildir-store.c:233
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "フォルダ名を変更できません: %s: 不正な操作です"
 
-#: camel/camel-store.c:777
+#: camel/camel-store.c:778
 msgid "Trash"
 msgstr "ゴミ箱"
 
-#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
-#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:780 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:93 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "ジャンク"
 
@@ -9956,7 +10260,7 @@ msgstr "キーの利用方法が認証署名をサポートしていません"
 msgid "Error in application verification"
 msgstr "アプリケーションの検証でエラーが発生しました"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:827
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9969,11 +10273,11 @@ msgstr ""
 "指紋:              %s\n"
 "署名:              %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:833
 msgid "GOOD"
 msgstr "GOOD"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:833
 msgid "BAD"
 msgstr "BAD"
 
@@ -9997,7 +10301,7 @@ msgstr ""
 "受諾してみますか？"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:836
+#: camel/camel-tcp-stream-ssl.c:837
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -10012,7 +10316,7 @@ msgstr ""
 "\n"
 "受諾してみますか？"
 
-#: camel/camel-tcp-stream-ssl.c:880
+#: camel/camel-tcp-stream-ssl.c:881
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -10021,7 +10325,7 @@ msgstr ""
 "認証問題: %s\n"
 "発行者: %s"
 
-#: camel/camel-tcp-stream-ssl.c:932
+#: camel/camel-tcp-stream-ssl.c:933
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -10030,7 +10334,7 @@ msgstr ""
 "おかしな認証ドメイン: %s\n"
 "発行者: %s"
 
-#: camel/camel-tcp-stream-ssl.c:950
+#: camel/camel-tcp-stream-ssl.c:951
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -10039,7 +10343,7 @@ msgstr ""
 "証明書の有効期限切れ: %s\n"
 "発行者: %s"
 
-#: camel/camel-tcp-stream-ssl.c:967
+#: camel/camel-tcp-stream-ssl.c:968
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -10048,686 +10352,777 @@ msgstr ""
 "証明書取り消し一覧の期限切れ: %s\n"
 "発行者: %s"
 
-#: camel/camel-url.c:292
+#: camel/camel-url.c:293
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "URL '%s' を解析できませんでした"
 
-#: camel/camel-vee-folder.c:633
+#: camel/camel-vee-folder.c:476
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "'%s' の格納中にエラー: %s"
 
-#: camel/camel-vee-folder.c:675
+#: camel/camel-vee-folder.c:518
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%s に %s のようなメッセージはありません"
 
-#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
+#: camel/camel-vee-folder.c:643 camel/camel-vee-folder.c:649
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "メッセージの仮想フォルダへのコピーまたは移動ができません"
 
-#: camel/camel-vee-store.c:374
+#: camel/camel-vee-store.c:390
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "フォルダを削除できません: %s: そのようなフォルダはありません"
 
-#: camel/camel-vee-store.c:396
+#: camel/camel-vee-store.c:412
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "フォルダ名を変更できません: %s: そのようなフォルダはありません"
 
-#: camel/camel-vtrash-folder.c:44
+#: camel/camel-vtrash-folder.c:47
 msgid "Cannot copy messages to the Trash folder"
 msgstr "ゴミ箱フォルダへメッセージをコピーできません"
 
-#: camel/camel-vtrash-folder.c:46
+#: camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Junk folder"
 msgstr "ジャンク・フォルダへメッセージをコピーできません"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:53
-#: camel/providers/imap4/camel-imap4-provider.c:35
+#: camel/providers/groupwise/camel-groupwise-provider.c:54
+#: camel/providers/imap4/camel-imap4-provider.c:36
 msgid "Checking for new mail"
 msgstr "新着メールのチェック"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap/camel-imap-provider.c:45
-#: camel/providers/imap4/camel-imap4-provider.c:37
+#: camel/providers/groupwise/camel-groupwise-provider.c:56
+#: camel/providers/imap4/camel-imap4-provider.c:38
 msgid "Check for new messages in all folders"
 msgstr "全てのフォルダの新着メールをチェックする"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:59
+#: camel/providers/groupwise/camel-groupwise-provider.c:61
 msgid "Apply filters to new messages in Inbox on this server"
 msgstr "このサーバの Inbox にある新しいメッセージへフィルタを適用する"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:61
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/groupwise/camel-groupwise-provider.c:63
+#: camel/providers/imap4/camel-imap4-provider.c:53
 msgid "Check new messages for Junk contents"
 msgstr "新着メールがスパムかどうかチェックする"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:63
-#: camel/providers/imap/camel-imap-provider.c:68
+#: camel/providers/groupwise/camel-groupwise-provider.c:65
+#: camel/providers/imap4/camel-imap4-provider.c:55
 msgid "Only check for Junk messages in the INBOX folder"
 msgstr "INBOX フォルダにあるメールのみスパムかどうかチェックする"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:65
-#: camel/providers/imap/camel-imap-provider.c:70
-msgid "Automatically synchronize remote mail locally"
-msgstr "リモートとローカルのメールを自動的に同期する"
+#: camel/providers/groupwise/camel-groupwise-provider.c:67
+msgid "Automatically synchronize account locally"
+msgstr "自動的にローカルのアカウントを同期する"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:69
+#: camel/providers/groupwise/camel-groupwise-provider.c:72
 msgid "Address Book and Calendar"
 msgstr "アドレス帳とカレンダ"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:72
+#: camel/providers/groupwise/camel-groupwise-provider.c:75
 msgid "Post Office Agent:"
 msgstr "ポスト・オフィス・エージェント:"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:75
+#: camel/providers/groupwise/camel-groupwise-provider.c:78
 msgid "Post Office Agent SOAP Port:"
 msgstr "ポスト・オフィス・エージェントの SOAP ポート:"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:78
+#: camel/providers/groupwise/camel-groupwise-provider.c:81
 msgid "Use Secure Connection (SSL)"
 msgstr "セキュリティ保護された接続 (SSL) の利用"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:92
+#: camel/providers/groupwise/camel-groupwise-provider.c:94
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:94
+#: camel/providers/groupwise/camel-groupwise-provider.c:96
 msgid "For accessing Novell Groupwise servers"
 msgstr "Novell Groupwise サーバ・アクセス用です"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:109
-#: camel/providers/imap/camel-imap-provider.c:93
-#: camel/providers/imap4/camel-imap4-provider.c:70
-#: camel/providers/imapp/camel-imapp-provider.c:65
-#: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
+#: camel/providers/groupwise/camel-groupwise-provider.c:111
+#: camel/providers/imap4/camel-imap4-provider.c:81
+#: camel/providers/imap/camel-imap-provider.c:96
+#: camel/providers/imapp/camel-imapp-provider.c:66
+#: camel/providers/nntp/camel-nntp-provider.c:72
+#: camel/providers/pop3/camel-pop3-provider.c:72
 msgid "Password"
 msgstr "パスワード"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:111
-#: camel/providers/imap/camel-imap-provider.c:95
-#: camel/providers/imapp/camel-imapp-provider.c:67
+#: camel/providers/groupwise/camel-groupwise-provider.c:113
+#: camel/providers/imap/camel-imap-provider.c:98
+#: camel/providers/imapp/camel-imapp-provider.c:68
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "このオプションはプレイン・テキストのパスワードを使って IMAP サーバに接続しま"
 "す"
 
-#: camel/providers/groupwise/camel-gw-listener.c:332
-#: camel/providers/groupwise/camel-gw-listener.c:362
+#: camel/providers/groupwise/camel-gw-listener.c:436
+#: plugins/groupwise-account-setup/camel-gw-listener.c:436
 msgid "Checklist"
 msgstr "チェックリスト"
 
-#: camel/providers/imap/camel-imap-command.c:218
-#: camel/providers/imap/camel-imap-command.c:257
-#: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3191
-msgid "Operation cancelled"
-msgstr "処理がキャンセルされました"
-
-#: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap4/camel-imap4-command.c:551
+#: camel/providers/imap4/camel-imap4-command.c:558
 #, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "突然サーバが接続を切りました: %s"
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "IMAP サーバ %s へのコマンド送信に失敗しました: %s"
 
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/imap4/camel-imap4-store.c:283
-#: camel/providers/pop3/camel-pop3-store.c:543
-#: camel/providers/pop3/camel-pop3-store.c:550
-#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1220
-msgid "Unknown error"
-msgstr "特定できないエラー"
+#: camel/providers/imap4/camel-imap4-command.c:661
+#, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "IMAP サーバ %s から予期しない応答がありました: %s"
 
-#. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:320
+#: camel/providers/imap4/camel-imap4-engine.c:216
 #, c-format
-msgid ""
-"Alert from IMAP server %s@%s:\n"
-"%s"
-msgstr ""
-"IMAP サーバ %s@%s からの警告:\n"
-"%s"
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "IMAP サーバ %s から予期しない応答がありました"
 
-#: camel/providers/imap/camel-imap-command.c:389
+#: camel/providers/imap4/camel-imap4-engine.c:410
 #, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "IMAP サーバから予期しない応答がありました: %s"
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "フォルダ '%s' を選択できません: mailbox の名前が不正です"
 
-#: camel/providers/imap/camel-imap-command.c:399
+#: camel/providers/imap4/camel-imap4-engine.c:416
 #, c-format
-msgid "IMAP command failed: %s"
-msgstr "IMAP コマンドが失敗しました: %s"
+msgid "Cannot select folder `%s': Bad command"
+msgstr "フォルダ '%s' を選択できません: コマンドが間違っています"
 
-#: camel/providers/imap/camel-imap-command.c:457
-msgid "Server response ended too soon."
-msgstr "サーバレスポンスはあっけなく終わりました"
+#: camel/providers/imap4/camel-imap4-engine.c:1464
+#: camel/providers/imap4/camel-imap4-engine.c:1503
+#: camel/providers/imap4/camel-imap4-engine.c:1548
+#: camel/providers/imap4/camel-imap4-engine.c:1604
+#, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "突然 IMAP4 サーバ %s が接続を切りました: %s"
 
-#: camel/providers/imap/camel-imap-command.c:649
+#: camel/providers/imap4/camel-imap4-folder.c:359
 #, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr "IMAP サーバの応答は %s 情報を含んでいません"
+msgid "Cannot access folder `%s': %s"
+msgstr "フォルダ '%s' にアクセスできません: %s"
 
-#: camel/providers/imap/camel-imap-command.c:685
+#: camel/providers/imap4/camel-imap4-folder.c:418
 #, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr "IMAP サーバから予期しない OK 応答がありました: %s"
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "フォルダ '%s' とフラグを同期できません: 不明なエラー"
 
-#: camel/providers/imap/camel-imap-folder.c:226
+#: camel/providers/imap4/camel-imap4-folder.c:424
 #, c-format
-msgid "Could not create directory %s: %s"
-msgstr "フォルダ %s を作成できませんでした: %s"
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "フォルダ '%s' とフラグを同期できません: コマンドが間違っています"
 
-#: camel/providers/imap/camel-imap-folder.c:245
+#: camel/providers/imap4/camel-imap4-folder.c:565
 #, c-format
-msgid "Could not load summary for %s"
-msgstr "%s のサマリをロードできませんでした"
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "フォルダ '%s' を抹消できません: 不明なエラー"
 
-#: camel/providers/imap/camel-imap-folder.c:330
-msgid "Folder was destroyed and recreated on server."
-msgstr "フォルダは破壊され再作成されました"
+#: camel/providers/imap4/camel-imap4-folder.c:570
+#, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "フォルダ '%s' を抹消できません: コマンドが間違っています"
 
-#. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:573
-msgid "Scanning for changed messages"
-msgstr "変更メッセージの解析中"
+#: camel/providers/imap4/camel-imap4-folder.c:749
+#: camel/providers/nntp/camel-nntp-folder.c:157
+#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/nntp/camel-nntp-folder.c:372
+#: camel/providers/pop3/camel-pop3-folder.c:263
+#: camel/providers/pop3/camel-pop3-folder.c:431
+#: camel/providers/pop3/camel-pop3-folder.c:492
+#: camel/providers/pop3/camel-pop3-folder.c:510
+msgid "User cancelled"
+msgstr "ユーザが取り消しました"
 
-#: camel/providers/imap/camel-imap-folder.c:1938
+#: camel/providers/imap4/camel-imap4-folder.c:754
+#: camel/providers/nntp/camel-nntp-folder.c:148
+#: camel/providers/nntp/camel-nntp-folder.c:150
+#: camel/providers/nntp/camel-nntp-folder.c:159
+#: camel/providers/nntp/camel-nntp-folder.c:235
+#: camel/providers/pop3/camel-pop3-folder.c:434
+#: camel/providers/pop3/camel-pop3-folder.c:495
+#: camel/providers/pop3/camel-pop3-folder.c:502
+#: camel/providers/pop3/camel-pop3-folder.c:513
 #, c-format
-msgid "Unable to retrieve message: %s"
-msgstr "メッセージを取得できません: %s"
+msgid "Cannot get message %s: %s"
+msgstr "メッセージ %s を取得できません: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1975
+#: camel/providers/imap4/camel-imap4-folder.c:772
+msgid "This message is not available in offline mode."
+msgstr "このメッセージはオフライン・モードでは利用できません。"
+
+#: camel/providers/imap4/camel-imap4-folder.c:826
 #, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
+msgid "Cannot get message %s from folder `%s': No such message"
 msgstr ""
-"メッセージを取得できません: %s\n"
-"  %s"
-
-#: camel/providers/imap/camel-imap-folder.c:1975
-#: camel/providers/local/camel-maildir-folder.c:244
-#: camel/providers/local/camel-mbox-folder.c:418
-#: camel/providers/local/camel-mh-folder.c:202
-msgid "No such message"
-msgstr "そのようなメッセージはありません"
+"メッセージ %s をフォルダ '%s' から取得できません: そのようなメッセージはあり"
+"ません"
 
-#: camel/providers/imap/camel-imap-folder.c:2017
-#: camel/providers/imap/camel-imap-folder.c:2620
-#: camel/providers/nntp/camel-nntp-folder.c:220
-msgid "This message is not currently available"
-msgstr "現在このメッセージは有効ではありません"
+#: camel/providers/imap4/camel-imap4-folder.c:831
+#, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"メッセージ %s をフォルダ '%s' から取得できません: コマンドが間違っています"
 
-#: camel/providers/imap/camel-imap-folder.c:2283
-#: camel/providers/imap/camel-imap-folder.c:2353
-msgid "Fetching summary information for new messages"
-msgstr "新規メッセージのサマリ情報の同期中"
+#: camel/providers/imap4/camel-imap4-folder.c:873
+msgid "Cannot append messages to IMAP folders in offline mode."
+msgstr "オフライン・モードではメッセージを IMAP フォルダへ追加できません。"
 
-#: camel/providers/imap/camel-imap-folder.c:2461
+#: camel/providers/imap4/camel-imap4-folder.c:966
 #, c-format
-msgid "Incomplete server response: no information provided for message %d"
-msgstr "不完全なサーバの応答: メッセージ %d の情報が提供されませんでした"
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "フォルダ '%s' へメッセージを追加できません: 不明なエラー"
 
-#: camel/providers/imap/camel-imap-folder.c:2469
+#: camel/providers/imap4/camel-imap4-folder.c:995
 #, c-format
-msgid "Incomplete server response: no UID provided for message %d"
-msgstr "不完全なサーバの応答: メッセージ %d の UID が提供されませんでした"
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "フォルダ '%s' へメッセージを追加できません: コマンドが間違っています"
 
-#: camel/providers/imap/camel-imap-folder.c:2482
-#, c-format
-msgid ""
-"Unexpected server response: Identical UIDs provided for messages %d and %d"
+#: camel/providers/imap4/camel-imap4-folder.c:1038
+msgid "Cannot move messages to or from IMAP folders in offline mode."
 msgstr ""
-"予期しないサーバの応答: メッセージ %d と %d に対して同じ UID が提供されました"
+"オフライン・モードではメッセージを IMAP フォルダへ/から移動することはできませ"
+"ん。"
 
-#: camel/providers/imap/camel-imap-folder.c:2658
-msgid "Could not find message body in FETCH response."
-msgstr "FETCH 応答にメッセージ本体がありませんでした。"
+#: camel/providers/imap4/camel-imap4-folder.c:1041
+msgid "Cannot copy messages to or from IMAP folders in offline mode."
+msgstr ""
+"オフライン・モードではメッセージを IMAP フォルダへ/からコピーすることはできま"
+"せん。"
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap4/camel-imap4-folder.c:1086
 #, c-format
-msgid "Could not open cache directory: %s"
-msgstr "キャッシュ・フォルダを開けませんでした: %s"
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"フォルダ '%s' からフォルダ '%s' へメッセージを移動できません: 不明なエラー"
 
-#: camel/providers/imap/camel-imap-message-cache.c:252
-#: camel/providers/imap/camel-imap-message-cache.c:309
-#: camel/providers/imap/camel-imap-message-cache.c:340
-#: camel/providers/imap/camel-imap-message-cache.c:372
+#: camel/providers/imap4/camel-imap4-folder.c:1090
 #, c-format
-msgid "Failed to cache message %s: %s"
-msgstr "メッセージ %s のキャッシュに失敗しました: %s"
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"フォルダ '%s' からフォルダ '%s' へメッセージをコピーできません: 不明なエラー"
 
-#: camel/providers/imap/camel-imap-message-cache.c:417
+#: camel/providers/imap4/camel-imap4-folder.c:1098
 #, c-format
-msgid "Failed to cache %s: %s"
-msgstr "%s のキャッシュに失敗しました: %s"
-
-#: camel/providers/imap/camel-imap-provider.c:43
-msgid "Checking for New Mail"
-msgstr "新着メールのチェック中"
-
-#: camel/providers/imap/camel-imap-provider.c:48
-msgid "Connection to Server"
-msgstr "サーバへ接続"
-
-#: camel/providers/imap/camel-imap-provider.c:50
-msgid "Use custom command to connect to server"
-msgstr "サーバへ接続する際にカスタム・コマンドを使用する"
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"フォルダ '%s' からフォルダ '%s' へメッセージを移動できません: コマンドが間"
+"違っています"
 
-#: camel/providers/imap/camel-imap-provider.c:52
-msgid "Command:"
-msgstr "コマンド:"
+#: camel/providers/imap4/camel-imap4-folder.c:1102
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"フォルダ '%s' からフォルダ '%s' へメッセージをコピーできません: コマンドが間"
+"違っています"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/nntp/camel-nntp-provider.c:41
+#: camel/providers/imap4/camel-imap4-provider.c:41
+#: camel/providers/imap/camel-imap-provider.c:56
+#: camel/providers/nntp/camel-nntp-provider.c:42
 msgid "Folders"
 msgstr "フォルダ"
 
-#: camel/providers/imap/camel-imap-provider.c:57
-#: camel/providers/imap4/camel-imap4-provider.c:42
+#: camel/providers/imap4/camel-imap4-provider.c:43
 msgid "Show only subscribed folders"
 msgstr "購読するフォルダだけ表示する"
 
-#: camel/providers/imap/camel-imap-provider.c:59
-#: camel/providers/imap4/camel-imap4-provider.c:44
+#: camel/providers/imap4/camel-imap4-provider.c:45
 msgid "Override server-supplied folder namespace"
 msgstr "サーバが提供するフォルダのネームスペースより優先する"
 
-#: camel/providers/imap/camel-imap-provider.c:61
-#: camel/providers/imap4/camel-imap4-provider.c:46
+#: camel/providers/imap4/camel-imap4-provider.c:47
+#: camel/providers/imap/camel-imap-provider.c:62
 msgid "Namespace"
 msgstr "ネームスペース"
 
-#: camel/providers/imap/camel-imap-provider.c:64
+#: camel/providers/imap4/camel-imap4-provider.c:51
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "このサーバ上の INBOX 内にある新規メッセージへフィルタを適用する"
 
-#: camel/providers/imap/camel-imap-provider.c:76
-msgid "IMAP"
-msgstr "IMAP"
+#: camel/providers/imap4/camel-imap4-provider.c:57
+msgid "Automatically synchronize remote mail locally"
+msgstr "リモートとローカルのメールを自動的に同期する"
 
-#: camel/providers/imap/camel-imap-provider.c:78
-msgid "For reading and storing mail on IMAP servers."
-msgstr "IMAP サーバのメールを読んだり大切なメールを保存します"
+#: camel/providers/imap4/camel-imap4-provider.c:64
+msgid "IMAPv4rev1"
+msgstr "IMAPv4rev1"
+
+#: camel/providers/imap4/camel-imap4-provider.c:66
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr ""
+"IMAPv4rev1 サーバのメールを読んだり大切なメールを保存します (EXPERIMENTAL!!)"
+
+#: camel/providers/imap4/camel-imap4-provider.c:83
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"このオプションはプレイン・テキストのパスワードを使って IMAPv4rev1 サーバに接"
+"続します"
 
-#: camel/providers/imap/camel-imap-store.c:424
-#: camel/providers/imap4/camel-imap4-store.c:177
+#: camel/providers/imap4/camel-imap4-store.c:203
+#: camel/providers/imap/camel-imap-store.c:421
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP サーバ %s"
 
-#: camel/providers/imap/camel-imap-store.c:426
-#: camel/providers/imap4/camel-imap4-store.c:179
+#: camel/providers/imap4/camel-imap4-store.c:205
+#: camel/providers/imap/camel-imap-store.c:423
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s の %s にある IMAP サービス"
 
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/imap4/camel-imap4-store.c:214
-#: camel/providers/imap4/camel-imap4-store.c:230
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: camel/providers/smtp/camel-smtp-transport.c:269
-#: camel/providers/smtp/camel-smtp-transport.c:285
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "%s (ポート %d) へ接続できませんでした: %s"
-
-#: camel/providers/imap/camel-imap-store.c:549
-#: camel/providers/imap4/camel-imap4-store.c:216
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imap4/camel-imap4-store.c:250
+#: camel/providers/imap/camel-imap-store.c:533
+#: camel/providers/imap/camel-imap-store.c:548
+#: camel/providers/nntp/camel-nntp-store.c:198
+#: camel/providers/nntp/camel-nntp-store.c:213
+#: camel/providers/pop3/camel-pop3-store.c:167
+#: camel/providers/pop3/camel-pop3-store.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:270
+#, c-format
+msgid "Could not connect to %s: %s"
+msgstr "%s へ接続できませんでした: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:236
+#: camel/providers/imap/camel-imap-store.c:534
+#: camel/providers/nntp/camel-nntp-store.c:199
+#: camel/providers/pop3/camel-pop3-store.c:168
+#: camel/providers/smtp/camel-smtp-transport.c:256
 msgid "SSL unavailable"
 msgstr "SSL は無効です"
 
-#: camel/providers/imap/camel-imap-store.c:564
-#: camel/providers/imap/camel-imap-store.c:841
-#: camel/providers/imap4/camel-imap4-store.c:227
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
+#: camel/providers/imap4/camel-imap4-store.c:247
+#: camel/providers/imap/camel-imap-store.c:545
+#: camel/providers/imap/camel-imap-store.c:808
+#: camel/providers/imapp/camel-imapp-store.c:248
+#: camel/providers/nntp/camel-nntp-store.c:210
+#: camel/providers/nntp/camel-nntp-store.c:229
+#: camel/providers/pop3/camel-pop3-store.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:267
 msgid "Connection cancelled"
 msgstr "接続をキャンセルしました"
 
-#: camel/providers/imap/camel-imap-store.c:675
-#: camel/providers/imap/camel-imap-store.c:706
-#: camel/providers/imap4/camel-imap4-store.c:282
+#: camel/providers/imap4/camel-imap4-store.c:274
+#: camel/providers/imap4/camel-imap4-store.c:287
+#: camel/providers/imap/camel-imap-store.c:652
+#: camel/providers/imap/camel-imap-store.c:674
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "セキュリティ保護されたモードで IMAP サーバ %s への接続に失敗しました: %s"
 
-#: camel/providers/imap/camel-imap-store.c:676
-#: camel/providers/pop3/camel-pop3-store.c:233
-msgid "SSL/TLS extension not supported."
-msgstr "SSL/TLS 拡張がサポートされていません。"
-
-#: camel/providers/imap/camel-imap-store.c:707
-#: camel/providers/pop3/camel-pop3-store.c:274
+#: camel/providers/imap4/camel-imap4-store.c:275
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/pop3/camel-pop3-store.c:243
 msgid "SSL negotiations failed"
 msgstr "SSL 接続に失敗しました"
 
-#: camel/providers/imap/camel-imap-store.c:844
-#, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "コマンド \"%s\" で接続できませんでした: %s"
-
-#: camel/providers/imap/camel-imap-store.c:1268
-#, c-format
-msgid "IMAP server %s does not support requested authentication type %s"
-msgstr "IMAP サーバ %s は要求した認証タイプ %s をサポートしていません"
-
-#: camel/providers/imap/camel-imap-store.c:1278
-#: camel/providers/smtp/camel-smtp-transport.c:486
-#, c-format
-msgid "No support for authentication type %s"
-msgstr "認証タイプ %s をサポートしていません"
-
-#: camel/providers/imap/camel-imap-store.c:1301
-#: camel/providers/imapp/camel-imapp-store.c:344
-#, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr "%s %s@%s の IMAP パスワードを入力して下さい"
-
-#: camel/providers/imap/camel-imap-store.c:1315
-msgid "You didn't enter a password."
-msgstr "パスワードを入力していません"
-
-#: camel/providers/imap/camel-imap-store.c:1344
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"IMAP サーバへ認証できません。\n"
-"%s\n"
-"\n"
-
-#: camel/providers/imap/camel-imap-store.c:1863
-#: camel/providers/imap/camel-imap-store.c:2053
-#, c-format
-msgid "No such folder %s"
-msgstr "そのようなフォルダ %s はありません"
-
-#: camel/providers/imap/camel-imap-store.c:1881
-#: camel/providers/imap/camel-imap-store.c:2259
-#: camel/providers/imap4/camel-imap4-store.c:764
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "フォルダ名 \"%s\" に文字 \"%c\"を含めることはできません"
-
-#: camel/providers/imap/camel-imap-store.c:1939
-#: camel/providers/imap/camel-imap-store.c:2320
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr "親フォルダには複数のサブフォルダを含めることはできません"
-
-#: camel/providers/imap/camel-imap-store.c:1994
-#: camel/providers/local/camel-maildir-store.c:139
-#: camel/providers/local/camel-mbox-store.c:212
-#: camel/providers/local/camel-mh-store.c:236
-#, c-format
-msgid "Cannot create folder `%s': folder exists."
-msgstr "フォルダ '%s' を作成できません: フォルダが存在します"
-
-#: camel/providers/imap/camel-imap-store.c:2270
-#, c-format
-msgid "Unknown parent folder: %s"
-msgstr "親フォルダを特定できません: %s"
-
-#: camel/providers/imap4/camel-imap4-command.c:550
-#: camel/providers/imap4/camel-imap4-command.c:557
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "IMAP サーバ %s へのコマンド送信に失敗しました: %s"
-
-#: camel/providers/imap4/camel-imap4-command.c:656
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "IMAP サーバ %s から予期しない応答がありました: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:230
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "IMAP サーバ %s から予期しない応答がありました"
-
-#: camel/providers/imap4/camel-imap4-engine.c:414
-#, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "フォルダ '%s' を選択できません: mailbox の名前が不正です"
-
-#: camel/providers/imap4/camel-imap4-engine.c:420
-#, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "フォルダ '%s' を選択できません: コマンドが間違っています"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1401
-#: camel/providers/imap4/camel-imap4-engine.c:1431
-#: camel/providers/imap4/camel-imap4-engine.c:1463
-#: camel/providers/imap4/camel-imap4-engine.c:1505
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "突然 IMAP4 サーバ %s が接続を切りました: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:359
-#, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "フォルダ '%s' とフラグを同期できません: 不明なエラー"
-
-#: camel/providers/imap4/camel-imap4-folder.c:365
-#, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "フォルダ '%s' とフラグを同期できません: コマンドが間違っています"
-
-#: camel/providers/imap4/camel-imap4-folder.c:502
-#, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "フォルダ '%s' を抹消できません: 不明なエラー"
-
-#: camel/providers/imap4/camel-imap4-folder.c:507
-#, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "フォルダ '%s' を抹消できません: コマンドが間違っています"
-
-#: camel/providers/imap4/camel-imap4-folder.c:697
-#, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-"メッセージ %s をフォルダ '%s' から取得できません: そのようなメッセージはあり"
-"ません"
-
-#: camel/providers/imap4/camel-imap4-folder.c:702
-#, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr ""
-"メッセージ %s をフォルダ '%s' から取得できません: コマンドが間違っています"
-
-#: camel/providers/imap4/camel-imap4-folder.c:827
-#, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "フォルダ '%s' へメッセージを追加できません: 不明なエラー"
-
-#: camel/providers/imap4/camel-imap4-folder.c:856
-#, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "フォルダ '%s' へメッセージを追加できません: コマンドが間違っています"
-
-#: camel/providers/imap4/camel-imap4-folder.c:935
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"フォルダ '%s' からフォルダ '%s' へメッセージを移動できません: 不明なエラー"
-
-#: camel/providers/imap4/camel-imap4-folder.c:939
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"フォルダ '%s' からフォルダ '%s' へメッセージをコピーできません: 不明なエラー"
-
-#: camel/providers/imap4/camel-imap4-folder.c:947
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"フォルダ '%s' からフォルダ '%s' へメッセージを移動できません: コマンドが間"
-"違っています"
-
-#: camel/providers/imap4/camel-imap4-folder.c:951
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"フォルダ '%s' からフォルダ '%s' へメッセージをコピーできません: コマンドが間"
-"違っています"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-msgid "IMAPv4rev1"
-msgstr "IMAPv4rev1"
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr ""
-"IMAPv4rev1 サーバのメールを読んだり大切なメールを保存します (EXPERIMENTAL!!)"
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"このオプションはプレイン・テキストのパスワードを使って IMAPv4rev1 サーバに接"
-"続します"
-
-#: camel/providers/imap4/camel-imap4-store.c:257
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-"セキュリティ保護されたモードで IMAP サーバ %s への接続に失敗しました: サーバ"
-"は STARTTLS をサポートしていません"
-
-#: camel/providers/imap4/camel-imap4-store.c:363
+#: camel/providers/imap4/camel-imap4-store.c:378
 #, c-format
 msgid ""
 "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
 msgstr "IMAP サーバ %s に対して認証方式 %s を使って認証できませんでした"
 
-#: camel/providers/imap4/camel-imap4-store.c:408
+#: camel/providers/imap4/camel-imap4-store.c:423
 #, c-format
 msgid "%sPlease enter the IMAP password for %s on host %s"
 msgstr "%s%s@%s の IMAP パスワードを入力して下さい。"
 
-#: camel/providers/imap4/camel-imap4-store.c:478
+#: camel/providers/imap4/camel-imap4-store.c:493
 #, c-format
 msgid "Cannot authenticate to IMAP server %s using %s"
 msgstr "IMAP サーバ %s で %s を使った認証を行えません"
 
-#: camel/providers/imap4/camel-imap4-store.c:701
+#: camel/providers/imap4/camel-imap4-store.c:656
+#: camel/providers/imap4/camel-imap4-store.c:769
+msgid "Cannot create IMAP folders in offline mode."
+msgstr "オフライン・モードでは IMAP フォルダを作成できません。"
+
+#: camel/providers/imap4/camel-imap4-store.c:695
 #, c-format
 msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "フォルダ '%s' を IMAP サーバ %s から取得できません: 不明なエラー"
 
-#: camel/providers/imap4/camel-imap4-store.c:815
+#: camel/providers/imap4/camel-imap4-store.c:759
+#: camel/providers/imap/camel-imap-store.c:1861
+#: camel/providers/imap/camel-imap-store.c:2239
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "フォルダ名 \"%s\" に文字 \"%c\"を含めることはできません"
+
+#: camel/providers/imap4/camel-imap4-store.c:817
 #, c-format
 msgid "Cannot create folder `%s': Invalid mailbox name"
 msgstr "フォルダ '%s' を作成できません: mailbox の名前が不正です"
 
-#: camel/providers/imap4/camel-imap4-store.c:821
+#: camel/providers/imap4/camel-imap4-store.c:823
 #, c-format
 msgid "Cannot create folder `%s': Bad command"
 msgstr "フォルダ '%s' を作成できません: コマンドが間違っています"
 
-#: camel/providers/imap4/camel-imap4-store.c:852
+#: camel/providers/imap4/camel-imap4-store.c:855
 #, c-format
 msgid "Cannot delete folder `%s': Special folder"
 msgstr "フォルダ '%s' を削除できません: 特別なフォルダです"
 
-#: camel/providers/imap4/camel-imap4-store.c:911
+#: camel/providers/imap4/camel-imap4-store.c:862
+msgid "Cannot delete IMAP folders in offline mode."
+msgstr "オフライン・モードでは IMAP フォルダを削除できません。"
+
+#: camel/providers/imap4/camel-imap4-store.c:921
 #, c-format
 msgid "Cannot delete folder `%s': Invalid mailbox name"
 msgstr "フォルダ '%s' を削除できません: mailbox の名前が不正です"
 
-#: camel/providers/imap4/camel-imap4-store.c:916
+#: camel/providers/imap4/camel-imap4-store.c:926
 #, c-format
 msgid "Cannot delete folder `%s': Bad command"
 msgstr "フォルダ '%s' を削除できません: コマンドが間違っています"
 
-#: camel/providers/imap4/camel-imap4-store.c:936
+#: camel/providers/imap4/camel-imap4-store.c:947
 #, c-format
 msgid "Cannot rename folder `%s' to `%s': Special folder"
 msgstr "フォルダ名 '%s' を '%s' に変更できません: 特別なフォルダです"
 
-#: camel/providers/imap4/camel-imap4-store.c:968
+#: camel/providers/imap4/camel-imap4-store.c:954
+msgid "Cannot rename IMAP folders in offline mode."
+msgstr "オフライン・モードでは IMAP フォルダの名前を変更できません。"
+
+#: camel/providers/imap4/camel-imap4-store.c:985
 #, c-format
 msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
 msgstr "フォルダ名 '%s' を '%s' に変更できません: mailbox の名前が不正です"
 
-#: camel/providers/imap4/camel-imap4-store.c:973
+#: camel/providers/imap4/camel-imap4-store.c:990
 #, c-format
 msgid "Cannot rename folder `%s' to `%s': Bad command"
 msgstr "フォルダ名 '%s' を '%s' に変更できません: コマンドが間違っています"
 
-#: camel/providers/imap4/camel-imap4-store.c:1221
+#: camel/providers/imap4/camel-imap4-store.c:1239
 #, c-format
 msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
 msgstr ""
 "%s 情報 (パターン '%s' に対する IMAP サーバ %s: %s 上の) を取得できません"
 
-#: camel/providers/imap4/camel-imap4-store.c:1223
+#: camel/providers/imap4/camel-imap4-store.c:1241
 msgid "Bad command"
 msgstr "コマンドが間違っています"
 
-#: camel/providers/imap4/camel-imap4-store.c:1299
+#: camel/providers/imap4/camel-imap4-store.c:1280
+msgid "Cannot subscribe to IMAP folders in offline mode."
+msgstr "オフライン・モードでは IMAP フォルダを購読できません。"
+
+#: camel/providers/imap4/camel-imap4-store.c:1325
 #, c-format
 msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
 msgstr "フォルダ '%s' を購読できません: mailbox の名前が不正です"
 
-#: camel/providers/imap4/camel-imap4-store.c:1304
+#: camel/providers/imap4/camel-imap4-store.c:1330
 #, c-format
 msgid "Cannot subscribe to folder `%s': Bad command"
 msgstr "フォルダ '%s' を購読できません: コマンドが間違っています"
 
-#: camel/providers/imap4/camel-imap4-store.c:1364
+#: camel/providers/imap4/camel-imap4-store.c:1353
+msgid "Cannot unsubscribe from IMAP folders in offline mode."
+msgstr "オフライン・モードでは IMAP フォルダの購読を停止できません。"
+
+#: camel/providers/imap4/camel-imap4-store.c:1398
 #, c-format
 msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "フォルダ '%s' の購読を解除できません: mailbox の名前が不正です"
+msgstr "フォルダ '%s' の購読を停止できません: mailbox の名前が不正です"
 
-#: camel/providers/imap4/camel-imap4-store.c:1369
+#: camel/providers/imap4/camel-imap4-store.c:1403
 #, c-format
 msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "フォルダ '%s' の購読を解除できません: コマンドが間違っています"
+msgstr "フォルダ '%s' の購読を停止できません: コマンドが間違っています"
+
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap4/camel-imap4-summary.c:1266
+#: camel/providers/imap/camel-imap-folder.c:573
+msgid "Scanning for changed messages"
+msgstr "変更メッセージの解析中"
 
-#: camel/providers/imap4/camel-imap4-utils.c:250
+#: camel/providers/imap4/camel-imap4-summary.c:1290
+msgid "Fetching envelopes for new messages"
+msgstr "新しいメッセージのエンベロープの取得中"
+
+#: camel/providers/imap4/camel-imap4-utils.c:368
 #, c-format
 msgid "Unexpected token in response from IMAP server %s: "
 msgstr "IMAP サーバ %s から予期しない応答がありました: "
 
-#: camel/providers/imap4/camel-imap4-utils.c:273
+#: camel/providers/imap4/camel-imap4-utils.c:391
 msgid "No data"
 msgstr "データなし"
 
-#: camel/providers/imap4/camel-imap4-utils.c:456
+#: camel/providers/imap4/camel-imap4-utils.c:574
 #, c-format
 msgid "IMAP server %s unexpectedly disconnected: %s"
 msgstr "突然 IMAP サーバ %s が接続を切りました: %s"
 
-#: camel/providers/imapp/camel-imapp-provider.c:39
-#: camel/providers/pop3/camel-pop3-provider.c:38
-msgid "Message storage"
-msgstr "メッセージ格納場所"
-
-#: camel/providers/imapp/camel-imapp-provider.c:47
-msgid "IMAP+"
+#: camel/providers/imap/camel-imap-command.c:218
+#: camel/providers/imap/camel-imap-command.c:257
+#: camel/providers/imap/camel-imap-command.c:447
+#: camel/providers/imap/camel-imap-store.c:3200
+msgid "Operation cancelled"
+msgstr "処理がキャンセルされました"
+
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:3203
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "突然サーバが接続を切りました: %s"
+
+#. for imap ALERT codes, account user@host
+#: camel/providers/imap/camel-imap-command.c:320
+#, c-format
+msgid ""
+"Alert from IMAP server %s@%s:\n"
+"%s"
+msgstr ""
+"IMAP サーバ %s@%s からの警告:\n"
+"%s"
+
+#: camel/providers/imap/camel-imap-command.c:389
+#, c-format
+msgid "Unexpected response from IMAP server: %s"
+msgstr "IMAP サーバから予期しない応答がありました: %s"
+
+#: camel/providers/imap/camel-imap-command.c:399
+#, c-format
+msgid "IMAP command failed: %s"
+msgstr "IMAP コマンドが失敗しました: %s"
+
+#: camel/providers/imap/camel-imap-command.c:457
+msgid "Server response ended too soon."
+msgstr "サーバレスポンスはあっけなく終わりました"
+
+#: camel/providers/imap/camel-imap-command.c:649
+#, c-format
+msgid "IMAP server response did not contain %s information"
+msgstr "IMAP サーバの応答は %s 情報を含んでいません"
+
+#: camel/providers/imap/camel-imap-command.c:685
+#, c-format
+msgid "Unexpected OK response from IMAP server: %s"
+msgstr "IMAP サーバから予期しない OK 応答がありました: %s"
+
+#: camel/providers/imap/camel-imap-folder.c:226
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr "フォルダ %s を作成できませんでした: %s"
+
+#: camel/providers/imap/camel-imap-folder.c:245
+#, c-format
+msgid "Could not load summary for %s"
+msgstr "%s のサマリをロードできませんでした"
+
+#: camel/providers/imap/camel-imap-folder.c:330
+msgid "Folder was destroyed and recreated on server."
+msgstr "フォルダは破壊され再作成されました"
+
+#: camel/providers/imap/camel-imap-folder.c:1939
+#, c-format
+msgid "Unable to retrieve message: %s"
+msgstr "メッセージを取得できません: %s"
+
+#: camel/providers/imap/camel-imap-folder.c:1979
+#, c-format
+msgid ""
+"Cannot get message: %s\n"
+"  %s"
+msgstr ""
+"メッセージを取得できません: %s\n"
+"  %s"
+
+#: camel/providers/imap/camel-imap-folder.c:1979
+#: camel/providers/local/camel-maildir-folder.c:245
+#: camel/providers/local/camel-mbox-folder.c:403
+#: camel/providers/local/camel-mh-folder.c:203
+msgid "No such message"
+msgstr "そのようなメッセージはありません"
+
+#: camel/providers/imap/camel-imap-folder.c:2021
+#: camel/providers/imap/camel-imap-folder.c:2623
+#: camel/providers/nntp/camel-nntp-folder.c:221
+msgid "This message is not currently available"
+msgstr "現在このメッセージは有効ではありません"
+
+#: camel/providers/imap/camel-imap-folder.c:2287
+#: camel/providers/imap/camel-imap-folder.c:2357
+msgid "Fetching summary information for new messages"
+msgstr "新規メッセージのサマリ情報の同期中"
+
+#: camel/providers/imap/camel-imap-folder.c:2464
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr "不完全なサーバの応答: メッセージ %d の情報が提供されませんでした"
+
+#: camel/providers/imap/camel-imap-folder.c:2472
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr "不完全なサーバの応答: メッセージ %d の UID が提供されませんでした"
+
+#: camel/providers/imap/camel-imap-folder.c:2485
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+"予期しないサーバの応答: メッセージ %d と %d に対して同じ UID が提供されました"
+
+#: camel/providers/imap/camel-imap-folder.c:2661
+msgid "Could not find message body in FETCH response."
+msgstr "FETCH 応答にメッセージ本体がありませんでした。"
+
+#: camel/providers/imap/camel-imap-message-cache.c:156
+#, c-format
+msgid "Could not open cache directory: %s"
+msgstr "キャッシュ・フォルダを開けませんでした: %s"
+
+#: camel/providers/imap/camel-imap-message-cache.c:253
+#: camel/providers/imap/camel-imap-message-cache.c:310
+#: camel/providers/imap/camel-imap-message-cache.c:341
+#: camel/providers/imap/camel-imap-message-cache.c:373
+#, c-format
+msgid "Failed to cache message %s: %s"
+msgstr "メッセージ %s のキャッシュに失敗しました: %s"
+
+#: camel/providers/imap/camel-imap-message-cache.c:418
+#, c-format
+msgid "Failed to cache %s: %s"
+msgstr "%s のキャッシュに失敗しました: %s"
+
+#: camel/providers/imap/camel-imap-provider.c:44 mail/em-account-editor.c:2078
+#: mail/em-account-editor.c:2156
+msgid "Checking for New Mail"
+msgstr "新着メールのチェック"
+
+#: camel/providers/imap/camel-imap-provider.c:46
+msgid "C_heck for new messages in all folders"
+msgstr "全てのフォルダの新着メールをチェックする(_H)"
+
+#: camel/providers/imap/camel-imap-provider.c:49
+msgid "Connection to Server"
+msgstr "サーバへの接続"
+
+#: camel/providers/imap/camel-imap-provider.c:51
+msgid "_Use custom command to connect to server"
+msgstr "サーバへ接続する際にカスタム・コマンドを使用する(_U)"
+
+#: camel/providers/imap/camel-imap-provider.c:53
+msgid "Command:"
+msgstr "コマンド:"
+
+#: camel/providers/imap/camel-imap-provider.c:58
+msgid "_Show only subscribed folders"
+msgstr "購読しているフォルダだけ表示する(_S)"
+
+#: camel/providers/imap/camel-imap-provider.c:60
+msgid "O_verride server-supplied folder namespace"
+msgstr "サーバが提供するフォルダのネームスペースを上書きする(_V)"
+
+#: camel/providers/imap/camel-imap-provider.c:66
+msgid "_Apply filters to new messages in INBOX on this server"
+msgstr "このサーバ上の INBOX 内にある新規メッセージへフィルタを適用する(_A)"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+msgid "Check new messages for _Junk contents"
+msgstr "新着メールにスパムが含まれているかチェックする(_J)"
+
+#: camel/providers/imap/camel-imap-provider.c:70
+msgid "Only check for Junk messa_ges in the INBOX folder"
+msgstr "INBOX フォルダにあるメールのみスパムかどうかチェックする(_G)"
+
+#: camel/providers/imap/camel-imap-provider.c:72
+msgid "Automatically synchroni_ze remote mail locally"
+msgstr "リモートとローカルのメールを自動的に同期する(_Z)"
+
+#: camel/providers/imap/camel-imap-provider.c:79
+msgid "IMAP"
+msgstr "IMAP"
+
+#: camel/providers/imap/camel-imap-provider.c:81
+msgid "For reading and storing mail on IMAP servers."
+msgstr "IMAP サーバのメールを読んだり大切なメールを保存します"
+
+#: camel/providers/imap/camel-imap-store.c:653
+#: camel/providers/smtp/camel-smtp-transport.c:323
+msgid "STARTTLS not supported"
+msgstr "STARTTLS はサポートしていません"
+
+#: camel/providers/imap/camel-imap-store.c:811
+#, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "コマンド \"%s\" で接続できませんでした: %s"
+
+#: camel/providers/imap/camel-imap-store.c:1245
+#, c-format
+msgid "IMAP server %s does not support requested authentication type %s"
+msgstr "IMAP サーバ %s は要求した認証タイプ %s をサポートしていません"
+
+#: camel/providers/imap/camel-imap-store.c:1255
+#: camel/providers/smtp/camel-smtp-transport.c:489
+#, c-format
+msgid "No support for authentication type %s"
+msgstr "認証タイプ %s をサポートしていません"
+
+#: camel/providers/imap/camel-imap-store.c:1278
+#: camel/providers/imapp/camel-imapp-store.c:364
+#, c-format
+msgid "%sPlease enter the IMAP password for %s@%s"
+msgstr "%s %s@%s の IMAP パスワードを入力して下さい"
+
+#: camel/providers/imap/camel-imap-store.c:1292
+msgid "You didn't enter a password."
+msgstr "パスワードを入力していません"
+
+#: camel/providers/imap/camel-imap-store.c:1321
+#, c-format
+msgid ""
+"Unable to authenticate to IMAP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+"IMAP サーバへ認証できません。\n"
+"%s\n"
+"\n"
+
+#: camel/providers/imap/camel-imap-store.c:1843
+#: camel/providers/imap/camel-imap-store.c:2033
+#, c-format
+msgid "No such folder %s"
+msgstr "そのようなフォルダ %s はありません"
+
+#: camel/providers/imap/camel-imap-store.c:1919
+#: camel/providers/imap/camel-imap-store.c:2300
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr "親フォルダには複数のサブフォルダを含めることはできません"
+
+#: camel/providers/imap/camel-imap-store.c:1974
+#: camel/providers/local/camel-maildir-store.c:140
+#: camel/providers/local/camel-mbox-store.c:210
+#: camel/providers/local/camel-mh-store.c:237
+#, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "フォルダ '%s' を作成できません: フォルダが存在します"
+
+#: camel/providers/imap/camel-imap-store.c:2250
+#, c-format
+msgid "Unknown parent folder: %s"
+msgstr "親フォルダを特定できません: %s"
+
+#: camel/providers/imapp/camel-imapp-provider.c:40
+#: camel/providers/pop3/camel-pop3-provider.c:39
+msgid "Message storage"
+msgstr "メッセージの格納場所"
+
+#: camel/providers/imapp/camel-imapp-provider.c:48
+msgid "IMAP+"
 msgstr "IMAP+"
 
-#: camel/providers/imapp/camel-imapp-provider.c:49
+#: camel/providers/imapp/camel-imapp-provider.c:50
 msgid ""
 "Experimental IMAP 4(.1) client\n"
 "This is untested and unsupported code, you want to use plain imap instead.\n"
@@ -10740,7 +11135,12 @@ msgstr ""
 "\n"
 " *** これを業務メールで使用しないこと ***\n"
 
-#: camel/providers/imapp/camel-imapp-store.c:328
+#: camel/providers/imapp/camel-imapp-store.c:251
+#, c-format
+msgid "Could not connect to %s (port %s): %s"
+msgstr "%s (ポート %s) へ接続できませんでした: %s"
+
+#: camel/providers/imapp/camel-imapp-store.c:348
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "%s の POP サーバへ接続できませんでした"
@@ -10750,41 +11150,41 @@ msgid "Index message body data"
 msgstr "メッセージ本体のデータの目録を作成する"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:388
+#: camel/providers/local/camel-local-folder.c:391
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:392
 #: camel/providers/local/camel-local-folder.c:395
+#: camel/providers/local/camel-local-folder.c:398
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "mailbox: %s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:399
+#: camel/providers/local/camel-local-folder.c:402
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:45
 msgid "Use the `.folders' folder summary file (exmh)"
 msgstr "フォルダ '.folder' のサマリファイル (exmh) 使用する"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:52
 msgid "MH-format mail directories"
 msgstr "MH 形式のメール・フォルダ"
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:53
 msgid "For storing local mail in MH-like mail directories."
 msgstr "ローカル・メールを MH 形式のメール・フォルダの中に保存します"
 
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:68
 msgid "Local delivery"
 msgstr "ローカルの配信"
 
-#: camel/providers/local/camel-local-provider.c:66
+#: camel/providers/local/camel-local-provider.c:69
 msgid ""
 "For retrieving (moving) local mail from standard mbox formated spools into "
 "folders managed by Evolution."
@@ -10792,28 +11192,28 @@ msgstr ""
 "ローカル・メールを標準 mbox 型式スプールから Evolution が管理するフォルダに配"
 "信 (移動) します"
 
-#: camel/providers/local/camel-local-provider.c:77
-#: camel/providers/local/camel-local-provider.c:94
+#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:100
 msgid "Apply filters to new messages in INBOX"
 msgstr "INBOX 内の新規メッセージへフィルタを適用します"
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:88
 msgid "Maildir-format mail directories"
 msgstr "Maildir 形式のメール・フォルダ"
 
-#: camel/providers/local/camel-local-provider.c:84
+#: camel/providers/local/camel-local-provider.c:89
 msgid "For storing local mail in maildir directories."
 msgstr "ローカル・メールを Maildir 形式のフォルダに保存します"
 
-#: camel/providers/local/camel-local-provider.c:95
+#: camel/providers/local/camel-local-provider.c:101
 msgid "Store status headers in Elm/Pine/Mutt format"
 msgstr "Elm/Pine/Mutt 書式にステータス・ヘッダを格納する"
 
-#: camel/providers/local/camel-local-provider.c:101
+#: camel/providers/local/camel-local-provider.c:108
 msgid "Standard Unix mbox spool or directory"
 msgstr "標準的な UNIX の mbox 形式のスプールまたはフォルダ"
 
-#: camel/providers/local/camel-local-provider.c:102
+#: camel/providers/local/camel-local-provider.c:109
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
@@ -10822,64 +11222,64 @@ msgstr ""
 "り格納します\n"
 "(Elm, Pine, Mutt 形式のフォルダの読み込みにも対応)"
 
-#: camel/providers/local/camel-local-store.c:142
-#: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:355
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-local-store.c:143
+#: camel/providers/local/camel-local-store.c:254
+#: camel/providers/local/camel-mbox-store.c:353
+#: camel/providers/local/camel-spool-store.c:117
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "保存したルート %s は絶対パスではありません"
 
-#: camel/providers/local/camel-local-store.c:149
+#: camel/providers/local/camel-local-store.c:150
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "保存したルート %s は通常のフォルダではありません"
 
-#: camel/providers/local/camel-local-store.c:158
-#: camel/providers/local/camel-local-store.c:166
-#: camel/providers/local/camel-local-store.c:264
+#: camel/providers/local/camel-local-store.c:159
+#: camel/providers/local/camel-local-store.c:167
+#: camel/providers/local/camel-local-store.c:265
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "フォルダを取得できません: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:178
+#: camel/providers/local/camel-local-store.c:179
 msgid "Local stores do not have an inbox"
 msgstr "ローカルへの保存は inbox を持てません"
 
-#: camel/providers/local/camel-local-store.c:224
+#: camel/providers/local/camel-local-store.c:225
 #, c-format
 msgid "Local mail file %s"
 msgstr "ローカル・メールのファイル %s"
 
-#: camel/providers/local/camel-local-store.c:333
+#: camel/providers/local/camel-local-store.c:334
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "フォルダを %s から %s へ名前変更できませんでした: %s"
 
-#: camel/providers/local/camel-local-store.c:398
+#: camel/providers/local/camel-local-store.c:399
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "'%s' の名前を変更できませんでした: %s"
 
-#: camel/providers/local/camel-local-store.c:423
-#: camel/providers/local/camel-mbox-store.c:284
+#: camel/providers/local/camel-local-store.c:424
+#: camel/providers/local/camel-mbox-store.c:282
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "フォルダからサマリ・ファイル '%s' を削除できませんでした: %s"
 
-#: camel/providers/local/camel-local-store.c:433
-#: camel/providers/local/camel-mbox-store.c:296
+#: camel/providers/local/camel-local-store.c:434
+#: camel/providers/local/camel-mbox-store.c:294
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "フォルダからインデックス・ファイル '%s' を削除できませんでした: %s"
 
-#: camel/providers/local/camel-local-store.c:456
-#: camel/providers/local/camel-mbox-store.c:320
+#: camel/providers/local/camel-local-store.c:457
+#: camel/providers/local/camel-mbox-store.c:318
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "フォルダのメタ・ファイル '%s' を削除できませんでした: %s"
 
-#: camel/providers/local/camel-local-summary.c:405
+#: camel/providers/local/camel-local-summary.c:406
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "サマリを保存できませんでした: %s: %s"
@@ -10889,32 +11289,35 @@ msgid "Unable to add message to summary: unknown reason"
 msgstr "メッセージをサマリへ追加できません: 理由は不明です"
 
 #. Inbox is always first
-#: camel/providers/local/camel-maildir-folder.c:74
-#: camel/providers/local/camel-maildir-store.c:232
-#: camel/providers/local/camel-maildir-store.c:248
+#. translators: standard local mailbox names
+#: camel/providers/local/camel-maildir-folder.c:75
+#: camel/providers/local/camel-maildir-store.c:233
+#: camel/providers/local/camel-maildir-store.c:249
+#: camel/providers/local/camel-spool-store.c:452
 #: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+#: mail/mail-component.c:138
 msgid "Inbox"
 msgstr "受信箱"
 
-#: camel/providers/local/camel-maildir-folder.c:214
+#: camel/providers/local/camel-maildir-folder.c:215
 msgid "Maildir append message cancelled"
 msgstr "Maildir 形式のメッセージ追加が取り消されました"
 
-#: camel/providers/local/camel-maildir-folder.c:217
+#: camel/providers/local/camel-maildir-folder.c:218
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Maildir 形式のフォルダへメッセージを追加できません: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:243
-#: camel/providers/local/camel-maildir-folder.c:257
-#: camel/providers/local/camel-maildir-folder.c:266
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mbox-folder.c:436
-#: camel/providers/local/camel-mbox-folder.c:467
-#: camel/providers/local/camel-mbox-folder.c:475
-#: camel/providers/local/camel-mh-folder.c:201
-#: camel/providers/local/camel-mh-folder.c:212
-#: camel/providers/local/camel-mh-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:244
+#: camel/providers/local/camel-maildir-folder.c:258
+#: camel/providers/local/camel-maildir-folder.c:267
+#: camel/providers/local/camel-mbox-folder.c:402
+#: camel/providers/local/camel-mbox-folder.c:421
+#: camel/providers/local/camel-mbox-folder.c:452
+#: camel/providers/local/camel-mbox-folder.c:460
+#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-mh-folder.c:213
+#: camel/providers/local/camel-mh-folder.c:222
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -10923,118 +11326,118 @@ msgstr ""
 "メッセージ %s をフォルダ %s から取得できません\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:267
+#: camel/providers/local/camel-maildir-folder.c:268
 msgid "Invalid message contents"
 msgstr "メッセージの内容は無効です"
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:154
-#: camel/providers/local/camel-mh-store.c:204
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:152
+#: camel/providers/local/camel-mh-store.c:205
 #, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "フォルダ '%s' を取得できません: %s"
 
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mbox-store.c:162
-#: camel/providers/local/camel-mh-store.c:211
+#: camel/providers/local/camel-maildir-store.c:114
+#: camel/providers/local/camel-mbox-store.c:160
+#: camel/providers/local/camel-mh-store.c:212
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "フォルダ '%s' を取得できません: フォルダが存在しません"
 
-#: camel/providers/local/camel-maildir-store.c:121
-#: camel/providers/local/camel-mbox-store.c:184
-#: camel/providers/local/camel-mbox-store.c:196
+#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:194
 #, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "フォルダ '%s' を作成できません: %s"
 
-#: camel/providers/local/camel-maildir-store.c:136
+#: camel/providers/local/camel-maildir-store.c:137
 #, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "フォルダ '%s' を取得できません: maildir フォルダが存在しません"
 
-#: camel/providers/local/camel-maildir-store.c:175
-#: camel/providers/local/camel-maildir-store.c:213
-#: camel/providers/local/camel-mh-store.c:260
+#: camel/providers/local/camel-maildir-store.c:176
+#: camel/providers/local/camel-maildir-store.c:214
+#: camel/providers/local/camel-mh-store.c:261
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "フォルダ '%s' を削除できませんでした: %s"
 
-#: camel/providers/local/camel-maildir-store.c:177
+#: camel/providers/local/camel-maildir-store.c:178
 msgid "not a maildir directory"
 msgstr "maildir 形式のフォルダではありません"
 
-#: camel/providers/local/camel-maildir-store.c:355
-#: camel/providers/local/camel-spool-store.c:284
-#: camel/providers/local/camel-spool-store.c:314
+#: camel/providers/local/camel-maildir-store.c:356
+#: camel/providers/local/camel-spool-store.c:319
+#: camel/providers/local/camel-spool-store.c:333
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "フォルダ '%s' をスキャンできませんでした: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:419
-#: camel/providers/local/camel-maildir-summary.c:550
+#: camel/providers/local/camel-maildir-summary.c:425
+#: camel/providers/local/camel-maildir-summary.c:556
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "maildir フォルダのパスを開けませんでした: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:543
+#: camel/providers/local/camel-maildir-summary.c:549
 msgid "Checking folder consistency"
 msgstr "フォルダの整合性のチェック中"
 
-#: camel/providers/local/camel-maildir-summary.c:646
+#: camel/providers/local/camel-maildir-summary.c:652
 msgid "Checking for new messages"
 msgstr "新しいメッセージのチェック"
 
-#: camel/providers/local/camel-maildir-summary.c:735
-#: camel/providers/local/camel-mbox-summary.c:369
-#: camel/providers/local/camel-mbox-summary.c:542
-#: camel/providers/local/camel-mbox-summary.c:633
-#: camel/providers/local/camel-spool-summary.c:137
+#: camel/providers/local/camel-maildir-summary.c:741
+#: camel/providers/local/camel-mbox-summary.c:416
+#: camel/providers/local/camel-mbox-summary.c:589
+#: camel/providers/local/camel-mbox-summary.c:680
+#: camel/providers/local/camel-spool-summary.c:140
 msgid "Storing folder"
 msgstr "フォルダに格納する"
 
-#: camel/providers/local/camel-mbox-folder.c:225
-#: camel/providers/local/camel-spool-folder.c:148
+#: camel/providers/local/camel-mbox-folder.c:210
+#: camel/providers/local/camel-spool-folder.c:176
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s のフォルダ・ロックを生成できません: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:284
+#: camel/providers/local/camel-mbox-folder.c:269
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "mailbox を開けません: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:344
+#: camel/providers/local/camel-mbox-folder.c:329
 msgid "Mail append cancelled"
 msgstr "メールの追加が取り消されました"
 
-#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:332
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "mbox ファイルにメッセージを追加できません: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:468
+#: camel/providers/local/camel-mbox-folder.c:453
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "フォルダで回復不能なエラーが発生したようです"
 
-#: camel/providers/local/camel-mbox-folder.c:476
-#: camel/providers/local/camel-mh-folder.c:222
+#: camel/providers/local/camel-mbox-folder.c:461
+#: camel/providers/local/camel-mh-folder.c:223
 msgid "Message construction failed."
 msgstr "メッセージの構築に失敗しました。"
 
-#: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:361
+#: camel/providers/local/camel-mbox-store.c:174
+#: camel/providers/local/camel-mbox-store.c:359
 msgid "Cannot create a folder by this name."
 msgstr "そのような名前でフォルダを作成できません。"
 
-#: camel/providers/local/camel-mbox-store.c:206
+#: camel/providers/local/camel-mbox-store.c:204
 #, c-format
 msgid "Cannot get folder `%s': not a regular file."
 msgstr "フォルダ '%s' を取得できません: 通常のファイルではありません"
 
-#: camel/providers/local/camel-mbox-store.c:236
-#: camel/providers/local/camel-mbox-store.c:247
-#: camel/providers/local/camel-mbox-store.c:270
+#: camel/providers/local/camel-mbox-store.c:234
+#: camel/providers/local/camel-mbox-store.c:245
+#: camel/providers/local/camel-mbox-store.c:268
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -11043,157 +11446,157 @@ msgstr ""
 "フォルダ '%s' を削除できませんでした:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:255
+#: camel/providers/local/camel-mbox-store.c:253
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "'%s' は通常のファイルではありません"
 
-#: camel/providers/local/camel-mbox-store.c:262
+#: camel/providers/local/camel-mbox-store.c:260
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "フォルダ '%s' は空ではありません。削除しません。"
 
-#: camel/providers/local/camel-mbox-store.c:374
+#: camel/providers/local/camel-mbox-store.c:372
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "フォルダ '%s' を作成できません: %s"
 
-#: camel/providers/local/camel-mbox-store.c:388
+#: camel/providers/local/camel-mbox-store.c:386
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "フォルダを作成できません: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:390
+#: camel/providers/local/camel-mbox-store.c:388
 msgid "Folder already exists"
 msgstr "既にフォルダがあります"
 
-#: camel/providers/local/camel-mbox-store.c:472
+#: camel/providers/local/camel-mbox-store.c:470
 msgid "The new folder name is illegal."
 msgstr "新しいフォルダの名前は正しくありません。"
 
-#: camel/providers/local/camel-mbox-store.c:485
+#: camel/providers/local/camel-mbox-store.c:483
 #, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "'%s' の名前を変更できませんでした: '%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:560
+#: camel/providers/local/camel-mbox-store.c:558
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "'%s' から %s へ名前を変更できませんでした: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:375
+#: camel/providers/local/camel-mbox-summary.c:422
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "フォルダを開けませんでした: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:423
+#: camel/providers/local/camel-mbox-summary.c:470
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "%ld 付近のフォルダ %s で致命的なメール構文解析エラーです"
 
-#: camel/providers/local/camel-mbox-summary.c:479
+#: camel/providers/local/camel-mbox-summary.c:526
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "フォルダをチェックできません: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:547
-#: camel/providers/local/camel-mbox-summary.c:638
-#: camel/providers/local/camel-spool-summary.c:142
+#: camel/providers/local/camel-mbox-summary.c:594
+#: camel/providers/local/camel-mbox-summary.c:685
+#: camel/providers/local/camel-spool-summary.c:145
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "ファイルを開けませんでした: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:559
-#: camel/providers/local/camel-spool-summary.c:162
+#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-spool-summary.c:165
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "作業用の mailbox を開けませんでした: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:572
-#: camel/providers/local/camel-mbox-summary.c:736
+#: camel/providers/local/camel-mbox-summary.c:619
+#: camel/providers/local/camel-mbox-summary.c:783
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "元のフォルダ %s を閉じることができませんでした: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:581
+#: camel/providers/local/camel-mbox-summary.c:628
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "作業フォルダを閉じることができませんでした: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:592
+#: camel/providers/local/camel-mbox-summary.c:639
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "フォルダ名を変更できませんでした: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:676
-#: camel/providers/local/camel-mbox-summary.c:684
-#: camel/providers/local/camel-mbox-summary.c:877
-#: camel/providers/local/camel-mbox-summary.c:885
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:731
+#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:933
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "同期しましたが, サマリーとフォルダが不一致です"
 
-#: camel/providers/local/camel-mbox-summary.c:811
-#: camel/providers/local/camel-spool-summary.c:334
+#: camel/providers/local/camel-mbox-summary.c:859
+#: camel/providers/local/camel-spool-summary.c:337
 #, c-format
 msgid "Unknown error: %s"
 msgstr "特定できないエラー: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:846
+#: camel/providers/local/camel-mbox-summary.c:894
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "フォルダを保存できませんでした: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:940
-#: camel/providers/local/camel-mbox-summary.c:966
+#: camel/providers/local/camel-mbox-summary.c:988
+#: camel/providers/local/camel-mbox-summary.c:1014
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "作業 mailbox へ書き出し中にエラー: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:957
+#: camel/providers/local/camel-mbox-summary.c:1005
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "作業 mailbox へ書き出し中にエラー: %s: %s"
 
-#: camel/providers/local/camel-mh-folder.c:174
+#: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr "MH 形式のメッセージ追加が取り消されました"
 
-#: camel/providers/local/camel-mh-folder.c:177
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "MH 形式フォルダへメッセージを追加できません: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:219
+#: camel/providers/local/camel-mh-store.c:220
 #, c-format
 msgid "Could not create folder `%s': %s"
 msgstr "フォルダ '%s' を作成できませんでした: %s"
 
-#: camel/providers/local/camel-mh-store.c:231
+#: camel/providers/local/camel-mh-store.c:232
 #, c-format
 msgid "Cannot get folder `%s': not a directory."
 msgstr "フォルダ '%s' を取得できません: フォルダではありません"
 
-#: camel/providers/local/camel-mh-summary.c:244
+#: camel/providers/local/camel-mh-summary.c:247
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH フォルダのパスを開けません: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:122
+#: camel/providers/local/camel-spool-store.c:123
 #, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr "スプール '%s' フォルダが開けません: %s"
 
-#: camel/providers/local/camel-spool-store.c:134
+#: camel/providers/local/camel-spool-store.c:135
 #, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr "スプール '%s' は通常のファイル/フォルダではありません"
 
-#: camel/providers/local/camel-spool-store.c:153
+#: camel/providers/local/camel-spool-store.c:154
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "フォルダ '%s/%s' がありません。"
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:164
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -11202,12 +11605,12 @@ msgstr ""
 "フォルダ '%s' を開けませんでした:\n"
 "%s"
 
-#: camel/providers/local/camel-spool-store.c:167
+#: camel/providers/local/camel-spool-store.c:168
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "フォルダ '%s' がありません。"
 
-#: camel/providers/local/camel-spool-store.c:172
+#: camel/providers/local/camel-spool-store.c:173
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -11216,48 +11619,48 @@ msgstr ""
 "フォルダ '%s' を作成できませんでした:\n"
 "%s"
 
-#: camel/providers/local/camel-spool-store.c:180
+#: camel/providers/local/camel-spool-store.c:181
 #, c-format
 msgid "`%s' is not a mailbox file."
 msgstr "'%s' はメールボックス・ファイルではありません。"
 
-#: camel/providers/local/camel-spool-store.c:197
+#: camel/providers/local/camel-spool-store.c:198
 msgid "Store does not support an INBOX"
 msgstr "INBOX 格納をサポートしていません"
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:210
 #, c-format
 msgid "Spool mail file %s"
 msgstr "スプール・メール・ファイル %s"
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:210
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "スプール・フォルダ・ツリー %s"
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:218
 msgid "Spool folders cannot be renamed"
 msgstr "スプール・フォルダの名前は変更できません"
 
-#: camel/providers/local/camel-spool-store.c:225
+#: camel/providers/local/camel-spool-store.c:226
 msgid "Spool folders cannot be deleted"
 msgstr "スプール・フォルダは削除できません"
 
-#: camel/providers/local/camel-spool-summary.c:175
-#: camel/providers/local/camel-spool-summary.c:185
-#: camel/providers/local/camel-spool-summary.c:195
+#: camel/providers/local/camel-spool-summary.c:178
+#: camel/providers/local/camel-spool-summary.c:188
+#: camel/providers/local/camel-spool-summary.c:198
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "作業用フォルダ %s を同期できませんでした: %s"
 
-#: camel/providers/local/camel-spool-summary.c:211
+#: camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "スプール・フォルダ %s を同期できませんでした: %s"
 
-#: camel/providers/local/camel-spool-summary.c:242
-#: camel/providers/local/camel-spool-summary.c:261
-#: camel/providers/local/camel-spool-summary.c:274
+#: camel/providers/local/camel-spool-summary.c:245
+#: camel/providers/local/camel-spool-summary.c:264
+#: camel/providers/local/camel-spool-summary.c:277
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -11267,7 +11670,7 @@ msgstr ""
 "フォルダが壊れている可能性があります。コピーを '%s' に保存しました。"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:1126
+#: camel/providers/nntp/camel-nntp-store.c:1144
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "%s@%s の NNTP パスワードを入力して下さい"
@@ -11284,47 +11687,25 @@ msgstr "サーバへユーザ名の送信に失敗しました"
 msgid "Server rejected username/password"
 msgstr "サーバはユーザ名/パスワードを拒否しました"
 
-#: camel/providers/nntp/camel-nntp-folder.c:147
-#: camel/providers/nntp/camel-nntp-folder.c:149
-#: camel/providers/nntp/camel-nntp-folder.c:158
-#: camel/providers/nntp/camel-nntp-folder.c:234
-#: camel/providers/pop3/camel-pop3-folder.c:433
-#: camel/providers/pop3/camel-pop3-folder.c:494
-#: camel/providers/pop3/camel-pop3-folder.c:501
-#: camel/providers/pop3/camel-pop3-folder.c:512
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "メッセージ %s を取得できません: %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:156
-#: camel/providers/nntp/camel-nntp-folder.c:232
-#: camel/providers/nntp/camel-nntp-folder.c:371
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "ユーザが取り消しました"
-
-#: camel/providers/nntp/camel-nntp-folder.c:176
-#: camel/providers/nntp/camel-nntp-folder.c:208
+#: camel/providers/nntp/camel-nntp-folder.c:177
+#: camel/providers/nntp/camel-nntp-folder.c:209
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr "内部エラー: UID の書式が不正です: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:328
-#: camel/providers/nntp/camel-nntp-folder.c:331
-#: camel/providers/nntp/camel-nntp-folder.c:373
-#: camel/providers/nntp/camel-nntp-folder.c:375
+#: camel/providers/nntp/camel-nntp-folder.c:329
+#: camel/providers/nntp/camel-nntp-folder.c:332
+#: camel/providers/nntp/camel-nntp-folder.c:374
+#: camel/providers/nntp/camel-nntp-folder.c:376
 #, c-format
 msgid "Posting failed: %s"
 msgstr "投稿に失敗しました: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:393
+#: camel/providers/nntp/camel-nntp-folder.c:394
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "オフライン状態の間は NNTP メッセージを投稿できません！"
 
-#: camel/providers/nntp/camel-nntp-folder.c:404
+#: camel/providers/nntp/camel-nntp-folder.c:405
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "NNTP フォルダからメッセージのコピーはできません！"
 
@@ -11343,24 +11724,24 @@ msgstr "%s のグループ一覧ファイルを読み込めません: %s"
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "%s のグループ一覧ファイルを保存できません: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:43
+#: camel/providers/nntp/camel-nntp-provider.c:44
 msgid ""
 "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr "短い表記でフォルダを表示する (例: \"comp.os.linux\" => \"c.o.linux\")"
 
-#: camel/providers/nntp/camel-nntp-provider.c:45
+#: camel/providers/nntp/camel-nntp-provider.c:46
 msgid "In the subscription dialog, show relative folder names"
 msgstr "購読ダイアログで、関連するフォルダ名を表示する"
 
-#: camel/providers/nntp/camel-nntp-provider.c:52
+#: camel/providers/nntp/camel-nntp-provider.c:53
 msgid "USENET news"
 msgstr "USENET ニュース"
 
-#: camel/providers/nntp/camel-nntp-provider.c:54
+#: camel/providers/nntp/camel-nntp-provider.c:55
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "USENET のニュースグループを購読したり投稿します"
 
-#: camel/providers/nntp/camel-nntp-provider.c:73
+#: camel/providers/nntp/camel-nntp-provider.c:74
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -11368,29 +11749,22 @@ msgstr ""
 "このオプションはプレイン・テキストのパスワードを使って NNTP サーバで認証しま"
 "す。"
 
-#: camel/providers/nntp/camel-nntp-store.c:118
-#: camel/providers/nntp/camel-nntp-store.c:1233
-#: camel/providers/nntp/camel-nntp-store.c:1331
-#, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP コマンドが失敗しました: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:227
+#: camel/providers/nntp/camel-nntp-store.c:232
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "%s からの挨拶を読むことができませんでした: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:239
+#: camel/providers/nntp/camel-nntp-store.c:244
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP サーバ %s がエラーコード %d を返しました: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:403
+#: camel/providers/nntp/camel-nntp-store.c:420
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s 経由の USENET ニュース"
 
-#: camel/providers/nntp/camel-nntp-store.c:777
+#: camel/providers/nntp/camel-nntp-store.c:799
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11401,7 +11775,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/providers/nntp/camel-nntp-store.c:872
+#: camel/providers/nntp/camel-nntp-store.c:893
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -11412,7 +11786,7 @@ msgstr ""
 "そのようなニュースグループはありません。選択したアイテムは親フォルダのものか"
 "もしれません。"
 
-#: camel/providers/nntp/camel-nntp-store.c:904
+#: camel/providers/nntp/camel-nntp-store.c:925
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -11422,115 +11796,120 @@ msgstr ""
 "\n"
 "ニュースグループがありません！"
 
-#: camel/providers/nntp/camel-nntp-store.c:929
+#: camel/providers/nntp/camel-nntp-store.c:950
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 "ニュース・ストアにフォルダを生成できません: 代わりに購読を申請して下さい。"
 
-#: camel/providers/nntp/camel-nntp-store.c:937
+#: camel/providers/nntp/camel-nntp-store.c:958
 msgid "You cannot rename a folder in a News store."
 msgstr "ニュース格納場所のフォルダ名を変更できません。"
 
-#: camel/providers/nntp/camel-nntp-store.c:945
+#: camel/providers/nntp/camel-nntp-store.c:966
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "ニュース格納場所のフォルダを削除できません: 代わりに購読を停止して下さい。"
 
-#: camel/providers/nntp/camel-nntp-store.c:1118
-msgid "Authentication requested but not username provided"
-msgstr "認証を必要としていますが、ユーザ名がありません"
+#: camel/providers/nntp/camel-nntp-store.c:1136
+msgid "Authentication requested but no username provided"
+msgstr "認証を必要としていますが、ユーザ名が指定されていません"
 
-#: camel/providers/nntp/camel-nntp-store.c:1146
+#: camel/providers/nntp/camel-nntp-store.c:1148
 #, c-format
 msgid "Cannot authenticate to server: %s"
 msgstr "サーバの認証を行えません: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:1262
+#: camel/providers/nntp/camel-nntp-store.c:1264
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "NNTP コマンドが失敗しました: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:1320
 msgid "Not connected."
 msgstr "接続していません"
 
-#: camel/providers/nntp/camel-nntp-store.c:1311
+#: camel/providers/nntp/camel-nntp-store.c:1373
 #, c-format
 msgid "No such folder: %s"
 msgstr "そのようなフォルダはありません: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:218
-#: camel/providers/nntp/camel-nntp-summary.c:314
+#: camel/providers/nntp/camel-nntp-summary.c:221
+#: camel/providers/nntp/camel-nntp-summary.c:317
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: 新しいメッセージの解析中"
 
-#: camel/providers/nntp/camel-nntp-summary.c:225
+#: camel/providers/nntp/camel-nntp-summary.c:228
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "xover から予期しないサーバ応答がありました: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:328
+#: camel/providers/nntp/camel-nntp-summary.c:331
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "head から予期しないサーバ応答がありました: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:368
+#: camel/providers/nntp/camel-nntp-summary.c:371
 msgid "Use cancel"
 msgstr "キャンセルを利用する"
 
-#: camel/providers/nntp/camel-nntp-summary.c:370
+#: camel/providers/nntp/camel-nntp-summary.c:373
 #, c-format
 msgid "Operation failed: %s"
 msgstr "操作が失敗しました: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:246
+#: camel/providers/pop3/camel-pop3-folder.c:247
 msgid "Retrieving POP summary"
 msgstr "POP サマリの取得中"
 
-#: camel/providers/pop3/camel-pop3-folder.c:265
+#: camel/providers/pop3/camel-pop3-folder.c:266
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "POP サマリを取得できません: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:308
+#: camel/providers/pop3/camel-pop3-folder.c:309
 msgid "Expunging deleted messages"
 msgstr "削除済みのメッセージの抹消"
 
-#: camel/providers/pop3/camel-pop3-folder.c:404
+#: camel/providers/pop3/camel-pop3-folder.c:405
 #, c-format
 msgid "No message with uid %s"
 msgstr "uid %s のメッセージはありません"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:411
+#: camel/providers/pop3/camel-pop3-folder.c:412
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "POP メッセージ %d を取得中"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1210
-#: composer/e-msg-composer.c:1231
+#: camel/providers/pop3/camel-pop3-folder.c:502 composer/e-msg-composer.c:1233
+#: composer/e-msg-composer.c:1254
 msgid "Unknown reason"
 msgstr "原因不明"
 
-#: camel/providers/pop3/camel-pop3-provider.c:40
+#: camel/providers/pop3/camel-pop3-provider.c:41
 msgid "Leave messages on server"
 msgstr "サーバにメッセージを残す"
 
-#: camel/providers/pop3/camel-pop3-provider.c:43
+#: camel/providers/pop3/camel-pop3-provider.c:44
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr "%s 日後に削除する"
 
-#: camel/providers/pop3/camel-pop3-provider.c:46
+#: camel/providers/pop3/camel-pop3-provider.c:47
 msgid "Disable support for all POP3 extensions"
 msgstr "全ての POP3 拡張サポートを無効にする"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
+#: camel/providers/pop3/camel-pop3-provider.c:55
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:56
+#: camel/providers/pop3/camel-pop3-provider.c:57
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "POP サーバに接続したりメールを読んだりします"
 
-#: camel/providers/pop3/camel-pop3-provider.c:73
+#: camel/providers/pop3/camel-pop3-provider.c:74
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -11538,7 +11917,7 @@ msgstr ""
 "このオプションはプレイン・テキストのパスワードを使って POP サーバへ接続しま"
 "す。これは多くの POP サーバでサポートされるオプションです。"
 
-#: camel/providers/pop3/camel-pop3-provider.c:83
+#: camel/providers/pop3/camel-pop3-provider.c:84
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -11548,31 +11927,30 @@ msgstr ""
 "バへ接続します。これは公平なサポートを要求するサーバで、全てのユーザが正常に"
 "動作するわけではありません。"
 
-#: camel/providers/pop3/camel-pop3-store.c:195
-#, c-format
-msgid "Could not connect to POP server %s (port %d): %s"
-msgstr "POP サーバ %s (ポート %d) に接続できませんでした: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:214
+#: camel/providers/pop3/camel-pop3-store.c:202
 #, c-format
-msgid "Failed to read a valid greeting from POP server %s (port %d)"
-msgstr "POP サーバ %s (ポート番号 %d) から妥当な挨拶を読みませんでした"
+msgid "Failed to read a valid greeting from POP server %s"
+msgstr "POP サーバ %s から妥当な挨拶の読み込みが失敗しました"
 
+#: camel/providers/pop3/camel-pop3-store.c:215
 #: camel/providers/pop3/camel-pop3-store.c:232
-#: camel/providers/pop3/camel-pop3-store.c:261
-#: camel/providers/pop3/camel-pop3-store.c:273
+#: camel/providers/pop3/camel-pop3-store.c:242
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "セキュリティ保護されたモードで POP サーバ %s への接続に失敗しました: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:371
+#: camel/providers/pop3/camel-pop3-store.c:216
+msgid "STLS not supported"
+msgstr "STLS はサポートしていません"
+
+#: camel/providers/pop3/camel-pop3-store.c:354
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "POP サーバ %s へ接続できませんでした"
 
-#: camel/providers/pop3/camel-pop3-store.c:412
-#: camel/providers/pop3/camel-pop3-store.c:526
+#: camel/providers/pop3/camel-pop3-store.c:395
+#: camel/providers/pop3/camel-pop3-store.c:509
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11580,28 +11958,28 @@ msgid ""
 msgstr ""
 "POP サーバ %s へ接続できません: 要求された認証方式をサポートしていません。"
 
-#: camel/providers/pop3/camel-pop3-store.c:428
+#: camel/providers/pop3/camel-pop3-store.c:411
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL '%s' の POP サーバ %s へのログインに失敗: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:440
+#: camel/providers/pop3/camel-pop3-store.c:423
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "POP サーバ %s へログインできません: SASL プロトコル・エラー"
 
-#: camel/providers/pop3/camel-pop3-store.c:459
+#: camel/providers/pop3/camel-pop3-store.c:442
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "POP サーバ %s で認証に失敗しました: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:485
+#: camel/providers/pop3/camel-pop3-store.c:468
 #, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%s%s@%s の POP パスワードを入力して下さい。"
 
-#: camel/providers/pop3/camel-pop3-store.c:540
-#: camel/providers/pop3/camel-pop3-store.c:553
+#: camel/providers/pop3/camel-pop3-store.c:523
+#: camel/providers/pop3/camel-pop3-store.c:536
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11610,7 +11988,7 @@ msgstr ""
 "POP サーバ %s に接続できません。\n"
 "パスワードの送信中にエラー: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:547
+#: camel/providers/pop3/camel-pop3-store.c:530
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11619,208 +11997,203 @@ msgstr ""
 "POP サーバ %s に接続できません。\n"
 "ユーザ名の送信中にエラー: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:652
+#: camel/providers/pop3/camel-pop3-store.c:635
 #, c-format
 msgid "No such folder `%s'."
 msgstr "そのようなフォルダ '%s' はありません"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:132
+#: camel/providers/sendmail/camel-sendmail-provider.c:37
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:38
+#: camel/providers/sendmail/camel-sendmail-provider.c:39
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr ""
 "メールを配送するためにローカルシステムの \"sendmail\" プログラムへ渡します"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:113
+#: camel/providers/sendmail/camel-sendmail-transport.c:114
 msgid "Could not parse recipient list"
 msgstr "返信リストを解析できませんでした"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:144
+#: camel/providers/sendmail/camel-sendmail-transport.c:145
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "sendmail へパイプを作成できませんでした: %s: メールを送信しません"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:166
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "sendmail を fork(2) できませんでした: %s: メールを送信しません"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:205
+#: camel/providers/sendmail/camel-sendmail-transport.c:206
 #, c-format
 msgid "Could not send message: %s"
 msgstr "メッセージを送信できませんでした: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:233
+#: camel/providers/sendmail/camel-sendmail-transport.c:234
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail はシグナル %s で終了しました: メールを送信しません"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:240
+#: camel/providers/sendmail/camel-sendmail-transport.c:241
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "%s を実行できませんでした: メールを送信しません"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:245
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail はステータス %d で終了しました: メールを送信しません"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:259
+#: camel/providers/sendmail/camel-sendmail-transport.c:260
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:261
+#: camel/providers/sendmail/camel-sendmail-transport.c:262
 msgid "Mail delivery via the sendmail program"
 msgstr "sendmail 経由でメールを配信"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
+#: camel/providers/smtp/camel-smtp-provider.c:38
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:39
+#: camel/providers/smtp/camel-smtp-provider.c:40
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "SMTP を使ってリモートのメールハブに接続することでメールを配信します"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Syntax error, command unrecognized"
 msgstr "構文解析エラー: コマンドではありません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:167
 msgid "Syntax error in parameters or arguments"
 msgstr "パラメータあるいは引数に構文解析エラー"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Command not implemented"
 msgstr "コマンドは実装されていません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Command parameter not implemented"
 msgstr "コマンドパラメータは実装されていません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "System status, or system help reply"
 msgstr "システム・ステータスまたはシステム・ヘルプの応答"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Help message"
 msgstr "ヘルプ・メッセージ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Service ready"
 msgstr "サービスは利用できます"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Service closing transmission channel"
 msgstr "サービスは送信チャンネルを閉じています"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service not available, closing transmission channel"
 msgstr "サービスは利用できません, 送信チャンネルを閉じています"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Requested mail action okay, completed"
 msgstr "要求されたメールの動作はOK, 完了しました"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "User not local; will forward to <forward-path>"
 msgstr "ユーザはローカルではありません; <forward-path> へ転送します"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "要求されたメールの動作は完了しません: メールボックスは利用できません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "要求された動作は完了しません: メールボックスは利用できません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested action aborted: error in processing"
 msgstr "要求された動作を中断しました: 処理中にエラー"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "User not local; please try <forward-path>"
 msgstr "ユーザはローカルではありません; <forward-path> を試して下さい。"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: insufficient system storage"
 msgstr "要求された動作は完了しません: システムの保存領域が足りません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "要求されたメールの動作を中断しました: 領域割り当てを越えました"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "要求された動作は完了しません: メールボックス名は認められません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "メールの入力を開始します; <CRLF>.<CRLF> で終了します"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Transaction failed"
 msgstr "処理は失敗しました"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "A password transition is needed"
 msgstr "パスワードの変更が必要です"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Authentication mechanism is too weak"
 msgstr "認証メカニズムは不十分過ぎます"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Encryption required for requested authentication mechanism"
 msgstr "要求した認証メカニズムのために暗号化が必要です"
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Temporary authentication failure"
 msgstr "一時的な認証に失敗しました"
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication required"
 msgstr "認証を必要としています"
 
-#: camel/providers/smtp/camel-smtp-transport.c:308
+#: camel/providers/smtp/camel-smtp-transport.c:292
 msgid "Welcome response error"
 msgstr "Welcome 応答エラー"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
-#: camel/providers/smtp/camel-smtp-transport.c:382
+#: camel/providers/smtp/camel-smtp-transport.c:322
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "セキュリティ保護されたモードで SMTP サーバ %s への接続に失敗しました: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:344
-msgid "server does not appear to support SSL"
-msgstr "サーバは SSL をサポートしていないようです"
-
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:331
 #, c-format
 msgid "STARTTLS command failed: %s"
 msgstr "STARTTLS コマンドが失敗しました: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:346
 msgid "STARTTLS command failed"
 msgstr "STARTTLS コマンドが失敗しました"
 
-#: camel/providers/smtp/camel-smtp-transport.c:476
+#: camel/providers/smtp/camel-smtp-transport.c:479
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP サーバ %s は要求した認証方式 %s をサポートしていません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:514
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid "%sPlease enter the SMTP password for %s on host %s"
 msgstr "%s%s@%s の SMTP パスワードを入力して下さい。"
 
-#: camel/providers/smtp/camel-smtp-transport.c:533
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -11831,33 +12204,33 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:657
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP サーバ %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:659
+#: camel/providers/smtp/camel-smtp-transport.c:662
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s 経由で SMTP メールを配信します"
 
-#: camel/providers/smtp/camel-smtp-transport.c:677
+#: camel/providers/smtp/camel-smtp-transport.c:680
 msgid "Cannot send message: service not connected."
 msgstr "メッセージを送信できません: サービスが接続されていません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:683
+#: camel/providers/smtp/camel-smtp-transport.c:686
 msgid "Cannot send message: sender address not valid."
 msgstr "メッセージを送信できません: 差出人のアドレスが正しくありません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:687
+#: camel/providers/smtp/camel-smtp-transport.c:690
 msgid "Sending message"
 msgstr "メッセージの送信中"
 
-#: camel/providers/smtp/camel-smtp-transport.c:702
+#: camel/providers/smtp/camel-smtp-transport.c:705
 msgid "Cannot send message: no recipients defined."
 msgstr "メッセージを送信できません: 宛先が定義されていません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:713
+#: camel/providers/smtp/camel-smtp-transport.c:716
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "メッセージを送信できません: 不正な応答が一つ以上あります"
 
@@ -11865,59 +12238,59 @@ msgstr "メッセージを送信できません: 不正な応答が一つ以上
 msgid "SMTP Greeting"
 msgstr "SMTP 接続中"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:911
 #, c-format
 msgid "HELO command failed: %s"
 msgstr "HELO コマンドが失敗しました: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:951
+#: camel/providers/smtp/camel-smtp-transport.c:928
 msgid "HELO command failed"
 msgstr "HELO コマンドが失敗しました"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1017
+#: camel/providers/smtp/camel-smtp-transport.c:994
 msgid "SMTP Authentication"
 msgstr "SMTP 認証"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1023
+#: camel/providers/smtp/camel-smtp-transport.c:1000
 msgid "Error creating SASL authentication object."
 msgstr "SASL 認証オブジェクトの生成中にエラーが発生しました"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1040
-#: camel/providers/smtp/camel-smtp-transport.c:1051
+#: camel/providers/smtp/camel-smtp-transport.c:1017
+#: camel/providers/smtp/camel-smtp-transport.c:1028
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr "AUTH コマンドが失敗しました: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1057
+#: camel/providers/smtp/camel-smtp-transport.c:1034
 msgid "AUTH command failed"
 msgstr "AUTH コマンドが失敗しました"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1119
+#: camel/providers/smtp/camel-smtp-transport.c:1096
 msgid "Bad authentication response from server.\n"
 msgstr "サーバから間違った認証応答がありました\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1144
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "MAIL FROM コマンドが失敗しました: %s: メールを送信しません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1161
+#: camel/providers/smtp/camel-smtp-transport.c:1138
 msgid "MAIL FROM command failed"
 msgstr "MAIL FROM コマンドが失敗しました"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1185
+#: camel/providers/smtp/camel-smtp-transport.c:1162
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "RCPT TO コマンドが失敗しました: %s: メールを送信しません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1204
+#: camel/providers/smtp/camel-smtp-transport.c:1181
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> コマンドが失敗しました"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1243
-#: camel/providers/smtp/camel-smtp-transport.c:1301
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1220
+#: camel/providers/smtp/camel-smtp-transport.c:1278
+#: camel/providers/smtp/camel-smtp-transport.c:1297
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "DATA コマンドが失敗しました: %s: メールを送信しません"
@@ -11925,67 +12298,64 @@ msgstr "DATA コマンドが失敗しました: %s: メールを送信しませ
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1260
-#: camel/providers/smtp/camel-smtp-transport.c:1336
+#: camel/providers/smtp/camel-smtp-transport.c:1237
+#: camel/providers/smtp/camel-smtp-transport.c:1313
 msgid "DATA command failed"
 msgstr "DATA コマンドが失敗しました"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1359
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 #, c-format
 msgid "RSET command failed: %s"
 msgstr "RSET コマンドが失敗しました: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1375
+#: camel/providers/smtp/camel-smtp-transport.c:1352
 msgid "RSET command failed"
 msgstr "RSET コマンドが失敗しました"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1398
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr "QUIT コマンドが失敗しました: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1412
+#: camel/providers/smtp/camel-smtp-transport.c:1389
 msgid "QUIT command failed"
 msgstr "QUIT コマンドが失敗しました"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:101
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:436
+#: composer/e-msg-composer-attachment-bar.c:293 mail/em-utils.c:436
 msgid "attachment"
 msgstr "添付"
 
-#: composer/e-msg-composer-attachment-bar.c:454
-msgid "Remove selected items from the attachment list"
-msgstr "添付した内容の一覧から指定したアイテムを削除します"
-
-#: composer/e-msg-composer-attachment-bar.c:494
-msgid "Add attachment..."
-msgstr "添付の追加..."
+#: composer/e-msg-composer-attachment-bar.c:441 mail/em-folder-tree.c:2750
+#: ui/evolution-mail-list.xml.h:27
+msgid "_Properties"
+msgstr "プロパティ(_P)"
 
-#: composer/e-msg-composer-attachment-bar.c:495
-msgid "Attach a file to the message"
-msgstr "メッセージへファイルを添付します"
+#: composer/e-msg-composer-attachment-bar.c:443
+msgid "_Add attachment..."
+msgstr "添付の追加(_A)..."
 
-#: composer/e-msg-composer-attachment.c:173
-#: composer/e-msg-composer-attachment.c:189
+#: composer/e-msg-composer-attachment.c:174
+#: composer/e-msg-composer-attachment.c:190
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "ファイル %s を添付できません: %s"
 
-#: composer/e-msg-composer-attachment.c:181
+#: composer/e-msg-composer-attachment.c:182
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "ファイル %s を添付できません: 通常のファイルではありません"
@@ -12003,69 +12373,144 @@ msgid "MIME type:"
 msgstr "MIME タイプ:"
 
 #: composer/e-msg-composer-attachment.glade.h:6
-#: composer/e-msg-composer-select-file.c:92
-#: composer/e-msg-composer-select-file.c:111
+#: composer/e-msg-composer-select-file.c:93
+#: composer/e-msg-composer-select-file.c:112
 msgid "Suggest automatic display of attachment"
 msgstr "添付した内容を自動的に表示するか提示する"
 
-#: composer/e-msg-composer-hdrs.c:512
-msgid "Posting destination"
-msgstr "送信先を指定します"
+#: composer/e-msg-composer.c:727
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"送信メッセージに署名できません: このアカウントに対して署名付きの証明書がセッ"
+"トされていません"
 
-#: composer/e-msg-composer-hdrs.c:513
-msgid "Choose folders to post the message to."
-msgstr "メッセージを投稿するフォルダを選択して下さい。"
+#: composer/e-msg-composer.c:734
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"送信するメッセージを暗号化できません: このアカウントに対して暗号化された証明"
+"書がセットされていません"
 
-#: composer/e-msg-composer-hdrs.c:547
-msgid "Click here for the address book"
-msgstr "ここをクリックするとアドレス帳が表示されます"
+#: composer/e-msg-composer.c:1291
+msgid "Could not open file"
+msgstr "ファイルを開けませんでした"
 
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: composer/e-msg-composer-hdrs.c:577
-msgid "Reply-To:"
-msgstr "返信先:"
+#: composer/e-msg-composer.c:1299
+msgid "Unable to retrieve message from editor"
+msgstr "エディタからメッセージを取得できません"
+
+#: composer/e-msg-composer.c:1569
+msgid "Untitled Message"
+msgstr "タイトルなしのメッセージ"
+
+#: composer/e-msg-composer.c:1599
+msgid "Open file"
+msgstr "ファイルを開く"
+
+#: composer/e-msg-composer.c:2006 mail/em-account-editor.c:578
+#: mail/em-account-editor.c:623 mail/em-account-editor.c:690
+msgid "Autogenerated"
+msgstr "自動生成"
+
+#: composer/e-msg-composer.c:2105
+msgid "Si_gnature:"
+msgstr "署名(_G):"
+
+#: composer/e-msg-composer.c:2364 composer/e-msg-composer.c:3357
+#: composer/e-msg-composer.c:3358
+msgid "Compose a message"
+msgstr "メッセージの作成"
+
+#: composer/e-msg-composer.c:2673
+#, c-format
+msgid "Attached message - %s"
+msgstr "添付されたメッセージ - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2678 composer/e-msg-composer.c:2841
+#, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "添付されたメッセージ"
+
+#: composer/e-msg-composer.c:2904 mail/em-folder-tree.c:1029
+#: mail/em-folder-tree.c:2247 mail/em-folder-view.c:823
+#: mail/message-list.c:1713
+msgid "_Move"
+msgstr "移動(_M)"
+
+#: composer/e-msg-composer.c:2906 mail/em-folder-tree.c:1031
+#: mail/message-list.c:1715
+msgid "Cancel _Drag"
+msgstr "ドラッグのキャンセル(_D)"
+
+#: composer/e-msg-composer.c:4538
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(コンポーザに編集できないテキスト形式のメッセージが含まれています。)<b>"
+
+#: composer/e-msg-composer-hdrs.c:512
+msgid "Posting destination"
+msgstr "送信先を指定します"
+
+#: composer/e-msg-composer-hdrs.c:513
+msgid "Choose folders to post the message to."
+msgstr "メッセージを投稿するフォルダを選択して下さい。"
+
+#: composer/e-msg-composer-hdrs.c:547
+msgid "Click here for the address book"
+msgstr "ここをクリックするとアドレス帳が表示されます"
+
+#.
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
+#.
+#: composer/e-msg-composer-hdrs.c:577
+msgid "_Reply-To:"
+msgstr "返信先(_R):"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:583
-msgid "From:"
-msgstr "差出人:"
+#: composer/e-msg-composer-hdrs.c:584
+msgid "Fr_om:"
+msgstr "差出人(_O):"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:589
-msgid "Subject:"
-msgstr "件名:"
+#: composer/e-msg-composer-hdrs.c:591
+msgid "S_ubject:"
+msgstr "件名(_U):"
 
-#: composer/e-msg-composer-hdrs.c:598
-msgid "To:"
-msgstr "宛先:"
+#: composer/e-msg-composer-hdrs.c:601
+msgid "_To:"
+msgstr "宛先(_T):"
 
-#: composer/e-msg-composer-hdrs.c:599
+#: composer/e-msg-composer-hdrs.c:602
 msgid "Enter the recipients of the message"
 msgstr "メッセージの宛先を入力します"
 
-#: composer/e-msg-composer-hdrs.c:602
-msgid "Cc:"
-msgstr "Cc:"
+#: composer/e-msg-composer-hdrs.c:605
+msgid "_Cc:"
+msgstr "Cc(_C):"
 
-#: composer/e-msg-composer-hdrs.c:603
+#: composer/e-msg-composer-hdrs.c:606
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "メッセージのカーボン・コピー (CC) を受信するアドレスを入力します"
 
-#: composer/e-msg-composer-hdrs.c:606
-msgid "Bcc:"
-msgstr "Bcc:"
+#: composer/e-msg-composer-hdrs.c:609
+msgid "_Bcc:"
+msgstr "Bcc(_B):"
 
-#: composer/e-msg-composer-hdrs.c:607
+#: composer/e-msg-composer-hdrs.c:610
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -12076,97 +12521,22 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:614
-msgid "Post To:"
-msgstr "送信先:"
+#: composer/e-msg-composer-hdrs.c:617
+msgid "_Post To:"
+msgstr "送信先(_P):"
 
-#: composer/e-msg-composer-hdrs.c:619
+#: composer/e-msg-composer-hdrs.c:622
 msgid "Click here to select folders to post to"
 msgstr "<ここをクリックして投稿するフォルダを選択して下さい>"
 
-#: composer/e-msg-composer-select-file.c:186
+#: composer/e-msg-composer-hdrs.c:628
+msgid "Post To:"
+msgstr "送信先:"
+
+#: composer/e-msg-composer-select-file.c:187
 msgid "Attach file(s)"
 msgstr "ファイルの添付"
 
-#: composer/e-msg-composer.c:704
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"送信メッセージに署名できません: このアカウントに対して署名付きの証明書がセッ"
-"トされていません"
-
-#: composer/e-msg-composer.c:711
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-"送信するメッセージを暗号化できません: このアカウントに対して暗号化された証明"
-"書がセットされていません"
-
-#: composer/e-msg-composer.c:1268
-msgid "Could not open file"
-msgstr "ファイルを開けませんでした"
-
-#: composer/e-msg-composer.c:1276
-msgid "Unable to retrieve message from editor"
-msgstr "エディタからメッセージを取得できません"
-
-#: composer/e-msg-composer.c:1546
-msgid "Untitled Message"
-msgstr "タイトルなしのメッセージ"
-
-#: composer/e-msg-composer.c:1576
-msgid "Open file"
-msgstr "ファイルを開く"
-
-#: composer/e-msg-composer.c:1983 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "自動生成"
-
-#: composer/e-msg-composer.c:2082
-msgid "Signature:"
-msgstr "署名:"
-
-#: composer/e-msg-composer.c:2283
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "添付ファイルが <b>%d</b> 個あります"
-msgstr[1] "添付ファイルが <b>%d</b> 個あります"
-
-#: composer/e-msg-composer.c:2312
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "添付ファイル・バーを隠す (ここに添付ファイルをドロップして下さい)(_A)"
-
-#: composer/e-msg-composer.c:2315 composer/e-msg-composer.c:3271
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-"添付ファイル・バーを表示する (ここに添付ファイルをドロップして下さい)(_A)"
-
-#: composer/e-msg-composer.c:2332 composer/e-msg-composer.c:3163
-#: composer/e-msg-composer.c:3164
-msgid "Compose a message"
-msgstr "メッセージの作成"
-
-#: composer/e-msg-composer.c:2634
-#, c-format
-msgid "Attached message - %s"
-msgstr "添付されたメッセージ - %s"
-
-#. translators, this count will always be >1
-#: composer/e-msg-composer.c:2639 composer/e-msg-composer.c:2783
-#, c-format
-msgid "Attached message"
-msgid_plural "%d attached messages"
-msgstr[0] "添付されたメッセージ"
-
-#: composer/e-msg-composer.c:4341
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(コンポーザに編集できないテキスト形式のメッセージが含まれています。)<b>"
-
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 msgid "You cannot attach the file `{0}' to this message."
@@ -12271,9 +12641,13 @@ msgstr ""
 "メッセージを永久に失うことになります。保存しておくと、後日、メッセージの作成"
 "を続行することができます。"
 
+#: composer/mail-composer-errors.xml.h:33
+msgid "_Discard Changes"
+msgstr "変更を破棄する(_D)"
+
 #: composer/mail-composer-errors.xml.h:34
-msgid "Save Message"
-msgstr "保存する"
+msgid "_Save Message"
+msgstr "保存する(_S)"
 
 #. mail-composer:no-build-message primary
 #: composer/mail-composer-errors.xml.h:36
@@ -12326,9 +12700,9 @@ msgstr ""
 "正しいバージョンの gtkhtml と libgtkhml がインストールされているか確認して下"
 "さい。"
 
-#: data/evolution.desktop.in.in.h:1 shell/main.c:503
+#: data/evolution.desktop.in.in.h:1 shell/main.c:520
 msgid "Evolution"
-msgstr "Evolution"
+msgstr "Evolution-2.2"
 
 #: data/evolution.desktop.in.in.h:2
 msgid "The Evolution Groupware Suite"
@@ -12444,7 +12818,7 @@ msgid ""
 msgstr ""
 "開封通知つきで E-メールを受信した際に、Evolution でどう処理するかを指定します"
 
-#: e-util/e-dialog-utils.c:265
+#: e-util/e-dialog-utils.c:267
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -12453,15 +12827,19 @@ msgstr ""
 "上書きしますか？"
 
 #. system:ask-save-file-exists-overwrite title
-#: e-util/e-dialog-utils.c:267 widgets/misc/e-system-errors.xml.h:2
+#: e-util/e-dialog-utils.c:269 widgets/misc/e-system-errors.xml.h:2
 msgid "Overwrite file?"
 msgstr "ファイルを上書きしますか？"
 
-#: e-util/e-passwords.c:460
+#: e-util/eggtrayicon.c:119
+msgid "The orientation of the tray."
+msgstr "トレイの向きです。"
+
+#: e-util/e-passwords.c:468
 msgid "_Remember this password"
 msgstr "このパスワードを記憶する(_R)"
 
-#: e-util/e-passwords.c:461
+#: e-util/e-passwords.c:469
 msgid "_Remember this password for the remainder of this session"
 msgstr "このパスワードをこのセッション用に保存する(_R)"
 
@@ -12545,7 +12923,7 @@ msgstr "%H時%M分%S秒"
 #. without seconds.
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1431 widgets/misc/e-dateedit.c:1697
 msgid "%I:%M %p"
 msgstr "%p %I時%M分"
 
@@ -12554,7 +12932,7 @@ msgstr "%p %I時%M分"
 #. without seconds.
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
+#: widgets/misc/e-dateedit.c:1428 widgets/misc/e-dateedit.c:1694
 msgid "%H:%M"
 msgstr "%H時%M分"
 
@@ -12691,71 +13069,6 @@ msgstr "別の名前を指定して下さい。"
 msgid "Choose a file"
 msgstr "ファイルの選択"
 
-#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
-#: mail/mail-config.c:76 mail/mail-config.glade.h:93
-msgid "Important"
-msgstr "重要"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
-#: mail/mail-config.glade.h:148
-msgid "To Do"
-msgstr "ToDo"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
-#: mail/mail-config.glade.h:97
-msgid "Later"
-msgstr "保留"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "テスト"
-
-#: filter/filter-rule.c:790
-msgid "Rule name:"
-msgstr "ルール名:"
-
-#: filter/filter-rule.c:817
-msgid "<b>If</b>"
-msgstr "<b>条件</b> "
-
-#: filter/filter-rule.c:854
-msgid "if all criteria are met"
-msgstr "全ての条件が合った時"
-
-#: filter/filter-rule.c:854
-msgid "if any criteria are met"
-msgstr "幾つかの条件が合った時"
-
-#: filter/filter-rule.c:856
-msgid "Execute actions"
-msgstr "実行する条件:"
-
-#: filter/filter-rule.c:877
-msgid "All related"
-msgstr "関係するもの全て"
-
-#: filter/filter-rule.c:877
-msgid "Replies"
-msgstr "返信だけ"
-
-#: filter/filter-rule.c:877
-msgid "Replies and parents"
-msgstr "返信とその親"
-
-#: filter/filter-rule.c:879
-msgid "Include threads"
-msgstr "次のスレッドを含める"
-
-#: filter/filter-rule.c:974
-msgid "incoming"
-msgstr "受信"
-
-#: filter/filter-rule.c:974
-msgid "outgoing"
-msgstr "送信"
-
 #: filter/filter.glade.h:1
 msgid "<b>_Filter Rules</b>"
 msgstr "<b>フィルタのルール(_F)</b>"
@@ -12764,11 +13077,15 @@ msgstr "<b>フィルタのルール(_F)</b>"
 msgid "Compare against"
 msgstr "逆比較"
 
-#: filter/filter.glade.h:3
+#: filter/filter.glade.h:3 filter/filter-rule.c:975
 msgid "Incoming"
 msgstr "入力"
 
 #: filter/filter.glade.h:4
+msgid "Show filters for mail:"
+msgstr "次のメールに対するフィルタを表示する:"
+
+#: filter/filter.glade.h:5
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -12776,7 +13093,7 @@ msgstr ""
 "メッセージの日付は\n"
 "指定した日付の 0:00 と比較されます。"
 
-#: filter/filter.glade.h:6
+#: filter/filter.glade.h:7
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -12784,7 +13101,7 @@ msgstr ""
 "メッセージの日付は、フィルタが実行された時の\n"
 "相対的な時間と比較されます。"
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:9
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -12792,34 +13109,95 @@ msgstr ""
 "メッセージの日付は、フィルタが実行された時の\n"
 "現在の時刻と比較されます。"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:12
 msgid "a time relative to the current time"
 msgstr "現在時刻への相対時間"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:13
 msgid "ago"
 msgstr "前"
 
-#: filter/filter.glade.h:16
+#: filter/filter.glade.h:17
 msgid "months"
 msgstr "月"
 
-#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+#: filter/filter.glade.h:18 mail/mail-config.glade.h:173
 msgid "seconds"
 msgstr " 秒"
 
-#: filter/filter.glade.h:18
+#: filter/filter.glade.h:19
 msgid "the current time"
 msgstr "現在時刻"
 
-#: filter/filter.glade.h:19
+#: filter/filter.glade.h:20
 msgid "the time you specify"
 msgstr "指定した時間"
 
-#: filter/filter.glade.h:21
+#: filter/filter.glade.h:22
 msgid "years"
 msgstr "年"
 
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:91
+msgid "Important"
+msgstr "重要"
+
+#. forest green
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:139
+msgid "To Do"
+msgstr "ToDo"
+
+#. blue
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:94
+msgid "Later"
+msgstr "保留"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "テスト"
+
+#: filter/filter-rule.c:790
+msgid "_Rule name:"
+msgstr "ルール名(_R):"
+
+#: filter/filter-rule.c:818
+msgid "<b>If</b>"
+msgstr "<b>条件</b> "
+
+#: filter/filter-rule.c:855
+msgid "if all criteria are met"
+msgstr "全ての条件が合った時"
+
+#: filter/filter-rule.c:855
+msgid "if any criteria are met"
+msgstr "幾つかの条件が合った時"
+
+#: filter/filter-rule.c:857
+msgid "Execute actions"
+msgstr "実行する条件:"
+
+#: filter/filter-rule.c:878
+msgid "All related"
+msgstr "関係するもの全て"
+
+#: filter/filter-rule.c:878
+msgid "Replies"
+msgstr "返信だけ"
+
+#: filter/filter-rule.c:878
+msgid "Replies and parents"
+msgstr "返信とその親"
+
+#: filter/filter-rule.c:880
+msgid "Include threads"
+msgstr "次のスレッドを含める"
+
+#: filter/filter-rule.c:975
+msgid "Outgoing"
+msgstr "送信"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "ルールの追加"
@@ -12832,112 +13210,88 @@ msgstr "ルールの編集"
 msgid "Rule name"
 msgstr "ルール名"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr "[CTRL]+[F1]"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "コンポーザの設定"
+#: mail/em-account-editor.c:377
+#, c-format
+msgid "%s License Agreement"
+msgstr "%s のライセンス同意書"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+#: mail/em-account-editor.c:384
+#, c-format
 msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr "セキュリティとメッセージ表示を含む、メール設定"
+"\n"
+"Please read carefully the license agreement\n"
+"for %s displayed below\n"
+"and tick the check box for accepting it\n"
+msgstr ""
+"\n"
+"次に示す %s のライセンス同意書を\n"
+"注意深く読んで、同意する場合は\n"
+"チェック・ボックスにチェックを入れて下さい。\n"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "スペルチェック、署名とメッセージ・コンポーザの設定"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your email accounts here"
-msgstr "使用する E-メールアカウントをここで設定します。"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Evolution メール"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution メール・アカウント設定コントロール"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Evolution メール・コンポーネント"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Evolution メール・コンポーザ"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution メール・コンポーザ設定コントロール"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution メール設定コントロール"
+#: mail/em-account-editor.c:454 mail/em-filter-folder-element.c:237
+#: mail/em-vfolder-rule.c:494
+msgid "Select Folder"
+msgstr "フォルダの選択"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:419
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
-#: mail/mail-component.c:557
-msgid "Mail"
-msgstr "メール"
+#: mail/em-account-editor.c:1808
+msgid "Automatically check for _new mail every"
+msgstr "新着メールを自動的にチェックする(_N)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "メールのアカウント"
+#. Most sections for this is auto-generated fromt the camel config
+#: mail/em-account-editor.c:2077 mail/em-account-editor.c:2155
+msgid "Receiving Options"
+msgstr "返信オプション"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "メールの設定"
+#: mail/em-account-editor.c:2500 mail/mail-config.glade.h:34
+msgid "Account Editor"
+msgstr "アカウント・エディタ"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-msgid "_Mail"
-msgstr "メール(_M)"
+#: mail/em-account-editor.c:2500 mail/mail-config.glade.h:80
+msgid "Evolution Account Assistant"
+msgstr "Evolution アカウント・アシスタント"
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:418
+#: mail/em-account-prefs.c:422
 msgid "[Default]"
 msgstr "[デフォルト]"
 
-#: mail/em-account-prefs.c:472
+#: mail/em-account-prefs.c:476
 msgid "Account name"
 msgstr "アカウント名"
 
-#: mail/em-account-prefs.c:474
+#: mail/em-account-prefs.c:478
 msgid "Protocol"
 msgstr "プロトコル"
 
-#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
-#: mail/mail-config.c:1045
+#: mail/em-composer-prefs.c:306 mail/em-composer-prefs.c:425
+#: mail/mail-config.c:935
 msgid "Unnamed"
 msgstr "名前なし"
 
-#: mail/em-composer-prefs.c:909
+#: mail/em-composer-prefs.c:949
 msgid "Language(s)"
 msgstr "言語"
 
-#: mail/em-composer-prefs.c:955
+#: mail/em-composer-prefs.c:995
 msgid "Add signature script"
 msgstr "署名スクリプトの追加"
 
-#: mail/em-composer-prefs.c:975
+#: mail/em-composer-prefs.c:1015
 msgid "Signature(s)"
 msgstr "署名"
 
-#: mail/em-composer-utils.c:889
+#: mail/em-composer-utils.c:897
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 転送するメッセージ --------"
 
-#: mail/em-composer-utils.c:1502
+#: mail/em-composer-utils.c:1513
 msgid "an unknown sender"
 msgstr "差出人が不明"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: mail/em-composer-utils.c:1549
+#: mail/em-composer-utils.c:1560
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -12949,23 +13303,18 @@ msgstr ""
 msgid "_Filter Rules"
 msgstr "フィルタのルール(_F)"
 
-#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "フォルダの選択"
-
 #. Automatically generated. Do not edit.
 #: mail/em-filter-i18n.h:2
 msgid "Adjust Score"
-msgstr "スコアの調整"
+msgstr "スコアを調整する"
 
 #: mail/em-filter-i18n.h:3
 msgid "Assign Color"
-msgstr "色の割当て"
+msgstr "色を付ける"
 
 #: mail/em-filter-i18n.h:4
 msgid "Assign Score"
-msgstr "スコアの割当て"
+msgstr "スコアを付ける"
 
 #: mail/em-filter-i18n.h:5
 msgid "Attachments"
@@ -12973,7 +13322,7 @@ msgstr "添付"
 
 #: mail/em-filter-i18n.h:6
 msgid "Beep"
-msgstr "ビープ音"
+msgstr "ビープ音を鳴らす"
 
 #: mail/em-filter-i18n.h:7
 msgid "contains"
@@ -13083,7 +13432,7 @@ msgstr "にフラグが付いていない"
 msgid "Junk Test"
 msgstr "ジャンクのテスト"
 
-#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:932
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:960
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "ラベル"
@@ -13093,109 +13442,113 @@ msgid "Mailing list"
 msgstr "メーリング・リスト"
 
 #: mail/em-filter-i18n.h:39
+msgid "Match All"
+msgstr "全てに一致する"
+
+#: mail/em-filter-i18n.h:40
 msgid "Message Body"
 msgstr "メッセージの本文"
 
-#: mail/em-filter-i18n.h:40
+#: mail/em-filter-i18n.h:41
 msgid "Message Header"
 msgstr "メッセージのヘッダ"
 
-#: mail/em-filter-i18n.h:41
+#: mail/em-filter-i18n.h:42
 msgid "Message is Junk"
 msgstr "メッセージはジャンクです"
 
-#: mail/em-filter-i18n.h:42
+#: mail/em-filter-i18n.h:43
 msgid "Message is not Junk"
 msgstr "メッセージはジャンクではありません"
 
-#: mail/em-filter-i18n.h:43
+#: mail/em-filter-i18n.h:44
 msgid "Move to Folder"
 msgstr "フォルダへ移動する"
 
-#: mail/em-filter-i18n.h:44
+#: mail/em-filter-i18n.h:45
 msgid "Pipe to Program"
 msgstr "プログラムへ引き渡す"
 
-#: mail/em-filter-i18n.h:45
+#: mail/em-filter-i18n.h:46
 msgid "Play Sound"
 msgstr "サウンドを演奏する"
 
-#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+#: mail/em-filter-i18n.h:47 mail/message-tag-followup.c:80
 msgid "Read"
 msgstr "既読"
 
-#: mail/em-filter-i18n.h:47
+#: mail/em-filter-i18n.h:48
 msgid "Recipients"
 msgstr "宛先"
 
-#: mail/em-filter-i18n.h:48
+#: mail/em-filter-i18n.h:49
 msgid "Regex Match"
 msgstr "正規表現による検索"
 
-#: mail/em-filter-i18n.h:49
+#: mail/em-filter-i18n.h:50
 msgid "Replied to"
-msgstr "返信先"
+msgstr "返信済"
 
-#: mail/em-filter-i18n.h:50
+#: mail/em-filter-i18n.h:51
 msgid "returns"
 msgstr "次を返す"
 
-#: mail/em-filter-i18n.h:51
+#: mail/em-filter-i18n.h:52
 msgid "returns greater than"
 msgstr "次より大きい値を返す"
 
-#: mail/em-filter-i18n.h:52
+#: mail/em-filter-i18n.h:53
 msgid "returns less than"
 msgstr "次より小さい値を返す"
 
-#: mail/em-filter-i18n.h:53
+#: mail/em-filter-i18n.h:54
 msgid "Run Program"
 msgstr "プログラムを実行する"
 
-#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+#: mail/em-filter-i18n.h:55 mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "スコア"
 
-#: mail/em-filter-i18n.h:55
+#: mail/em-filter-i18n.h:56
 msgid "Sender"
 msgstr "差出人"
 
-#: mail/em-filter-i18n.h:56
+#: mail/em-filter-i18n.h:57
 msgid "Set Status"
 msgstr "ステータスをセットする"
 
-#: mail/em-filter-i18n.h:57
+#: mail/em-filter-i18n.h:58
 msgid "Size (kB)"
 msgstr "サイズ (KB)"
 
-#: mail/em-filter-i18n.h:58
+#: mail/em-filter-i18n.h:59
 msgid "sounds like"
 msgstr "次のようである"
 
-#: mail/em-filter-i18n.h:59
+#: mail/em-filter-i18n.h:60
 msgid "Source Account"
 msgstr "ソースのアカウント"
 
-#: mail/em-filter-i18n.h:60
+#: mail/em-filter-i18n.h:61
 msgid "Specific header"
 msgstr "指定したフォルダ"
 
-#: mail/em-filter-i18n.h:61
+#: mail/em-filter-i18n.h:62
 msgid "starts with"
 msgstr "が次で始まる"
 
-#: mail/em-filter-i18n.h:63
+#: mail/em-filter-i18n.h:64
 msgid "Stop Processing"
 msgstr "読み込みを停止する"
 
-#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1550
-#: mail/em-format-quote.c:305 mail/em-format.c:805 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1131
+#: mail/em-filter-i18n.h:65 mail/em-format.c:853 mail/em-format-html.c:1534
+#: mail/em-format-quote.c:306 mail/em-mailer-prefs.c:88
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:330
+#: plugins/shared-folder/properties.glade.h:14 smime/lib/e-cert.c:1131
 msgid "Subject"
 msgstr "件名"
 
-#: mail/em-filter-i18n.h:65
+#: mail/em-filter-i18n.h:66
 msgid "Unset Status"
 msgstr "ステータスを外す"
 
@@ -13204,28 +13557,28 @@ msgstr "ステータスを外す"
 msgid "<b>Then</b>"
 msgstr "<b>アクション</b> "
 
-#: mail/em-folder-browser.c:129
+#: mail/em-folder-browser.c:133
 msgid "Create _Virtual Folder From Search..."
 msgstr "検索結果から仮想フォルダの作成(_V)..."
 
-#: mail/em-folder-properties.c:122
-msgid "Folder Properties"
-msgstr "フォルダのプロパティ"
-
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:161
+#: mail/em-folder-properties.c:143
 msgid "Total message:"
 msgid_plural "Total messages:"
 msgstr[0] "メッセージ総数:"
 msgstr[1] "メッセージ総数:"
 
-#: mail/em-folder-properties.c:173
+#: mail/em-folder-properties.c:155
 msgid "Unread message:"
 msgid_plural "Unread messages:"
 msgstr[0] "未読のメッセージ数:"
 msgstr[1] "未読のメッセージ数:"
 
-#: mail/em-folder-selection-button.c:120
+#: mail/em-folder-properties.c:269 plugins/shared-folder/properties.glade.h:9
+msgid "Folder Properties"
+msgstr "フォルダのプロパティ"
+
+#: mail/em-folder-selection-button.c:121
 msgid "<click here to select a folder>"
 msgstr "<ここをクリックしてフォルダを選択して下さい>"
 
@@ -13233,552 +13586,557 @@ msgstr "<ここをクリックしてフォルダを選択して下さい>"
 msgid "Create New Folder"
 msgstr "新規フォルダの作成"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
-#: mail/mail-component.c:707
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2463
+#: mail/mail-component.c:732 plugins/shared-folder/share-folder-common.c:311
 msgid "Specify where to create the folder:"
 msgstr "フォルダを作成する場所を指定して下さい:"
 
-#: mail/em-folder-selector.c:300
+#: mail/em-folder-selector.c:304
 msgid "Create"
 msgstr "作成"
 
-#: mail/em-folder-selector.c:304
+#: mail/em-folder-selector.c:308
 msgid "Folder _name:"
 msgstr "フォルダ名(_N):"
 
-#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
-#: mail/mail-vfolder.c:872
-msgid "VFolders"
-msgstr "仮想フォルダ"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
-msgid "UNMATCHED"
-msgstr "該当しないもの"
-
-#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
-msgid "Loading..."
-msgstr "読み込み中..."
+#: mail/em-folder-tree.c:670
+msgid "Mail Folder Tree"
+msgstr "メール・フォルダのツリー"
 
-#: mail/em-folder-tree.c:846
+#: mail/em-folder-tree.c:903
 #, c-format
 msgid "Moving folder %s"
 msgstr "フォルダ %s の移動中"
 
-#: mail/em-folder-tree.c:848
+#: mail/em-folder-tree.c:905
 #, c-format
 msgid "Copying folder %s"
 msgstr "フォルダ %s のコピー中"
 
-#: mail/em-folder-tree.c:855 mail/message-list.c:1613
+#: mail/em-folder-tree.c:912 mail/message-list.c:1617
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "フォルダ %s へメッセージの移動中"
 
-#: mail/em-folder-tree.c:857 mail/message-list.c:1615
+#: mail/em-folder-tree.c:914 mail/message-list.c:1619
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "フォルダ %s へメッセージのコピー中"
 
-#: mail/em-folder-tree.c:873
+#: mail/em-folder-tree.c:930
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "メッセージをトップレベルの中に移せません"
 
-#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:1026 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "フォルダへコピー(_C)"
 
-#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:1027 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "フォルダへ移動(_M)"
 
-#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
-#: mail/em-folder-view.c:803 mail/message-list.c:1703
-msgid "_Move"
-msgstr "移動(_M)"
-
-#: mail/em-folder-tree.c:968 mail/message-list.c:1705
-msgid "Cancel _Drag"
-msgstr "ドラッグのキャンセル(_D)"
+#: mail/em-folder-tree.c:1726 mail/mail-ops.c:1017
+#, c-format
+msgid "Scanning folders in \"%s\""
+msgstr "\"%s\" のフォルダを走査中"
 
-#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
-#: mail/em-folder-view.c:803 mail/em-folder-view.c:817
-#: mail/importers/evolution-mbox-importer.c:119
-#: mail/importers/evolution-outlook-importer.c:133
+#: mail/em-folder-tree.c:2233 mail/em-folder-tree.c:2247
+#: mail/em-folder-view.c:823 mail/em-folder-view.c:838
+#: mail/importers/evolution-mbox-importer.c:120
+#: mail/importers/evolution-outlook-importer.c:134
 msgid "Select folder"
 msgstr "フォルダの選択"
 
-#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:817
+#: mail/em-folder-tree.c:2233 mail/em-folder-view.c:838
 msgid "C_opy"
 msgstr "コピー(_O)"
 
-#: mail/em-folder-tree.c:2144
+#: mail/em-folder-tree.c:2274 plugins/shared-folder/share-folder-common.c:115
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "フォルダ '%s' の作成中"
 
-#: mail/em-folder-tree.c:2330 mail/mail-component.c:707
+#: mail/em-folder-tree.c:2463 mail/mail-component.c:732
+#: plugins/shared-folder/share-folder-common.c:311
 msgid "Create folder"
 msgstr "フォルダの作成"
 
-#: mail/em-folder-tree.c:2526
+#: mail/em-folder-tree.c:2656
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "フォルダ \"%s\" の変更先:"
 
-#: mail/em-folder-tree.c:2528
+#: mail/em-folder-tree.c:2658
 msgid "Rename Folder"
 msgstr "フォルダ名の変更"
 
-#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2734 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:49
 msgid "_View"
 msgstr "表示(_V)"
 
-#: mail/em-folder-tree.c:2604
+#: mail/em-folder-tree.c:2735
 msgid "Open in _New Window"
 msgstr "新しいウィンドウで開く(_N)"
 
-#: mail/em-folder-tree.c:2608
+#: mail/em-folder-tree.c:2739
 msgid "_Copy..."
 msgstr "コピー(_C)..."
 
-#: mail/em-folder-tree.c:2609
+#: mail/em-folder-tree.c:2740
 msgid "_Move..."
 msgstr "移動(_M)..."
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2613
+#: mail/em-folder-tree.c:2744
 msgid "_New Folder..."
 msgstr "新しいフォルダ(_N)"
 
-#: mail/em-folder-tree.c:2616
+#: mail/em-folder-tree.c:2747
 msgid "_Rename..."
 msgstr "名前の変更(_R)..."
 
-#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
-msgid "_Properties"
-msgstr "プロパティ(_P)"
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:880
+msgid "VFolders"
+msgstr "仮想フォルダ"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr "該当しないもの"
+
+#: mail/em-folder-tree-model.c:491 mail/em-folder-tree-model.c:795
+msgid "Loading..."
+msgstr "読み込み中..."
+
+#: mail/em-folder-view.c:426 mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:531
+#: mail/mail-component.c:582
+msgid "Mail"
+msgstr "メール"
 
-#. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:900 mail/em-popup.c:690
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:928 ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "新規のメッセージとして編集(_E)..."
 
-#: mail/em-folder-view.c:902
+#: mail/em-folder-view.c:930
 msgid "_Print"
 msgstr "印刷(_P)"
 
-#: mail/em-folder-view.c:905 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:933 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "差出人へ返信(_R)"
 
-#: mail/em-folder-view.c:906 mail/em-popup.c:811
+#: mail/em-folder-view.c:934 mail/em-popup.c:502
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "メーリング・リストへ返信(_L)"
 
-#: mail/em-folder-view.c:907 mail/em-popup.c:812
+#: mail/em-folder-view.c:935 mail/em-popup.c:503
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "全員へ返信(_A)"
 
-#: mail/em-folder-view.c:908 mail/em-popup.c:814
+#: mail/em-folder-view.c:936 mail/em-popup.c:505
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "転送(_F)"
 
-#: mail/em-folder-view.c:911
+#: mail/em-folder-view.c:939
 msgid "Follo_w Up..."
 msgstr "フォロー・アップ(_W)..."
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:940
 msgid "Fla_g Completed"
 msgstr "完了フラグの付与(_G)"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:941
 msgid "Cl_ear Flag"
 msgstr "フラグの解除(_E)"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:944 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "既読としてマーク(_K)"
 
-#: mail/em-folder-view.c:917
+#: mail/em-folder-view.c:945
 msgid "Mark as _Unread"
 msgstr "未読としてマーク(_U)"
 
-#: mail/em-folder-view.c:918
+#: mail/em-folder-view.c:946
 msgid "Mark as _Important"
 msgstr "重要としてマーク(_I)"
 
-#: mail/em-folder-view.c:919
+#: mail/em-folder-view.c:947
 msgid "_Mark as Unimportant"
 msgstr "重要でないとしてマーク(_M)"
 
-#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:948 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "ジャンクとしてマーク(_J)"
 
-#: mail/em-folder-view.c:921 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:949 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "ジャンクではないとしてマーク(_N)"
 
-#: mail/em-folder-view.c:925
+#: mail/em-folder-view.c:953
 msgid "U_ndelete"
 msgstr "削除の取り消し(_N)"
 
-#: mail/em-folder-view.c:928
+#: mail/em-folder-view.c:956
 msgid "Mo_ve to Folder..."
 msgstr "フォルダへ移動(_V)..."
 
-#: mail/em-folder-view.c:929 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:957 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "フォルダへコピー(_C)..."
 
-#: mail/em-folder-view.c:937
+#: mail/em-folder-view.c:965
 msgid "Add Sender to Address_book"
 msgstr "差出人をアドレス帳に追加"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:968
 msgid "Appl_y Filters"
 msgstr "フィルタの適用(_Y)"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:969
 msgid "F_ilter Junk"
 msgstr "ジャンク・フィルタの適用(_I)"
 
-#: mail/em-folder-view.c:944
+#: mail/em-folder-view.c:972
 msgid "Crea_te Rule From Message"
 msgstr "メッセージからルールの作成(_T)"
 
-#: mail/em-folder-view.c:945
+#: mail/em-folder-view.c:973
 msgid "VFolder on _Subject"
 msgstr "件名の仮想フォルダ(_S)"
 
-#: mail/em-folder-view.c:946
+#: mail/em-folder-view.c:974
 msgid "VFolder on Se_nder"
 msgstr "差出人の仮想フォルダ(_N)"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:975
 msgid "VFolder on _Recipients"
 msgstr "宛先の仮想フォルダ(_R)"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:976
 msgid "VFolder on Mailing _List"
 msgstr "メーリング・リストの仮想フォルダ(_L)"
 
-#: mail/em-folder-view.c:952
+#: mail/em-folder-view.c:980
 msgid "Filter on Sub_ject"
 msgstr "件名のフィルタ(_J)"
 
-#: mail/em-folder-view.c:953
+#: mail/em-folder-view.c:981
 msgid "Filter on Sen_der"
 msgstr "差出人のフィルタ(_D)"
 
-#: mail/em-folder-view.c:954
+#: mail/em-folder-view.c:982
 msgid "Filter on Re_cipients"
 msgstr "宛先のフィルタ(_C)"
 
-#: mail/em-folder-view.c:955
+#: mail/em-folder-view.c:983
 msgid "Filter on _Mailing List"
 msgstr "メーリング・リストのフィルタ(_M)"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1711 mail/em-folder-view.c:1751
-#: mail/mail-config.glade.h:68
+#: mail/em-folder-view.c:1760 mail/em-folder-view.c:1803
 msgid "Default"
 msgstr "デフォルト"
 
-#: mail/em-folder-view.c:1848
+#: mail/em-folder-view.c:1900
 msgid "Print Message"
 msgstr "メッセージの印刷"
 
-#: mail/em-folder-view.c:2115
+#: mail/em-folder-view.c:2179
 msgid "_Copy Link Location"
 msgstr "リンク先のコピー(_C)"
 
-#: mail/em-folder-view.c:2380
+#: mail/em-folder-view.c:2462
 #, c-format
 msgid "Click to mail %s"
 msgstr "クリックすると %s へのメッセージを作成します"
 
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
+#: mail/em-format.c:848 mail/em-format-html.c:1425 mail/em-format-quote.c:193
+#: mail/em-mailer-prefs.c:83 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:326
+msgid "From"
+msgstr "差出人"
+
+#: mail/em-format.c:849 mail/em-format-html.c:1425 mail/em-format-quote.c:193
+#: mail/em-mailer-prefs.c:84
+msgid "Reply-To"
+msgstr "返信先"
+
+#: mail/em-format.c:850 mail/em-format-html.c:1425 mail/em-format-quote.c:193
+#: mail/em-mailer-prefs.c:85 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "宛先"
+
+#: mail/em-format.c:851 mail/em-format-html.c:1425 mail/em-format-quote.c:193
+#: mail/em-mailer-prefs.c:86
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format.c:852 mail/em-format-html.c:1425 mail/em-format-quote.c:193
+#: mail/em-mailer-prefs.c:87
+msgid "Bcc"
+msgstr "Bcc"
+
+#: mail/em-format.c:854 mail/em-format-html.c:1578 mail/em-format-quote.c:322
+#: mail/em-mailer-prefs.c:89 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "日付"
+
+#: mail/em-format.c:855 mail/em-format-html.c:1601 mail/em-mailer-prefs.c:90
+msgid "Newsgroups"
+msgstr "ニュースグループ"
+
+#: mail/em-format.c:1104
 #, c-format
-msgid "Matches: %d"
-msgstr "一致するもの: %d"
+msgid "%s attachment"
+msgstr "添付ファイル: %s"
+
+#: mail/em-format.c:1143 mail/em-format.c:1276
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "S/MIME メッセージを解析できませんでした: 不明なエラーです"
+
+#: mail/em-format.c:1266
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "サポートしていない S/MIME の暗号化の種類"
+
+#: mail/em-format.c:1414
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "MIME メッセージを解析できませんでした。ソースを表示します。"
+
+#: mail/em-format.c:1433
+msgid "Unsupported signature format"
+msgstr "サポートしていない署名の書式"
+
+#: mail/em-format.c:1441
+msgid "Error verifying signature"
+msgstr "署名を検証する際にエラーが発生しました"
+
+#: mail/em-format.c:1441
+msgid "Unknown error verifying signature"
+msgstr "署名を検証する際に不明なエラーが発生しました"
 
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:582
+#: mail/em-format-html.c:473 mail/em-format-html.c:475
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "'%s' の取得中"
+
+#: mail/em-format-html.c:580 mail/em-format-html-display.c:638
 msgid "Unsigned"
 msgstr "署名なし"
 
-#: mail/em-format-html-display.c:641
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr ""
-"このメッセージは署名されていません。このメッセージの信頼性を保証できません。"
-
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:583
+#: mail/em-format-html.c:581 mail/em-format-html-display.c:639
 msgid "Valid signature"
 msgstr "妥当な署名"
 
-#: mail/em-format-html-display.c:642
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr ""
-"このメッセージには署名が付与されています。このメッセージは非常に信頼できるも"
-"のであることを意味します。"
-
-#: mail/em-format-html-display.c:643 mail/em-format-html.c:584
+#: mail/em-format-html.c:582 mail/em-format-html-display.c:640
 msgid "Invalid signature"
 msgstr "不正な署名"
 
-#: mail/em-format-html-display.c:643
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr "転送中に改鼠されているので、このメッセージの署名を検証できません。"
-
-#: mail/em-format-html-display.c:644
-msgid "Valid signature, cannot verify sender"
+#: mail/em-format-html.c:583
+msgid "Valid signature but cannot verify sender"
 msgstr "署名は妥当ですが、差出人を検証できません"
 
-#: mail/em-format-html-display.c:644
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
-msgstr ""
-"このメッセージには妥当な署名が付与されていますが、メッセージの差出人を検証で"
-"きません。"
-
-#: mail/em-format-html-display.c:650 mail/em-format-html.c:591
+#: mail/em-format-html.c:589 mail/em-format-html-display.c:647
 msgid "Unencrypted"
 msgstr "暗号化なし"
 
-#: mail/em-format-html-display.c:650
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"the Internet."
-msgstr ""
-"このメッセージは暗号化されていません。その内容がインターネットを介して閲覧さ"
-"れる可能性があります。"
-
-#: mail/em-format-html-display.c:651 mail/em-format-html.c:592
+#: mail/em-format-html.c:590 mail/em-format-html-display.c:648
 msgid "Encrypted, weak"
 msgstr "暗号化済み (レベルは不十分)"
 
-#: mail/em-format-html-display.c:651
-msgid ""
-"This message is encrypted, but with a weak encryption algorithm.  It would "
-"be difficult, but not impossible for an outsider to view the content of this "
-"message in a practical amount of time."
-msgstr ""
-"このメッセージは暗号化されていますが、その暗号化アルゴリズムのレベルが不十分"
-"です。(現実的には困難ですが)、このメッセージの内容を外部の者に閲覧される可能"
-"性があります。"
-
-#: mail/em-format-html-display.c:652 mail/em-format-html.c:593
+#: mail/em-format-html.c:591 mail/em-format-html-display.c:649
 msgid "Encrypted"
 msgstr "暗号化済み"
 
-#: mail/em-format-html-display.c:652
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
-"このメッセージは暗号化されています。外部の者がこのメッセージの内容を閲覧する"
-"ことは困難と思われます。"
-
-#: mail/em-format-html-display.c:653 mail/em-format-html.c:594
+#: mail/em-format-html.c:592 mail/em-format-html-display.c:650
 msgid "Encrypted, strong"
 msgstr "暗号化済み (レベルは強力)"
 
-#: mail/em-format-html-display.c:653
-msgid ""
-"This message is encrypted, with a strong encryption algorithm.  It would be "
-"very difficult for an outsider to view the content of this message in a "
-"practical amount of time."
-msgstr ""
-"このメッセージは強力なアルゴリズムで暗号化されています。現実的に、外部の者が"
-"このメッセージの内容を閲覧することは非常に困難と思われます。"
-
-#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
-msgid "_View Certificate"
-msgstr "証明書の表示(_V)"
-
-#: mail/em-format-html-display.c:769
-msgid "This certificate is not viewable"
-msgstr "この証明書は表示可能な形式ではありません"
-
-#: mail/em-format-html-display.c:1004
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "%Y年%B%e日 %p %l:%M に完了"
-
-#: mail/em-format-html-display.c:1012
-msgid "Overdue:"
-msgstr "期限切れ:"
-
-#: mail/em-format-html-display.c:1015
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "%Y年%B%e日 %p %l:%M まで"
-
-#: mail/em-format-html-display.c:1054
-msgid "_View Inline"
-msgstr "インライン表示(_V)"
-
-#: mail/em-format-html-display.c:1055
-msgid "_Hide"
-msgstr "隠す(_H)"
-
-#: mail/em-format-html-print.c:130
-#, c-format
-msgid "Page %d of %d"
-msgstr "%d / %d ページ"
-
-#: mail/em-format-html.c:475 mail/em-format-html.c:477
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "'%s' の取得中"
-
-#: mail/em-format-html.c:585
-msgid "Valid signature but cannot verify sender"
-msgstr "署名は妥当ですが、差出人を検証できません"
-
-#: mail/em-format-html.c:848
+#: mail/em-format-html.c:841
 msgid "Malformed external-body part."
 msgstr "おかしな external-body 部分です。"
 
-#: mail/em-format-html.c:878
+#: mail/em-format-html.c:871
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP サイト (%s) を指しています"
 
-#: mail/em-format-html.c:889
+#: mail/em-format-html.c:882
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "ローカル・ファイル (%s) はサイト \"%s\" に正しくリンクしています"
 
-#: mail/em-format-html.c:891
+#: mail/em-format-html.c:884
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "ローカル・ファイル (%s) にリンクしています"
 
-#: mail/em-format-html.c:912
+#: mail/em-format-html.c:905
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "リモート・データ (%s) にリンクしています"
 
-#: mail/em-format-html.c:923
+#: mail/em-format-html.c:916
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "不明な外部データ (\"%s\" タイプ) にリンクしています"
 
-#: mail/em-format-html.c:1165
+#: mail/em-format-html.c:1138
 msgid "Formatting message"
 msgstr "メッセージの整形"
 
-#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:800
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "差出人"
-
-#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:801
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "返信先"
-
-#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:802
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "宛先"
-
-#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:803
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:804
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Bcc"
-
 #. pseudo-header
-#: mail/em-format-html.c:1554 mail/em-format-quote.c:314
-#: mail/em-mailer-prefs.c:939
+#: mail/em-format-html.c:1538 mail/em-format-quote.c:315
+#: mail/em-mailer-prefs.c:984
 msgid "Mailer"
 msgstr "メーラー"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1581
+#: mail/em-format-html.c:1565
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%R %a %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1584
+#: mail/em-format-html.c:1568
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1594 mail/em-format-quote.c:321 mail/em-format.c:806
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "日付"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:405
+#, c-format
+msgid "Matches: %d"
+msgstr "一致するもの: %d"
 
-#: mail/em-format-html.c:1617 mail/em-format.c:807 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
-msgstr "ニュースグループ"
+#: mail/em-format-html-display.c:638
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr ""
+"このメッセージは署名されていません。このメッセージの信頼性を保証できません。"
 
-#: mail/em-format.c:1056
-#, c-format
-msgid "%s attachment"
-msgstr "添付ファイル: %s"
+#: mail/em-format-html-display.c:639
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
+"このメッセージには署名が付与されています。このメッセージは非常に信頼できるも"
+"のであることを意味します。"
 
-#: mail/em-format.c:1095 mail/em-format.c:1228
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "S/MIME メッセージを解析できませんでした: 不明なエラーです"
+#: mail/em-format-html-display.c:640
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr "転送中に改鼠されているので、このメッセージの署名を検証できません。"
 
-#: mail/em-format.c:1218
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "サポートしていない S/MIME の暗号化の種類"
+#: mail/em-format-html-display.c:641
+msgid "Valid signature, cannot verify sender"
+msgstr "署名は妥当ですが、差出人を検証できません"
 
-#: mail/em-format.c:1379
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "MIME メッセージを解析できませんでした。ソースを表示します。"
+#: mail/em-format-html-display.c:641
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+"このメッセージには妥当な署名が付与されていますが、メッセージの差出人を検証で"
+"きません。"
 
-#: mail/em-format.c:1398
-msgid "Unsupported signature format"
-msgstr "サポートしていない署名の書式"
+#: mail/em-format-html-display.c:647
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"the Internet."
+msgstr ""
+"このメッセージは暗号化されていません。その内容がインターネットを介して閲覧さ"
+"れる可能性があります。"
 
-#: mail/em-format.c:1406
-msgid "Error verifying signature"
-msgstr "署名を検証する際にエラーが発生しました"
+#: mail/em-format-html-display.c:648
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+"このメッセージは暗号化されていますが、その暗号化アルゴリズムのレベルが不十分"
+"です。(現実的には困難ですが)、このメッセージの内容を外部の者に閲覧される可能"
+"性があります。"
 
-#: mail/em-format.c:1406
-msgid "Unknown error verifying signature"
-msgstr "署名を検証する際に不明なエラーが発生しました"
+#: mail/em-format-html-display.c:649
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+"このメッセージは暗号化されています。外部の者がこのメッセージの内容を閲覧する"
+"ことは困難と思われます。"
+
+#: mail/em-format-html-display.c:650
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+"このメッセージは強力なアルゴリズムで暗号化されています。現実的に、外部の者が"
+"このメッセージの内容を閲覧することは非常に困難と思われます。"
+
+#: mail/em-format-html-display.c:751 smime/gui/smime-ui.glade.h:47
+msgid "_View Certificate"
+msgstr "証明書の表示(_V)"
+
+#: mail/em-format-html-display.c:766
+msgid "This certificate is not viewable"
+msgstr "この証明書は表示可能な形式ではありません"
+
+#: mail/em-format-html-display.c:995
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "%Y年%B%e日 %p %l:%M に完了"
+
+#: mail/em-format-html-display.c:1003
+msgid "Overdue:"
+msgstr "期限切れ:"
+
+#: mail/em-format-html-display.c:1006
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "%Y年%B%e日 %p %l:%M まで"
+
+#: mail/em-format-html-display.c:1053
+msgid "_View Inline"
+msgstr "インライン表示(_V)"
+
+#: mail/em-format-html-display.c:1054
+msgid "_Hide"
+msgstr "隠す(_H)"
+
+#: mail/em-format-html-display.c:1298
+msgid "Attachment Button"
+msgstr "添付ボタン"
+
+#: mail/em-format-html-print.c:130
+#, c-format
+msgid "Page %d of %d"
+msgstr "%d / %d ページ"
 
-#: mail/em-junk-filter.c:86
+#: mail/em-junk-filter.c:110
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (内蔵)"
 
-#: mail/em-mailer-prefs.c:100
+#: mail/em-mailer-prefs.c:101
 msgid "Every time"
 msgstr "毎回"
 
-#: mail/em-mailer-prefs.c:101
+#: mail/em-mailer-prefs.c:102
 msgid "Once per day"
 msgstr "日に一度"
 
-#: mail/em-mailer-prefs.c:102
+#: mail/em-mailer-prefs.c:103
 msgid "Once per week"
 msgstr "週に一度"
 
-#: mail/em-mailer-prefs.c:103
+#: mail/em-mailer-prefs.c:104
 msgid "Once per month"
 msgstr "月に一度"
 
@@ -13824,17 +14182,17 @@ msgstr "POP3 keep-on-server のデータ・フォルダ '%s' を作成できま
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "POP3 keep-on-server のデータ '%s' をコピーできません: %s"
 
-#: mail/em-migrate.c:2415 mail/em-migrate.c:2427
+#: mail/em-migrate.c:2494 mail/em-migrate.c:2506
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "ローカルのメール・フォルダ '%s' の作成に失敗しました: %s"
 
-#: mail/em-migrate.c:2578
+#: mail/em-migrate.c:2657
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "'%s' にあるローカルのメール・フォルダを作成できません: %s"
 
-#: mail/em-migrate.c:2596
+#: mail/em-migrate.c:2675
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -13842,62 +14200,62 @@ msgstr ""
 "Evolution の以前の設定を読み込むことができません。'${HOME}/evolution/config."
 "xmldb' が存在しないかデータが壊れています。"
 
-#: mail/em-popup.c:700
+#: mail/em-popup.c:386
 msgid "Save As..."
 msgstr "別名で保存..."
 
-#: mail/em-popup.c:718
+#: mail/em-popup.c:405
 #, c-format
 msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:499
 msgid "Set as _Background"
 msgstr "壁紙にセットする(_B)"
 
-#: mail/em-popup.c:810
+#: mail/em-popup.c:501
 msgid "_Reply to sender"
 msgstr "差出人へ返信(_R)"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:553
 msgid "_Open Link in Browser"
 msgstr "リンクをブラウザで開く(_O)"
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:554
 msgid "Se_nd message to..."
 msgstr "メッセージの送信(_N)..."
 
-#: mail/em-popup.c:861
+#: mail/em-popup.c:555
 msgid "_Add to Addressbook"
 msgstr "アドレス帳に追加(_A)"
 
-#: mail/em-popup.c:985
+#: mail/em-popup.c:686
 #, c-format
 msgid "Open in %s..."
 msgstr "%s の中を開きます..."
 
-#: mail/em-subscribe-editor.c:606
+#: mail/em-subscribe-editor.c:613
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "この格納場所は購読をサポートしていないか、有効になっていません。"
 
-#: mail/em-subscribe-editor.c:635
+#: mail/em-subscribe-editor.c:642
 msgid "Subscribed"
 msgstr "購読済み"
 
-#: mail/em-subscribe-editor.c:639
+#: mail/em-subscribe-editor.c:646
 msgid "Folder"
 msgstr "フォルダ"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:852
+#: mail/em-subscribe-editor.c:861
 msgid "Please select a server."
 msgstr "サーバを一つ選択して下さい。"
 
-#: mail/em-subscribe-editor.c:873
+#: mail/em-subscribe-editor.c:882
 msgid "No server has been selected"
 msgstr "サーバが指定されていません"
 
-#: mail/em-utils.c:104
+#: mail/em-utils.c:105
 msgid "Don't show this message again."
 msgstr "このメッセージを二度と表示しない"
 
@@ -13918,7 +14276,7 @@ msgid "Add address"
 msgstr "住所の追加"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1053
+#: mail/em-utils.c:1055
 #, c-format
 msgid "Messages from %s"
 msgstr "%s からのメッセージ"
@@ -13927,10 +14285,6 @@ msgstr "%s からのメッセージ"
 msgid "Virtual _Folders"
 msgstr "仮想フォルダ(_F)"
 
-#: mail/em-vfolder-rule.c:494
-msgid "_Add"
-msgstr "追加(_A)"
-
 #: mail/em-vfolder-rule.c:574
 msgid "VFolder source"
 msgstr "仮想フォルダのソース"
@@ -14243,14 +14597,6 @@ msgstr ""
 msgid "Show deleted messages in the message-list"
 msgstr "メッセージ一覧の中に削除したメッセージを表示する"
 
-#: mail/evolution-mail.schemas.in.in.h:71
-msgid "Show the \"Preview\" pane"
-msgstr "\"プレビュー\" ウィンドウの表示可否"
-
-#: mail/evolution-mail.schemas.in.in.h:72
-msgid "Show the \"Preview\" pane."
-msgstr "\"プレビュー\" ペインを表示します。"
-
 #: mail/evolution-mail.schemas.in.in.h:73
 msgid "Sound file to play when new mail arrives."
 msgstr "新着メールが届いたら演奏するサウンド・ファイルです。"
@@ -14409,48 +14755,73 @@ msgstr "ユーザが起動した spamd のポート番号です。"
 msgid "spamd port"
 msgstr "spamd のポート番号"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm インポータ"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "コンポーザの設定"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution Netscape メール・インポータ"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr "セキュリティとメッセージ表示を含む、メール設定"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4 インポータ"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "スペルチェック、署名とメッセージ・コンポーザの設定"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine インポータ"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "使用する E-メールアカウントをここで設定します。"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox インポータ"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Evolution メール"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution メール・アカウント設定コントロール"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Evolution メール・コンポーネント"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Evolution メール・コンポーザ"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution メール・コンポーザ設定コントロール"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail preferences control"
+msgstr "Evolution メール設定コントロール"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Mail Accounts"
+msgstr "メールのアカウント"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13 mail/mail-config.glade.h:96
+msgid "Mail Preferences"
+msgstr "メールの設定"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+msgid "_Mail"
+msgstr "メール(_M)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution は古い Elm 形式メールをインポート中です"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:221
-#: mail/importers/evolution-outlook-importer.c:255
+#: mail/importers/evolution-mbox-importer.c:225
+#: mail/importers/evolution-outlook-importer.c:259
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "インポート中..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:223
-#: mail/importers/evolution-outlook-importer.c:257
+#: mail/importers/evolution-mbox-importer.c:227
+#: mail/importers/evolution-outlook-importer.c:261
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "少々お待ち下さい"
@@ -14471,41 +14842,69 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/evolution-mbox-importer.c:116
-#: mail/importers/evolution-outlook-importer.c:130
+#: mail/importers/evolution-mbox-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:131
 msgid "Destination folder:"
 msgstr "転送先フォルダ:"
 
-#: mail/importers/evolution-mbox-importer.c:119
-#: mail/importers/evolution-outlook-importer.c:133
+#: mail/importers/evolution-mbox-importer.c:120
+#: mail/importers/evolution-outlook-importer.c:134
 msgid "Select folder to import into"
 msgstr "インポート先フォルダの選択"
 
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:254
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "'%s' のインポート"
 
-#: mail/importers/evolution-outlook-importer.c:301
+#: mail/importers/evolution-outlook-importer.c:305
 #: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "mailbox のインポート"
 
-#: mail/importers/mail-importer.c:360
-#, c-format
-msgid "Scanning %s"
-msgstr "%s の解析"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm インポータ"
 
-#: mail/importers/netscape-importer.c:73
-#, c-format
-msgid "Priority Filter \"%s\""
-msgstr "優先度フィルタ \"%s\""
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution Netscape メール・インポータ"
 
-#: mail/importers/netscape-importer.c:662
-msgid ""
-"Some of your Netscape email filters are based on\n"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook Express 4 インポータ"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine インポータ"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox インポータ"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/mail-importer.c:363
+#, c-format
+msgid "Scanning %s"
+msgstr "%s の解析"
+
+#: mail/importers/netscape-importer.c:73
+#, c-format
+msgid "Priority Filter \"%s\""
+msgstr "優先度フィルタ \"%s\""
+
+#: mail/importers/netscape-importer.c:662
+msgid ""
+"Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
 "Instead, Evolution provides scores in the range of\n"
 "-3 to 3 that can be assigned to emails and filtered\n"
@@ -14586,10 +14985,6 @@ msgstr "Evolution は古い Pine データのインポート中です"
 msgid "Importing Pine data"
 msgstr "Pine データのインポート"
 
-#: mail/importers/pine-importer.c:479
-msgid "Addressbook"
-msgstr "アドレス帳"
-
 #: mail/importers/pine-importer.c:498
 msgid ""
 "Evolution has found Pine mail files.\n"
@@ -14602,41 +14997,6 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
-msgid "Evolution Account Editor"
-msgstr "Evolution アカウント・エディタ"
-
-#: mail/mail-account-gui.c:246
-#, c-format
-msgid ""
-"\n"
-"Please read carefully the license agreement\n"
-"for %s displayed below\n"
-"and tick the check box for accepting it\n"
-msgstr ""
-"\n"
-"次に示す %s のライセンス同意書を\n"
-"注意深く読んで、同意する場合は\n"
-"チェック・ボックスにチェックを入れて下さい。\n"
-
-#: mail/mail-account-gui.c:252
-#, c-format
-msgid "%s License Agreement"
-msgstr "%s のライセンス同意書"
-
-#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
-msgid "_Host:"
-msgstr "ホスト(_H):"
-
-#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
-msgid "User_name:"
-msgstr "ユーザ名:"
-
-#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
-msgid "_Path:"
-msgstr "パス(_P):"
-
 #: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
@@ -14661,150 +15021,95 @@ msgstr "%s メーリング・リスト"
 msgid "Add Filter Rule"
 msgstr "フィルタ・ルールの追加"
 
-#: mail/mail-component.c:459
+#: mail/mail-component.c:139
+msgid "Drafts"
+msgstr "草案"
+
+#: mail/mail-component.c:140
+msgid "Outbox"
+msgstr "送信トレイ"
+
+#: mail/mail-component.c:141
+msgid "Sent"
+msgstr "送信済み"
+
+#: mail/mail-component.c:484
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "削除済 %d 通"
 msgstr[1] "削除済 %d 通"
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:486
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "ジャンク %d 通"
 msgstr[1] "ジャンク %d 通"
 
-#: mail/mail-component.c:484
+#: mail/mail-component.c:509
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "草案 %d 通"
 msgstr[1] "草案 %d 通"
 
-#: mail/mail-component.c:486
+#: mail/mail-component.c:511
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "送信済 %d 通"
 msgstr[1] "送信済 %d 通"
 
-#: mail/mail-component.c:488
+#: mail/mail-component.c:513
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "未送信 %d 通"
 msgstr[1] "未送信 %d 通"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:517
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "合計 %d 通"
 msgstr[1] "合計 %d 通"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:519
 #, c-format
 msgid ", %d unread"
 msgid_plural ", %d unread"
 msgstr[0] ", 未読 %d 通"
 msgstr[1] ", 未読 %d 通"
 
-#: mail/mail-component.c:659
+#: mail/mail-component.c:684
 msgid "New Mail Message"
 msgstr "新しいメッセージ"
 
-#: mail/mail-component.c:660
+#: mail/mail-component.c:685
 msgid "_Mail Message"
 msgstr "メッセージ(_M)"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:686
 msgid "Compose a new mail message"
 msgstr "新しいメッセージを作成します"
 
-#: mail/mail-component.c:667
+#: mail/mail-component.c:692
 msgid "New Mail Folder"
 msgstr "新しいメール・フォルダ"
 
-#: mail/mail-component.c:668
+#: mail/mail-component.c:693
 msgid "Mail _Folder"
 msgstr "メールのフォルダ(_F)"
 
-#: mail/mail-component.c:669
+#: mail/mail-component.c:694
 msgid "Create a new mail folder"
 msgstr "新しいメール・フォルダを作成します"
 
-#: mail/mail-component.c:801
+#: mail/mail-component.c:841
 msgid "Failed upgrading Mail settings or folders."
 msgstr "メールの設定または関連フォルダのアップグレードに失敗しました。"
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
-msgid "Identity"
-msgstr "身元情報"
-
-#: mail/mail-config-druid.c:364
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
-msgstr ""
-"あなたのお名前と E-メール・アドレスを入力して下さい。\"追加情報\" の欄は必須"
-"ではありませんが、この情報を送信する E-メールの中に挿入する場合は入力して下さ"
-"い。"
-
-#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:119
-msgid "Receiving Mail"
-msgstr "メールの受信"
-
-#: mail/mail-config-druid.c:372
-msgid ""
-"Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"メールを受信するサーバの情報を入力して下さい。不明な場合は、システム管理者ま"
-"たはインターネット・サービス・プロバイダ (ISP) にお尋ね下さい。"
-
-#: mail/mail-config-druid.c:379
-msgid "Please select among the following options"
-msgstr "オプションを以下から選択して下さい。"
-
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
-msgid "Sending Mail"
-msgstr "メールの送信"
-
-#: mail/mail-config-druid.c:384
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"メールを送信する方法について情報を入力して下さい。不明な場合は、システム管理"
-"者またはインターネット・サービス・プロバイダ (ISP) にお尋ね下さい。"
-
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
-msgid "Account Management"
-msgstr "アカウント管理"
-
-#: mail/mail-config-druid.c:391
-msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
-msgstr ""
-"メール設定処理がほぼ完了しました。入力した身元情報、メール受信サーバとメール"
-"の送信方法は Evolution メールアカウントと一緒にまとめられます。このアカウント"
-"の名前を下の空欄に入力して下さい。この名前は表示目的のみに使用されます。"
-
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "サービスの確認"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "サーバへ接続中..."
-
 #: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
 msgid "    "
 msgstr "    "
@@ -14814,7 +15119,7 @@ msgid " Ch_eck for Supported Types "
 msgstr " サポートしているかチェックする(_E) "
 
 #: mail/mail-config.glade.h:5
-msgid "<b>SSL is not supported in this build of evolution</b>"
+msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>この Evolution は SSL サポート付きでビルドされていません</b>"
 
 #: mail/mail-config.glade.h:6
@@ -14846,191 +15151,191 @@ msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">認証</span>"
 
 #: mail/mail-config.glade.h:13
-msgid "<span weight=\"bold\">Checking for New Mail</span>"
-msgstr "<span weight=\"bold\">新着メールのチェック</span>"
-
-#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">メッセージの作成</span>"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">設定</span>"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">デフォルトの動作</span>"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">メールの削除</span>"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">表示するヘッダの項目(_H)</span>"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">フィルタリングのオプション</span>"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19 plugins/itip-formatter/itip-formatter.c:1545
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">全般</span>"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">ラベルと色</span>"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">画像の読み込み</span>"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">メッセージの表示</span>"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">メッセージのフォント</span>"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">新着メールの通知</span>"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">追加情報</span>"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">オプション</span>"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">ちょっとしたプライバシー (PGP/GPG)</span>"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">印刷用フォント</span>"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">必須情報</span>"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">セキュアな MIME (S/MIME)</span>"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">セキュリティ</span>"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">送信メッセージと草案メッセージ</span>"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">サーバの設定</span>"
 
 #: mail/mail-config.glade.h:35
-msgid "A_lso encrypt to self when sending encrypted mail"
-msgstr "暗号化したメールを送信する場合は、メール全体も暗号化する(_L)"
+msgid "Account Management"
+msgstr "アカウント管理"
 
 #: mail/mail-config.glade.h:36
-msgid "Account Editor"
-msgstr "アカウント・エディタ"
-
-#: mail/mail-config.glade.h:38
 msgid "Add Ne_w Signature..."
 msgstr "新しい署名の追加(_W)..."
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "スクリプトの追加(_S)"
 
-#: mail/mail-config.glade.h:40
-msgid "Al_ways encrypt to myself when sending encrypted mail"
-msgstr "暗号化したメールを送信する場合は、常にメールを暗号化する(_W)"
+#: mail/mail-config.glade.h:38
+msgid "Al_ways sign outgoing messages when using this account"
+msgstr "このアカウントを使用する場合は、常に送信メッセージに署名を付与する(_W)"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:39
+msgid "Also encrypt to sel_f when sending encrypted mail"
+msgstr "暗号化したメールを送信する場合は、メール全体も暗号化する(_F)"
+
+#: mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "常に使用する CC 先(_S):"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "常に使用する Bcc 先(_B):"
 
-#: mail/mail-config.glade.h:44
-msgid "Always _sign outgoing messages when using this account"
-msgstr "このアカウントを使用する場合は、常に送信メッセージに署名を付与する(_S)"
-
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "暗号解読時に常に信用キーを使用する(_T)"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:43
+msgid "Always encrypt to _myself when sending encrypted mail"
+msgstr "暗号化したメールを送信する場合は、常にメールを暗号化する(_M)"
+
+#: mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "オリジナルのメッセージを添付する"
 
-#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "添付する"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:46
 msgid "Automatically _insert smiley images"
 msgstr "スマイリー・アイコンを自動的に挿入する(_I)"
 
-#: mail/mail-config.glade.h:49
-msgid "Automatically check for _new mail every"
-msgstr "新着メールを自動的にチェックする(_N)"
-
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
 msgstr "バルチック語 (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-4)"
 msgstr "バルチック語 (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:49
 msgid "Beep w_hen new mail arrives"
 msgstr "新着メールが届いたらビープ音を鳴らす(_H)"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:50
 msgid "C_haracter set:"
 msgstr "文字セット(_H):"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "サポートしているかチェックする(_E) "
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:52
 msgid "Check _incoming mail for junk"
 msgstr "ジャンク・メールをチェックする(_I)"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
 msgstr "入力時にスペル・チェックする(_T)"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 "受信したメール・メッセージがジャンク (SPAM; UCE, UBE) かどうかチェックします"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:55
+msgid "Cle_ar"
+msgstr "クリア(_A)"
+
+#: mail/mail-config.glade.h:56
+msgid "Clea_r"
+msgstr "クリア(_R)"
+
+#: mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
 msgstr "スペルミスした文字の色(_M):"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Colors"
 msgstr "色"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 msgid "Confirm _when expunging a folder"
 msgstr "フォルダを抹消する前に確認する(_W)"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -15046,241 +15351,255 @@ msgstr ""
 "\n"
 "\"適用\" をクリックして設定を保存して下さい。"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:66
 msgid "De_fault"
 msgstr "デフォルト(_F)"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Default character e_ncoding:"
 msgstr "デフォルトの文字エンコード(_N): "
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "デフォルト"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
+msgid "Digitally _sign outgoing messages (by default)"
+msgstr "送信するメッセージにデジタル署名する (デフォルト)(_S)"
+
+#: mail/mail-config.glade.h:71
 msgid "Do not quote original message"
 msgstr "オリジナルのメッセージを引用しない"
 
-#: mail/mail-config.glade.h:73
-msgid "Don't sign _meeting requests (for Outlook compatibility)"
-msgstr "会議開催要求に合意しない (Outlook 互換)"
-
-#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:72 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "完了"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:73
 msgid "Drafts _Folder:"
 msgstr "草案フォルダ(_F):"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "E-メール・アカウント"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Email _Address:"
 msgstr "E-メール・アドレス(_A):"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 msgid "Empty trash folders on e_xit"
 msgstr "終了時にゴミ箱フォルダを空にする(_X)"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "暗号化する証明書(_P):"
 
-#: mail/mail-config.glade.h:81
-msgid "Evolution Account Assistant"
-msgstr "Evolution アカウント・アシスタント"
+#: mail/mail-config.glade.h:79
+msgid "Encrypt out_going messages (by default)"
+msgstr "送信メッセージを暗号化する (デフォルト)(_G)"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:81
 msgid "Execute Command..."
 msgstr "コマンドの実行..."
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
 msgstr "固定幅(_X):"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:83
 msgid "Font Properties"
 msgstr "フォントのプロパティ"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:84
 msgid "Format messages in _HTML"
 msgstr "HTML の中のメッセージを整形する(_H)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:86
 msgid "HTML Mail"
 msgstr "HTML 形式のメール"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:87
 msgid "Headers"
 msgstr "ヘッダ"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:88
 msgid "Highlight _quotations with"
 msgstr "引用を強調表示する(_Q)"
 
-#: mail/mail-config.glade.h:90
-msgid "IMAPv4 "
-msgstr "IMAPv4 "
-
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "I_nclude remote tests"
 msgstr "リモートのテストも含める(_N)"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:90
+msgid "Identity"
+msgstr "身元情報"
+
+#: mail/mail-config.glade.h:92
 msgid "Inline"
 msgstr "インラインにする"
 
-#: mail/mail-config.glade.h:96
-msgid "Kerberos "
-msgstr "Kerberos "
-
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:95
 msgid "Mail Configuration"
 msgstr "メールの設定"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 msgid "Mailbox location"
 msgstr "メールボックスの場所"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 msgid "Message Composer"
 msgstr "メッセージ作成"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:99
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "注意: 最初に接続するまで、パスワードの入力は求められません"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:100
 msgid "Or_ganization:"
 msgstr "組織(_G):"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:101
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG 鍵の ID(_K):"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:104
 msgid "Play sound file when new mail arri_ves"
 msgstr "新着メールが届いたらサウンドを演奏する(_V)"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:105
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+msgstr ""
+"メールを送信する方法について情報を入力して下さい。不明な場合は、システム管理"
+"者またはインターネット・サービス・プロバイダ (ISP) にお尋ね下さい。"
+
+#: mail/mail-config.glade.h:106
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+"あなたのお名前と E-メール・アドレスを入力して下さい。\"追加情報\" の欄は必須"
+"ではありませんが、この情報を送信する E-メールの中に挿入する場合は入力して下さ"
+"い。"
+
+#: mail/mail-config.glade.h:107
+msgid "Please select among the following options"
+msgstr "オプションを以下から選択して下さい。"
+
+#: mail/mail-config.glade.h:108
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Bcc 受信者のみ指定されている場合は送信する前に確認する(_O)"
 
-#: mail/mail-config.glade.h:113
-msgid "Qmail maildir "
-msgstr "Qmail maildir "
-
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:109
 msgid "Quote original message"
 msgstr "オリジナルのメッセージを引用する"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:110
 msgid "Quoted"
 msgstr "引用する"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:111
 msgid "Re_member password"
 msgstr "このパスワードを記憶する(_M)"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:112
 msgid "Re_ply-To:"
 msgstr "返信先(_P):"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:113
 msgid "Receiving Email"
 msgstr "メールの受信"
 
-#: mail/mail-config.glade.h:120
-msgid "Receiving Options"
-msgstr "返信オプション"
-
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:114
 msgid "Remember _password"
 msgstr "このパスワードを記憶する(_P)"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:115
+msgid "S_elect..."
+msgstr "選択(_E)..."
+
+#: mail/mail-config.glade.h:116
 msgid "S_tandard Font:"
 msgstr "標準フォント(_T):"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:117
+msgid "Se_lect..."
+msgstr "選択(_L)..."
+
+#: mail/mail-config.glade.h:118
 msgid "Security"
 msgstr "セキュリティ"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:119
 msgid "Select HTML fixed width font"
 msgstr "HTML 表示の固定幅フォントの選択"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:120
 msgid "Select HTML fixed width font for printing"
 msgstr "印刷時の HTML 固定幅フォントの選択"
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:121
 msgid "Select HTML variable width font"
 msgstr "HtML 可変幅フォントの選択"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:122
 msgid "Select HTML variable width font for printing"
 msgstr "印刷時の HTML 可変幅フォントの選択"
 
-#: mail/mail-config.glade.h:129
-msgid "Select..."
-msgstr "選択..."
-
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:123
 msgid "Sending Email"
 msgstr "メールの送信"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:124
+msgid "Sending Mail"
+msgstr "メールの送信"
+
+#: mail/mail-config.glade.h:125
 msgid "Sent _Messages Folder:"
 msgstr "送信済フォルダ(_M):"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:126
 msgid "Ser_ver requires authentication"
 msgstr "サーバ認証を行う(_V)"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:127
 msgid "Server _Type: "
 msgstr "サーバ種別(_T):"
 
-#: mail/mail-config.glade.h:136
-msgid "Si_gning certificate:"
-msgstr "署名する証明書(_G):"
+#: mail/mail-config.glade.h:128
+msgid "Sig_ning certificate:"
+msgstr "署名する証明書(_N):"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:129
 msgid "Signat_ure:"
 msgstr "署名(_U):"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:130
 msgid "Signatures"
 msgstr "署名"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:131
 msgid "Specify _filename:"
 msgstr "ファイル名の指定(_F):"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:132
 msgid "Spell Checking"
 msgstr "スペル・チェック"
 
-#: mail/mail-config.glade.h:141
-msgid "Standard Unix mbox"
-msgstr "標準的な UNIX の mbox ファイル"
-
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:133
 msgid "T_erminal Font:"
 msgstr "端末のフォント(_E):"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:134
 msgid "T_ype: "
 msgstr "種別(_Y): "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:135
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -15289,7 +15608,7 @@ msgstr ""
 "このスクリプトの出力を署名として使用します。\n"
 "\"名前\" は表示の目的でのみ使用されます。"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:138
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -15298,7 +15617,7 @@ msgstr ""
 "このページでは、スペル・チェックとその対象言語を設定します。インストールした"
 "辞書の言語のみ一覧に表示されます。"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:140
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15306,11 +15625,15 @@ msgstr ""
 "このアカウントにお好みの名前を付けて下さい:\n"
 "(例: \"仕事\" とか \"プライベート\" とか)"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:142
+msgid "User_name:"
+msgstr "ユーザ名:"
+
+#: mail/mail-config.glade.h:143
 msgid "V_ariable-width:"
 msgstr "可変幅(_A):"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:144
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15320,83 +15643,99 @@ msgstr ""
 "\n"
 "[進む] ボタンをクリックして下さい。"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:148
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
+msgstr ""
+"メール設定処理がほぼ完了しました。入力した身元情報、メール受信サーバとメール"
+"の送信方法は Evolution メールアカウントと一緒にまとめられます。このアカウント"
+"の名前を下の空欄に入力して下さい。この名前は表示目的のみに使用されます。"
+
+#: mail/mail-config.glade.h:149
 msgid "_Add Signature"
 msgstr "署名の追加(_A)"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:150
 msgid "_Always load images from the Internet"
 msgstr "常に画像を読み込む(_A)"
 
-#: mail/mail-config.glade.h:160
-msgid "_Digitally sign outgoing messages (by default)"
-msgstr "送信するメッセージにデジタル署名する (デフォルト)(_D)"
-
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr "新着メールが届いても通知しない(_D)"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:152
+msgid "_Don't sign meeting requests (for Outlook compatibility)"
+msgstr "会議開催要求に署名しない (Outlook 互換)(_D)"
+
+#: mail/mail-config.glade.h:154
 msgid "_Enable"
 msgstr "有効(_E)"
 
-#: mail/mail-config.glade.h:164
-msgid "_Encrypt outgoing messages (by default)"
-msgstr "送信メッセージを暗号化する (デフォルト)(_E)"
-
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:155
 msgid "_Forward style:"
 msgstr "転送方式(_F):"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:157
+msgid "_Host:"
+msgstr "ホスト(_H):"
+
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in address book"
 msgstr "アドレス帳に登録された差出人の場合は画像を読み込む(_L)"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:159
 msgid "_Make this my default account"
 msgstr "これをデフォルトのアカウントにする(_M)"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:160
 msgid "_Mark messages as read after"
 msgstr "メッセージに\"既読\"マークを付与する時間(_M)"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:162
 msgid "_Never load images from the Internet"
 msgstr "二度と画像を読み込まない(_N)"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:163
+msgid "_Path:"
+msgstr "パス(_P):"
+
+#: mail/mail-config.glade.h:164
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "HTML 形式を希望しない連絡先へ送信する場合は確認する(_P)"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "件名が空の場合は送信する前に確認する(_P)"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:166
 msgid "_Reply style:"
 msgstr "返信方法(_R):"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:167
 msgid "_Script:"
 msgstr "スクリプト(_S):"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:168
 msgid "_Show animated images"
 msgstr "アニメーションを表示する(_S)"
 
-#: mail/mail-config.glade.h:179
-msgid "_Use Secure Connection (SSL):"
-msgstr "セキュリティ保護された接続 (SSL) の利用(_U):"
+#: mail/mail-config.glade.h:169
+msgid "_Use Secure Connection:"
+msgstr "セキュアな接続を利用する(_U):"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:170
 msgid "_Use the same fonts as other applications"
 msgstr "他のアプリと同じフォントを使う(_U)"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:171
 msgid "color"
 msgstr "色"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:172
 msgid "description"
 msgstr "説明"
 
@@ -15423,51 +15762,47 @@ msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<span weight=\"bold\">暗号化</span>"
 
 #: mail/mail-dialogs.glade.h:10
-msgid "Accept License"
-msgstr "ライセンスを受諾する"
+msgid "Case _Sensitive"
+msgstr "大/小文字を区別する(_S)"
 
 #: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "完了しました(_O)"
+msgid "Co_mpleted"
+msgstr "完了した(_M)"
 
-#: mail/mail-dialogs.glade.h:12
-msgid "Case Sensitive"
-msgstr "大/小文字を区別する"
+#: mail/mail-dialogs.glade.h:13
+msgid "F_ind:"
+msgstr "検索(_I):"
 
 #: mail/mail-dialogs.glade.h:14
 msgid "Find in Message"
-msgstr "メッセージの中を検索"
-
-#: mail/mail-dialogs.glade.h:15
-msgid "Find:"
-msgstr "検索:"
+msgstr "メッセージの検索"
 
-#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/mail-dialogs.glade.h:15 mail/message-tag-followup.c:295
 #: mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "フォローアップするフラグ"
 
-#: mail/mail-dialogs.glade.h:17
+#: mail/mail-dialogs.glade.h:16
 msgid "Folder Subscriptions"
 msgstr "フォルダの購読"
 
-#: mail/mail-dialogs.glade.h:18
+#: mail/mail-dialogs.glade.h:17
 msgid "License Agreement"
 msgstr "ライセンス同意書"
 
-#: mail/mail-dialogs.glade.h:19
+#: mail/mail-dialogs.glade.h:18
 msgid "None Selected"
 msgstr "何も選択されていません"
 
-#: mail/mail-dialogs.glade.h:20
+#: mail/mail-dialogs.glade.h:19
 msgid "S_erver:"
 msgstr "サーバ(_E):"
 
-#: mail/mail-dialogs.glade.h:21
+#: mail/mail-dialogs.glade.h:20
 msgid "Security Information"
 msgstr "セキュリティ情報"
 
-#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+#: mail/mail-dialogs.glade.h:22 mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -15475,22 +15810,26 @@ msgstr ""
 "フォローアップとして指定したメッセージが下記に一覧化されています。\n"
 "\"フラグ\" メニューからフォローアップの内容を選択して下さい。"
 
-#: mail/mail-dialogs.glade.h:25
-msgid "Tick this to accept the license agreement"
-msgstr "ライセンス同意書を受諾する場合はここをチェック"
+#: mail/mail-dialogs.glade.h:24
+msgid "_Accept License"
+msgstr "ライセンスを受諾する(_A)"
 
-#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+#: mail/mail-dialogs.glade.h:25 mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "期日(_D):"
 
-#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "フラグ付き(_F):"
 
-#: mail/mail-dialogs.glade.h:28
+#: mail/mail-dialogs.glade.h:27
 msgid "_Subscribe"
 msgstr "購読(_S)"
 
+#: mail/mail-dialogs.glade.h:28
+msgid "_Tick this to accept the license agreement"
+msgstr "ライセンス同意書を受諾する場合はここをチェックする(_T)"
+
 #: mail/mail-dialogs.glade.h:29
 msgid "_Unsubscribe"
 msgstr "購読の停止(_U)"
@@ -15556,11 +15895,6 @@ msgstr ""
 "{0}\n"
 "とにかく送信しますか？"
 
-#: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
-#: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
-msgid "_Send"
-msgstr "送信する(_S)"
-
 #. mail:ask-send-no-subject primary
 #: mail/mail-errors.xml.h:17
 msgid "Are you sure you want to send a message without a subject?"
@@ -15775,789 +16109,1609 @@ msgstr "ファイルが存在していますが、通常のファイルではあ
 msgid "Cannot delete folder \"{0}\"."
 msgstr "フォルダ \"{0}\" を削除できません。"
 
-#. mail:no-delete-spethal-folder primary
-#: mail/mail-errors.xml.h:114
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "システム・フォルダ \"{0}\" を削除できません。"
+#. mail:no-delete-special-folder primary
+#: mail/mail-errors.xml.h:114
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "システム・フォルダ \"{0}\" を削除できません。"
+
+#. mail:no-delete-special-folder secondary
+#. mail:no-rename-special-folder secondary
+#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
+msgid ""
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
+msgstr ""
+"システム・フォルダは Ximian Evolution を正しく機能させるために必要なので、名"
+"前の変更、移動または削除することはできません。"
+
+#. mail:no-rename-special-folder primary
+#: mail/mail-errors.xml.h:118
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "システム・フォルダ \"{0}\" の名前変更または移動はできません。"
+
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
+msgid "Delete \"{0}\"?"
+msgstr "\"{0}\" を削除しますか？"
+
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "本当にフォルダ \"{0}\" とそのサブフォルダの全てを削除しますか？"
+
+#. mail:ask-delete-folder secondary
+#: mail/mail-errors.xml.h:126
+msgid ""
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
+msgstr ""
+"このフォルダを削除すると、そのフォルダの内容とそのサブフォルダの内容の全てが"
+"永久に削除されることになります。"
+
+#. mail:no-rename-folder-exists primary
+#. mail:no-rename-folder primary
+#: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr "\"{0}\" から \"{1}\" へ名前を変更できません。"
+
+#. mail:no-rename-folder-exists secondary
+#. mail:vfolder-notunique secondary
+#: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr "既に同名のフォルダ \"{1}\" があります。別の名前を使用して下さい。"
+
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
+msgstr "理由は \"{2}\" です。"
+
+#. mail:no-move-folder-nostore primary
+#. mail:no-move-folder-to-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "フォルダ \"{0}\" を \"{1}\" へ移動できません。"
+
+#. mail:no-move-folder-nostore secondary
+#. mail:no-copy-folder-nostore secondary
+#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
+msgid "Cannot open source \"{2}\"."
+msgstr "操作の対象先 \"{2}\" を開けません。"
+
+#. mail:no-move-folder-to-nostore secondary
+#. mail:no-copy-folder-to-nostore secondary
+#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
+msgid "Cannot open target \"{2}\"."
+msgstr "操作の対象元 \"{2}\" を開けません。"
+
+#. mail:no-copy-folder-nostore primary
+#. mail:no-copy-folder-to-nostore primary
+#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "フォルダ \"{0}\" を \"{1}\" へコピーできません。"
+
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
+msgid "Cannot create folder \"{0}\"."
+msgstr "フォルダ \"{0}\" を作成できません。"
+
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
+msgid "Cannot open source \"{1}\""
+msgstr "ソース \"{1}\" を開けません。"
+
+#. mail:account-incomplete primary
+#. mail:account-notunique primary
+#: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+msgid "Cannot save changes to account."
+msgstr "変更したアカウント情報を保存できません。"
+
+#. mail:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
+msgstr "必要な情報の全てを埋めていません。"
+
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
+msgstr "同じ名前のアカウントを二つ作れません。"
+
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
+msgid "Delete account?"
+msgstr "アカウントを削除しますか？"
+
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
+msgstr "このアカウントを削除してもよろしいですか？"
+
+#. mail:ask-delete-account secondary
+#: mail/mail-errors.xml.h:168
+msgid "If you proceed, the account information will be deleted permanently."
+msgstr "続行すると、アカウント情報が永久に削除されます。"
+
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "削除しない"
+
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
+msgid "Could not save signature file."
+msgstr "署名ファイルを保存できませんでした。"
+
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
+msgstr "理由は \"{0}\" です。"
+
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+msgid "Cannot set signature script \"{0}\"."
+msgstr "署名スクリプト \"{0}\" をセットできません。"
+
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
+msgstr "スクリプト・ファイルが存在し実行可能でなければなりません。"
+
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+msgid "Discard changed?"
+msgstr "変更を破棄しますか？"
+
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
+msgid "Do you wish to save your changes?"
+msgstr "変更を保存しますか？"
+
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
+msgid "This signature has been changed, but has not been saved."
+msgstr "この署名は変更されていますが保存されていません。"
+
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
+msgstr "変更を破棄する(_D)"
+
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "仮想フォルダ \"{0}\" が存在していないので編集できません。"
+
+#. mail:vfolder-notexist secondary
+#: mail/mail-errors.xml.h:188
+msgid ""
+"This folder may have been added implictly, go to the virtual folder editor "
+"to add it explictly, if required."
+msgstr ""
+"このフォルダは自動的に追加されたかもしれません。必要であれば、仮想フォルダの"
+"エディタを起動して明確に追加して下さい。"
+
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
+msgstr "仮想フォルダ \"{0}\" を追加できません。"
+
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
+msgid "vFolders automatically updated."
+msgstr "仮想フォルダが自動的に更新されました。"
+
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+"次の仮想フォルダ:\n"
+"{0}\n"
+"が削除済みフォルダに使用されています:\n"
+"    \"{1}\"\n"
+"更に更新されています。"
+
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
+msgstr "メールのフィルタが自動的に更新されました。"
+
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+"次のフィルタ・ルール:\n"
+"{0}\n"
+"が削除済みフォルダに使用されています:\n"
+"    \"{1}\"\n"
+"更に更新されています。"
+
+#. mail:no-folder primary
+#: mail/mail-errors.xml.h:210
+msgid "Missing folder."
+msgstr "フォルダがありません。"
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr "フォルダを指定して下さい。"
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+msgid "You must name this vFolder."
+msgstr "この仮装フォルダに名前を付けて下さい。"
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+msgid "No sources selected."
+msgstr "ソースが選択されていません。"
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+"ソースのフォルダを少なくとも一つ指定して下さい。\n"
+"フォルダをそれぞれ個々に選択する、かつ/または\n"
+"全てのローカル・フォルダ、全てのリモート・フォルダ、\n"
+"またはその両方を選択して下さい。"
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
+msgid "Problem migrating old mail folder \"{0}\"."
+msgstr "古いメール・フォルダ \"{0}\" の移行中に問題が発生しました。"
+
+#. mail:ask-migrate-existing secondary
+#: mail/mail-errors.xml.h:226
+msgid ""
+"A non-empty folder at \"{1}\" already exists.\n"
+"\n"
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit.\n"
+msgstr ""
+"\"{1}\" に空ではないフォルダが存在しています。\n"
+"\n"
+"このフォルダを無視する、上書きする、またはそのフォルダの内容に追加する、また"
+"は終了するから選択することが可能です。\n"
+
+#: mail/mail-errors.xml.h:230
+msgid "Ignore"
+msgstr "無視する"
+
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
+msgid "_Overwrite"
+msgstr "上書きする(_O)"
+
+#: mail/mail-errors.xml.h:232
+msgid "_Append"
+msgstr "追加する(_A)"
+
+#. mail:no-load-license primary
+#: mail/mail-errors.xml.h:234
+msgid "Unable to read license file."
+msgstr "ライセンス・ファイルを読み込めません。"
+
+#. mail:no-load-license secondary
+#: mail/mail-errors.xml.h:236
+msgid ""
+"Cannot read the license file \"{0}\", due to an\n"
+"      installation problem.  You will not be able to use this provider "
+"until\n"
+"      you can accept its license."
+msgstr ""
+"ライセンス・ファイル \"{0}\" を読み込めません。\n"
+"      インストールに問題があるようです。そのライセンスを受諾しない限り\n"
+"      このプロバイダを利用することはできません。"
+
+#. mail:checking-service title
+#: mail/mail-errors.xml.h:240
+msgid "Querying server"
+msgstr "問い合わせサーバ"
+
+#. mail:checking-service primary
+#: mail/mail-errors.xml.h:242
+msgid "Please wait."
+msgstr "少々お待ち下さい。"
+
+#. mail:checking-service secondary
+#: mail/mail-errors.xml.h:244
+msgid "Querying server for a list of supported authentication mechanisms."
+msgstr "サポートする認証メカニズムのリストを持つ問い合わせサーバです。"
+
+#. mail:gw-accountsetup-error primary
+#: mail/mail-errors.xml.h:246
+msgid ""
+"Unable to connect to the GroupWise\n"
+"server."
+msgstr ""
+"GroupWise サーバへ\n"
+"接続できません。"
+
+#. mail:gw-accountsetup-error secondary
+#: mail/mail-errors.xml.h:249
+msgid ""
+"\n"
+"Please check your account settings and try again.\n"
+msgstr ""
+"\n"
+"お使いのアカウントの設定を確認して再度、実行して下さい。\n"
+
+#: mail/mail-folder-cache.c:813
+#, c-format
+msgid "Pinging %s"
+msgstr "%s への ping 中に"
+
+#: mail/mail-ops.c:101
+msgid "Filtering Folder"
+msgstr "フォルダのフィルタリング中に"
+
+#: mail/mail-ops.c:262
+msgid "Fetching Mail"
+msgstr "メールの同期中に"
+
+#: mail/mail-ops.c:556
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "出力フィルタの適用に失敗しました: %s"
+
+#: mail/mail-ops.c:581
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local `Sent' folder instead."
+msgstr ""
+"%s への追加に失敗しました: %s\n"
+"かわりにローカルの '送信箱' へ追加します。"
+
+#: mail/mail-ops.c:590
+#, c-format
+msgid "Failed to append to local `Sent' folder: %s"
+msgstr "ローカルの '送信箱' フォルダへの追加に失敗しました: %s"
+
+#: mail/mail-ops.c:687
+#, c-format
+msgid "Sending message %d of %d"
+msgstr "メッセージ %d / %d 通を送信中"
+
+#: mail/mail-ops.c:718
+#, c-format
+msgid "Failed to send %d of %d messages"
+msgstr "メッセージ %d / %d の送信に失敗しました"
+
+#: mail/mail-ops.c:722
+msgid "Complete."
+msgstr "完了しました"
+
+#: mail/mail-ops.c:819
+msgid "Saving message to folder"
+msgstr "フォルダへメッセージを保存中"
+
+#: mail/mail-ops.c:904
+#, c-format
+msgid "Moving messages to %s"
+msgstr "%s へメッセージを移動中"
+
+#: mail/mail-ops.c:904
+#, c-format
+msgid "Copying messages to %s"
+msgstr "%s へメッセージをコピー中"
+
+#: mail/mail-ops.c:1130
+msgid "Forwarded messages"
+msgstr "転送メッセージ"
+
+#: mail/mail-ops.c:1173
+#, c-format
+msgid "Opening folder %s"
+msgstr "フォルダ %s をオープン中"
+
+#: mail/mail-ops.c:1245
+#, c-format
+msgid "Opening store %s"
+msgstr "保存された %s をオープン中"
+
+#: mail/mail-ops.c:1323
+#, c-format
+msgid "Removing folder %s"
+msgstr "フォルダ %s の削除中"
+
+#: mail/mail-ops.c:1417
+#, c-format
+msgid "Storing folder '%s'"
+msgstr "フォルダ '%s' の格納中"
+
+#: mail/mail-ops.c:1482
+#, c-format
+msgid "Expunging and storing account '%s'"
+msgstr "アカウント '%s' の削除と保存中"
+
+#: mail/mail-ops.c:1483
+#, c-format
+msgid "Storing account '%s'"
+msgstr "アカウント '%s' の格納中"
+
+#: mail/mail-ops.c:1538
+msgid "Refreshing folder"
+msgstr "フォルダの更新中"
+
+#: mail/mail-ops.c:1574 mail/mail-ops.c:1625
+msgid "Expunging folder"
+msgstr "フォルダの抹消中"
+
+#: mail/mail-ops.c:1622
+#, c-format
+msgid "Emptying trash in '%s'"
+msgstr "'%s' にあるゴミ箱のクリア中"
+
+#: mail/mail-ops.c:1623
+msgid "Local Folders"
+msgstr "ローカル・フォルダ"
+
+#: mail/mail-ops.c:1706
+#, c-format
+msgid "Retrieving message %s"
+msgstr "メッセージ %s を取得中"
+
+#: mail/mail-ops.c:1778
+#, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "メッセージ %d 通の受信中"
+msgstr[1] "メッセージ %d 通の受信中"
+
+#: mail/mail-ops.c:1864
+#, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] "メッセージ %d 通の保存中"
+msgstr[1] "メッセージ %d 通の保存中"
+
+#: mail/mail-ops.c:1914
+#, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr ""
+"出力ファイルを生成できません: %s\n"
+" %s"
+
+#: mail/mail-ops.c:1942
+#, c-format
+msgid ""
+"Error saving messages to: %s:\n"
+" %s"
+msgstr ""
+"ファイルの保存中にエラー: %s:\n"
+" %s"
+
+#: mail/mail-ops.c:2013
+msgid "Saving attachment"
+msgstr "添付した内容の保存中"
+
+#: mail/mail-ops.c:2025
+#, c-format
+msgid ""
+"Cannot create output file: %s:\n"
+" %s"
+msgstr ""
+"出力ファイルを生成できません: %s:\n"
+" %s"
+
+#: mail/mail-ops.c:2035
+#, c-format
+msgid "Could not write data: %s"
+msgstr "データを書き出せませんでした: %s"
+
+#: mail/mail-ops.c:2185
+#, c-format
+msgid "Disconnecting from %s"
+msgstr "%s からの接続はありません"
+
+#: mail/mail-ops.c:2185
+#, c-format
+msgid "Reconnecting to %s"
+msgstr "%s へ再接続"
+
+#: mail/mail-ops.c:2301
+msgid "Checking Service"
+msgstr "サービスの確認"
+
+#: mail/mail-send-recv.c:158
+msgid "Cancelling..."
+msgstr "キャンセル中..."
+
+#: mail/mail-send-recv.c:265
+#, c-format
+msgid "Server: %s, Type: %s"
+msgstr "サーバ: %s  種別: %s"
+
+#: mail/mail-send-recv.c:267
+#, c-format
+msgid "Path: %s, Type: %s"
+msgstr "パス: %s  種類: %s"
+
+#: mail/mail-send-recv.c:269
+#, c-format
+msgid "Type: %s"
+msgstr "種別: %s"
+
+#: mail/mail-send-recv.c:320
+msgid "Send & Receive Mail"
+msgstr "メールの送信/受信"
+
+#: mail/mail-send-recv.c:323
+msgid "Cancel _All"
+msgstr "全てキャンセル(_A)"
+
+#: mail/mail-send-recv.c:410
+msgid "Updating..."
+msgstr "更新中..."
+
+#: mail/mail-send-recv.c:410 mail/mail-send-recv.c:462
+msgid "Waiting..."
+msgstr "待機中..."
+
+#: mail/mail-session.c:208
+#, c-format
+msgid "Enter Password for %s"
+msgstr "%s のパスワードを入力して下さい"
+
+#: mail/mail-session.c:210
+msgid "Enter Password"
+msgstr "パスワードの入力"
+
+#: mail/mail-session.c:239
+msgid "User canceled operation."
+msgstr "ユーザによって操作がキャンセルされました"
+
+#: mail/mail-signature-editor.c:371
+msgid "Edit signature"
+msgstr "署名の編集"
+
+#: mail/mail-signature-editor.c:411
+msgid "Enter a name for this signature."
+msgstr "この署名の名前を入力して下さい。"
+
+#: mail/mail-signature-editor.c:414
+#: plugins/shared-folder/properties.glade.h:11
+msgid "Name:"
+msgstr "名前:"
+
+#: mail/mail-tools.c:115
+#, c-format
+msgid "Could not create spool directory `%s': %s"
+msgstr "スプール用フォルダ '%s' を生成できませんでした: %s"
+
+#: mail/mail-tools.c:142
+#, c-format
+msgid "Trying to movemail a non-mbox source `%s'"
+msgstr "mbox 形式ではないソース '%s' の移動を試みます"
+
+#: mail/mail-tools.c:277
+#, c-format
+msgid "Forwarded message - %s"
+msgstr "転送されたメッセージ - %s"
+
+#: mail/mail-tools.c:279
+msgid "Forwarded message"
+msgstr "転送されたメッセージ"
+
+#: mail/mail-tools.c:320
+#, c-format
+msgid "Invalid folder: `%s'"
+msgstr "不正なフォルダ: '%s'"
+
+#: mail/mail-vfolder.c:87
+#, c-format
+msgid "Setting up vfolder: %s"
+msgstr "仮想フォルダの設定: %s"
+
+#: mail/mail-vfolder.c:235
+#, c-format
+msgid "Updating vFolders for '%s:%s'"
+msgstr "'%s:%s' の仮想フォルダの更新中"
+
+#: mail/mail-vfolder.c:242
+#, c-format
+msgid "Updating vFolders for '%s'"
+msgstr "'%s' の仮想フォルダの更新中"
+
+#: mail/mail-vfolder.c:950
+msgid "vFolders"
+msgstr "仮想フォルダ"
+
+#: mail/mail-vfolder.c:989
+msgid "Edit VFolder"
+msgstr "仮想フォルダの編集"
+
+#: mail/mail-vfolder.c:1073
+msgid "New VFolder"
+msgstr "新しい仮想フォルダ"
+
+#: mail/message-list.c:999
+msgid "Unseen"
+msgstr "未読"
+
+#: mail/message-list.c:1000
+msgid "Seen"
+msgstr "既読"
+
+#: mail/message-list.c:1001
+msgid "Answered"
+msgstr "返答済み"
+
+#: mail/message-list.c:1002
+msgid "Multiple Unseen Messages"
+msgstr "複数の未読メッセージ"
+
+#: mail/message-list.c:1003
+msgid "Multiple Messages"
+msgstr "複数のメッセージ"
+
+#: mail/message-list.c:1007
+msgid "Lowest"
+msgstr "最も低い"
+
+#: mail/message-list.c:1008
+msgid "Lower"
+msgstr "低い"
+
+#: mail/message-list.c:1012
+msgid "Higher"
+msgstr "高い"
+
+#: mail/message-list.c:1013
+msgid "Highest"
+msgstr "最も高い"
+
+#: mail/message-list.c:1341
+msgid "?"
+msgstr "?"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: mail/message-list.c:1348 plugins/itip-formatter/itip-view.c:160
+msgid "Today %l:%M %p"
+msgstr "今日の %p %l時%M分"
+
+#: mail/message-list.c:1357
+msgid "Yesterday %l:%M %p"
+msgstr "昨日の %p %l時%M分"
+
+#: mail/message-list.c:1369
+msgid "%a %l:%M %p"
+msgstr "%p %l時%M分 (%a)"
+
+#: mail/message-list.c:1377
+msgid "%b %d %l:%M %p"
+msgstr "%B%e日 %p %l時%M分"
+
+#: mail/message-list.c:1379
+msgid "%b %d %Y"
+msgstr "%Y年 %B%e日"
+
+#: mail/message-list.c:2044
+msgid "Message List"
+msgstr "メッセージ一覧"
+
+#: mail/message-list.c:3409
+msgid "Generating message list"
+msgstr "メッセージ一覧の作成中"
+
+#: mail/message-list.etspec.h:3
+msgid "Due By"
+msgstr "期日"
+
+#: mail/message-list.etspec.h:4
+msgid "Flag Status"
+msgstr "フラグの状態"
+
+#: mail/message-list.etspec.h:5
+msgid "Flagged"
+msgstr "フラグ付き"
+
+#: mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
+msgstr "フラグのフォローアップ"
+
+#: mail/message-list.etspec.h:8
+msgid "Original Location"
+msgstr "元の連絡先"
+
+#: mail/message-list.etspec.h:9
+msgid "Received"
+msgstr "受信済み"
+
+#: mail/message-list.etspec.h:11
+msgid "Size"
+msgstr "サイズ"
+
+#: mail/message-tag-followup.c:74
+msgid "Call"
+msgstr "呼び出す"
+
+#: mail/message-tag-followup.c:75
+msgid "Do Not Forward"
+msgstr "転送しない"
+
+#: mail/message-tag-followup.c:76
+msgid "Follow-Up"
+msgstr "フローアップ"
+
+#: mail/message-tag-followup.c:77
+msgid "For Your Information"
+msgstr "F.Y.I"
+
+#: mail/message-tag-followup.c:78 ui/evolution-mail-message.xml.h:42
+msgid "Forward"
+msgstr "転送"
+
+#: mail/message-tag-followup.c:79
+msgid "No Response Necessary"
+msgstr "返信の必要なし"
+
+#: mail/message-tag-followup.c:81 ui/evolution-mail-message.xml.h:85
+msgid "Reply"
+msgstr "返信"
+
+#: mail/message-tag-followup.c:82 ui/evolution-mail-message.xml.h:86
+msgid "Reply to All"
+msgstr "全員へ返信"
+
+#: mail/message-tag-followup.c:83
+msgid "Review"
+msgstr "レビュー"
+
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "本文が次のものを含む"
+
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "本文が次のものを含まない"
+
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "本文または件名が次のものを含む"
+
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "メッセージが次のものを含む"
+
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "宛先が次のものを含む"
 
-#. mail:no-delete-spethal-folder secondary
-#. mail:no-rename-spethal-folder secondary
-#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
-msgstr ""
-"システム・フォルダは Ximian Evolution を正しく機能させるために必要なので、名"
-"前の変更、移動または削除することはできません。"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "差出人が次のものを含む"
 
-#. mail:no-rename-spethal-folder primary
-#: mail/mail-errors.xml.h:118
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "システム・フォルダ \"{0}\" の名前変更または移動はできません。"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "件名が次のものを含む"
 
-#. mail:ask-delete-folder title
-#: mail/mail-errors.xml.h:122
-msgid "Delete \"{0}\"?"
-msgstr "\"{0}\" を削除しますか？"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "件名が次のものを含まない"
 
-#. mail:ask-delete-folder primary
-#: mail/mail-errors.xml.h:124
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "本当にフォルダ \"{0}\" とそのサブフォルダの全てを削除しますか？"
+#: plugins/backup-restore/backup.c:109
+msgid "Backup Evolution directory"
+msgstr "Evolution フォルダのバックアップ"
 
-#. mail:ask-delete-folder secondary
-#: mail/mail-errors.xml.h:126
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
-msgstr ""
-"このフォルダを削除すると、そのフォルダの内容とそのサブフォルダの内容の全てが"
-"永久に削除されることになります。"
+#: plugins/backup-restore/backup.c:111
+msgid "Restore Evolution directory"
+msgstr "Evolution フォルダのリストア"
 
-#. mail:no-rename-folder-exists primary
-#. mail:no-rename-folder primary
-#: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
-msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr "\"{0}\" から \"{1}\" へ名前を変更できません。"
+#: plugins/backup-restore/backup.c:113
+msgid "Check Evolution archive"
+msgstr "Evolution アーカイブの確認"
 
-#. mail:no-rename-folder-exists secondary
-#. mail:vfolder-notunique secondary
-#: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "既に同名のフォルダ \"{1}\" があります。別の名前を使用して下さい。"
+#: plugins/backup-restore/backup.c:115
+msgid "Restart Evolution"
+msgstr "Evolution の再起動"
 
-#. mail:no-rename-folder secondary
-#: mail/mail-errors.xml.h:134
-msgid "Because \"{2}\"."
-msgstr "理由は \"{2}\" です。"
+#: plugins/backup-restore/backup-restore.c:51
+msgid "Select name of Evolution archive"
+msgstr "Evolution アーカイブ名の選択"
 
-#. mail:no-move-folder-nostore primary
-#. mail:no-move-folder-to-nostore primary
-#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "フォルダ \"{0}\" を \"{1}\" へ移動できません。"
+#: plugins/backup-restore/backup-restore.c:61
+msgid "_Restart Evolution after backup"
+msgstr "バックアップした後に Evolution を再起動する(_R)"
 
-#. mail:no-move-folder-nostore secondary
-#. mail:no-copy-folder-nostore secondary
-#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
-msgid "Cannot open source \"{2}\"."
-msgstr "操作の対象先 \"{2}\" を開けません。"
+#: plugins/backup-restore/backup-restore.c:89
+msgid "Select Evolution archive to restore"
+msgstr "リストアする Evolution アーカイブの選択"
 
-#. mail:no-move-folder-to-nostore secondary
-#. mail:no-copy-folder-to-nostore secondary
-#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
-msgid "Cannot open target \"{2}\"."
-msgstr "操作の対象元 \"{2}\" を開けません。"
+#: plugins/backup-restore/backup-restore.c:97
+msgid "_Restart Evolution after restore"
+msgstr "リストアした後に Evolution を再起動する(_R)"
 
-#. mail:no-copy-folder-nostore primary
-#. mail:no-copy-folder-to-nostore primary
-#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "フォルダ \"{0}\" を \"{1}\" へコピーできません。"
+#: plugins/backup-restore/org-gnome-backup-restore.xml.h:1
+msgid "Backup Settings..."
+msgstr "バックアップの設定..."
 
-#. mail:no-create-folder-nostore primary
-#: mail/mail-errors.xml.h:152
-msgid "Cannot create folder \"{0}\"."
-msgstr "フォルダ \"{0}\" を作成できません。"
+#: plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+msgid "Backup and restore Evolution data and settings"
+msgstr "Evolution のデータと設定をバックアップしたりリストアします"
 
-#. mail:no-create-folder-nostore secondary
-#: mail/mail-errors.xml.h:154
-msgid "Cannot open source \"{1}\""
-msgstr "ソース \"{1}\" を開けません。"
+#: plugins/backup-restore/org-gnome-backup-restore.xml.h:3
+msgid "Restore Settings..."
+msgstr "リストアの設定..."
 
-#. mail:account-incomplete primary
-#. mail:account-notunique primary
-#: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
-msgid "Cannot save changes to account."
-msgstr "変更したアカウント情報を保存できません。"
+#: plugins/bbdb/bbdb.c:387
+msgid "Automatic Contacts"
+msgstr "連絡先の自動生成"
 
-#. mail:account-incomplete secondary
-#: mail/mail-errors.xml.h:158
-msgid "You have not filled in all of the required information."
-msgstr "必要な情報の全てを埋めていません。"
+#: plugins/bbdb/bbdb.c:396
+msgid "<span weight=\"bold\">Automatic Contacts</span>"
+msgstr "<span weight=\"bold\">連絡先の自動生成</span>"
 
-#. mail:account-notunique secondary
-#: mail/mail-errors.xml.h:162
-msgid "You may not create two accounts with the same name."
-msgstr "同じ名前のアカウントを二つ作れません。"
+#. Enable BBDB checkbox
+#: plugins/bbdb/bbdb.c:409
+msgid ""
+"_Automatically create entries in the addressbook when responding to mail"
+msgstr "メールに返信したら自動的にアドレス帳の中に連絡先を登録する(_A)"
 
-#. mail:ask-delete-account title
-#: mail/mail-errors.xml.h:164
-msgid "Delete account?"
-msgstr "アカウントを削除しますか？"
+#: plugins/bbdb/bbdb.c:427
+msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
+msgstr "<span weight=\"bold\">インスタント・メッセンジャの連絡先</span>"
 
-#. mail:ask-delete-account primary
-#: mail/mail-errors.xml.h:166
-msgid "Are you sure you want to delete this account?"
-msgstr "このアカウントを削除してもよろしいですか？"
+#. Enable Gaim Checkbox
+#: plugins/bbdb/bbdb.c:440
+msgid ""
+"Periodically synchronize contact information and images from my _instant "
+"messenger"
+msgstr "インスタント・メッセンジャと周期的に連絡先と画像を同期する(_I)"
 
-#. mail:ask-delete-account secondary
-#: mail/mail-errors.xml.h:168
-msgid "If you proceed, the account information will be deleted permanently."
-msgstr "続行すると、アカウント情報が永久に削除されます。"
+#. Synchronize now button.
+#: plugins/bbdb/bbdb.c:447
+msgid "Synchronize with _buddy list now"
+msgstr "今すぐ仲間リストを同期する(_B)"
 
-#: mail/mail-errors.xml.h:169
-msgid "Don't delete"
-msgstr "削除しない"
+#: plugins/folder-unsubscribe/folder-unsubscribe.c:57
+#, c-format
+msgid "Unsubscribing from folder \"%s\""
+msgstr "フォルダ \"%s\" の購読停止中"
 
-#. mail:no-save-signature primary
-#: mail/mail-errors.xml.h:171
-msgid "Could not save signature file."
-msgstr "署名ファイルを保存できませんでした。"
+#: plugins/itip-formatter/itip-formatter.c:670
+#, c-format
+msgid "Unable to send item to calendar '%s'.  %s"
+msgstr "アイテムをカレンダ '%s' へ送信できません。%s"
 
-#. mail:no-save-signature secondary
-#: mail/mail-errors.xml.h:173
-msgid "Because \"{0}\"."
-msgstr "理由は \"{0}\" です。"
+#: plugins/itip-formatter/itip-formatter.c:681
+#, c-format
+msgid "Sent to calendar '%s' as accepted"
+msgstr "カレンダ '%s' へ送信完了 (承認済)"
 
-#. mail:signature-notscript primary
-#: mail/mail-errors.xml.h:175
-msgid "Cannot set signature script \"{0}\"."
-msgstr "署名スクリプト \"{0}\" をセットできません。"
+#: plugins/itip-formatter/itip-formatter.c:685
+#, c-format
+msgid "Sent to calendar '%s' as tentative"
+msgstr "カレンダ '%s' へ送信完了 (仮承認)"
 
-#. mail:signature-notscript secondary
-#: mail/mail-errors.xml.h:177
-msgid "The script file must exist and be executable."
-msgstr "スクリプト・ファイルが存在し実行可能でなければなりません。"
+#: plugins/itip-formatter/itip-formatter.c:690
+#, c-format
+msgid "Sent to calendar '%s' as declined"
+msgstr "カレンダ '%s' へ送信完了 (辞退)"
 
-#. mail:ask-signature-changed title
-#: mail/mail-errors.xml.h:179
-msgid "Discard changed?"
-msgstr "変更を破棄しますか？"
+#: plugins/itip-formatter/itip-formatter.c:695
+#, c-format
+msgid "Sent to calendar '%s' as cancelled"
+msgstr "カレンダ '%s' へ送信完了 (キャンセル)"
 
-#. mail:ask-signature-changed primary
-#: mail/mail-errors.xml.h:181
-msgid "Do you wish to save your changes?"
-msgstr "変更を保存しますか？"
+#: plugins/itip-formatter/itip-formatter.c:743
+msgid "Attendee status could not be updated because the status is invalid"
+msgstr "不正なステータスのため出席状況が更新できませんでした"
 
-#. mail:ask-signature-changed secondary
-#: mail/mail-errors.xml.h:183
-msgid "This signature has been changed, but has not been saved."
-msgstr "この署名は変更されていますが保存されていません。"
+#: plugins/itip-formatter/itip-formatter.c:754
+#, c-format
+msgid "Unable to update attendee statusAttendee status updated. %s"
+msgstr "出席状況を更新できませんでした。%s"
 
-#: mail/mail-errors.xml.h:184
-msgid "_Discard changes"
-msgstr "変更を破棄する(_D)"
+#: plugins/itip-formatter/itip-formatter.c:758
+msgid "Attendee status updated"
+msgstr "出席状況を更新しました"
 
-#. mail:vfolder-notexist primary
-#: mail/mail-errors.xml.h:186
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "仮想フォルダ \"{0}\" が存在していないので編集できません。"
+#: plugins/itip-formatter/itip-formatter.c:883
+msgid "The calendar attached is not valid"
+msgstr "添付されたカレンダが不正です"
 
-#. mail:vfolder-notexist secondary
-#: mail/mail-errors.xml.h:188
+#: plugins/itip-formatter/itip-formatter.c:884
 msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+"The message claims to contain a calendar, but the calendar is not valid "
+"iCalendar."
 msgstr ""
-"このフォルダは自動的に追加されたかもしれません。必要であれば、仮想フォルダの"
-"エディタを起動して明確に追加して下さい。"
-
-#. mail:vfolder-notunique primary
-#: mail/mail-errors.xml.h:190
-msgid "Cannot add vFolder \"{0}\"."
-msgstr "仮想フォルダ \"{0}\" を追加できません。"
+"メッセージにカレンダが添付されていますが、そのカレンダは妥当な iCalendar 形式"
+"ではありません。"
 
-#. mail:vfolder-updated primary
-#: mail/mail-errors.xml.h:194
-msgid "vFolders automatically updated."
-msgstr "仮想フォルダが自動的に更新されました。"
+#: plugins/itip-formatter/itip-formatter.c:918
+#: plugins/itip-formatter/itip-formatter.c:967
+msgid "The item in the calendar is not valid"
+msgstr "カレンダのアイテムが不正です"
 
-#. mail:vfolder-updated secondary
-#: mail/mail-errors.xml.h:196
+#: plugins/itip-formatter/itip-formatter.c:919
+#: plugins/itip-formatter/itip-formatter.c:968
 msgid ""
-"The following vFolder(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
+"The message does contain a calendar, but the calendar contains no events, "
+"tasks or free/busy information"
 msgstr ""
-"次の仮想フォルダ:\n"
-"{0}\n"
-"が削除済みフォルダに使用されています:\n"
-"    \"{1}\"\n"
-"更に更新されています。"
+"メッセージにカレンダが添付されていますが、そのカレンダにはイベントまたタス"
+"ク、予定の有無が含まれていません。"
 
-#. mail:filter-updated primary
-#: mail/mail-errors.xml.h:202
-msgid "Mail filters automatically updated."
-msgstr "メールのフィルタが自動的に更新されました。"
+#: plugins/itip-formatter/itip-formatter.c:1536
+msgid "Meetings and Tasks"
+msgstr "会議とタスク"
 
-#. mail:filter-updated secondary
-#: mail/mail-errors.xml.h:204
-msgid ""
-"The following filter rule(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"次のフィルタ・ルール:\n"
-"{0}\n"
-"が削除済みフォルダに使用されています:\n"
-"    \"{1}\"\n"
-"更に更新されています。"
+#. Delete message after acting
+#. FIXME Need a schema for this
+#: plugins/itip-formatter/itip-formatter.c:1559
+msgid "_Delete message after acting"
+msgstr "会議開催後にメッセージを削除する(_D)"
 
-#. mail:no-folder primary
-#: mail/mail-errors.xml.h:210
-msgid "Missing folder."
-msgstr "フォルダがありません。"
+#: plugins/itip-formatter/itip-formatter.c:1569
+msgid "<span weight=\"bold\">Conflict Search</span>"
+msgstr "<span weight=\"bold\">重複した会議の検索</span>"
 
-#. mail:no-folder secondary
-#: mail/mail-errors.xml.h:212
-msgid "You must specify a folder."
-msgstr "フォルダを指定して下さい。"
+#. Source selector
+#: plugins/itip-formatter/itip-formatter.c:1582
+msgid "Select the calendars to search for meeting conflicts"
+msgstr "重複する会議を検索するカレンダを選択して下さい:"
 
-#. mail:no-name-vfolder secondary
-#: mail/mail-errors.xml.h:216
-msgid "You must name this vFolder."
-msgstr "この仮装フォルダに名前を付けて下さい。"
+#. strftime format of a weekday and a date.
+#: plugins/itip-formatter/itip-view.c:146 ui/evolution-calendar.xml.h:34
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:450
+msgid "Today"
+msgstr "今日"
 
-#. mail:vfolder-no-source primary
-#: mail/mail-errors.xml.h:218
-msgid "No sources selected."
-msgstr "ソースが選択されていません。"
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: plugins/itip-formatter/itip-view.c:151
+msgid "Today %H:%M"
+msgstr "今日の %H:%M"
 
-#. mail:vfolder-no-source secondary
-#: mail/mail-errors.xml.h:220
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-"ソースのフォルダを少なくとも一つ指定して下さい。\n"
-"フォルダをそれぞれ個々に選択する、かつ/または\n"
-"全てのローカル・フォルダ、全てのリモート・フォルダ、\n"
-"またはその両方を選択して下さい。"
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format.
+#: plugins/itip-formatter/itip-view.c:155
+msgid "Today %H:%M:%S"
+msgstr "今日の %H:%M:%S"
 
-#. mail:ask-migrate-existing primary
-#: mail/mail-errors.xml.h:224
-msgid "Problem migrating old mail folder \"{0}\"."
-msgstr "古いメール・フォルダ \"{0}\" の移行中に問題が発生しました。"
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format.
+#: plugins/itip-formatter/itip-view.c:164
+msgid "Today %l:%M:%S %p"
+msgstr "今日の %p %l時%M分%S秒"
 
-#. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:226
-msgid ""
-"A non-empty folder at \"{1}\" already exists.\n"
-"\n"
-"You can choose to ignore this folder, overwrite or append its contents, or "
-"quit.\n"
-msgstr ""
-"\"{1}\" に空ではないフォルダが存在しています。\n"
-"\n"
-"このフォルダを無視する、上書きする、またはそのフォルダの内容に追加する、また"
-"は終了するから選択することが可能です。\n"
+#. strftime format of a weekday and a date.
+#: plugins/itip-formatter/itip-view.c:172
+#: plugins/itip-formatter/itip-view.c:224
+msgid "%A, %B %e"
+msgstr "%B%e日 %A"
 
-#: mail/mail-errors.xml.h:230
-msgid "Ignore"
-msgstr "無視する"
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: plugins/itip-formatter/itip-view.c:177
+#: plugins/itip-formatter/itip-view.c:229
+msgid "%A, %B %e %H:%M"
+msgstr "%B%e日 %A %H:%M"
 
-#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
-msgid "_Overwrite"
-msgstr "上書きする(_O)"
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format.
+#: plugins/itip-formatter/itip-view.c:181
+#: plugins/itip-formatter/itip-view.c:233
+msgid "%A, %B %e %H:%M:%S"
+msgstr "%B%e日 %A %H:%M:%S"
 
-#: mail/mail-errors.xml.h:232
-msgid "_Append"
-msgstr "追加する(_A)"
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: plugins/itip-formatter/itip-view.c:186
+#: plugins/itip-formatter/itip-view.c:238
+msgid "%A, %B %e %l:%M %p"
+msgstr "%B%e日 %A %p %l時%M分"
 
-#. mail:gw-accountsetup-error primary
-#: mail/mail-errors.xml.h:234
-msgid ""
-"Could not connect to {0}. Groupwise account setup is incomplete. You may "
-"need to setup  the account again"
-msgstr ""
-"{0} へ接続できませんでした。Groupwise アカウント設定が不完全です。再度、アカ"
-"ウントを設定する必要があるかもしれません。"
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format.
+#: plugins/itip-formatter/itip-view.c:190
+#: plugins/itip-formatter/itip-view.c:242
+msgid "%A, %B %e %l:%M:%S %p"
+msgstr "%B%e日 %A %p %l時%M分%S秒"
 
-#: mail/mail-folder-cache.c:795
+#. strftime format of a weekday and a date.
+#: plugins/itip-formatter/itip-view.c:198
 #, c-format
-msgid "Pinging %s"
-msgstr "%s への ping 中に"
+msgid "%A"
+msgstr "%A"
 
-#: mail/mail-ops.c:98
-msgid "Filtering Folder"
-msgstr "フォルダのフィルタリング中に"
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: plugins/itip-formatter/itip-view.c:203
+msgid "%A %H:%M"
+msgstr "%A の %H:%M"
 
-#: mail/mail-ops.c:259
-msgid "Fetching Mail"
-msgstr "メールの同期中に"
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format.
+#: plugins/itip-formatter/itip-view.c:207
+msgid "%A %H:%M:%S"
+msgstr "%A の %H:%M:%S"
 
-#: mail/mail-ops.c:542
-#, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "出力フィルタの適用に失敗しました: %s"
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: plugins/itip-formatter/itip-view.c:212
+msgid "%A %l:%M %p"
+msgstr "%A の %p %l時%M分"
 
-#: mail/mail-ops.c:567
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
-msgstr ""
-"%s への追加に失敗しました: %s\n"
-"かわりにローカルの '送信箱' へ追加します。"
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format.
+#: plugins/itip-formatter/itip-view.c:216
+msgid "%A %l:%M:%S %p"
+msgstr "%A の %p %I時%M分%S秒"
 
-#: mail/mail-ops.c:576
-#, c-format
-msgid "Failed to append to local `Sent' folder: %s"
-msgstr "ローカルの '送信箱' フォルダへの追加に失敗しました: %s"
+#. strftime format of a weekday and a date.
+#: plugins/itip-formatter/itip-view.c:248
+msgid "%A, %B %e, %Y"
+msgstr "%Y年 %B%e日 %A"
 
-#: mail/mail-ops.c:672
-#, c-format
-msgid "Sending message %d of %d"
-msgstr "メッセージ %d / %d 通を送信中"
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: plugins/itip-formatter/itip-view.c:253
+msgid "%A, %B %e, %Y %H:%M"
+msgstr "%Y年 %B%e日 %A %H:%M"
 
-#: mail/mail-ops.c:703
-#, c-format
-msgid "Failed to send %d of %d messages"
-msgstr "メッセージ %d / %d の送信に失敗しました"
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format.
+#: plugins/itip-formatter/itip-view.c:257
+msgid "%A, %B %e, %Y %H:%M:%S"
+msgstr "%Y年 %B%e日 %A %H:%M:%S"
 
-#: mail/mail-ops.c:707
-msgid "Complete."
-msgstr "完了しました"
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: plugins/itip-formatter/itip-view.c:262
+msgid "%A, %B %e, %Y %l:%M %p"
+msgstr "%Y年%B%e日 %A %p %l時%M分"
 
-#: mail/mail-ops.c:804
-msgid "Saving message to folder"
-msgstr "フォルダへメッセージを保存中"
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format.
+#: plugins/itip-formatter/itip-view.c:266
+msgid "%A, %B %e, %Y %l:%M:%S %p"
+msgstr "%Y年%B%e日 %A %p %l時%M分%S秒"
 
-#: mail/mail-ops.c:889
+#: plugins/itip-formatter/itip-view.c:291
 #, c-format
-msgid "Moving messages to %s"
-msgstr "%s へメッセージを移動中"
+msgid "<b>%s</b> through %s has published the following meeting information:"
+msgstr "<b>%s</b> さんは %s さん次の会議召集情報を公開したと考えています:"
 
-#: mail/mail-ops.c:889
+#: plugins/itip-formatter/itip-view.c:293
 #, c-format
-msgid "Copying messages to %s"
-msgstr "%s へメッセージをコピー中"
+msgid "<b>%s</b> has published the following meeting information:"
+msgstr "<b>%s</b> さんが次の会議召集情報を公開しました:"
 
-#: mail/mail-ops.c:1002
+#: plugins/itip-formatter/itip-view.c:298
 #, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "\"%s\" のフォルダを走査中"
+msgid "<b>%s</b> requests the presence of %s at the following meeting:"
+msgstr "<b>%s</b> さんが次の会議で %s の出席を要求しています:"
 
-#: mail/mail-ops.c:1115
-msgid "Forwarded messages"
-msgstr "転送メッセージ"
+#: plugins/itip-formatter/itip-view.c:301
+#, c-format
+msgid "<b>%s</b> through %s requests your presence at the following meeting:"
+msgstr "<b>%s</b> さんは %s さんが次の会議への出席を要求すると考えています:"
 
-#: mail/mail-ops.c:1158
+#: plugins/itip-formatter/itip-view.c:303
 #, c-format
-msgid "Opening folder %s"
-msgstr "フォルダ %s をオープン中"
+msgid "<b>%s</b> requests your presence at the following meeting:"
+msgstr "<b>%s</b> さんが会議への出席を要求しています:"
 
-#: mail/mail-ops.c:1230
+#: plugins/itip-formatter/itip-view.c:309
 #, c-format
-msgid "Opening store %s"
-msgstr "保存された %s をオープン中"
+msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
+msgstr ""
+"<b>%s</b> さんは %s さんが既存の会議への参加を希望していると考えています:"
 
-#: mail/mail-ops.c:1308
+#: plugins/itip-formatter/itip-view.c:311
 #, c-format
-msgid "Removing folder %s"
-msgstr "フォルダ %s の削除中"
+msgid "<b>%s</b> wishes to add to an existing meeting:"
+msgstr "<b>%s</b> さんは既存の会議への参加を希望しています:"
 
-#: mail/mail-ops.c:1402
+#: plugins/itip-formatter/itip-view.c:314
 #, c-format
-msgid "Storing folder '%s'"
-msgstr "フォルダ '%s' の格納中"
+msgid ""
+"<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgstr "<b>%s</b> さんは次の会議の最新情報を希望しています:"
 
-#: mail/mail-ops.c:1467
+#: plugins/itip-formatter/itip-view.c:317
 #, c-format
-msgid "Expunging and storing account '%s'"
-msgstr "アカウント '%s' の削除と保存中"
+msgid "<b>%s</b> has sent back the following meeting response:"
+msgstr "<b>%s</b> さんが次の会議の返事を返してきました:"
 
-#: mail/mail-ops.c:1468
+#: plugins/itip-formatter/itip-view.c:321
 #, c-format
-msgid "Storing account '%s'"
-msgstr "アカウント '%s' の格納中"
+msgid "<b>%s</b> through %s has cancelled the following meeting:"
+msgstr "<b>%s</b> さんは %s さんが次の会議をキャンセルしたと考えています:"
 
-#: mail/mail-ops.c:1523
-msgid "Refreshing folder"
-msgstr "フォルダの更新中"
+#: plugins/itip-formatter/itip-view.c:323
+#, c-format
+msgid "<b>%s</b> has cancelled the following meeting."
+msgstr "<b>%s</b> さんが次の会議をキャンセルしました:"
 
-#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
-msgid "Expunging folder"
-msgstr "フォルダの抹消中"
+#: plugins/itip-formatter/itip-view.c:326
+#, c-format
+msgid "<b>%s</b> has proposed the following meeting changes."
+msgstr "<b>%s</b> さんが会議の変更を提案してきました:"
 
-#: mail/mail-ops.c:1607
+#: plugins/itip-formatter/itip-view.c:330
 #, c-format
-msgid "Emptying trash in '%s'"
-msgstr "'%s' にあるゴミ箱のクリア中"
+msgid "<b>%s</b> through %s has declined the following meeting changes:"
+msgstr "<b>%s</b> さんは %s さんが会議の変更を断ったと考えています:"
 
-#: mail/mail-ops.c:1608
-msgid "Local Folders"
-msgstr "ローカル・フォルダ"
+#: plugins/itip-formatter/itip-view.c:332
+#, c-format
+msgid "<b>%s</b> has declined the following meeting changes."
+msgstr "<b>%s</b> さんが会議の変更を断ってきました:"
 
-#: mail/mail-ops.c:1691
+#: plugins/itip-formatter/itip-view.c:359
 #, c-format
-msgid "Retrieving message %s"
-msgstr "メッセージ %s を取得中"
+msgid "<b>%s</b> through %s has published the following task:"
+msgstr "<b>%s</b> さんは %s さんが次のタスクを公開したと考えています:"
 
-#: mail/mail-ops.c:1763
+#: plugins/itip-formatter/itip-view.c:361
 #, c-format
-msgid "Retrieving %d message"
-msgid_plural "Retrieving %d messages"
-msgstr[0] "メッセージ %d 通の受信中"
-msgstr[1] "メッセージ %d 通の受信中"
+msgid "<b>%s</b> has published the following task:"
+msgstr "<b>%s</b> さんが次のタスク情報を公開しました:"
 
-#: mail/mail-ops.c:1849
+#: plugins/itip-formatter/itip-view.c:366
 #, c-format
-msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
-msgstr[0] "メッセージ %d 通の保存中"
-msgstr[1] "メッセージ %d 通の保存中"
+msgid "<b>%s</b> requests the assignment of %s to the following task:"
+msgstr "<b>%s</b> さんが次のタスクに対する %s の割り当てを要求しています:"
 
-#: mail/mail-ops.c:1899
+#: plugins/itip-formatter/itip-view.c:369
 #, c-format
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr ""
-"出力ファイルを生成できません: %s\n"
-" %s"
+msgid "<b>%s</b> through %s has assigned you a task:"
+msgstr "<b>%s</b> さんは %s さんがタスクを割り当てたと考えています:"
 
-#: mail/mail-ops.c:1927
+#: plugins/itip-formatter/itip-view.c:371
 #, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
+msgid "<b>%s</b> has assigned you a task:"
+msgstr "<b>%s</b> さんはタスクをあなたに割り当てました:"
+
+#: plugins/itip-formatter/itip-view.c:377
+#, c-format
+msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr ""
-"ファイルの保存中にエラー: %s:\n"
-" %s"
+"<b>%s</b> さんは %s さんが既存のタスクへの追加を希望していると考えています:"
 
-#: mail/mail-ops.c:1998
-msgid "Saving attachment"
-msgstr "添付した内容の保存中"
+#: plugins/itip-formatter/itip-view.c:379
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task:"
+msgstr "<b>%s</b> さんは既存のタスクへの追加を希望しています:"
 
-#: mail/mail-ops.c:2010
+#: plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid ""
-"Cannot create output file: %s:\n"
-" %s"
-msgstr ""
-"出力ファイルを生成できません: %s:\n"
-" %s"
+"<b>%s</b> wishes to receive the latest information for the following "
+"assigned task:"
+msgstr "<b>%s</b> さんは次のタスク割り当てに関するの最新情報を希望しています:"
 
-#: mail/mail-ops.c:2020
+#: plugins/itip-formatter/itip-view.c:385
 #, c-format
-msgid "Could not write data: %s"
-msgstr "データを書き出せませんでした: %s"
+msgid "<b>%s</b> has sent back the following assigned task response:"
+msgstr "<b>%s</b> さんは次のタスク割り当てに対する回答を返してきました:"
 
-#: mail/mail-ops.c:2168
+#: plugins/itip-formatter/itip-view.c:389
 #, c-format
-msgid "Disconnecting from %s"
-msgstr "%s からの接続はありません"
+msgid "<b>%s</b> through %s has cancelled the following assigned task:"
+msgstr ""
+"<b>%s</b> さんは %s さんが割り当てたタスクをキャンセルしたと考えています:"
 
-#: mail/mail-ops.c:2168
+#: plugins/itip-formatter/itip-view.c:391
 #, c-format
-msgid "Reconnecting to %s"
-msgstr "%s へ再接続"
-
-#: mail/mail-send-recv.c:157
-msgid "Cancelling..."
-msgstr "キャンセル中..."
+msgid "<b>%s</b> has cancelled the following assigned task:"
+msgstr "<b>%s</b> さんはタスクの割り当てをキャンセルしました:"
 
-#: mail/mail-send-recv.c:264
+#: plugins/itip-formatter/itip-view.c:394
 #, c-format
-msgid "Server: %s, Type: %s"
-msgstr "サーバ: %s  種別: %s"
+msgid "<b>%s</b> has proposed the following task assignment changes:"
+msgstr "<b>%s</b> さんがタスク割り当ての変更を提案してきました:"
 
-#: mail/mail-send-recv.c:266
+#: plugins/itip-formatter/itip-view.c:398
 #, c-format
-msgid "Path: %s, Type: %s"
-msgstr "パス: %s  種類: %s"
+msgid "<b>%s</b> through %s has declined the following assigned task:"
+msgstr "<b>%s</b> さんは %s さんが次のタスク割り当てを辞退すると考えています:"
 
-#: mail/mail-send-recv.c:268
+#: plugins/itip-formatter/itip-view.c:400
 #, c-format
-msgid "Type: %s"
-msgstr "種別: %s"
+msgid "<b>%s</b> has declined the following assigned task:"
+msgstr "<b>%s</b> さん次のタスク割り当てを辞退しました:"
 
-#: mail/mail-send-recv.c:320
-msgid "Send & Receive Mail"
-msgstr "メールの送信/受信"
+#. Comment
+#: plugins/itip-formatter/itip-view.c:846
+#: plugins/itip-formatter/itip-view.c:896
+msgid "Comment:"
+msgstr "コメント:"
 
-#: mail/mail-send-recv.c:323
-msgid "Cancel _All"
-msgstr "全てキャンセル(_A)"
+#: plugins/itip-formatter/itip-view.c:1573
+msgid "_Calendar:"
+msgstr "カレンダ(_C):"
 
-#: mail/mail-send-recv.c:412
-msgid "Updating..."
-msgstr "更新中..."
+#. org.gnome.mailing-list-actions:no-header primary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:2
+msgid "Action not available"
+msgstr "その操作は利用できません"
 
-#: mail/mail-send-recv.c:412 mail/mail-send-recv.c:466
-msgid "Waiting..."
-msgstr "待機中..."
+#. org.gnome.mailing-list-actions:no-header secondary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:4
+msgid ""
+"This message does not contain the header information required for this "
+"action."
+msgstr "このメッセージには、その操作に必要なヘッダ情報が含まれていません。"
 
-#: mail/mail-session.c:207
-#, c-format
-msgid "Enter Password for %s"
-msgstr "%s のパスワードを入力して下さい"
+#. org.gnome.mailing-list-actions:posting-not-allowed primary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:6
+msgid "Posting not allowed"
+msgstr "投稿できません"
 
-#: mail/mail-session.c:209
-msgid "Enter Password"
-msgstr "パスワードの入力"
+#. org.gnome.mailing-list-actions:posting-not-allowed secondary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:8
+msgid ""
+"Posting to this mailing list is not allowed. Possibly, this is a read-only "
+"mailing list. Contact the list owner for details."
+msgstr ""
+"このメーリング・リストへ投稿できません。おそらく閲覧専用のメーリング・リスト"
+"のようです。詳細はメーリング・リストの管理者に問い合わせて下さい。"
 
-#: mail/mail-session.c:238
-msgid "User canceled operation."
-msgstr "ユーザによって操作がキャンセルされました"
+#. org.gnome.mailing-list-actions:ask-send-message primary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:10
+msgid "Send e-mail message to mailing list?"
+msgstr "メーリング・リストへメッセージを送信しますか？"
 
-#: mail/mail-signature-editor.c:371
-msgid "Edit signature"
-msgstr "署名の編集"
+#. org.gnome.mailing-list-actions:ask-send-message secondary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:12
+msgid ""
+"An e-mail message will be sent to the URL \"{0}\". You can either send the "
+"message automatically, or see and change it first.\n"
+"\n"
+"You should receive an answer from the mailing list shortly after the message "
+"has been sent."
+msgstr ""
+"メッセージを URL \"{0}\" へ送信します。そのまま自動的に送信するか、あるいは最"
+"初に内容を確認できます。\n"
+"\n"
+"メッセージを送信したら、なるべく早めにメーリング・リストからの応答を受け取っ"
+"て下さい。"
 
-#: mail/mail-signature-editor.c:411
-msgid "Enter a name for this signature."
-msgstr "この署名の名前を入力して下さい。"
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:15
+msgid "_Send message"
+msgstr "送信する(_S)"
 
-#: mail/mail-signature-editor.c:414
-msgid "Name:"
-msgstr "名前:"
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:16
+msgid "_Edit message"
+msgstr "編集する(_E)"
 
-#: mail/mail-tools.c:114
-#, c-format
-msgid "Could not create spool directory `%s': %s"
-msgstr "スプール用フォルダ '%s' を生成できませんでした: %s"
+#. org.gnome.mailing-list-actions:malformed-header primary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:18
+msgid "Malformed header"
+msgstr "おかしなヘッダです"
 
-#: mail/mail-tools.c:141
-#, c-format
-msgid "Trying to movemail a non-mbox source `%s'"
-msgstr "mbox 形式ではないソース '%s' の移動を試みます"
+#. org.gnome.mailing-list-actions:malformed-header secondary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:20
+msgid ""
+"The {0} header of this message is malformed and could not be processed.\n"
+"\n"
+"Header: {1}"
+msgstr ""
+"このメッセージ {0} のヘッダが壊れているので処理できませんでした。\n"
+"\n"
+"ヘッダ: {1}"
 
-#: mail/mail-tools.c:276
-#, c-format
-msgid "Forwarded message - %s"
-msgstr "転送されたメッセージ - %s"
+#. org.gnome.mailing-list-actions:no-action primary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:24
+msgid "No e-mail action"
+msgstr "実行できません"
 
-#: mail/mail-tools.c:278
-msgid "Forwarded message"
-msgstr "転送されたメッセージ"
+#. org.gnome.mailing-list-actions:no-action secondary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:26
+msgid ""
+"The action could not be performed. This means the header for this action did "
+"not contain any action we could handle.\n"
+"\n"
+"Header: {0}"
+msgstr ""
+"その操作を実行できませんでした。ヘッダの中に実行できる操作が含まれていないよ"
+"うです。\n"
+"\n"
+"ヘッダ: {0}"
 
-#: mail/mail-tools.c:319
-#, c-format
-msgid "Invalid folder: `%s'"
-msgstr "不正なフォルダ: '%s'"
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
+msgid "Contact list _owner"
+msgstr "管理者への問い合わせ(_O)"
 
-#: mail/mail-vfolder.c:87
-#, c-format
-msgid "Setting up vfolder: %s"
-msgstr "仮想フォルダの設定: %s"
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
+msgid "Contact the owner of the mailing list this message belongs to"
+msgstr "このメッセージが属するメーリング・リストの所有者に連絡します"
 
-#: mail/mail-vfolder.c:235
-#, c-format
-msgid "Updating vFolders for '%s:%s'"
-msgstr "'%s:%s' の仮想フォルダの更新中"
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
+msgid "Get an archive of the list this message belongs to"
+msgstr "このメッセージが属するメーリング・リストのアーカイブを取得します"
 
-#: mail/mail-vfolder.c:242
-#, c-format
-msgid "Updating vFolders for '%s'"
-msgstr "'%s' の仮想フォルダの更新中"
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
+msgid "Get information about the usage of the list this message belongs to"
+msgstr "このメッセージが属するメーリング・リストの使い方を取得します"
 
-#: mail/mail-vfolder.c:942
-msgid "vFolders"
-msgstr "仮想フォルダ"
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
+msgid "Get list _archive"
+msgstr "アーカイブの取得(_A)"
 
-#: mail/mail-vfolder.c:981
-msgid "Edit VFolder"
-msgstr "仮想フォルダの編集"
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
+msgid "Get list _usage information"
+msgstr "利用方法の取得(_U)"
 
-#: mail/mail-vfolder.c:1065
-msgid "New VFolder"
-msgstr "新しい仮想フォルダ"
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7
+msgid "Mailing _List"
+msgstr "メーリング・リスト(_L)"
 
-#: mail/message-list.c:1000
-msgid "Unseen"
-msgstr "未読"
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
+msgid "Post a message to the mailing list this message belongs to"
+msgstr "このメッセージのメーリング・リストへ投稿します"
 
-#: mail/message-list.c:1001
-msgid "Seen"
-msgstr "既読"
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
+msgid "Subscribe to the mailing list this message belongs to"
+msgstr "このメッセージのメーリング・リストを購読します"
 
-#: mail/message-list.c:1002
-msgid "Answered"
-msgstr "返答済み"
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
+msgid "Unsubscribe to the mailing list this message belongs to"
+msgstr "このメッセージのメーリング・リストの購読を停止します"
 
-#: mail/message-list.c:1003
-msgid "Multiple Unseen Messages"
-msgstr "複数の未読メッセージ"
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
+msgid "_Post message to list"
+msgstr "メッセージの投稿(_P)"
 
-#: mail/message-list.c:1004
-msgid "Multiple Messages"
-msgstr "複数のメッセージ"
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
+msgid "_Subscribe to list"
+msgstr "購読(_S)"
 
-#: mail/message-list.c:1008
-msgid "Lowest"
-msgstr "最も低い"
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
+msgid "_Un-subscribe to list"
+msgstr "購読の停止(_U)"
 
-#: mail/message-list.c:1009
-msgid "Lower"
-msgstr "低い"
+#: plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
+msgid "Enable and disable plugins"
+msgstr "プラグインの有効/無効を管理します"
+
+#: plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
+msgid "Manage Plugins..."
+msgstr "プラグインの管理..."
+
+#: plugins/plugin-manager/plugin-manager.c:45
+msgid "Author(s)"
+msgstr "作者"
+
+#: plugins/plugin-manager/plugin-manager.c:46
+msgid "Id"
+msgstr "識別子"
+
+#: plugins/plugin-manager/plugin-manager.c:47
+msgid "Path"
+msgstr "パス"
+
+#: plugins/plugin-manager/plugin-manager.c:48
+msgid "Description"
+msgstr "説明"
+
+#. Setup the ui
+#: plugins/plugin-manager/plugin-manager.c:188
+msgid "Plugin Manager"
+msgstr "プラグイン・マネージャ"
+
+#: plugins/plugin-manager/plugin-manager.c:201
+msgid "Note: Some changes will not take effect until restart"
+msgstr ""
+"注記: プラグインに対するいくつかの変更は再起動するまで有効になりません。"
+
+#: plugins/plugin-manager/plugin-manager.c:210
+msgid "Plugin"
+msgstr "プラグイン"
 
-#: mail/message-list.c:1013
-msgid "Higher"
-msgstr "高い"
+#: plugins/prefer-plain/prefer-plain.c:105
+msgid "Show HTML if present"
+msgstr "可能ならば HTML を表示する"
 
-#: mail/message-list.c:1014
-msgid "Highest"
-msgstr "最も高い"
+#: plugins/prefer-plain/prefer-plain.c:106
+msgid "Prefer PLAIN"
+msgstr "通常のテキストで表示する"
 
-#: mail/message-list.c:1337
-msgid "?"
-msgstr "?"
+#: plugins/prefer-plain/prefer-plain.c:107
+msgid "Only ever show PLAIN"
+msgstr "通常のテキストだけ表示する"
 
-#: mail/message-list.c:1344
-msgid "Today %l:%M %p"
-msgstr "今日の %p %l時%M分"
+#: plugins/prefer-plain/prefer-plain.c:150
+msgid "HTML Mode"
+msgstr "HTML モード"
 
-#: mail/message-list.c:1353
-msgid "Yesterday %l:%M %p"
-msgstr "昨日の %p %l時%M分"
+#: plugins/save-attachments/org-gnome-save-attachments.xml.h:1
+msgid "Save Attachments ..."
+msgstr "添付の保存..."
 
-#: mail/message-list.c:1365
-msgid "%a %l:%M %p"
-msgstr "%p %l時%M分 (%a)"
+#: plugins/save-attachments/org-gnome-save-attachments.xml.h:2
+msgid "Save all attachments"
+msgstr "メールに添付されたものを全て保存します"
 
-#: mail/message-list.c:1373
-msgid "%b %d %l:%M %p"
-msgstr "%B%e日 %p %l時%M分"
+#: plugins/save-attachments/save-attachments.c:331
+msgid "Select save base name"
+msgstr "保存先のフォルダの選択"
 
-#: mail/message-list.c:1375
-msgid "%b %d %Y"
-msgstr "%Y年 %B%e日"
+#: plugins/save-attachments/save-attachments.c:351
+msgid "MIME Type"
+msgstr "MIME 型"
 
-#: mail/message-list.c:3380
-msgid "Generating message list"
-msgstr "メッセージ一覧の作成中"
+#: plugins/save-attachments/save-attachments.c:359
+#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:6
+msgid "Save"
+msgstr "保存"
 
-#: mail/message-list.etspec.h:3
-msgid "Due By"
-msgstr "期日"
+#: plugins/save-calendar/csv-format.c:167
+#, c-format
+msgid "%s%d/%s%d/%s%d %s%d:%s%d:%s%d"
+msgstr "%s%d/%s%d/%s%d %s%d:%s%d:%s%d"
 
-#: mail/message-list.etspec.h:4
-msgid "Flag Status"
-msgstr "フラグの状態"
+#: plugins/save-calendar/csv-format.c:370
+#, c-format
+msgid ""
+"Uid%sSummary%sDescription List%sCategories List%sComment List%sCompleted%"
+"sCreated%sContact List%sStart%sEnd%sDue%sPercent Done%sPriority%sUrl%"
+"sAttendees List%sLocation%sModified%s"
+msgstr ""
+"Uid%sサマリ%s説明%sカテゴリ%sコメント%s完了時刻%s作成日%s連絡先%s開始時刻%s終"
+"了時刻%s期日%s進捗率%s優先度%sURI%s出席者%s場所%s変更日%s"
 
-#: mail/message-list.etspec.h:5
-msgid "Flagged"
-msgstr "フラグ付き"
+#: plugins/save-calendar/csv-format.c:519
+msgid "Advanced options for the CSV format"
+msgstr "CSV 形式の拡張オプション"
 
-#: mail/message-list.etspec.h:6
-msgid "Follow Up Flag"
-msgstr "フラグのフォローアップ"
+#: plugins/save-calendar/csv-format.c:526
+msgid "Prepend a header"
+msgstr "ヘッダを付与する"
 
-#: mail/message-list.etspec.h:8
-msgid "Original Location"
-msgstr "元の連絡先"
+#: plugins/save-calendar/csv-format.c:535
+msgid "Value delimiter:"
+msgstr "数値の区切り:"
 
-#: mail/message-list.etspec.h:9
-msgid "Received"
-msgstr "受信済み"
+#: plugins/save-calendar/csv-format.c:541
+msgid "Record delimiter:"
+msgstr "レコードの区切り:"
 
-#: mail/message-list.etspec.h:11
-msgid "Size"
-msgstr "サイズ"
+#: plugins/save-calendar/csv-format.c:547
+msgid "Encapsulate values with:"
+msgstr "数値のカプセル化:"
 
-#: mail/message-tag-followup.c:73
-msgid "Call"
-msgstr "呼び出す"
+#: plugins/save-calendar/csv-format.c:569
+msgid "Comma separated value format (.csv)"
+msgstr "カンマで区切った形式 (.csv)"
 
-#: mail/message-tag-followup.c:74
-msgid "Do Not Forward"
-msgstr "転送しない"
+#: plugins/save-calendar/ical-format.c:120
+msgid "iCalendar format (.ics)"
+msgstr "iCalendar 形式 (.ics)"
 
-#: mail/message-tag-followup.c:75
-msgid "Follow-Up"
-msgstr "フローアップ"
+#: plugins/save-calendar/rdf-format.c:390
+msgid "RDF format (.rdf)"
+msgstr "RDF 形式 (.rdf)"
 
-#: mail/message-tag-followup.c:76
-msgid "For Your Information"
-msgstr "F.Y.I"
+#: plugins/save-calendar/save-calendar.c:172
+#: plugins/save-calendar/save-calendar.c:182
+msgid "Select destination file"
+msgstr "保存先の選択"
 
-#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
-msgid "Forward"
-msgstr "転送"
+#: plugins/save-calendar/save-calendar.c:217
+#, c-format
+msgid ""
+"The suggested filename extension of this filetype (%s) is unused in the "
+"chosen filename. Do you want to continue?"
+msgstr ""
+"このファイルの種類 (%s) の拡張子は選択したファイル名で使用していません。続行"
+"しますか？"
 
-#: mail/message-tag-followup.c:78
-msgid "No Response Necessary"
-msgstr "返信の必要なし"
+#: plugins/shared-folder/properties.glade.h:1
+msgid ""
+"\n"
+"Share List"
+msgstr ""
+"\n"
+"共有リスト"
 
-#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
-msgid "Reply"
-msgstr "返信"
+#: plugins/shared-folder/properties.glade.h:4
+msgid "Ad_d"
+msgstr "追加(_D)"
 
-#: mail/message-tag-followup.c:81 ui/evolution-mail-message.xml.h:86
-msgid "Reply to All"
-msgstr "全員へ返信"
+#: plugins/shared-folder/properties.glade.h:5
+msgid "Additional Access"
+msgstr "追加するアクセス権"
 
-#: mail/message-tag-followup.c:82
-msgid "Review"
-msgstr "レビュー"
+#: plugins/shared-folder/properties.glade.h:7
+msgid "Delet_e"
+msgstr "削除(_E)"
 
-#: mail/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "本文が次のものを含む"
+#: plugins/shared-folder/properties.glade.h:8
+msgid "Edi_t"
+msgstr "編集(_T)"
 
-#: mail/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "本文が次のものを含まない"
+#: plugins/shared-folder/properties.glade.h:10
+msgid "Message"
+msgstr "メッセージ"
 
-#: mail/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "本文または件名が次のものを含む"
+#: plugins/shared-folder/properties.glade.h:12
+msgid "Sen_d Custom Notification"
+msgstr "カスタム通知の送信(_D)"
 
-#: mail/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "メッセージが次のものを含む"
+#: plugins/shared-folder/properties.glade.h:13
+msgid "Shared Folder Notification"
+msgstr "共有フォルダの通知"
 
-#: mail/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "宛先が次のものを含む"
+#: plugins/shared-folder/properties.glade.h:15
+msgid "The participants will receive the following notification.\n"
+msgstr "関係者は次のような通知を受け取ることになります。\n"
 
-#: mail/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "差出人が次のものを含む"
+#: plugins/shared-folder/properties.glade.h:18
+msgid "_Not Shared"
+msgstr "共有しない(_N)"
 
-#: mail/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "件名が次のものを含む"
+#: plugins/shared-folder/properties.glade.h:20
+msgid "_Shared With ..."
+msgstr "次の人達と共有する(_S)..."
 
-#: mail/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "件名が次のものを含まない"
+#: plugins/shared-folder/properties.glade.h:21
+msgid "_Sharing"
+msgstr "共有(_S)"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution シェル"
+#: plugins/shared-folder/share-folder-common.c:282
+msgid "Users"
+msgstr "ユーザ"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution のテスト"
+#: plugins/shared-folder/share-folder-common.c:283
+msgid "Enter the users and set permissions"
+msgstr "ユーザを入力して権限を設定して下さい"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Evolution のテスト・コンポーネント"
+#: plugins/shared-folder/share-folder-common.c:361
+msgid "Sharing"
+msgstr "共有"
+
+#. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
+#: plugins/subject-thread/subject-thread.c:54
+msgid "Fall back to threading messages by sub_ject"
+msgstr "スレッド表示のメール件名表示に戻す(_J)"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
-msgid "480"
-msgstr "480"
+msgid "Button style"
+msgstr "ボタンのスタイル"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
+msgid "Buttons are visible"
+msgstr "ボタンを表示する"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default width of the folder bar pane"
 msgstr "フォルダ・バーのデフォルトの幅"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:3
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window height"
 msgstr "ウィンドウのデフォルトの高さ"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Default window width"
 msgstr "ウィンドウのデフォルトの幅"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "Evolution configuration version"
 msgstr "Evolution 設定バージョン"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:7
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "起動時にデフォルトで表示するコンポーネントの ID/エイリアスです。"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:8
 msgid ""
 "If set to true, Evolution will start up in offline mode instead of online "
 "mode."
@@ -16565,7 +17719,7 @@ msgstr ""
 "TRUE にすると、オンライン・モードではなく、オフライン・モードで Evolution を"
 "起動します。"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
 "If set to true, the warning dialog in development versions of Evolution is "
 "not displayed."
@@ -16573,28 +17727,42 @@ msgstr ""
 "TRUE にすると、Evolution の開発バージョンである旨を警告するダイアログを表示し"
 "ません。"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Last upgraded Evolution configuration version"
 msgstr "最後にアップグレードした Evolution 設定のバージョン"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "オフライン時にローカル・ディスクと同期するフォルダへのパスのリスト"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid ""
+"The style of the displayed buttons. Can be text, icons, both, toolbar. If "
+"toolbar is set, the style of the toolbar is followed as determined by the "
+"GNOME setting."
+msgstr ""
+"表示するボタンのスタイルです。ツールバーがセットされていたら、ツールバーのス"
+"タイルは GNOME デスクトップの設定に従います。利用可能な値: text、icons、"
+"both、toolbar"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "Toolbar is visible"
 msgstr "ツールバーを表示する"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "Whether Evolution should start up in offline mode"
 msgstr "Evolution をオフライン・モードで起動するかどうか"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:13
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+msgid "Whether the buttons should be visible."
+msgstr "ボタンを表示するかどうかです。"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "Whether the toolbar should be visible."
 msgstr "ツールバーを表示するかどうかです。"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:14
+#: shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "Whether to skip the development warning dialog"
 msgstr "開発版を警告するダイアログをスキップするかどうか"
 
@@ -16610,7 +17778,36 @@ msgstr "対象となる接続"
 msgid "Click OK to close these connections and go offline"
 msgstr "[OK] をクリックすると、上記の接続を閉じてオフラインになります"
 
-#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
+#: shell/e-shell.c:597
+msgid "Uknown system error."
+msgstr "特定できないシステム・エラーです。"
+
+#: shell/e-shell.c:805 shell/e-shell.c:806
+#, c-format
+msgid "%ld KB"
+msgstr "%ld Kバイト"
+
+#: shell/e-shell.c:1249 widgets/misc/e-cell-date-edit.c:256
+msgid "OK"
+msgstr "OK"
+
+#: shell/e-shell.c:1251
+msgid "Invalid arguments"
+msgstr "不正な引数"
+
+#: shell/e-shell.c:1253
+msgid "Cannot register on OAF"
+msgstr "OAF に登録できません"
+
+#: shell/e-shell.c:1255
+msgid "Configuration Database not found"
+msgstr "データベースの設定がありません"
+
+#: shell/e-shell.c:1257
+msgid "Generic error"
+msgstr "一般的なエラー"
+
+#: shell/e-shell-folder-title-bar.c:586 shell/e-shell-folder-title-bar.c:587
 msgid "(Untitled)"
 msgstr "(タイトルなし)"
 
@@ -16635,7 +17832,7 @@ msgstr ""
 msgid "Choose the destination for this import"
 msgstr "インポート先の選択"
 
-#: shell/e-shell-importer.c:158 shell/e-shell-startup-wizard.c:748
+#: shell/e-shell-importer.c:158 shell/e-shell-startup-wizard.c:750
 msgid "Please select the information that you would like to import:"
 msgstr "インポートしたい情報を選択して下さい:"
 
@@ -16652,7 +17849,7 @@ msgstr ""
 "再度チェックを実行する場合は、\n"
 "[戻る] ボタンをクリックして下さい。\n"
 
-#: shell/e-shell-importer.c:229 shell/e-shell-importer.c:260
+#: shell/e-shell-importer.c:232 shell/e-shell-importer.c:266
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -16661,30 +17858,30 @@ msgstr ""
 "%s をインポート中\n"
 "アイテム %d をインポート中"
 
-#: shell/e-shell-importer.c:333
+#: shell/e-shell-importer.c:340
 msgid "Select importer"
 msgstr "インポーターの選択"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:461 shell/e-shell-importer.c:1073
 #, c-format
 msgid "File %s does not exist"
 msgstr "ファイル %s がありません"
 
-#: shell/e-shell-importer.c:459
+#: shell/e-shell-importer.c:469
 msgid "Importing"
 msgstr "インポート中"
 
-#: shell/e-shell-importer.c:467
+#: shell/e-shell-importer.c:477
 #, c-format
 msgid "Importing %s.\n"
 msgstr "%s をインポートしています。\n"
 
-#: shell/e-shell-importer.c:477 shell/e-shell-importer.c:478
+#: shell/e-shell-importer.c:487 shell/e-shell-importer.c:488
 #, c-format
 msgid "Error loading %s"
 msgstr "%s のロード中にエラーが発生しました"
 
-#: shell/e-shell-importer.c:495
+#: shell/e-shell-importer.c:506
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -16693,31 +17890,31 @@ msgstr ""
 "%s をインポート中\n"
 "アイテム 1 をインポート中"
 
-#: shell/e-shell-importer.c:570
+#: shell/e-shell-importer.c:582
 msgid "Automatic"
 msgstr "自動"
 
-#: shell/e-shell-importer.c:626
+#: shell/e-shell-importer.c:638
 msgid "F_ilename:"
 msgstr "ファイル名(_I):"
 
-#: shell/e-shell-importer.c:631
+#: shell/e-shell-importer.c:643
 msgid "Select a file"
 msgstr "ファイルの選択"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:655
 msgid "File _type:"
 msgstr "ファイルの種類(_T):"
 
-#: shell/e-shell-importer.c:682
+#: shell/e-shell-importer.c:694
 msgid "Import data and settings from _older programs"
 msgstr "以前のバージョンからデータとその設定をインポートする(_O)"
 
-#: shell/e-shell-importer.c:685
+#: shell/e-shell-importer.c:697
 msgid "Import a _single file"
 msgstr "ファイル単体をインポートする(_S)"
 
-#: shell/e-shell-importer.c:753 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:765 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16725,41 +17922,41 @@ msgstr ""
 "少々お待ち下さい...\n"
 "既存の設定を読み込んでいます。"
 
-#: shell/e-shell-importer.c:757
+#: shell/e-shell-importer.c:772
 msgid "Starting Intelligent Importers"
 msgstr "インテリジェント・インポーターの起動"
 
-#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:898 shell/e-shell-startup-wizard.c:700
 #, c-format
 msgid "From %s:"
 msgstr "差出人 %s:"
 
-#: shell/e-shell-importer.c:1074
+#: shell/e-shell-importer.c:1092
 #, c-format
 msgid "No importer available for file %s"
 msgstr "ファイル %s で利用できるインポータがありません"
 
-#: shell/e-shell-importer.c:1086
+#: shell/e-shell-importer.c:1106
 msgid "Unable to execute importer"
 msgstr "インポータを実行できません"
 
-#: shell/e-shell-importer.c:1200
+#: shell/e-shell-importer.c:1220
 msgid "_Import"
 msgstr "インポート(_I)"
 
-#: shell/e-shell-offline-handler.c:594
+#: shell/e-shell-offline-handler.c:589
 msgid "Closing connections..."
 msgstr "接続を閉じています..."
 
-#: shell/e-shell-settings-dialog.c:326
+#: shell/e-shell-settings-dialog.c:318
 msgid "Evolution Settings"
 msgstr "Evolution の設定"
 
-#: shell/e-shell-startup-wizard.c:575
+#: shell/e-shell-startup-wizard.c:577
 msgid "Starting import"
 msgstr "インポートの開始"
 
-#: shell/e-shell-startup-wizard.c:795
+#: shell/e-shell-startup-wizard.c:797
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -16793,6 +17990,27 @@ msgstr "フォルダ名には文字 \"#\" を含めることはできません
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' と '..' はフォルダ名として予約済みです。"
 
+#: shell/e-shell-window.c:341
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"現在 Evolution はオンラインです (オフラインにする場合はこのボタンをクリックし"
+"て下さい)"
+
+#: shell/e-shell-window.c:349
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution はオフラインのままで処理します"
+
+#: shell/e-shell-window.c:356
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"現在 Evolution はオフラインです (オンラインにする場合はこのボタンをクリックし"
+"て下さい)"
+
+#: shell/e-shell-window.c:708
+#, c-format
+msgid "Switch to %s"
+msgstr "\"%s\" へ切り替えます"
+
 #: shell/e-shell-window-commands.c:67
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
@@ -16811,69 +18029,35 @@ msgstr "Bug buddy がインストールされていません。"
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy を実行できませんでした"
 
-#: shell/e-shell-window-commands.c:323
+#. The translator-credits string is for translators to list
+#. * per language credits for translation, displayed in the
+#. * about box
+#: shell/e-shell-window-commands.c:425
+msgid "translator-credits"
+msgstr ""
+"相花 毅 <aihana@gnome.gr.jp>\n"
+"Akira TAGOH <tagoh@gnome.gr.jp>\n"
+"Yukihiro Nakai <nakai@gnome.gr.jp>\n"
+"Takuo KITAME <kitame@debian.org>\n"
+"日本GNOMEユーザー会 <http://www.gnome.gr.jp>"
+
+#: shell/e-shell-window-commands.c:439
 msgid "Groupware Suite"
-msgstr "Groupwise スイートです。"
+msgstr "グループウェア・スイートです。"
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:680
 msgid "_Work Online"
 msgstr "オンラインで動作(_W)"
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:693 ui/evolution.xml.h:51
 msgid "_Work Offline"
 msgstr "オフラインで動作(_W)"
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:706 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "オフラインで動作"
 
-#: shell/e-shell-window.c:337
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"現在 Evolution はオンラインです (オフラインにする場合はこのボタンをクリックし"
-"て下さい)"
-
-#: shell/e-shell-window.c:344
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution はオフラインのままで処理します"
-
-#: shell/e-shell-window.c:350
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"現在 Evolution はオフラインです (オンラインにする場合はこのボタンをクリックし"
-"て下さい)"
-
-#: shell/e-shell-window.c:637
-#, c-format
-msgid "Switch to %s"
-msgstr "\"%s\" へ切り替えます"
-
-#: shell/e-shell.c:585
-msgid "Uknown system error."
-msgstr "特定できないシステム・エラーです。"
-
-#: shell/e-shell.c:789 shell/e-shell.c:790
-#, c-format
-msgid "%ld KB"
-msgstr "%ld Kバイト"
-
-#: shell/e-shell.c:1212
-msgid "Invalid arguments"
-msgstr "不正な引数"
-
-#: shell/e-shell.c:1214
-msgid "Cannot register on OAF"
-msgstr "OAF に登録できません"
-
-#: shell/e-shell.c:1216
-msgid "Configuration Database not found"
-msgstr "データベースの設定がありません"
-
-#: shell/e-shell.c:1218
-msgid "Generic error"
-msgstr "一般的なエラー"
-
-#: shell/e-user-creatable-items-handler.c:691
+#: shell/e-user-creatable-items-handler.c:685
 msgid "New"
 msgstr "新規"
 
@@ -16895,28 +18079,25 @@ msgstr "ようこそ"
 
 #: shell/evolution-startup-wizard.glade.h:6
 msgid ""
-"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"
+"Welcome to Evolution. The next few screens will allow Evolution to connect "
+"to your email accounts, and to import files from other applications. \n"
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
-"Evolution へようこそ。\n"
-"次のいくつかのステップでは、Evolution を\n"
-"お使いの E-メール・アカウントへ接続させて\n"
-"ファイルを他のアプリケーションからインポートできるようにします。\n"
+"Evolution へようこそ。次のいくつかのステップでは、Evolution をお使いの E-メー"
+"ル・アカウントへ接続させて、他のアプリケーションからファイルをインポートでき"
+"るようにします。\n"
 "\n"
 "[進む] ボタンをクリックすると続行します。"
 
-#: shell/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:9
 msgid ""
-"You have successfully entered all of the information\n"
-"needed to set up Evolution. \n"
+"You have successfully entered all of the information needed to set up "
+"Evolution. \n"
 "\n"
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
-"Evolution の設定に必要な全ての情報の\n"
-"入力が完了しました。\n"
+"Evolution の設定に必要な全ての情報の入力が完了しました。\n"
 "\n"
 "[適用] ボタンをクリックすると設定を保存します。"
 
@@ -16932,6 +18113,18 @@ msgstr "テスト(_T)"
 msgid "Create a new test item"
 msgstr "新しいタスク・アイテムを作成します"
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution シェル"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Evolution のテスト"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Evolution のテスト・コンポーネント"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "\"インポート\" をクリックしてファイルの収集を開始して下さい。"
@@ -16991,7 +18184,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution は以下のファイルからデータ取込みが可能です:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:226
+#: shell/main.c:237
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17026,7 +18219,7 @@ msgstr ""
 "私たちの激務の結果に満足してくれることを願い、\n"
 "そしてあなたの貢献を熱心に待っています！\n"
 
-#: shell/main.c:250
+#: shell/main.c:261
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17034,35 +18227,43 @@ msgstr ""
 "感謝します。\n"
 "Evolution 開発チーム\n"
 
-#: shell/main.c:257
+#: shell/main.c:268
 msgid "Don't tell me again"
 msgstr "このメッセージを二度と表示しない"
 
-#: shell/main.c:462
+#: shell/main.c:473
 msgid "Start Evolution activating the specified component"
 msgstr "指定したコンポーネントを有効にして Evolution を起動する"
 
-#: shell/main.c:464
+#: shell/main.c:475
 msgid "Start in offline mode"
 msgstr "オフライン・モードで起動する"
 
-#: shell/main.c:466
+#: shell/main.c:477
 msgid "Start in online mode"
 msgstr "オンライン・モードで起動する"
 
-#: shell/main.c:469
-msgid "Forcibly shut down all evolution components"
+#: shell/main.c:480
+msgid "Forcibly shut down all Evolution components"
 msgstr "全ての Evolution コンポーネントを強制終了する"
 
-#: shell/main.c:473
+#: shell/main.c:484
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Evolution 1.4系から関連ファイルを強制的に移行する"
 
-#: shell/main.c:476
+#: shell/main.c:487
 msgid "Send the debugging output of all components to a file."
 msgstr "全てのコンポーネントのデバッグ出力をファイルへ送る"
 
-#: shell/main.c:507
+#: shell/main.c:490
+msgid "Disable the mono plugin environment."
+msgstr "Mono プラグイン環境を無効にする"
+
+#: shell/main.c:493
+msgid "Disable loading of any plugins."
+msgstr "プラグインを読み込まない"
+
+#: shell/main.c:524
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -17213,33 +18414,15 @@ msgstr ""
 "詳細はヘルプをご覧下さい。"
 
 #: smime/gui/ca-trust-dialog.c:91
-#, c-format
-msgid ""
-"Certificate '%s' is a CA certificate.\n"
-"\n"
-"Edit trust settings:"
-msgstr ""
-"証明書 '%s' は CA 証明書です。\n"
-"\n"
-"信用度を設定して下さい:"
-
-#: smime/gui/cert-trust-dialog.c:145
-msgid ""
-"Because you trust the certificate authority that issued this certificate, "
-"then you trust the authenticity of this certificate unless otherwise "
-"indicated here"
-msgstr ""
-"この証明書を発行した認証局を信用したので、ここで表示された他のものを除いて、"
-"この証明書の信憑性を信用することになります。"
-
-#: smime/gui/cert-trust-dialog.c:149
+#, c-format
 msgid ""
-"Because you do not trust the certificate authority that issued this "
-"certificate, then you do not trust the authenticity of this certificate "
-"unless otherwise indicated here"
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
 msgstr ""
-"この証明書を発行した認証局を信用しなかったので、ここで表示された他のものを除"
-"いて、この証明書の信憑性を信用しないことになります。"
+"証明書 '%s' は CA 証明書です。\n"
+"\n"
+"信用度を設定して下さい:"
 
 #: smime/gui/certificate-manager.c:134 smime/gui/certificate-manager.c:142
 #: smime/gui/certificate-manager.c:375 smime/gui/certificate-manager.c:383
@@ -17274,6 +18457,24 @@ msgstr "E-メール・アドレス"
 msgid "Certificate Viewer: %s"
 msgstr "証明書ビューア: %s"
 
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+"この証明書を発行した認証局を信用したので、ここで表示された他のものを除いて、"
+"この証明書の信憑性を信用することになります。"
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+"この証明書を発行した認証局を信用しなかったので、ここで表示された他のものを除"
+"いて、この証明書の信憑性を信用しないことになります。"
+
 #: smime/gui/component.c:45
 #, c-format
 msgid "Enter the password for `%s'"
@@ -17289,7 +18490,7 @@ msgid "Enter new password"
 msgstr "新しいパスワードの入力"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:121
+#: smime/gui/e-cert-selector.c:119
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -17298,7 +18499,7 @@ msgstr ""
 "発行先:\n"
 "  件名: %s\n"
 
-#: smime/gui/e-cert-selector.c:122
+#: smime/gui/e-cert-selector.c:120
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -17307,7 +18508,7 @@ msgstr ""
 "発行元:\n"
 "  件名: %s\n"
 
-#: smime/gui/e-cert-selector.c:169
+#: smime/gui/e-cert-selector.c:167
 msgid "Select certificate"
 msgstr "証明書の選択"
 
@@ -17484,10 +18685,9 @@ msgstr "ユーザの証明書"
 msgid "_Edit CA Trust"
 msgstr "CA トラストの編集(_E)"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:612
-msgid "Certificate already exists"
-msgstr "既に証明書があります"
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr "dialog1"
 
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
@@ -17688,15 +18888,20 @@ msgstr "件名の重複しない ID"
 msgid "Certificate Signature Value"
 msgstr "証明書の署名の値"
 
-#: smime/lib/e-pkcs12.c:263
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr "既に証明書があります"
+
+#: smime/lib/e-pkcs12.c:264
 msgid "PKCS12 File Password"
 msgstr "PKCS12 ファイルのパスワード"
 
-#: smime/lib/e-pkcs12.c:263
+#: smime/lib/e-pkcs12.c:264
 msgid "Enter password for PKCS12 file:"
 msgstr "PKCS12 ファイルのパスワードを入力して下さい:"
 
-#: smime/lib/e-pkcs12.c:362
+#: smime/lib/e-pkcs12.c:363
 msgid "Imported Certificate"
 msgstr "インポートした証明書"
 
@@ -17774,8 +18979,7 @@ msgid "Previews the contacts to be printed"
 msgstr "連絡先の印刷プレビューを表示します"
 
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:81
-#: ui/evolution-tasks.xml.h:15
+#: ui/evolution-mail-message.xml.h:81 ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "印刷プレビュー(_V)"
 
@@ -17824,16 +19028,14 @@ msgid "View the current contact"
 msgstr "現在の連絡先の表示"
 
 #: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
-#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
-#: ui/evolution-contact-list-editor.xml.h:11
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
+#: ui/evolution-mail-global.xml.h:15 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:19
+#: ui/evolution.xml.h:36
 msgid "_Actions"
 msgstr "アクション(_A)"
 
-#: ui/evolution-addressbook.xml.h:35 ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Forward Contact..."
 msgstr "連絡先の転送(_F)..."
 
@@ -17957,11 +19159,6 @@ msgstr "1 週間を表示します"
 msgid "Show the working week"
 msgstr "平日を表示します"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:249
-#: widgets/misc/e-dateedit.c:435
-msgid "Today"
-msgstr "今日"
-
 #: ui/evolution-calendar.xml.h:35
 msgid "View the current appointment"
 msgstr "現在の予定の表示"
@@ -17978,76 +19175,6 @@ msgstr "平日"
 msgid "_Open Appointment"
 msgstr "予定を開く(_O)"
 
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "閉じる(_L)"
-
-#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2
-#: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:4
-msgid "Close"
-msgstr "閉じる"
-
-#: ui/evolution-comp-editor.xml.h:3
-msgid "Close this item"
-msgstr "このアイテムを閉じます"
-
-#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
-msgid "Delete this item"
-msgstr "このアイテムを削除します"
-
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
-msgid "Main toolbar"
-msgstr "メイン・ツールバー"
-
-#: ui/evolution-comp-editor.xml.h:7
-msgid "Preview the printed item"
-msgstr "印刷されるアイテムのプレビューを表示します"
-
-#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
-msgid "Print this item"
-msgstr "このアイテムを印刷します"
-
-#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save _As..."
-msgstr "別名で保存(_A)..."
-
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:9
-#: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:7
-msgid "Save and Close"
-msgstr "保存して閉じる"
-
-#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:10
-#: ui/evolution-contact-list-editor.xml.h:7
-#: ui/evolution-signature-editor.xml.h:8
-msgid "Save and _Close"
-msgstr "保存して閉じる(_C)"
-
-#: ui/evolution-comp-editor.xml.h:14
-msgid "Save the item and close the dialog box"
-msgstr "アイテムを保存してダイアログを閉じます"
-
-#: ui/evolution-comp-editor.xml.h:15
-msgid "Save this item to disk"
-msgstr "このアイテムをディスクに保存します"
-
-#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:13
-#: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:29
-msgid "_File"
-msgstr "ファイル(_F)"
-
 #: ui/evolution-composer-entries.xml.h:1
 msgid "Copy selected text to the clipboard"
 msgstr "選択したテキストをクリップボードにコピーします"
@@ -18073,81 +19200,6 @@ msgstr "全て選択(_A)"
 msgid "Select all text"
 msgstr "全てのテキストを選択します"
 
-#: ui/evolution-contact-editor.xml.h:6
-msgid "Print En_velope..."
-msgstr "宛名の印刷(_V)..."
-
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Save the contact and close the dialog box"
-msgstr "連絡先を保存してこのダイアログボックスを閉じます"
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "Send _Message to Contact..."
-msgstr "連絡先へメールの送信(_M)..."
-
-#: ui/evolution-contact-editor.xml.h:18
-#: ui/evolution-contact-list-editor.xml.h:14
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:15
-msgid "_Save"
-msgstr "保存(_S)"
-
-#: ui/evolution-contact-list-editor.xml.h:4
-msgid "Delete this list"
-msgstr "この一覧を削除します"
-
-#: ui/evolution-contact-list-editor.xml.h:8
-msgid "Save the list and close the dialog box"
-msgstr "一覧を保存してダイアログボックスを閉じます"
-
-#: ui/evolution-contact-list-editor.xml.h:9
-msgid "Se_nd list to other..."
-msgstr "一覧を他へ送信(_N)..."
-
-#: ui/evolution-contact-list-editor.xml.h:10
-msgid "Send _message to list..."
-msgstr "メッセージを一覧に送信(_M)..."
-
-#: ui/evolution-contact-list-editor.xml.h:12
-msgid "_Delete..."
-msgstr "削除(_D)..."
-
-#: ui/evolution-event-editor.xml.h:1
-msgid "Cancel Mee_ting"
-msgstr "会議のキャンセル(_T)"
-
-#: ui/evolution-event-editor.xml.h:2
-msgid "Cancel the meeting for this item"
-msgstr "このアイテムに対する会議をキャンセルします"
-
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
-msgid "Forward as i_Calendar"
-msgstr "iCalender 形式で転送(_C)"
-
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
-msgid "Forward this item via email"
-msgstr "このアイテムをメールを使って転送します"
-
-#: ui/evolution-event-editor.xml.h:6
-msgid "Meeting"
-msgstr "会議"
-
-#: ui/evolution-event-editor.xml.h:7
-msgid "Obtain the latest meeting information"
-msgstr "会議の最新情報を取得します"
-
-#: ui/evolution-event-editor.xml.h:8
-msgid "Re_fresh Meeting"
-msgstr "会議のリフレッシュ(_F)"
-
-#: ui/evolution-event-editor.xml.h:9
-msgid "Schedule _Meeting"
-msgstr "会議のスケジュール(_M)"
-
-#: ui/evolution-event-editor.xml.h:10
-msgid "Schedule a meeting for this item"
-msgstr "このアイテムに対する会議のスケジュールを編集します"
-
 #: ui/evolution-executive-summary.xml.h:1
 msgid "Customize My Evolution"
 msgstr "My Evolution のカスタマイズ"
@@ -18178,7 +19230,7 @@ msgstr "メール・メッセージを作成するためのウィンドウを開
 
 #: ui/evolution-mail-global.xml.h:8
 msgid "Permanently remove all deleted messages from all folders"
-msgstr "全てのフォルダで削除マークが付いたメッセージを永久に削除します"
+msgstr "全てのフォルダで削除マークが付いたメッセージを完全に削除します"
 
 #: ui/evolution-mail-global.xml.h:9
 msgid "Post Ne_w Message"
@@ -18255,7 +19307,7 @@ msgstr "クリップボードからメッセージを貼り付けます"
 
 #: ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
-msgstr "このフォルダで削除マークが付いたメッセージを永久に削除します"
+msgstr "このフォルダで削除マークが付いたメッセージを完全に削除します"
 
 #: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
@@ -18305,6 +19357,33 @@ msgstr "選択の反転(_I)"
 msgid "_Threaded Message List"
 msgstr "メッセージ一覧のスレッド化(_T)"
 
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "閉じる"
+
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "このウィンドウを閉じます"
+
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
+msgid "Main toolbar"
+msgstr "メイン・ツールバー"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:37
+msgid "_Close"
+msgstr "閉じる(_C)"
+
+#: ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:39
+msgid "_File"
+msgstr "ファイル(_F)"
+
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "差出人をアドレス帳へ追加(_D)"
@@ -18697,7 +19776,7 @@ msgstr "前のメッセージへ(_P)"
 msgid "_Quoted"
 msgstr "引用する(_Q)"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:48
 msgid "_Tools"
 msgstr "ツール(_T)"
 
@@ -18705,16 +19784,6 @@ msgstr "ツール(_T)"
 msgid "_Undelete"
 msgstr "削除の取り消し(_U)"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "このウィンドウを閉じます"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "閉じる(_C)"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "添付"
@@ -18767,15 +19836,14 @@ msgstr "S/MIME による暗号化"
 msgid "S/MIME Sign"
 msgstr "S/MIME 署名"
 
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:6
-msgid "Save"
-msgstr "保存"
-
 #: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "別名で保存"
 
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save _As..."
+msgstr "別名で保存(_A)..."
+
 #: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "草案の保存(_D)"
@@ -18887,6 +19955,11 @@ msgstr "送信先フィールド(_P)"
 msgid "_Reply-To Field"
 msgstr "返信先フィールド(_R)"
 
+#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-signature-editor.xml.h:15
+msgid "_Save"
+msgstr "保存(_S)"
+
 #: ui/evolution-message-composer.xml.h:51
 msgid "_Security"
 msgstr "セキュリティ(_S)"
@@ -18895,10 +19968,22 @@ msgstr "セキュリティ(_S)"
 msgid "_To Field"
 msgstr "宛先フィールド(_T)"
 
+#: ui/evolution-signature-editor.xml.h:1
+msgid "C_lose"
+msgstr "閉じる(_L)"
+
 #: ui/evolution-signature-editor.xml.h:5
 msgid "H_TML"
 msgstr "HTML(_T)"
 
+#: ui/evolution-signature-editor.xml.h:7
+msgid "Save and Close"
+msgstr "保存して閉じる"
+
+#: ui/evolution-signature-editor.xml.h:8
+msgid "Save and _Close"
+msgstr "保存して閉じる(_C)"
+
 #: ui/evolution-signature-editor.xml.h:10
 msgid "Save the current file and close the window"
 msgstr "ファイルを保存してダイアログを閉じます"
@@ -18931,30 +20016,6 @@ msgstr "購読"
 msgid "Unsubscribe"
 msgstr "購読停止"
 
-#: ui/evolution-task-editor.xml.h:1
-msgid "Assign Task"
-msgstr "タスクの割当て"
-
-#: ui/evolution-task-editor.xml.h:2
-msgid "Assign this task to others"
-msgstr "このタスクを他の人に割り当てる"
-
-#: ui/evolution-task-editor.xml.h:3
-msgid "Cancel Task"
-msgstr "タスクの取り消し"
-
-#: ui/evolution-task-editor.xml.h:4
-msgid "Cancel this task"
-msgstr "このタスクを取り消します"
-
-#: ui/evolution-task-editor.xml.h:7
-msgid "Obtain the latest task information"
-msgstr "最新のタスク情報を取得します"
-
-#: ui/evolution-task-editor.xml.h:8
-msgid "Re_fresh Task"
-msgstr "タスクの更新"
-
 #: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "選択したタスクをクリップボードにコピーします"
@@ -19016,98 +20077,146 @@ msgid "Create a new window displaying this folder"
 msgstr "このフォルダを表示する新しいウィンドウを作成します"
 
 #: ui/evolution.xml.h:7
+msgid "Display window buttons using the desktop toolbar setting"
+msgstr "デスクトップの設定に従ってウィンドウ・ボタンを表示します"
+
+#: ui/evolution.xml.h:8
+msgid "Display window buttons with icons and text"
+msgstr "アイコンとラベルを付けてウィンドウ・ボタンを表示します"
+
+#: ui/evolution.xml.h:9
+msgid "Display window buttons with icons only"
+msgstr "アイコンのみ付けてウィンドウ・ボタンを表示します"
+
+#: ui/evolution.xml.h:10
+msgid "Display window buttons with text only"
+msgstr "ラベルのみ付けてウィンドウ・ボタンを表示します"
+
+#: ui/evolution.xml.h:11
 msgid "E_xit"
 msgstr "終了(_X)"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:12
 msgid "Evolution _FAQ"
 msgstr "Evolution FAQ(_F)"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:13
 msgid "Exit the program"
 msgstr "プログラムを終了します"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:14
 msgid "Forget _Passwords"
 msgstr "パスワードの紛失(_P)"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:15
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "記憶したパスワードを忘れた場合に再び表示します"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:16
+msgid "Hide window buttons"
+msgstr "ウィンドウ・ボタンを隠します"
+
+#: ui/evolution.xml.h:17
+msgid "Icons _and text"
+msgstr "アイコンとラベル(_A)"
+
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr "他のプログラムからデータを取り込みます"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:20
 msgid "New _Window"
 msgstr "新しいウィンドウ(_W)"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:21
 msgid "Pi_lot Settings..."
 msgstr "パイロットの設定(_L)..."
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:22
+msgid "Prefere_nces"
+msgstr "設定(_N)"
+
+#: ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "送受信"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:24
 msgid "Send queued items and retrieve new items"
 msgstr "キューにあるメールを送信して新着メールを受信します"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:25
 msgid "Set up Pilot configuration"
 msgstr "GNOME パイロットを設定します"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Evolution についての情報を表示します"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "バグ報告の提出"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "バグ報告の提出(_B)"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:29
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug Buddy を使ってバグを報告します"
 
-#: ui/evolution.xml.h:23
-msgid "T_oolbar"
-msgstr "ツールバー(_O)"
-
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "オフライン作業かどうかを切替えます"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
+msgid "Tool_bar"
+msgstr "ツールバー(_B)"
+
+#: ui/evolution.xml.h:32
+msgid "Tool_bar style"
+msgstr "ツールバーのスタイル(_B)"
+
+#: ui/evolution.xml.h:33
+msgid "Window B_uttons"
+msgstr "ウィンドウ・ボタン(_U)"
+
+#: ui/evolution.xml.h:35
 msgid "_About Evolution..."
 msgstr "Evolution について(_A)..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:41
+msgid "_Hide buttons"
+msgstr "ボタンを隠す(_H)"
+
+#: ui/evolution.xml.h:42
+msgid "_Icons only"
+msgstr "アイコンのみ(_I)"
+
+#: ui/evolution.xml.h:43
 msgid "_Import..."
 msgstr "インポート(_I)..."
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:44
 msgid "_New"
 msgstr "新規(_N)"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:45
 msgid "_Quick Reference"
 msgstr "クィック・リファレンス(_Q)"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:46
 msgid "_Send / Receive"
 msgstr "送受信(_S)"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:47
+msgid "_Text only"
+msgstr "ラベルのみ(_T)"
+
+#: ui/evolution.xml.h:50
 msgid "_Window"
 msgstr "ウィンドウ(_W)"
 
@@ -19175,8 +20284,8 @@ msgstr "期日(_D)"
 msgid "With _Status"
 msgstr "ステータス(_S)"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:195
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:637
 msgid "UTC"
 msgstr "UTC"
 
@@ -19188,11 +20297,15 @@ msgstr "<b>タイム・ゾーン</b>"
 msgid "<b>_Selection</b>"
 msgstr "<b>選択した項目(_S)</b>"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "Select a Time Zone"
 msgstr "タイムゾーンの選択"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+msgid "TimeZone Combobox"
+msgstr "タイムゾーンのコンボ・ボックスです"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -19206,40 +20319,39 @@ msgstr ""
 msgid "_Current View"
 msgstr "現在の表示(_C)"
 
-#. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:351
-msgid "Custom View"
-msgstr "カスタム表示"
-
 #: widgets/menus/gal-view-menus.c:360
 msgid "Save Custom View..."
 msgstr "カスタム表示の保存..."
 
-#: widgets/menus/gal-view-menus.c:373
-msgid "Define Views..."
-msgstr "ビューの定義..."
+#: widgets/misc/e-calendar.c:177 widgets/misc/e-calendar.c:201
+msgid "Previous Button"
+msgstr "前へのボタン"
+
+#: widgets/misc/e-calendar.c:226
+msgid "Month Calendar"
+msgstr "月別カレンダ"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:423
+#: widgets/misc/e-calendar-item.c:415
 msgid "MTWTFSS"
 msgstr "月火水木金土日"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1128
+#: widgets/misc/e-calendar-item.c:1123
 msgid "%B %Y"
 msgstr "%Y年 %B"
 
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:444
 msgid "Now"
 msgstr "今"
 
-#: widgets/misc/e-cell-date-edit.c:805
+#: widgets/misc/e-cell-date-edit.c:801
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "時間はフォーマットに入れなければなりません: %s"
 
-#: widgets/misc/e-cell-percent.c:77
+#: widgets/misc/e-cell-percent.c:76
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "パーセント値は 0 と 100 の間で含んでいなければなりません"
 
@@ -19330,26 +20442,54 @@ msgstr "その他..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:83 widgets/misc/e-error.c:84
-#: widgets/misc/e-error.c:126
+#: widgets/misc/e-dateedit.c:313
+msgid "Date and Time Entry"
+msgstr "日付と時刻のエントリです"
+
+#: widgets/misc/e-dateedit.c:332
+msgid "Text entry to input date"
+msgstr "日付を入力するためのテキスト・エントリです"
+
+#: widgets/misc/e-dateedit.c:333
+msgid "Text Date Entry"
+msgstr "テキスト・エントリです"
+
+#: widgets/misc/e-dateedit.c:350
+msgid "Click this button to show a calendar"
+msgstr "このボタンをクリックするとカレンダを表示します"
+
+#: widgets/misc/e-dateedit.c:351
+msgid "Date Button"
+msgstr "日付のボタンです"
+
+#: widgets/misc/e-dateedit.c:371
+msgid "Combo box to select time"
+msgstr "時刻を選択するためのコンボ・ボックスです"
+
+#: widgets/misc/e-dateedit.c:372
+msgid "Time Combo Box"
+msgstr "時刻のコンボ・ボックスです"
+
+#: widgets/misc/e-error.c:84 widgets/misc/e-error.c:85
+#: widgets/misc/e-error.c:127
 msgid "Evolution Error"
 msgstr "Evolution のエラー"
 
-#: widgets/misc/e-error.c:85 widgets/misc/e-error.c:86
-#: widgets/misc/e-error.c:124
+#: widgets/misc/e-error.c:86 widgets/misc/e-error.c:87
+#: widgets/misc/e-error.c:125
 msgid "Evolution Warning"
 msgstr "Evolution の警告"
 
-#: widgets/misc/e-error.c:123
+#: widgets/misc/e-error.c:124
 msgid "Evolution Information"
 msgstr "Evolution の情報"
 
-#: widgets/misc/e-error.c:125
+#: widgets/misc/e-error.c:126
 msgid "Evolution Query"
 msgstr "Evolution の問い合わせ"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:421
+#: widgets/misc/e-error.c:436
 #, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19442,6 +20582,18 @@ msgstr "拡張(_A)..."
 msgid "Choose Image"
 msgstr "画像の選択"
 
+#: widgets/misc/e-map.c:647
+msgid "World Map"
+msgstr "世界地図"
+
+#: widgets/misc/e-map.c:649
+msgid ""
+"Mouse-based interactive map widget for selecting timezone. Keyboard users "
+"should select the timezone from the below combo box instead."
+msgstr ""
+"タイムゾーンを選択するためのマウス感応型の地図です。キーボードをご利用の際"
+"は、この下にあるタイムゾーン選択用のコンボ・ボックスを利用して下さい。"
+
 #: widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
 msgstr "次と同期:"
@@ -19502,12 +20654,12 @@ msgstr "ファイル \"{0}\" を保存せきません。"
 msgid "Cannot open file \"{0}\"."
 msgstr "ファイル \"{0}\" を開けません。"
 
-#: widgets/misc/e-task-widget.c:212
+#: widgets/misc/e-task-widget.c:208
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:217
+#: widgets/misc/e-task-widget.c:213
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完了)"
-- 
cgit