Updated Japanese translation for v1.5.4.

2006-01-03 Takeshi AIHANA <aihana@gnome.gr.jp> * ja.po: Updated Japanese translation for v1.5.4. svn path=/trunk/; revision=31040
author: Takeshi AIHANA <aihana@gnome.gr.jp> 2006-01-04 00:40:40 +0800
committer: Takeshi Aihana <aihana@src.gnome.org> 2006-01-04 00:40:40 +0800
commit: 31611aad52d469804801a624e79e52721b77360f (patch)
tree: d3d607be957e2c16cae0f76ee293f69b0459ac9d /po/ja.po
parent: 6e64033d4c4c4728e21a686a251aafed65440b69 (diff)
download: gsoc2013-evolution-31611aad52d469804801a624e79e52721b77360f.tar.gz
gsoc2013-evolution-31611aad52d469804801a624e79e52721b77360f.tar.zst
gsoc2013-evolution-31611aad52d469804801a624e79e52721b77360f.zip
1 files changed, 1512 insertions, 1303 deletions
diff --git a/po/ja.po b/po/ja.po
index 66cb848d96..1f6d4096b8 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,16 +1,16 @@
 # evolution ja.po.
-# Copyright (C) 2000-2005 Free Software Foundation, Inc.
+# Copyright (C) 2000-2006 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-2005.
-# 
+# Takeshi AIHANA <aihana@gnome.gr.jp>, 2001-2006.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-18 20:35+0900\n"
-"PO-Revision-Date: 2005-12-18 20:32+0900\n"
+"POT-Creation-Date: 2006-01-04 01:39+0900\n"
+"PO-Revision-Date: 2006-01-04 01:37+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"
@@ -25,12 +25,12 @@ msgid "evolution addressbook"
 msgstr "evolution アドレス帳"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:225
+#: ../addressbook/gui/component/addressbook-component.c:226
 msgid "New Contact"
 msgstr "新しい連絡先"
 
 #: ../a11y/addressbook/ea-minicard-view.c:35
-#: ../addressbook/gui/component/addressbook-component.c:233
+#: ../addressbook/gui/component/addressbook-component.c:234
 msgid "New Contact List"
 msgstr "新しい連絡先の一覧"
 
@@ -395,7 +395,6 @@ msgid "Server Version"
 msgstr "サーバのバージョン"
 
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../calendar/calendar.error.xml.h:44
 msgid "Some features may not work properly with your current server"
 msgstr "お使いのサーバでは、いくつかの機能が正しく動作しないかもしれません"
 
@@ -467,7 +466,6 @@ msgstr ""
 "除できませんでした。連絡先を移動する代わりにコピーでよろしいですか？"
 
 #: ../addressbook/addressbook.error.xml.h:30
-#: ../calendar/calendar.error.xml.h:61
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -488,7 +486,7 @@ msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "Evolution を再起動するまで、{0}の連絡先は利用できません。"
 
-#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:495
+#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:496
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:15
@@ -579,13 +577,13 @@ msgstr "ここでお使いの S/MIME 型の証明書を管理します"
 
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:137
+#: ../addressbook/gui/component/addressbook-component.c:141
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../calendar/gui/calendar-component.c:208
-#: ../calendar/gui/memos-component.c:192 ../calendar/gui/migration.c:467
+#: ../calendar/gui/memos-component.c:193 ../calendar/gui/migration.c:467
 #: ../calendar/gui/migration.c:560 ../calendar/gui/migration.c:1061
-#: ../calendar/gui/tasks-component.c:188 ../mail/em-folder-tree-model.c:197
-#: ../mail/em-folder-tree-model.c:199 ../mail/mail-component.c:292
+#: ../calendar/gui/tasks-component.c:189 ../mail/em-folder-tree-model.c:198
+#: ../mail/em-folder-tree-model.c:200 ../mail/mail-component.c:298
 #: ../mail/mail-vfolder.c:223
 msgid "On This Computer"
 msgstr "このコンピュータ"
@@ -595,54 +593,54 @@ msgstr "このコンピュータ"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:145
+#: ../addressbook/gui/component/addressbook-component.c:149
 #: ../addressbook/gui/component/addressbook-migrate.c:515
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../calendar/gui/calendar-component.c:216
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:475
+#: ../calendar/gui/memos-component.c:201 ../calendar/gui/migration.c:475
 #: ../calendar/gui/migration.c:568 ../calendar/gui/migration.c:1069
-#: ../calendar/gui/tasks-component.c:196 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1043 ../mail/mail-config.c:78
+#: ../calendar/gui/tasks-component.c:197 ../filter/filter-label.c:123
+#: ../mail/em-migrate.c:1053 ../mail/mail-config.c:86
 #: ../mail/mail-config.glade.h:104
 msgid "Personal"
 msgstr "プライベート"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:155
+#: ../addressbook/gui/component/addressbook-component.c:159
 #: ../addressbook/gui/component/addressbook-migrate.c:525
 msgid "On LDAP Servers"
 msgstr "LDAP サーバ"
 
-#: ../addressbook/gui/component/addressbook-component.c:226
+#: ../addressbook/gui/component/addressbook-component.c:227
 msgid "_Contact"
 msgstr "連絡先(_C)"
 
-#: ../addressbook/gui/component/addressbook-component.c:227
+#: ../addressbook/gui/component/addressbook-component.c:228
 msgid "Create a new contact"
 msgstr "新しい連絡先を作成します"
 
-#: ../addressbook/gui/component/addressbook-component.c:234
+#: ../addressbook/gui/component/addressbook-component.c:235
 msgid "Contact _List"
 msgstr "連絡先の一覧(_L)"
 
-#: ../addressbook/gui/component/addressbook-component.c:235
+#: ../addressbook/gui/component/addressbook-component.c:236
 msgid "Create a new contact list"
 msgstr "新しい連絡先一覧を作成します"
 
-#: ../addressbook/gui/component/addressbook-component.c:241
+#: ../addressbook/gui/component/addressbook-component.c:242
 #: ../addressbook/gui/component/addressbook-config.c:1202
 msgid "New Address Book"
 msgstr "新しいアドレス帳"
 
-#: ../addressbook/gui/component/addressbook-component.c:242
+#: ../addressbook/gui/component/addressbook-component.c:243
 msgid "Address _Book"
 msgstr "アドレス帳(_B)"
 
-#: ../addressbook/gui/component/addressbook-component.c:243
+#: ../addressbook/gui/component/addressbook-component.c:244
 msgid "Create a new address book"
 msgstr "新しいアドレス帳を作成します"
 
-#: ../addressbook/gui/component/addressbook-component.c:385
+#: ../addressbook/gui/component/addressbook-component.c:386
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr "アドレス帳の設定または関連フォルダのアップグレードに失敗しました"
 
@@ -662,11 +660,11 @@ msgstr "オフライン操作用にアドレス帳の内容をローカルへコ
 
 #: ../addressbook/gui/component/addressbook-config.c:981
 #: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: ../calendar/gui/dialogs/calendar-setup.c:368
 #: ../calendar/gui/dialogs/calendar-setup.c:379
 #: ../calendar/gui/dialogs/calendar-setup.c:390
-#: ../mail/em-folder-properties.c:215 ../mail/mail-config.glade.h:85
+#: ../mail/em-folder-properties.c:217 ../mail/mail-config.glade.h:85
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "全般"
@@ -704,12 +702,12 @@ msgid "Address Book Properties"
 msgstr "アドレス帳のプロパティ"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:147 ../mail/em-migrate.c:1190
+#: ../calendar/gui/migration.c:147 ../mail/em-migrate.c:1200
 msgid "Migrating..."
 msgstr "移行中..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:194 ../mail/em-migrate.c:1231
+#: ../calendar/gui/migration.c:194 ../mail/em-migrate.c:1241
 #, c-format
 msgid "Migrating `%s':"
 msgstr "'%s' の移行中:"
@@ -773,17 +771,17 @@ msgstr "新しいアドレス帳(_N)"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:966
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/e-calendar-table.c:1196
-#: ../calendar/gui/e-calendar-view.c:1585 ../calendar/gui/e-memo-table.c:871
-#: ../calendar/gui/tasks-component.c:441 ../mail/em-folder-tree.c:2054
-#: ../mail/em-folder-view.c:1050 ../ui/evolution-addressbook.xml.h:34
-#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
+#: ../calendar/gui/e-calendar-view.c:1573 ../calendar/gui/e-memo-table.c:871
+#: ../calendar/gui/tasks-component.c:442 ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-view.c:1091 ../ui/evolution-addressbook.xml.h:34
+#: ../ui/evolution-calendar.xml.h:38 ../ui/evolution-mail-list.xml.h:27
 #: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "削除(_D)"
 
 #: ../addressbook/gui/component/addressbook-view.c:772
 #: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/tasks-component.c:442
+#: ../calendar/gui/tasks-component.c:443
 msgid "_Properties..."
 msgstr "プロパティ(_P)..."
 
@@ -1111,6 +1109,7 @@ msgid "_Name:"
 msgstr "名前(_N):"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_Port:"
 msgstr "ポート番号(_P):"
 
@@ -1120,6 +1119,7 @@ msgstr "検索範囲(_S):"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
 #: ../mail/mail-config.glade.h:171
+#: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "サーバ(_S):"
 
@@ -1155,7 +1155,6 @@ msgstr "分"
 #: ../addressbook/gui/contact-editor/im.glade.h:1
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:1
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:1
 #: ../calendar/gui/dialogs/memo-page.glade.h:1
 #: ../calendar/gui/dialogs/new-calendar.glade.h:1
@@ -1268,8 +1267,8 @@ msgstr "電話"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:202
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1042
-#: ../mail/mail-config.c:77 ../mail/mail-config.glade.h:153
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1052
+#: ../mail/mail-config.c:85 ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "仕事"
 
@@ -1296,7 +1295,7 @@ msgid "_Calendar:"
 msgstr "カレンダ(_C):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: ../ui/evolution-event-editor.xml.h:26 ../ui/evolution-task-editor.xml.h:18
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-task-editor.xml.h:18
 msgid "_Categories"
 msgstr "カテゴリ(_C)"
 
@@ -1322,7 +1321,7 @@ msgstr "ファイルのグループ(_F);"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
-msgstr "予定の有無(_F):"
+msgstr "Free/Busy(_F):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
@@ -1402,7 +1401,7 @@ msgstr "住所"
 #: ../addressbook/gui/widgets/e-minicard-view.c:520
 #: ../addressbook/gui/widgets/e-minicard.c:175
 #: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1768 ../widgets/text/e-entry.c:1312
+#: ../widgets/table/e-cell-text.c:1770 ../widgets/text/e-entry.c:1312
 #: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3584
 #: ../widgets/text/e-text.c:3585
 msgid "Editable"
@@ -2410,8 +2409,8 @@ msgid "Service"
 msgstr "サービス"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:594
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../plugins/publish-calendar/publish-calendar.c:455
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "場所"
@@ -2801,13 +2800,13 @@ msgid "Email begins with"
 msgstr "E-メールが次のもので始まる"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:172
-#: ../calendar/gui/cal-search-bar.c:53
+#: ../calendar/gui/cal-search-bar.c:50
 msgid "Category is"
 msgstr "カテゴリが次のものを含む"
 
 #. We attach subitems below
 #: ../addressbook/gui/widgets/e-addressbook-view.c:173
-#: ../calendar/gui/cal-search-bar.c:48
+#: ../calendar/gui/cal-search-bar.c:53
 msgid "Any field contains"
 msgstr "項目が次のものを含む"
 
@@ -2840,9 +2839,9 @@ msgid "Save as VCard..."
 msgstr "vCard 形式で保存..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:944
-#: ../calendar/gui/dialogs/comp-editor.c:1059
+#: ../calendar/gui/dialogs/comp-editor.c:1069
 #: ../calendar/gui/e-calendar-table.c:1176
-#: ../calendar/gui/e-calendar-view.c:1565 ../calendar/gui/e-memo-table.c:854
+#: ../calendar/gui/e-calendar-view.c:1553 ../calendar/gui/e-memo-table.c:854
 #: ../ui/evolution-addressbook.xml.h:38
 msgid "_Open"
 msgstr "開く(_O)"
@@ -2901,12 +2900,12 @@ msgstr "切り取り(_T)"
 #: ../calendar/gui/calendar-component.c:536
 #: ../calendar/gui/dialogs/comp-editor.c:433
 #: ../calendar/gui/e-calendar-table.c:1184
-#: ../calendar/gui/e-calendar-view.c:1572 ../calendar/gui/e-memo-table.c:862
-#: ../calendar/gui/tasks-component.c:440 ../composer/e-msg-composer.c:3074
-#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1036
+#: ../calendar/gui/e-calendar-view.c:1560 ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/tasks-component.c:441 ../composer/e-msg-composer.c:3074
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
 #: ../mail/message-list.c:1716 ../ui/evolution-addressbook.xml.h:32
-#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-calendar.xml.h:37 ../ui/evolution-composer-entries.xml.h:7
+#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:105
 #: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "コピー(_C)"
@@ -3821,7 +3820,7 @@ msgstr "シェーディング"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:941
+#: ../plugins/exchange-operations/exchange-account-setup.c:949
 #: ../plugins/exchange-operations/exchange-calendar.c:224
 #: ../plugins/exchange-operations/exchange-contacts.c:197
 msgid "Size:"
@@ -3958,36 +3957,21 @@ msgstr "ファイル名が指定されていません。"
 
 #: ../calendar/calendar.error.xml.h:1
 msgid ""
-" There are few attachments getting downloaded. Saving the appointment will "
-"cause the appointment to be saved without those pending attachments "
-msgstr ""
-"ダウンロードした添付ファイルはほとんどありません。このまま予定を保存すると "
-"\"添付ファイルなし\" として保存されることになります。"
-
-#: ../calendar/calendar.error.xml.h:2
-msgid ""
-" There are few attachments getting downloaded. Saving the task will cause "
-"the task to be saved without those pending attachments "
-msgstr ""
-"ダウンロードした添付ファイルはほとんどありません。このままタスクを保存すると "
-"\"添付ファイルなし\" として保存されることになります。"
-
-#: ../calendar/calendar.error.xml.h:3
-msgid ""
-"Adding a meaningful Summary to your appointment will give your recipients an "
+"Adding a meaningful summary to your appointment will give your recipients an "
 "idea of what your appointment is about."
 msgstr ""
-"意味のある件名を追加しておくと、メッセージを受信する人が予定の内容が理解しや"
-"すくなります。"
+"予定に簡単なサマリ (概要) を追加しておくと、その予定の内容が理解しやすくなり"
+"ます。"
 
-#: ../calendar/calendar.error.xml.h:4
+#: ../calendar/calendar.error.xml.h:2
 msgid ""
-"Adding a meaningful Summary to your task will give your recipients an idea "
+"Adding a meaningful summary to your task will give your recipients an idea "
 "of what your task is about."
 msgstr ""
-"タスクに意味のある件名を追加しておくと、タスクの内容が理解しやすくなります。"
+"タスクに簡単なサマリ (概要) を追加しておくと、タスクの内容が理解しやすくなり"
+"ます。"
 
-#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:3
 msgid ""
 "All information in these journal entries will be deleted and can not be "
 "restored."
@@ -3995,125 +3979,125 @@ msgstr ""
 "これらのジャーナル・エントリにある全ての情報が削除されるので復旧できなくなり"
 "ます。"
 
-#: ../calendar/calendar.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:4
 msgid ""
 "All information in this journal will be deleted and can not be restored."
 msgstr "このジャーナルにある全ての情報が削除されるので復旧できなくなります。"
 
-#: ../calendar/calendar.error.xml.h:7
+#: ../calendar/calendar.error.xml.h:5
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
 msgstr "これらの予定の情報が全て削除されるので復旧できなくなります。"
 
-#: ../calendar/calendar.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:6
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "これらのタスクの情報が全て削除されるので復旧できなくなります。"
 
-#: ../calendar/calendar.error.xml.h:9
+#: ../calendar/calendar.error.xml.h:7
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
 msgstr "この予定の情報が全て削除されるので復旧できなくなります。"
 
-#: ../calendar/calendar.error.xml.h:10
+#: ../calendar/calendar.error.xml.h:8
 msgid ""
 "All information on this journal entry will be deleted and can not be "
 "restored."
 msgstr ""
 "ジャーナル・エントリにある全ての情報が削除されるので復旧できなくなります。"
 
-#: ../calendar/calendar.error.xml.h:11
+#: ../calendar/calendar.error.xml.h:9
 msgid ""
 "All information on this meeting will be deleted and can not be restored."
 msgstr "この会議の全ての情報が削除されるので復旧できなくなります。"
 
-#: ../calendar/calendar.error.xml.h:12
+#: ../calendar/calendar.error.xml.h:10
 msgid "All information on this task will be deleted and can not be restored."
 msgstr "このタスクの全ての情報が削除されるので復旧できなくなります。"
 
-#: ../calendar/calendar.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:11
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "本当にタスク '{0}' を削除してもよろしいですか？"
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:12
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "本当にサマリが '{0}' の予定を削除してもよろしいですか？"
 
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:13
 msgid "Are you sure you want to delete the journal entry '{0}'?"
 msgstr "本当にジャーナル・エントリ '{0}' を削除してもよろしいですか？"
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:14
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "本当に {0}個の予定を削除してもよろしいですか？"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete these {0} journal entries?"
 msgstr "本当に {0}個のジャーナル・エントリを削除してもよろしいですか？"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "本当に {0}個のタスクを削除してもよろしいですか？"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete this appointment?"
 msgstr "本当にこの予定を削除してもよろしいですか？"
 
-#: ../calendar/calendar.error.xml.h:20
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete this journal entry?"
 msgstr "本当にこのジャーナル・エントリを削除してもよろしいですか？"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete this meeting?"
 msgstr "本当にこの会議を削除してもよろしいですか？"
 
-#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete this task?"
 msgstr "本当にこのタスクを削除してもよろしいですか？"
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to send the appointment without a summary?"
-msgstr "件名を付けずに予定を送信してもよろしいですか？"
+msgstr "サマリを付けずに予定を送信してもよろしいですか？"
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to send the task without a summary?"
-msgstr "件名を付けずにタスクを送信してもよろしいですか？"
+msgstr "サマリを付けずにタスクを送信してもよろしいですか？"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:23
 msgid "Delete calendar '{0}'?"
 msgstr "カレンダ '{0}' を削除しますか？"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:24
 msgid "Delete memo list '{0}'?"
 msgstr "このメモ一覧 '{0}' を削除しますか？"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:25
 msgid "Delete task list '{0}'?"
 msgstr "このタスク一覧 '{0}' を削除しますか？"
 
-#: ../calendar/calendar.error.xml.h:28
-msgid "Don't Send"
+#: ../calendar/calendar.error.xml.h:26
+msgid "Do not Send"
 msgstr "送信しない"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:27
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "ダウンロード中です。予定を保存しますか？"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:28
 msgid "Download in progress. Do you want to save the task?"
 msgstr "ダウンロード中です。タスクを保存しますか？"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:29
 msgid "Editor could not be loaded."
 msgstr "エディタを読み込めませんでした。"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:30
 msgid ""
 "Email invitations will be sent to all participants and allow them to RSVP."
 msgstr ""
 "全ての出席者へ会議開催通知を送信するので返事をお願いできるようになります。"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:31
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -4121,52 +4105,52 @@ msgstr ""
 "全ての出席者へ会議開催通知を送信するので、このタスクを受諾することができま"
 "す。"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:32
 msgid "Error loading calendar"
 msgstr "カレンダを読み込む際にエラー"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:33
 msgid "Error loading memo list"
 msgstr "メモ一覧を読み込む際にエラー"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:34
 msgid "Error loading task list"
 msgstr "タスク一覧を読み込む際にエラー"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:35
 msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the journal has been deleted."
+"If you do not send a cancellation notice, the other participants may not "
+"know the journal has been deleted."
 msgstr ""
-"キャンセル通知を送信しないと、他の出席者にはジャーナルが削除されたことが周知"
+"キャンセル通知を送信しないと、ジャーナルが削除されたことが他の出席者には周知"
 "されないかもしれません。"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:36
 msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the meeting is canceled."
+"If you do not send a cancellation notice, the other participants may not "
+"know the meeting is cancelled."
 msgstr ""
-"キャンセル通知を送信しないと、他の出席者には会議がキャンセルされたことが周知"
+"キャンセル通知を送信しないと、会議がキャンセルされたことが他の出席者には周知"
 "されないかもしれません。"
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:37
 msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the task has been deleted."
+"If you do not send a cancellation notice, the other participants may not "
+"know the task has been deleted."
 msgstr ""
-"キャンセル通知を送信しないと、他の出席者にはタスクが削除されたことが周知され"
+"キャンセル通知を送信しないと、タスクが削除されたことが他の出席者には周知され"
 "ないかもしれません。"
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:38
 #: ../ui/evolution-message-composer.xml.h:28
 msgid "Send"
 msgstr "送信"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:39
 msgid "Send Notice"
 msgstr "通知する"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:40
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4174,7 +4158,7 @@ msgstr ""
 "更新した情報を送信すると、他の出席者が自分たちのカレンダ情報を更新することが"
 "できます。"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:41
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4182,6 +4166,26 @@ msgstr ""
 "更新した情報を送信すると、他の出席者が自分たちのタスク一覧を更新することがで"
 "きます。"
 
+#: ../calendar/calendar.error.xml.h:42
+msgid ""
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
+msgstr ""
+"添付ファイルをダウンロードしています。ここで予定を保存してしまうと、いくつか"
+"の添付ファイルが失われてしまいます。"
+
+#: ../calendar/calendar.error.xml.h:43
+msgid ""
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
+msgstr ""
+"添付ファイルをダウンロードしています。ここでタスクを保存してしまうと、いくつ"
+"かの添付ファイルが失われてしまいます。"
+
+#: ../calendar/calendar.error.xml.h:44
+msgid "Some features may not work properly with your current server."
+msgstr "お使いのサーバでは、いくつかの機能が正しく動作しないかもしれません。"
+
 #: ../calendar/calendar.error.xml.h:45
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution カレンダが突然終了しました。"
@@ -4191,16 +4195,16 @@ msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution タスクが突然終了しました。"
 
 #: ../calendar/calendar.error.xml.h:47
-msgid "The calendar is not marked for offline usage"
-msgstr "カレンダがオフラインになっていません"
+msgid "The calendar is not marked for offline usage."
+msgstr "カレンダがオフライン使用になっていません。"
 
 #: ../calendar/calendar.error.xml.h:48
 msgid "The memo list is not marked for offline usage"
-msgstr "メモ一覧がオフラインになっていません"
+msgstr "メモ一覧がオフライン使用になっていません。"
 
 #: ../calendar/calendar.error.xml.h:49
-msgid "The task list is not marked for offline usage"
-msgstr "タスク一覧がオフラインになっていません"
+msgid "The task list is not marked for offline usage."
+msgstr "タスク一覧がオフライン使用になっていません。"
 
 #: ../calendar/calendar.error.xml.h:50
 msgid "This calendar will be removed permanently."
@@ -4246,6 +4250,16 @@ msgstr "更新した会議の情報を出席者へ送信しますか？"
 msgid "Would you like to send updated task information to participants?"
 msgstr "更新したタスク情報を出席者へ送信しますか？"
 
+#: ../calendar/calendar.error.xml.h:61
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results, the server should be upgraded to "
+"a supported version."
+msgstr ""
+"サポートしていない GroupWise サーバに接続しているため、Evolution を利用すると"
+"問題を引き起こすおそれがあります。そのサーバをサポートしているバージョンに"
+"アップグレードすることを強くお奨めします。"
+
 #: ../calendar/calendar.error.xml.h:62
 msgid "You have changed this appointment, but not yet saved them."
 msgstr "この予定は変更されていますが、まだ保存していません。"
@@ -4277,7 +4291,7 @@ msgid "_Save Changes"
 msgstr "変更を保存する(_S)"
 
 #: ../calendar/calendar.error.xml.h:69
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:129
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:132
 msgid "_Send"
 msgstr "送信する(_S)"
 
@@ -4338,7 +4352,7 @@ msgid "Calendar and Tasks"
 msgstr "カレンダとタスク"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1309
+#: ../calendar/gui/calendar-component.c:1290
 msgid "Calendars"
 msgstr "カレンダ"
 
@@ -4376,18 +4390,18 @@ msgstr "Evolution のタスク・コンポーネント"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
 msgid "Memo_s"
-msgstr "メンバー"
+msgstr "メモ(_S)"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memos.c:1092 ../calendar/gui/memos-component.c:528
-#: ../calendar/gui/memos-component.c:998 ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/e-memos.c:1092 ../calendar/gui/memos-component.c:529
+#: ../calendar/gui/memos-component.c:999 ../calendar/gui/memos-control.c:340
 msgid "Memos"
 msgstr "メモ"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
 #: ../calendar/gui/e-tasks.c:1334 ../calendar/gui/print.c:1831
-#: ../calendar/gui/tasks-component.c:519
-#: ../calendar/gui/tasks-component.c:1013 ../calendar/gui/tasks-control.c:472
+#: ../calendar/gui/tasks-component.c:520
+#: ../calendar/gui/tasks-component.c:1014 ../calendar/gui/tasks-control.c:472
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
@@ -4450,17 +4464,18 @@ msgid "Snooze _time:"
 msgstr "アラーム停止時間(_T):"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:6
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:13
-#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-calendar.xml.h:41
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:159
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
+#: ../plugins/publish-calendar/publish-calendar.glade.h:20
+#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-message-composer.xml.h:45
 #: ../ui/evolution-signature-editor.xml.h:23
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:37
 msgid "_Edit"
 msgstr "編集(_E)"
 
@@ -4484,7 +4499,7 @@ msgstr "設定"
 msgid "_Configure Alarms"
 msgstr "アラームの設定(_C)"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1208 ../ui/evolution.xml.h:44
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1208 ../ui/evolution.xml.h:45
 msgid "_Quit"
 msgstr "終了(_Q)"
 
@@ -4546,11 +4561,11 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "このメッセージを二度と表示しない"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:155
+#: ../calendar/gui/alarm-notify/notify-main.c:140
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo を初期化できませんでした"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:166
+#: ../calendar/gui/alarm-notify/notify-main.c:153
 msgid "Could not create the alarm notify service factory"
 msgstr "アラーム通知サービスファクトリを作成できませんでした"
 
@@ -4669,12 +4684,12 @@ msgid "Default reminder value"
 msgstr "リマインダの値  (デフォルト)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Free/busy server urls"
-msgstr "\"予定の有無\" サーバの URI"
+msgid "Free/busy server URLs"
+msgstr "Free/Busy サーバの URL"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Free/busy template url"
-msgstr "\"予定の有無\" のテンプレート URI"
+msgid "Free/busy template URL"
+msgstr "Free/Busy テンプレートの URL"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide completed tasks"
@@ -4709,8 +4724,8 @@ msgid "Last alarm time"
 msgstr "最後のアラーム時刻"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
-msgid "List of server urls for free/busy publishing."
-msgstr "\"予定の有無\" の公開で使用する URI のリストです。"
+msgid "List of server URLs for free/busy publishing."
+msgstr "Free/Busy として公開するサーバ URL の並びです。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
@@ -4741,12 +4756,12 @@ msgid "Month view vertical pane position"
 msgstr "月間ビューの垂直ペインの位置"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
-msgid "Number of units for determining for a default reminder."
+msgid "Number of units for determining a default reminder."
 msgstr "デフォルトのリマインダを決定する単位の数です。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
-msgstr "タスクを何時隠すか決定する単位の数です。"
+msgstr "いつタスクを隠すかを決定する単位の数です。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
@@ -4850,22 +4865,22 @@ msgstr "今日が期限のタスクの色"
 msgid "Tasks vertical pane position"
 msgstr "タスクの垂直方向ペインの位置"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#, no-c-format
 msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\"."
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
 msgstr ""
-"カレンダの日付と時刻で使用するタイムゾーンのデフォルト値で、Olsen タイムゾー"
-"ン・データベースの場所 (例: \"America/New York\") です。"
+"Free/Busy データの代替えとして使用する URL テンプレートでは、%u をメール・ア"
+"ドレスのユーザ部分で、%d をドメイン名でそれぞれ置き換えられます。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
-#, no-c-format
 msgid ""
-"The url template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
 msgstr ""
-"\"予定あり/なし\" のデータの代替えとして使用する URI のテンプレートで、%u は"
-"メール・アドレスのユーザ部分で、%d はドメイン名でそれぞれ置き換えられます。"
+"カレンダの日付と時刻で使用するタイムゾーンのデフォルト値で、Olsen タイムゾー"
+"ン・データベースの場所 (例: \"America/New York\") です。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
@@ -4995,11 +5010,11 @@ msgstr "平日の開始時刻 (時)"
 msgid "Workday start minute"
 msgstr "平日の開始時刻 (分)"
 
-#: ../calendar/gui/cal-search-bar.c:49
+#: ../calendar/gui/cal-search-bar.c:48
 msgid "Summary contains"
 msgstr "サマリが次のものを含む"
 
-#: ../calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:49
 msgid "Description contains"
 msgstr "説明が次のものを含む"
 
@@ -5015,14 +5030,14 @@ msgstr "場所が次のものを含む"
 msgid "Unmatched"
 msgstr "該当しないもの"
 
-#: ../calendar/gui/calendar-commands.c:120 ../calendar/gui/print.c:2512
-#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:19
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2512
+#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:18
 #: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:11
 #: ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "印刷"
 
-#: ../calendar/gui/calendar-commands.c:120
+#: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:708
 #: ../calendar/gui/dialogs/calendar-setup.c:369
 #: ../calendar/gui/gnome-cal.c:2117
@@ -5031,10 +5046,11 @@ msgstr "印刷"
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:590
 #: ../plugins/hula-account-setup/camel-hula-listener.c:374
 #: ../plugins/hula-account-setup/camel-hula-listener.c:403
+#: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "カレンダ"
 
-#: ../calendar/gui/calendar-commands.c:355
+#: ../calendar/gui/calendar-commands.c:348
 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 "
@@ -5043,11 +5059,11 @@ msgstr ""
 "この操作は選択したイベントより古いイベントを全て完全に削除します。続行する"
 "と、これらのイベントを復旧できなくなります。"
 
-#: ../calendar/gui/calendar-commands.c:361
+#: ../calendar/gui/calendar-commands.c:354
 msgid "Purge events older than"
 msgstr "次より古いイベントを抹消する"
 
-#: ../calendar/gui/calendar-commands.c:366
+#: ../calendar/gui/calendar-commands.c:359
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:12
 #: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:265
@@ -5061,9 +5077,9 @@ msgstr "日"
 #. Create the Webcal source group
 #. Create the LDAP source group
 #: ../calendar/gui/calendar-component.c:234
-#: ../calendar/gui/memos-component.c:219 ../calendar/gui/migration.c:494
+#: ../calendar/gui/memos-component.c:220 ../calendar/gui/migration.c:494
 #: ../calendar/gui/migration.c:587 ../calendar/gui/migration.c:1088
-#: ../calendar/gui/tasks-component.c:215
+#: ../calendar/gui/tasks-component.c:216
 msgid "On The Web"
 msgstr "ウェブ"
 
@@ -5081,69 +5097,69 @@ msgstr "天気"
 msgid "_New Calendar"
 msgstr "新しいカレンダ(_N)"
 
-#: ../calendar/gui/calendar-component.c:858
+#: ../calendar/gui/calendar-component.c:839
 msgid "Failed upgrading calendars."
 msgstr "カレンダのアップグレードに失敗しました。"
 
-#: ../calendar/gui/calendar-component.c:1157
+#: ../calendar/gui/calendar-component.c:1138
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "イベントと会議の作成に必要なカレンダ '%s' を開けません"
 
-#: ../calendar/gui/calendar-component.c:1170
+#: ../calendar/gui/calendar-component.c:1151
 msgid "There is no calendar available for creating events and meetings"
 msgstr "イベントと会議の作成で利用可能なカレンダがありません"
 
-#: ../calendar/gui/calendar-component.c:1284
+#: ../calendar/gui/calendar-component.c:1265
 msgid "Calendar Source Selector"
 msgstr "カレンダの格納場所の選択"
 
-#: ../calendar/gui/calendar-component.c:1475
+#: ../calendar/gui/calendar-component.c:1456
 msgid "New appointment"
 msgstr "新しい予定"
 
-#: ../calendar/gui/calendar-component.c:1476
+#: ../calendar/gui/calendar-component.c:1457
 msgid "_Appointment"
 msgstr "予定(_A)"
 
-#: ../calendar/gui/calendar-component.c:1477
+#: ../calendar/gui/calendar-component.c:1458
 msgid "Create a new appointment"
 msgstr "新しい予定を作成します"
 
-#: ../calendar/gui/calendar-component.c:1483
+#: ../calendar/gui/calendar-component.c:1464
 msgid "New meeting"
 msgstr "新規の会議"
 
-#: ../calendar/gui/calendar-component.c:1484
+#: ../calendar/gui/calendar-component.c:1465
 msgid "M_eeting"
 msgstr "会議(_E)"
 
-#: ../calendar/gui/calendar-component.c:1485
+#: ../calendar/gui/calendar-component.c:1466
 msgid "Create a new meeting request"
 msgstr "新しい会議を召集します"
 
-#: ../calendar/gui/calendar-component.c:1491
+#: ../calendar/gui/calendar-component.c:1472
 msgid "New all day appointment"
 msgstr "新しい終日の予定"
 
-#: ../calendar/gui/calendar-component.c:1492
+#: ../calendar/gui/calendar-component.c:1473
 msgid "All Day A_ppointment"
 msgstr "終日の予定(_P)"
 
-#: ../calendar/gui/calendar-component.c:1493
+#: ../calendar/gui/calendar-component.c:1474
 msgid "Create a new all-day appointment"
 msgstr "新しい終日の予定を作成します"
 
-#: ../calendar/gui/calendar-component.c:1499
+#: ../calendar/gui/calendar-component.c:1480
 msgid "New calendar"
 msgstr "新しいカレンダ"
 
-#: ../calendar/gui/calendar-component.c:1500
+#: ../calendar/gui/calendar-component.c:1481
 #: ../calendar/gui/dialogs/event-page.c:870
 msgid "Cale_ndar"
 msgstr "カレンダ(_N)"
 
-#: ../calendar/gui/calendar-component.c:1501
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Create a new calendar"
 msgstr "新しいカレンダを作成します"
 
@@ -5175,7 +5191,7 @@ msgstr "カレンダをオープンする際の方法がサポートされてい
 msgid "Permission denied to open the calendar"
 msgstr "カレンダをオープンする権限がありません"
 
-#: ../calendar/gui/comp-editor-factory.c:444 ../shell/e-shell.c:1265
+#: ../calendar/gui/comp-editor-factory.c:444 ../shell/e-shell.c:1279
 msgid "Unknown error"
 msgstr "特定できないエラー"
 
@@ -5343,299 +5359,259 @@ msgstr "ファイル名:"
 msgid "MIME type:"
 msgstr "MIME タイプ:"
 
-#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:583
-#: ../mail/em-account-prefs.c:505 ../mail/em-composer-prefs.c:930
-#: ../plugins/plugin-manager/plugin-manager.c:213
-msgid "Enabled"
-msgstr "有効"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:740
-msgid "Are you sure you want to remove this URL?"
-msgstr "本当にこの URL を削除してもよろしいですか？"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:743
-msgid "Remove"
-msgstr "削除する"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:748
-msgid "Don't Remove"
-msgstr "削除しない"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:797
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:830
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:863
-#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:407
-msgid "Disable"
-msgstr "無効"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:797
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:830
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:865
-#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:409
-msgid "Enable"
-msgstr "有効"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid "05 minutes"
-msgstr "05 分"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "10 minutes"
-msgstr "10 分"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
-msgid "15 minutes"
-msgstr "15 分"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "30 minutes"
-msgstr "30 分"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+msgid ""
+"60 minutes\n"
+"30 minutes\n"
+"15 minutes\n"
+"10 minutes\n"
+"05 minutes"
+msgstr ""
+"60 分毎\n"
+"30 分毎\n"
+"15 分毎\n"
+"10 分毎\n"
+"05 分毎"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "60 minutes"
-msgstr "60 分"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "<b>Alerts</b>"
-msgstr "<b>警告</b>"
+msgid "<b>Publishing</b>"
+msgstr "<b>公開する場所</b>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "<b>Default Free/Busy Server</b>"
-msgstr "<b>デフォルトの予定有無のサーバ</b>"
+#, 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:9
-msgid "<b>General</b>"
-msgstr "<b>全般</b>"
+#: ../mail/mail-config.glade.h:9
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr "<span weight=\"bold\">警告</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "<b>Publishing</b>"
-msgstr "<b>公開する場所</b>"
+msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
+msgstr "<span weight=\"bold\">デフォルトの Free/Busy サーバ</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "<b>Task List</b>"
-msgstr "<b>タスク一覧</b>"
+#: ../mail/mail-config.glade.h:18
+#: ../plugins/itip-formatter/itip-formatter.c:1977
+#: ../plugins/publish-calendar/publish-calendar.glade.h:1
+msgid "<span weight=\"bold\">General</span>"
+msgstr "<span weight=\"bold\">全般</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "<b>Time</b>"
-msgstr "<b>時刻</b>"
+msgid "<span weight=\"bold\">Task List</span>"
+msgstr "<span weight=\"bold\">タスク一覧</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "<b>Work Week</b>"
-msgstr "<b>平日</b>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#, 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>"
+msgid "<span weight=\"bold\">Time</span>"
+msgstr "<span weight=\"bold\">時間</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Calendar and Tasks Settings"
-msgstr "カレンダとタスクの設定"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Color for overdue tasks"
-msgstr "期限が過ぎたタスクの色"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+msgid "<span weight=\"bold\">Work Week</span>"
+msgstr "<span weight=\"bold\">平日</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Color for tasks due today"
-msgstr "今日が期限のタスクの色"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Day _ends:"
 msgstr "一日の終了(_E):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Days"
-msgstr "日"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Display"
 msgstr "表示"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: ../mail/mail-config.glade.h:74
+#: ../plugins/publish-calendar/publish-calendar.glade.h:9
 msgid "E_nable"
 msgstr "有効(_N)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: ../calendar/gui/dialogs/event-editor.c:555
-#: ../ui/evolution-event-editor.xml.h:6
+#: ../ui/evolution-event-editor.xml.h:7
 msgid "Free/Busy"
-msgstr "予定の有無"
+msgstr "Free/Busy"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: ../calendar/gui/dialogs/recurrence-page.c:1050
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Friday"
 msgstr "金曜日"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Hours"
-msgstr "時"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Minutes"
-msgstr "分"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+msgid ""
+"Minutes\n"
+"Hours\n"
+"Days"
+msgstr ""
+"分\n"
+"時間\n"
+"日"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: ../calendar/gui/dialogs/recurrence-page.c:1046
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Monday"
 msgstr "月曜日"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid ""
+"Monday\n"
+"Tuesday\n"
+"Wednesday\n"
+"Thursday\n"
+"Friday\n"
+"Saturday\n"
+"Sunday"
+msgstr ""
+"月曜日\n"
+"火曜日\n"
+"水曜日\n"
+"木曜日\n"
+"金曜日\n"
+"土曜日\n"
+"日曜日"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Publishing Table"
 msgstr "公開する場所の一覧"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "S_un"
 msgstr "日(_U)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: ../calendar/gui/dialogs/recurrence-page.c:1051
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Saturday"
 msgstr "土曜日"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "Sh_ow a reminder"
 msgstr "リマインダの表示(_O):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Show week _numbers in date navigator"
 msgstr "期日ナビゲータの中に週番号を表示する(_N)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #: ../calendar/gui/dialogs/recurrence-page.c:1052
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Sunday"
 msgstr "日曜日"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "T_asks due today:"
 msgstr "今日が期限のタスクの色(_A):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "T_hu"
 msgstr "木(_H)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Template:"
 msgstr "テンプレート:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/dialogs/recurrence-page.c:1049
 #: ../calendar/gui/e-itip-control.c:732
 msgid "Thursday"
 msgstr "木曜日"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 #: ../calendar/gui/dialogs/event-page.glade.h:14
 msgid "Time _zone:"
 msgstr "タイムゾーン(_Z):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Time format:"
 msgstr "時刻の書式:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 #: ../calendar/gui/dialogs/recurrence-page.c:1047
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Tuesday"
 msgstr "火曜日"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "W_eek starts:"
 msgstr "週の開始(_E):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #: ../calendar/gui/dialogs/recurrence-page.c:1048
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Wednesday"
 msgstr "水曜日"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Work days:"
 msgstr "平日:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_12 hour (AM/PM)"
 msgstr "12 時間制 (午前/午後)(_1)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_24 hour"
 msgstr "24 時間制(_2)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Add URL"
 msgstr "URL の追加(_A)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Ask for confirmation when deleting items"
 msgstr "アイテムを削除する時に確認する(_A)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Compress weekends in month view"
 msgstr "月間ビューで週末を短縮する(_C)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Day begins:"
 msgstr "一日の開始(_D):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Fri"
 msgstr "金(_F)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Hide completed tasks after"
 msgstr "完了したタスクを隠す期間(_H)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Mon"
 msgstr "月(_M)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Overdue tasks:"
 msgstr "期限を過ぎたタスクの色(_O):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Sat"
 msgstr "土(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "_Show appointment end times in week and month views"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+msgid "_Show appointment end times in week and month view"
 msgstr "週間と月間ビューの中に予定の期日を表示する(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Time divisions:"
 msgstr "時間を分割する単位(_T):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Tue"
 msgstr "火(_T)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_Wed"
 msgstr "水(_W)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "before every appointment"
 msgstr "前に表示する"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "option menu to choose reminder units"
-msgstr "リマインダの時刻の単位を選択するオプション・メニューです"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "option menu to choose time units"
-msgstr "タスクを隠す時間の単位を選択するオプション・メニューです"
-
 #: ../calendar/gui/dialogs/calendar-setup.c:287
 msgid "Copy calendar contents locally for offline operation"
 msgstr "オフライン用にフォルダの内容をローカルへコピーする"
@@ -5674,7 +5650,7 @@ msgid "Task List Properties"
 msgstr "タスク一覧のプロパティ"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:594
-#: ../calendar/gui/memos-component.c:448
+#: ../calendar/gui/memos-component.c:449
 msgid "New Memo List"
 msgstr "新しいメモ一覧"
 
@@ -5802,7 +5778,7 @@ msgstr[1] "添付されたメッセージ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:434 ../composer/e-msg-composer.c:3075
 #: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:932 ../mail/message-list.c:1717
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1717
 msgid "_Move"
 msgstr "移動(_M)"
 
@@ -5815,23 +5791,23 @@ msgstr "ドラッグのキャンセル(_D)"
 msgid "Could not update object"
 msgstr "オブジェクトを更新できませんでした"
 
-#: ../calendar/gui/dialogs/comp-editor.c:918 ../composer/e-msg-composer.c:2468
+#: ../calendar/gui/dialogs/comp-editor.c:928 ../composer/e-msg-composer.c:2468
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "添付ファイル: <b>%d</b> 個"
 msgstr[1] "添付ファイル: <b>%d</b> 個"
 
-#: ../calendar/gui/dialogs/comp-editor.c:948
+#: ../calendar/gui/dialogs/comp-editor.c:958
 msgid "Hide Attachment _Bar"
 msgstr "添付ファイル・バーを隠す(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:951
-#: ../calendar/gui/dialogs/comp-editor.c:1400
+#: ../calendar/gui/dialogs/comp-editor.c:961
+#: ../calendar/gui/dialogs/comp-editor.c:1401
 msgid "Show Attachment _Bar"
 msgstr "添付ファイル・バーを表示する(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../calendar/gui/dialogs/comp-editor.c:1070
 #: ../calendar/gui/dialogs/event-page.c:1861
 #: ../calendar/gui/dialogs/meeting-page.c:909
 #: ../calendar/gui/dialogs/task-page.c:1183
@@ -5843,77 +5819,77 @@ msgstr "添付ファイル・バーを表示する(_B)"
 msgid "_Remove"
 msgstr "削除(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1061
+#: ../calendar/gui/dialogs/comp-editor.c:1071
 #: ../composer/e-msg-composer-attachment-bar.c:471
 #: ../composer/e-msg-composer.c:3574 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-mail-list.xml.h:29
 msgid "_Properties"
 msgstr "プロパティ(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1063
+#: ../calendar/gui/dialogs/comp-editor.c:1073
 #: ../composer/e-msg-composer-attachment-bar.c:473
 #: ../composer/e-msg-composer.c:3576
 msgid "_Add attachment..."
 msgstr "添付ファイルの追加(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1424
+#: ../calendar/gui/dialogs/comp-editor.c:1425
 msgid "Attachment Button: Press space key to toggle attachment bar"
 msgstr "添付ファイル・ボタン: [SPACE] キーを押すとバーの表示が切り替わります"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2027
-#: ../calendar/gui/dialogs/comp-editor.c:2070
+#: ../calendar/gui/dialogs/comp-editor.c:2028
+#: ../calendar/gui/dialogs/comp-editor.c:2071
 msgid "Edit Appointment"
 msgstr "予定の編集"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2033
-#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2034
+#: ../calendar/gui/dialogs/comp-editor.c:2077
 #, c-format
 msgid "Meeting - %s"
 msgstr "会議 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2035
-#: ../calendar/gui/dialogs/comp-editor.c:2078
+#: ../calendar/gui/dialogs/comp-editor.c:2036
+#: ../calendar/gui/dialogs/comp-editor.c:2079
 #, c-format
 msgid "Appointment - %s"
 msgstr "予定 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2039
-#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2040
+#: ../calendar/gui/dialogs/comp-editor.c:2083
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "タスクの割当て - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2041
-#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2042
+#: ../calendar/gui/dialogs/comp-editor.c:2085
 #, c-format
 msgid "Task - %s"
 msgstr "タスク - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2044
-#: ../calendar/gui/dialogs/comp-editor.c:2087
+#: ../calendar/gui/dialogs/comp-editor.c:2045
+#: ../calendar/gui/dialogs/comp-editor.c:2088
 #, c-format
 msgid "Journal entry - %s"
 msgstr "ジャーナル・エントリ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2055
-#: ../calendar/gui/dialogs/comp-editor.c:2097
+#: ../calendar/gui/dialogs/comp-editor.c:2056
+#: ../calendar/gui/dialogs/comp-editor.c:2098
 msgid "No summary"
 msgstr "サマリ無し"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2607
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:138
-#: ../mail/em-utils.c:483 ../mail/em-utils.c:520
+#: ../calendar/gui/dialogs/comp-editor.c:2608
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:155
+#: ../mail/em-utils.c:501 ../mail/em-utils.c:538
 #: ../widgets/misc/e-attachment-bar.c:341
 msgid "attachment"
 msgstr "添付"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2700
-#: ../calendar/gui/dialogs/comp-editor.c:2733
-#: ../calendar/gui/dialogs/comp-editor.c:2757
+#: ../calendar/gui/dialogs/comp-editor.c:2701
+#: ../calendar/gui/dialogs/comp-editor.c:2734
+#: ../calendar/gui/dialogs/comp-editor.c:2758
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "更新が届いたらこのアイテムに対する変更を破棄する"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2781
+#: ../calendar/gui/dialogs/comp-editor.c:2782
 msgid "Unable to use current version!"
 msgstr "現在のバージョンを使用できません！"
 
@@ -5995,9 +5971,9 @@ msgid "Appoint_ment"
 msgstr "予定(_M)"
 
 #: ../calendar/gui/dialogs/event-editor.c:535
-#: ../ui/evolution-event-editor.xml.h:12
+#: ../ui/evolution-event-editor.xml.h:13
 msgid "Recurrence"
-msgstr "繰り返し"
+msgstr "繰り返す"
 
 #: ../calendar/gui/dialogs/event-page.c:876
 #: ../calendar/gui/dialogs/task-page.c:444
@@ -6141,7 +6117,7 @@ msgstr "説明(_D):"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:16
 msgid "_Set alarm\t"
-msgstr "アラームのセット(_S)\t"
+msgstr "アラームをセットする(_S)\t"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
@@ -6150,12 +6126,12 @@ msgstr "時刻(_T):"
 #: ../calendar/gui/dialogs/event-page.glade.h:18
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
-msgstr "間"
+msgstr "から"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:21
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
-msgstr "まで"
+msgstr "から"
 
 #: ../calendar/gui/dialogs/meeting-page.c:306
 msgid "<b>Dele_gatees</b>"
@@ -6176,12 +6152,12 @@ msgstr "<b>自宅</b> "
 #: ../calendar/gui/e-itip-control.c:1105 ../composer/e-msg-composer.c:2260
 #: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:691
 #: ../mail/em-account-editor.c:1356 ../mail/em-account-prefs.c:465
-#: ../mail/em-folder-view.c:1065 ../mail/em-junk-hook.c:78
+#: ../mail/em-folder-view.c:1106 ../mail/em-junk-hook.c:78
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
 #: ../plugins/itip-formatter/itip-formatter.c:1627
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:190
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:474
 #: ../widgets/misc/e-dateedit.c:1513 ../widgets/misc/e-dateedit.c:1727
 msgid "None"
@@ -6222,15 +6198,16 @@ msgstr "言語"
 msgid "Member"
 msgstr "メンバー"
 
+#. To translators: RSVP means "please reply"
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:501
+#: ../calendar/gui/e-meeting-list-view.c:502
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "返信の有無"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:512
+#: ../calendar/gui/e-meeting-list-view.c:513
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
 #: ../mail/message-list.etspec.h:12
 msgid "Status"
@@ -6338,21 +6315,21 @@ msgid "Task List Name"
 msgstr "タスク一覧の名前"
 
 #: ../calendar/gui/dialogs/recur-comp.c:52
-msgid "You are modifying a recurring event, what would you like to modify?"
+msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "繰り返しのイベントを修正中です。何を修正しますか？"
 
 #: ../calendar/gui/dialogs/recur-comp.c:54
-msgid "You are delegating a recurring event, what would like to delegate?"
+msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "繰り返しのイベントを委任中です。何を委任しますか？"
 
 #: ../calendar/gui/dialogs/recur-comp.c:58
-msgid "You are modifying a recurring task, what would you like to modify?"
+msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "繰り返しのタスクを修正中です。何を修正しますか？"
 
 #: ../calendar/gui/dialogs/recur-comp.c:62
 msgid ""
-"You are modifying a recurring journal entry, what would you like to modify?"
-msgstr "繰り返しのエントリを修正中です。何を修正しますか？"
+"You are modifying a recurring journal entry. What would you like to modify?"
+msgstr "繰り返しのジャーナル・エントリを修正中です。何を修正しますか？"
 
 #: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
@@ -6547,7 +6524,7 @@ msgid "_Web Page:"
 msgstr "ウェブ・ページ(_W):"
 
 #: ../calendar/gui/dialogs/task-editor.c:419
-#: ../calendar/gui/tasks-component.c:1172
+#: ../calendar/gui/tasks-component.c:1173
 msgid "_Task"
 msgstr "タスク(_T)"
 
@@ -6594,7 +6571,7 @@ msgstr "期日(_D):"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
 msgid "<b>Free/Busy C_alendars</b>"
-msgstr "<b>予定の有無のカレンダ</b>"
+msgstr "<b>Free/Busy のカレンダ(_A)</b>"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
 msgid "<b>Publishing Frequency</b>"
@@ -6606,7 +6583,7 @@ msgstr "<b>予定を公開する場所</b>"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
 msgid "Free/Busy Publishing Settings"
-msgstr "予定の有無の公開の設定"
+msgstr "Free/Busy 公開の設定"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
 msgid "_Daily"
@@ -6617,14 +6594,17 @@ msgid "_Manual"
 msgstr "手動(_M)"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
 msgid "_Password:"
 msgstr "パスワード(_P):"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
 msgid "_Remember password"
 msgstr "このパスワードを記憶する(_R)"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Username:"
 msgstr "ユーザ名(_U):"
 
@@ -6718,7 +6698,7 @@ msgid "%s for an unknown trigger type"
 msgstr "トリガーの種類が不明な %s"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2728
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2829
 #, c-format
 msgid "Click to open %s"
 msgstr "クリックすると %s を開きます"
@@ -6755,7 +6735,7 @@ msgstr "期日:"
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:224
 #: ../calendar/gui/e-itip-control.c:1133
-#: ../plugins/exchange-operations/exchange-account-setup.c:265
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
 #: ../plugins/itip-formatter/itip-view.c:908
 msgid "Status:"
 msgstr "ステータス:"
@@ -6823,7 +6803,7 @@ msgstr "いいえ"
 #: ../calendar/gui/e-meeting-list-view.c:168
 #: ../calendar/gui/e-meeting-list-view.c:182
 #: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:160
-#: ../calendar/gui/e-meeting-store.c:225 ../mail/em-utils.c:1283
+#: ../calendar/gui/e-meeting-store.c:225 ../mail/em-utils.c:1311
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1652
 #: ../plugins/plugin-manager/plugin-manager.c:72
@@ -6844,7 +6824,7 @@ msgstr "割当て済み"
 msgid "Save As..."
 msgstr "別名で保存..."
 
-#: ../calendar/gui/e-cal-popup.c:187 ../mail/em-format-html-display.c:1812
+#: ../calendar/gui/e-cal-popup.c:187 ../mail/em-format-html-display.c:1842
 msgid "Select folder to save selected attachments..."
 msgstr "選択した添付ファイルを保存するフォルダの選択..."
 
@@ -6854,8 +6834,8 @@ msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
 #: ../calendar/gui/e-cal-popup.c:270 ../calendar/gui/e-calendar-table.c:1178
-#: ../calendar/gui/e-calendar-view.c:1566 ../calendar/gui/e-memo-table.c:856
-#: ../mail/em-folder-view.c:1046 ../mail/em-popup.c:553 ../mail/em-popup.c:564
+#: ../calendar/gui/e-calendar-view.c:1554 ../calendar/gui/e-memo-table.c:856
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:553 ../mail/em-popup.c:564
 msgid "_Save As..."
 msgstr "別名で保存(_S)..."
 
@@ -6922,17 +6902,17 @@ msgid "Task Table"
 msgstr "タスク・テーブル"
 
 #: ../calendar/gui/e-calendar-table.c:705
-#: ../calendar/gui/e-calendar-view.c:679 ../calendar/gui/e-memo-table.c:435
+#: ../calendar/gui/e-calendar-view.c:678 ../calendar/gui/e-memo-table.c:435
 msgid "Deleting selected objects"
 msgstr "指定したオブジェクトを削除します"
 
 #: ../calendar/gui/e-calendar-table.c:884
-#: ../calendar/gui/e-calendar-view.c:807 ../calendar/gui/e-memo-table.c:612
+#: ../calendar/gui/e-calendar-view.c:806 ../calendar/gui/e-memo-table.c:612
 msgid "Updating objects"
 msgstr "オブジェクトの更新"
 
 #: ../calendar/gui/e-calendar-table.c:1034
-#: ../calendar/gui/e-calendar-view.c:1142 ../calendar/gui/e-memo-table.c:744
+#: ../calendar/gui/e-calendar-view.c:1141 ../calendar/gui/e-memo-table.c:744
 #: ../composer/e-msg-composer.c:1339
 msgid "Save as..."
 msgstr "別名で保存..."
@@ -6942,27 +6922,27 @@ msgid "Open _Web Page"
 msgstr "ウェブ・ページを開く(_W)"
 
 #: ../calendar/gui/e-calendar-table.c:1179
-#: ../calendar/gui/e-calendar-view.c:1546
-#: ../calendar/gui/e-calendar-view.c:1567 ../calendar/gui/e-memo-table.c:857
-#: ../mail/em-folder-view.c:1047
+#: ../calendar/gui/e-calendar-view.c:1539
+#: ../calendar/gui/e-calendar-view.c:1555 ../calendar/gui/e-memo-table.c:857
+#: ../mail/em-folder-view.c:1088
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:122 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "印刷(_P)..."
 
 #: ../calendar/gui/e-calendar-table.c:1183
-#: ../calendar/gui/e-calendar-view.c:1571 ../calendar/gui/e-memo-table.c:861
+#: ../calendar/gui/e-calendar-view.c:1559 ../calendar/gui/e-memo-table.c:861
 #: ../ui/evolution-addressbook.xml.h:1 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "切り取り(_U)"
 
 #: ../calendar/gui/e-calendar-table.c:1185
-#: ../calendar/gui/e-calendar-view.c:1549
-#: ../calendar/gui/e-calendar-view.c:1573 ../calendar/gui/e-memo-table.c:863
-#: ../ui/evolution-addressbook.xml.h:39 ../ui/evolution-calendar.xml.h:43
+#: ../calendar/gui/e-calendar-view.c:1542
+#: ../calendar/gui/e-calendar-view.c:1561 ../calendar/gui/e-memo-table.c:863
+#: ../ui/evolution-addressbook.xml.h:39 ../ui/evolution-calendar.xml.h:41
 #: ../ui/evolution-composer-entries.xml.h:9 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
@@ -7024,95 +7004,90 @@ msgstr "開始日"
 msgid "Task sort"
 msgstr "タスクの並び替え"
 
-#: ../calendar/gui/e-calendar-view.c:1268
+#: ../calendar/gui/e-calendar-view.c:1267
 msgid "Moving items"
 msgstr "アイテムの移動中"
 
-#: ../calendar/gui/e-calendar-view.c:1270
+#: ../calendar/gui/e-calendar-view.c:1269
 msgid "Copying items"
 msgstr "アイテムのコピー中"
 
-#: ../calendar/gui/e-calendar-view.c:1540
+#: ../calendar/gui/e-calendar-view.c:1533
 msgid "New _Appointment..."
 msgstr "新しい予定(_A)..."
 
-#: ../calendar/gui/e-calendar-view.c:1541
+#: ../calendar/gui/e-calendar-view.c:1534
 msgid "New All Day _Event"
 msgstr "新しい終日のイベント(_E)"
 
-#: ../calendar/gui/e-calendar-view.c:1542
+#: ../calendar/gui/e-calendar-view.c:1535
 msgid "New _Meeting"
 msgstr "新しい会議(_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1543
+#: ../calendar/gui/e-calendar-view.c:1536
 msgid "New _Task"
 msgstr "新しいタスク(_T)"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1553
+#: ../calendar/gui/e-calendar-view.c:1546
 #: ../widgets/menus/gal-view-menus.c:291
 msgid "_Current View"
 msgstr "現在のビュー(_C)"
 
-#: ../calendar/gui/e-calendar-view.c:1555
+#: ../calendar/gui/e-calendar-view.c:1548
 msgid "Select T_oday"
 msgstr "今日にする(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1556
+#: ../calendar/gui/e-calendar-view.c:1549
 msgid "_Select Date..."
 msgstr "日付の選択(_S)..."
 
-#. TODO: Why is this in a context menu when it applies globally?
-#: ../calendar/gui/e-calendar-view.c:1561 ../ui/evolution-calendar.xml.h:45
-msgid "_Publish Free/Busy Information"
-msgstr "予定の有無の公開(_P)"
-
-#: ../calendar/gui/e-calendar-view.c:1577
+#: ../calendar/gui/e-calendar-view.c:1565
 msgid "Cop_y to Calendar..."
 msgstr "カレンダへコピー(_Y)..."
 
-#: ../calendar/gui/e-calendar-view.c:1578
+#: ../calendar/gui/e-calendar-view.c:1566
 msgid "Mo_ve to Calendar..."
 msgstr "カレンダへ移動(_V)..."
 
-#: ../calendar/gui/e-calendar-view.c:1579
+#: ../calendar/gui/e-calendar-view.c:1567
 msgid "_Delegate Meeting..."
 msgstr "会議の委任(_D)..."
 
-#: ../calendar/gui/e-calendar-view.c:1580
+#: ../calendar/gui/e-calendar-view.c:1568
 msgid "_Schedule Meeting..."
 msgstr "会議のスケジュール(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1569
 msgid "_Forward as iCalendar..."
 msgstr "iCalender 形式で転送(_F)..."
 
-#: ../calendar/gui/e-calendar-view.c:1586
+#: ../calendar/gui/e-calendar-view.c:1574
 msgid "Make this Occurrence _Movable"
 msgstr "このイベントを移動可能にする(_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1587
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "Delete this _Occurrence"
 msgstr "このイベントの削除(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1588
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "Delete _All Occurrences"
 msgstr "全てのイベントの削除(_A)"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:1963
+#: ../calendar/gui/e-calendar-view.c:1959
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "主催者: %s <%s>"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1977 ../calendar/gui/print.c:2339
+#: ../calendar/gui/e-calendar-view.c:1973 ../calendar/gui/print.c:2339
 #, c-format
 msgid "Location: %s"
 msgstr "場所: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2008
+#: ../calendar/gui/e-calendar-view.c:2004
 #, c-format
 msgid "Time: %s %s"
 msgstr "時刻; %s %s"
@@ -7120,12 +7095,12 @@ msgstr "時刻; %s %s"
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: ../calendar/gui/e-cell-date-edit-text.c:115
 msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%Y/%m/%d (%a) %k:%M:%S"
+msgstr "%Y/%m/%d (%a)%k:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
 #: ../calendar/gui/e-cell-date-edit-text.c:118
 msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%Y/%m/%d (%a) %p %l:%M:%S"
+msgstr "%Y/%m/%d (%a) %p%l:%M:%S"
 
 #: ../calendar/gui/e-cell-date-edit-text.c:123
 #, c-format
@@ -7281,7 +7256,7 @@ msgstr "受諾済"
 #: ../calendar/gui/e-itip-control.c:1142 ../calendar/gui/itip-utils.c:549
 #: ../plugins/itip-formatter/itip-formatter.c:1643
 msgid "Tentatively Accepted"
-msgstr "暫定的に受諾済"
+msgstr "仮承認済"
 
 #: ../calendar/gui/e-itip-control.c:1146
 #: ../calendar/gui/e-meeting-list-view.c:205
@@ -7445,7 +7420,7 @@ msgstr "<b>%s</b> さんが予定を公開しました。"
 
 #: ../calendar/gui/e-itip-control.c:1462
 msgid "Free/Busy Information"
-msgstr "予定の有無"
+msgstr "Free/Busy の情報"
 
 #: ../calendar/gui/e-itip-control.c:1466
 #, c-format
@@ -7454,7 +7429,7 @@ msgstr "<b>%s</b> さんが予定を要求してきました。"
 
 #: ../calendar/gui/e-itip-control.c:1467
 msgid "Free/Busy Request"
-msgstr "予定の有無の要求"
+msgstr "Free/Busy の要求"
 
 #: ../calendar/gui/e-itip-control.c:1471
 #, c-format
@@ -7463,11 +7438,11 @@ msgstr "予定の有無の要求に対して <b>%s</s> さんが返信してき�
 
 #: ../calendar/gui/e-itip-control.c:1472
 msgid "Free/Busy Reply"
-msgstr "予定の有無の返信"
+msgstr "Free/Busy の返信"
 
 #: ../calendar/gui/e-itip-control.c:1477
 msgid "Bad Free/Busy Message"
-msgstr "予定の有無のメッセージが間違っています"
+msgstr "Free/Busy のメッセージが間違っています"
 
 #: ../calendar/gui/e-itip-control.c:1552
 msgid "The message does not appear to be properly formed"
@@ -7526,37 +7501,37 @@ msgstr "そのアイテムは送信できませんでした！\n"
 msgid "Choose an action:"
 msgstr "アクションの選択:"
 
-#: ../calendar/gui/e-itip-control.c:2236
+#: ../calendar/gui/e-itip-control.c:2237
 msgid "Update"
 msgstr "更新"
 
-#: ../calendar/gui/e-itip-control.c:2264
+#: ../calendar/gui/e-itip-control.c:2265
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "受諾"
 
-#: ../calendar/gui/e-itip-control.c:2265
+#: ../calendar/gui/e-itip-control.c:2266
 msgid "Tentatively accept"
-msgstr "暫定的に受諾"
+msgstr "仮承認"
 
-#: ../calendar/gui/e-itip-control.c:2266
+#: ../calendar/gui/e-itip-control.c:2267
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "辞退"
 
-#: ../calendar/gui/e-itip-control.c:2295
+#: ../calendar/gui/e-itip-control.c:2296
 msgid "Send Free/Busy Information"
-msgstr "予定の有無の送信"
+msgstr "Free/Busy 情報の送信"
 
-#: ../calendar/gui/e-itip-control.c:2323
+#: ../calendar/gui/e-itip-control.c:2324
 msgid "Update respondent status"
 msgstr "応答者ステータスの更新"
 
-#: ../calendar/gui/e-itip-control.c:2351
+#: ../calendar/gui/e-itip-control.c:2352
 msgid "Send Latest Information"
 msgstr "最新情報の送信"
 
-#: ../calendar/gui/e-itip-control.c:2379 ../calendar/gui/itip-utils.c:569
+#: ../calendar/gui/e-itip-control.c:2380 ../calendar/gui/itip-utils.c:569
 #: ../mail/mail-send-recv.c:414 ../mail/mail-send-recv.c:466
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
@@ -7670,7 +7645,7 @@ msgstr "要アクション"
 #: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/e-meeting-time-sel.c:414
 msgid "Tentative"
-msgstr "暫定"
+msgstr "仮承認"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
 #: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
@@ -7963,7 +7938,7 @@ msgstr "ジャーナル情報"
 
 #: ../calendar/gui/itip-utils.c:514 ../calendar/gui/itip-utils.c:652
 msgid "Free/Busy information"
-msgstr "予定の有無"
+msgstr "Free/Busy の情報"
 
 #: ../calendar/gui/itip-utils.c:516
 msgid "Calendar information"
@@ -7984,7 +7959,7 @@ msgstr "カウンタープロポーザル"
 #: ../calendar/gui/itip-utils.c:648
 #, c-format
 msgid "Free/Busy information (%s to %s)"
-msgstr "予定の有無 (%s から %s)"
+msgstr "Free/Busy の情報 (%s から %s)"
 
 #: ../calendar/gui/itip-utils.c:658
 msgid "iCalendar information"
@@ -7994,75 +7969,75 @@ msgstr "iCalendar 情報"
 msgid "You must be an attendee of the event."
 msgstr "イベントの出席しなければなりません。"
 
-#: ../calendar/gui/memos-component.c:449 ../ui/evolution-addressbook.xml.h:3
+#: ../calendar/gui/memos-component.c:450 ../ui/evolution-addressbook.xml.h:3
 #: ../ui/evolution-memos.xml.h:2 ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "コピー"
 
-#: ../calendar/gui/memos-component.c:450 ../mail/em-filter-i18n.h:11
+#: ../calendar/gui/memos-component.c:451 ../mail/em-filter-i18n.h:11
 #: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
-msgstr "削除"
+msgstr "削除する"
 
-#: ../calendar/gui/memos-component.c:451
+#: ../calendar/gui/memos-component.c:452
 msgid "Properties..."
 msgstr "プロパティ..."
 
-#: ../calendar/gui/memos-component.c:524
+#: ../calendar/gui/memos-component.c:525
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d 個のメモ"
 msgstr[1] "%d 個のメモ"
 
-#: ../calendar/gui/memos-component.c:526 ../calendar/gui/tasks-component.c:517
-#: ../mail/mail-component.c:548
+#: ../calendar/gui/memos-component.c:527 ../calendar/gui/tasks-component.c:518
+#: ../mail/mail-component.c:559
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", 選択済 %d 個"
 msgstr[1] ", 選択済 %d 個"
 
-#: ../calendar/gui/memos-component.c:573
+#: ../calendar/gui/memos-component.c:574
 msgid "Failed upgrading memos."
 msgstr "メモの移行に失敗しました。"
 
-#: ../calendar/gui/memos-component.c:869
+#: ../calendar/gui/memos-component.c:870
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "イベントと会議の作成に必要なメモ一覧 '%s' を開けません"
 
-#: ../calendar/gui/memos-component.c:882
+#: ../calendar/gui/memos-component.c:883
 msgid "There is no calendar available for creating memos"
 msgstr "メモを作成できるカレンダがありません"
 
-#: ../calendar/gui/memos-component.c:973
+#: ../calendar/gui/memos-component.c:974
 msgid "Memo Source Selector"
 msgstr "メモの格納場所の選択"
 
-#: ../calendar/gui/memos-component.c:1156
+#: ../calendar/gui/memos-component.c:1157
 msgid "New memo"
 msgstr "新しいメモ"
 
-#: ../calendar/gui/memos-component.c:1157
+#: ../calendar/gui/memos-component.c:1158
 msgid "_Memo"
 msgstr "メモ(_M)"
 
-#: ../calendar/gui/memos-component.c:1158
+#: ../calendar/gui/memos-component.c:1159
 msgid "Create a new memo"
 msgstr "新しいメモを作成します"
 
-#: ../calendar/gui/memos-component.c:1164
+#: ../calendar/gui/memos-component.c:1165
 msgid "New memo list"
 msgstr "新しいメモ一覧"
 
-#: ../calendar/gui/memos-component.c:1165
+#: ../calendar/gui/memos-component.c:1166
 msgid "Memo l_ist"
 msgstr "メモ一覧(_I)"
 
-#: ../calendar/gui/memos-component.c:1166
+#: ../calendar/gui/memos-component.c:1167
 msgid "Create a new memo list"
 msgstr "新しいメモ一覧を作成します"
 
@@ -8347,63 +8322,63 @@ msgstr "印刷プレビュー"
 msgid "Print Item"
 msgstr "アイテムの印刷"
 
-#: ../calendar/gui/tasks-component.c:439
+#: ../calendar/gui/tasks-component.c:440
 msgid "_New Task List"
 msgstr "新しいタスク一覧(_N)"
 
-#: ../calendar/gui/tasks-component.c:515
+#: ../calendar/gui/tasks-component.c:516
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d 個のタスク"
 msgstr[1] "%d 個のタスク"
 
-#: ../calendar/gui/tasks-component.c:564
+#: ../calendar/gui/tasks-component.c:565
 msgid "Failed upgrading tasks."
 msgstr "タスクの移行に失敗しました。"
 
-#: ../calendar/gui/tasks-component.c:875
+#: ../calendar/gui/tasks-component.c:876
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "イベントと会議の作成に必要なタスク一覧 '%s' を開けません"
 
-#: ../calendar/gui/tasks-component.c:888
+#: ../calendar/gui/tasks-component.c:889
 msgid "There is no calendar available for creating tasks"
 msgstr "タスクを作成できるカレンダがありません"
 
-#: ../calendar/gui/tasks-component.c:988
+#: ../calendar/gui/tasks-component.c:989
 msgid "Task Source Selector"
 msgstr "タスクの格納場所の選択"
 
-#: ../calendar/gui/tasks-component.c:1171
+#: ../calendar/gui/tasks-component.c:1172
 msgid "New task"
 msgstr "新規のタスク"
 
-#: ../calendar/gui/tasks-component.c:1173
+#: ../calendar/gui/tasks-component.c:1174
 msgid "Create a new task"
 msgstr "新しいタスクを作成します"
 
-#: ../calendar/gui/tasks-component.c:1179
+#: ../calendar/gui/tasks-component.c:1180
 msgid "New assigned task"
 msgstr "新しいタスクの割当て"
 
-#: ../calendar/gui/tasks-component.c:1180
+#: ../calendar/gui/tasks-component.c:1181
 msgid "Assigne_d Task"
 msgstr "タスクの割当て(_D)"
 
-#: ../calendar/gui/tasks-component.c:1181
+#: ../calendar/gui/tasks-component.c:1182
 msgid "Create a new assigned task"
 msgstr "新しいタスクの割り当てを作成します"
 
-#: ../calendar/gui/tasks-component.c:1187
+#: ../calendar/gui/tasks-component.c:1188
 msgid "New task list"
 msgstr "新しいタスク一覧"
 
-#: ../calendar/gui/tasks-component.c:1188
+#: ../calendar/gui/tasks-component.c:1189
 msgid "Task l_ist"
 msgstr "タスク一覧(_I)"
 
-#: ../calendar/gui/tasks-component.c:1189
+#: ../calendar/gui/tasks-component.c:1190
 msgid "Create a new task list"
 msgstr "新しいタスク一覧を作成します"
 
@@ -8450,8 +8425,8 @@ msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar インポータ"
 
 #: ../calendar/importers/icalendar-importer.c:521
-msgid "Reminder!!"
-msgstr "リマインダです！！"
+msgid "Reminder!"
+msgstr "リマインダです！"
 
 #: ../calendar/importers/icalendar-importer.c:573
 msgid "vCalendar files (.vcf)"
@@ -10027,15 +10002,15 @@ msgstr "添付ファイル・バー"
 #: ../composer/e-msg-composer-attachment.c:203
 #: ../composer/e-msg-composer-attachment.c:297
 #: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:221 ../widgets/misc/e-attachment.c:237
-#: ../widgets/misc/e-attachment.c:425 ../widgets/misc/e-attachment.c:441
+#: ../widgets/misc/e-attachment.c:238 ../widgets/misc/e-attachment.c:254
+#: ../widgets/misc/e-attachment.c:442 ../widgets/misc/e-attachment.c:458
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "ファイル %s を添付できません: %s"
 
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:229 ../widgets/misc/e-attachment.c:433
+#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:450
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "ファイル %s を添付できません: 通常のファイルではありません"
@@ -10216,7 +10191,7 @@ msgstr ""
 "ん。"
 
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:19
 msgid "Because &quot;{1}&quot;."
 msgstr "理由は &quot;{1}&quot; です。"
 
@@ -10227,8 +10202,8 @@ msgid ""
 "continue the message at a later date."
 msgstr ""
 "メール作成ウィンドウを閉じる際にメッセージを草案フォルダに保存しないと、メッ"
-"セージを永久に失うことになります。保存しておくと、後日、メッセージの作成を続"
-"行することができます。"
+"セージを完全に抹消することになります。保存しておくと、後日、メッセージの作成"
+"を続行することができます。"
 
 #: ../composer/mail-composer.error.xml.h:7
 msgid "Could not create composer window."
@@ -10255,12 +10230,12 @@ msgid "Directories can not be attached to Messages."
 msgstr "フォルダをメッセージへ添付することはできません。"
 
 #: ../composer/mail-composer.error.xml.h:13
-msgid "Do you want to recover unfinished messages?"
-msgstr "未完のメッセージを復旧しますか？"
+msgid "Do not Recover"
+msgstr "復旧しない"
 
 #: ../composer/mail-composer.error.xml.h:14
-msgid "Don't Recover"
-msgstr "復旧しない"
+msgid "Do you want to recover unfinished messages?"
+msgstr "未完のメッセージを復旧しますか？"
 
 #: ../composer/mail-composer.error.xml.h:15
 msgid "Download in progress. Do you want to send the mail?"
@@ -10336,7 +10311,7 @@ msgstr "メッセージの保存(_S)"
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
 #: ../shell/main.c:514
 msgid "Evolution"
-msgstr "Evolution-2.4"
+msgstr "Evolution-2.6"
 
 #: ../data/evolution.desktop.in.in.h:2
 msgid "The Evolution Groupware Suite"
@@ -10386,7 +10361,7 @@ msgid "I am currently out of the office"
 msgstr "現在、私は外出中です"
 
 #: ../designs/OOA/ooa.glade.h:10
-msgid "No, Don't Change Status"
+msgid "No, Do not Change Status"
 msgstr "いいえ、ステータスを変更しません"
 
 #: ../designs/OOA/ooa.glade.h:12
@@ -10505,7 +10480,7 @@ msgstr "上書きしてもよろしいですか？"
 msgid "File exists &quot;{0}&quot;."
 msgstr "&quot;{0}&quot; というファイルが存在します。"
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:128
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:131
 msgid "_Overwrite"
 msgstr "上書きする(_O)"
 
@@ -10584,20 +10559,20 @@ msgid "Choose a file"
 msgstr "ファイルの選択"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1041 ../mail/mail-config.c:76
+#: ../mail/em-migrate.c:1051 ../mail/mail-config.c:84
 #: ../mail/mail-config.glade.h:91
 msgid "Important"
 msgstr "重要"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1044
-#: ../mail/mail-config.c:79 ../mail/mail-config.glade.h:145
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1054
+#: ../mail/mail-config.c:87 ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "ToDo"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1045
-#: ../mail/mail-config.c:80 ../mail/mail-config.glade.h:95
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1055
+#: ../mail/mail-config.c:88 ../mail/mail-config.glade.h:95
 msgid "Later"
 msgstr "保留"
 
@@ -10606,24 +10581,24 @@ msgid "Test"
 msgstr "テスト"
 
 #: ../filter/filter-rule.c:791
-msgid "_Rule name:"
-msgstr "ルール名(_R):"
+msgid "_Search name:"
+msgstr "ルールの名前(_S):"
 
 #: ../filter/filter-rule.c:819
-msgid "If"
-msgstr "条件"
+msgid "Find items that meet the following criteria"
+msgstr "次の条件に一致するアイテムを検索します:"
 
 #: ../filter/filter-rule.c:858
-msgid "if all criteria are met"
-msgstr "全ての条件が合った時"
+msgid "If all criteria are met"
+msgstr "全ての条件が一致した時"
 
 #: ../filter/filter-rule.c:858
-msgid "if any criteria are met"
-msgstr "幾つかの条件が合った時"
+msgid "If any criteria are met"
+msgstr "幾つかの条件が一致した時"
 
 #: ../filter/filter-rule.c:860
-msgid "Execute actions"
-msgstr "実行する条件:"
+msgid "Find items:"
+msgstr "アイテムを検索する条件:"
 
 #: ../filter/filter-rule.c:881
 msgid "All related"
@@ -10642,11 +10617,11 @@ msgid "Include threads"
 msgstr "次のスレッドを含める"
 
 #: ../filter/filter-rule.c:978 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:330
+#: ../mail/em-utils.c:348
 msgid "Incoming"
-msgstr "入力"
+msgstr "受信"
 
-#: ../filter/filter-rule.c:978 ../mail/em-utils.c:331
+#: ../filter/filter-rule.c:978 ../mail/em-utils.c:349
 msgid "Outgoing"
 msgstr "送信"
 
@@ -10672,7 +10647,7 @@ msgstr "日付がありません。"
 msgid "Missing file name."
 msgstr "氏名がありません。"
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:67
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:70
 msgid "Missing name."
 msgstr "名前がありません。"
 
@@ -10756,15 +10731,15 @@ msgstr "指定した時間"
 msgid "years"
 msgstr "年"
 
-#: ../filter/rule-editor.c:290
+#: ../filter/rule-editor.c:292
 msgid "Add Rule"
 msgstr "ルールの追加"
 
-#: ../filter/rule-editor.c:366
+#: ../filter/rule-editor.c:368
 msgid "Edit Rule"
 msgstr "ルールの編集"
 
-#: ../filter/rule-editor.c:698
+#: ../filter/rule-editor.c:735
 msgid "Rule name"
 msgstr "ルール名"
 
@@ -10809,11 +10784,11 @@ msgstr "Evolution メール作成ウィンドウの設定コントロール"
 msgid "Evolution Mail preferences control"
 msgstr "Evolution メール設定コントロール"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:495
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
-#: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:561
-#: ../mail/mail-component.c:648
+#: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:577
+#: ../mail/mail-component.c:578 ../mail/mail-component.c:663
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "メール"
@@ -10850,7 +10825,7 @@ msgstr ""
 "チェック・ボックスにチェックを入れて下さい。\n"
 
 #: ../mail/em-account-editor.c:472 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:495
+#: ../mail/em-vfolder-rule.c:496
 msgid "Select Folder"
 msgstr "フォルダの選択"
 
@@ -10870,7 +10845,7 @@ msgstr "メールの受信"
 msgid "Automatically check for _new mail every"
 msgstr "新着メールを自動的にチェックする(_N)"
 
-#: ../mail/em-account-editor.c:2160 ../mail/mail-config.glade.h:128
+#: ../mail/em-account-editor.c:2160 ../mail/mail-config.glade.h:129
 msgid "Sending Email"
 msgstr "メールの送信"
 
@@ -10880,32 +10855,49 @@ msgstr "デフォルト"
 
 #. Security settings
 #: ../mail/em-account-editor.c:2285 ../mail/mail-config.glade.h:122
-#: ../plugins/exchange-operations/exchange-account-setup.c:313
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "セキュリティ"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2322 ../mail/em-account-editor.c:2412
+#: ../mail/em-account-editor.c:2322 ../mail/em-account-editor.c:2413
 msgid "Receiving Options"
 msgstr "返信オプション"
 
-#: ../mail/em-account-editor.c:2323 ../mail/em-account-editor.c:2413
+#: ../mail/em-account-editor.c:2323 ../mail/em-account-editor.c:2414
 msgid "Checking for New Mail"
 msgstr "新着メールのチェック"
 
-#: ../mail/em-account-editor.c:2737 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2753 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "アカウント・エディタ"
 
-#: ../mail/em-account-editor.c:2737 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2753 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Evolution アカウント・アシスタント"
 
+#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
+#: ../mail/em-account-prefs.c:407
+msgid "Disable"
+msgstr "無効"
+
+#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
+#: ../mail/em-account-prefs.c:409
+msgid "Enable"
+msgstr "有効"
+
 #. translators: default account indicator
 #: ../mail/em-account-prefs.c:456
 msgid "[Default]"
 msgstr "[デフォルト]"
 
+#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
+#: ../mail/em-account-prefs.c:505 ../mail/em-composer-prefs.c:930
+#: ../plugins/plugin-manager/plugin-manager.c:213
+#: ../plugins/publish-calendar/publish-calendar.c:451
+msgid "Enabled"
+msgstr "有効"
+
 #: ../mail/em-account-prefs.c:511
 msgid "Account name"
 msgstr "アカウント名"
@@ -10919,7 +10911,7 @@ msgid "Mail Accounts Table"
 msgstr "メール・アカウントの一覧"
 
 #: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:958
+#: ../mail/mail-config.c:966
 msgid "Unnamed"
 msgstr "名前なし"
 
@@ -10971,7 +10963,7 @@ msgstr "色を付ける"
 msgid "Assign Score"
 msgstr "スコアを付ける"
 
-#: ../mail/em-filter-i18n.h:5 ../ui/evolution-editor.xml.h:1
+#: ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "ファイルの添付"
 
@@ -10985,7 +10977,7 @@ msgstr "が次を含む"
 
 #: ../mail/em-filter-i18n.h:8
 msgid "Copy to Folder"
-msgstr "フォルダへコピー"
+msgstr "フォルダへコピーする"
 
 #: ../mail/em-filter-i18n.h:9
 msgid "Date received"
@@ -11092,7 +11084,7 @@ msgstr "ジャンク"
 msgid "Junk Test"
 msgstr "ジャンクのテスト"
 
-#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1064
+#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1105
 #: ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "ラベル"
@@ -11103,7 +11095,7 @@ msgstr "メーリング・リスト"
 
 #: ../mail/em-filter-i18n.h:39
 msgid "Match All"
-msgstr "全てに一致する"
+msgstr "一致するもの全て"
 
 #: ../mail/em-filter-i18n.h:40
 msgid "Message Body"
@@ -11127,7 +11119,7 @@ msgstr "フォルダへ移動する"
 
 #: ../mail/em-filter-i18n.h:45
 msgid "Pipe to Program"
-msgstr "プログラムへ引き渡す"
+msgstr "プログラムに引き渡す"
 
 #: ../mail/em-filter-i18n.h:46
 msgid "Play Sound"
@@ -11201,9 +11193,9 @@ msgstr "が次で始まる"
 msgid "Stop Processing"
 msgstr "読み込みを停止する"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1572
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1582
 #: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:88 ../mail/message-list.etspec.h:13
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:336
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1131
@@ -11219,24 +11211,26 @@ msgstr "ステータスを外す"
 msgid "<b>Then</b>"
 msgstr "<b>アクション</b> "
 
-#: ../mail/em-folder-browser.c:134
+#: ../mail/em-folder-browser.c:143
 msgid "C_reate Search Folder From Search..."
 msgstr "検索結果から仮想フォルダの作成(_R)..."
 
 #. TODO: can this be done in a loop?
-#: ../mail/em-folder-properties.c:144
-msgid "Total message:"
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:145
+msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "メッセージの総数:"
 msgstr[1] "メッセージの総数:"
 
-#: ../mail/em-folder-properties.c:156
-msgid "Unread message:"
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:158
+msgid "Unread messages:"
 msgid_plural "Unread messages:"
-msgstr[0] "未読のメッセージ:"
-msgstr[1] "未読のメッセージ:"
+msgstr[0] "未読のメッセージ数:"
+msgstr[1] "未読のメッセージ数:"
 
-#: ../mail/em-folder-properties.c:278
+#: ../mail/em-folder-properties.c:289
 #: ../plugins/groupwise-features/properties.glade.h:3
 msgid "Folder Properties"
 msgstr "フォルダのプロパティ"
@@ -11254,34 +11248,34 @@ msgid "Folder _name:"
 msgstr "フォルダ名(_N):"
 
 # "検索フォルダ"は適訳ではない
-#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-folder-tree-model.c:204
 #: ../mail/mail-vfolder.c:938 ../mail/mail-vfolder.c:1011
 msgid "Search Folders"
 msgstr "仮想フォルダ"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:207 ../mail/em-folder-tree-model.c:209
+#: ../mail/em-folder-tree-model.c:208 ../mail/em-folder-tree-model.c:210
 msgid "UNMATCHED"
 msgstr "該当しないもの"
 
-#: ../mail/em-folder-tree-model.c:469 ../mail/mail-component.c:144
+#: ../mail/em-folder-tree-model.c:483 ../mail/mail-component.c:150
 msgid "Drafts"
 msgstr "草案"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:472 ../mail/mail-component.c:143
+#: ../mail/em-folder-tree-model.c:486 ../mail/mail-component.c:149
 msgid "Inbox"
 msgstr "受信箱"
 
-#: ../mail/em-folder-tree-model.c:475 ../mail/mail-component.c:145
+#: ../mail/em-folder-tree-model.c:489 ../mail/mail-component.c:151
 msgid "Outbox"
 msgstr "送信トレイ"
 
-#: ../mail/em-folder-tree-model.c:477 ../mail/mail-component.c:146
+#: ../mail/em-folder-tree-model.c:491 ../mail/mail-component.c:152
 msgid "Sent"
 msgstr "送信済み"
 
-#: ../mail/em-folder-tree-model.c:499 ../mail/em-folder-tree-model.c:803
+#: ../mail/em-folder-tree-model.c:513 ../mail/em-folder-tree-model.c:817
 msgid "Loading..."
 msgstr "読み込み中..."
 
@@ -11313,11 +11307,11 @@ msgstr "フォルダ %s へメッセージのコピー中"
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "メッセージをトップレベルの中に移せません"
 
-#: ../mail/em-folder-tree.c:977
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:106
 msgid "_Copy to Folder"
 msgstr "フォルダへコピー(_C)"
 
-#: ../mail/em-folder-tree.c:978
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "フォルダへ移動(_M)"
 
@@ -11355,7 +11349,7 @@ msgstr "新しいフォルダ(_N)"
 msgid "_Rename..."
 msgstr "名前の変更(_R)..."
 
-#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:125
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:128
 msgid "_Empty Trash"
 msgstr "ゴミ箱を空にする(_E)"
 
@@ -11364,13 +11358,13 @@ msgstr "ゴミ箱を空にする(_E)"
 msgid "Copying `%s' to `%s'"
 msgstr "'%s' を '%s' へコピー中"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:932
-#: ../mail/em-folder-view.c:947 ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "フォルダの選択"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:947
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "コピー(_O)"
 
@@ -11405,166 +11399,166 @@ msgstr "フォルダの作成"
 msgid "Specify where to create the folder:"
 msgstr "フォルダを作成する場所を指定して下さい:"
 
-#: ../mail/em-folder-view.c:1040
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "差出人へ返信(_R)"
 
-#: ../mail/em-folder-view.c:1041 ../mail/em-popup.c:558 ../mail/em-popup.c:569
+#: ../mail/em-folder-view.c:1082 ../mail/em-popup.c:558 ../mail/em-popup.c:569
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _All"
 msgstr "全員へ返信(_A)"
 
-#: ../mail/em-folder-view.c:1042 ../mail/em-popup.c:560 ../mail/em-popup.c:571
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:560 ../mail/em-popup.c:571
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "転送(_F)"
 
-#: ../mail/em-folder-view.c:1045 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:108
 msgid "_Edit as New Message..."
 msgstr "新規のメッセージとして編集(_E)..."
 
-#: ../mail/em-folder-view.c:1051
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "削除の取り消し(_N)"
 
-#: ../mail/em-folder-view.c:1052 ../ui/evolution-addressbook.xml.h:37
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../mail/em-folder-view.c:1093 ../ui/evolution-addressbook.xml.h:37
 msgid "_Move to Folder..."
 msgstr "フォルダへ移動(_M)..."
 
-#: ../mail/em-folder-view.c:1053 ../ui/evolution-addressbook.xml.h:33
-#: ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-view.c:1094 ../ui/evolution-addressbook.xml.h:33
 msgid "_Copy to Folder..."
 msgstr "フォルダへコピー(_C)..."
 
-#: ../mail/em-folder-view.c:1056
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "既読としてマーク(_K)"
 
-#: ../mail/em-folder-view.c:1057
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "未読としてマーク(_U)"
 
-#: ../mail/em-folder-view.c:1058
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "重要としてマーク(_I)"
 
-#: ../mail/em-folder-view.c:1059
+#: ../mail/em-folder-view.c:1100
 msgid "_Mark as Unimportant"
 msgstr "重要でないとしてマーク(_M)"
 
-#: ../mail/em-folder-view.c:1060
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "ジャンクとしてマーク(_J)"
 
-#: ../mail/em-folder-view.c:1061
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "ジャンクではないとしてマーク(_N)"
 
-#: ../mail/em-folder-view.c:1062
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr "フォロー・アップとしてマーク(_W)"
 
-#: ../mail/em-folder-view.c:1070
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "完了フラグの付与(_G)"
 
-#: ../mail/em-folder-view.c:1071
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "フラグの解除(_E)"
 
-#: ../mail/em-folder-view.c:1074
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "メッセージからルールの作成(_T)"
 
-#: ../mail/em-folder-view.c:1075
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "件名の仮想フォルダ(_S)"
 
-#: ../mail/em-folder-view.c:1076
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "差出人の仮想フォルダ(_N)"
 
-#: ../mail/em-folder-view.c:1077
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "宛先の仮想フォルダ(_R)"
 
-#: ../mail/em-folder-view.c:1078
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "メーリング・リストの仮想フォルダ(_L)"
 
-#: ../mail/em-folder-view.c:1082
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "件名のフィルタ(_J)"
 
-#: ../mail/em-folder-view.c:1083
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "差出人のフィルタ(_D)"
 
-#: ../mail/em-folder-view.c:1084
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "宛先のフィルタ(_C)"
 
-#: ../mail/em-folder-view.c:1085
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "メーリング・リストのフィルタ(_M)"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1923 ../mail/em-folder-view.c:1967
+#: ../mail/em-folder-view.c:1974 ../mail/em-folder-view.c:2018
 msgid "Default"
 msgstr "デフォルト"
 
-#: ../mail/em-folder-view.c:2066
+#: ../mail/em-folder-view.c:2117
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "メッセージの印刷"
 
-#: ../mail/em-folder-view.c:2222
+#: ../mail/em-folder-view.c:2273
 msgid "Unable to retrieve message"
 msgstr "メッセージを取得できません"
 
-#: ../mail/em-folder-view.c:2415
+#: ../mail/em-folder-view.c:2466
 msgid "_Copy Link Location"
 msgstr "リンク先のコピー(_C)"
 
-#: ../mail/em-folder-view.c:2417
+#: ../mail/em-folder-view.c:2468
 msgid "Create _Search Folder"
 msgstr "仮想フォルダの作成(_S)"
 
-#: ../mail/em-folder-view.c:2418
+#: ../mail/em-folder-view.c:2469
 msgid "_From this Address"
 msgstr "この宛先から(_F)"
 
-#: ../mail/em-folder-view.c:2419
+#: ../mail/em-folder-view.c:2470
 msgid "_To this Address"
 msgstr "この宛先へ(_T)"
 
-#: ../mail/em-folder-view.c:2723
+#: ../mail/em-folder-view.c:2824
 #, c-format
 msgid "Click to mail %s"
 msgstr "クリックすると %s へのメッセージを作成します"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:461
+#: ../mail/em-format-html-display.c:472
 #, c-format
 msgid "Matches: %d"
-msgstr "一致するもの: %d"
+msgstr "検索結果: %d 個"
 
-#: ../mail/em-format-html-display.c:712 ../mail/em-format-html.c:597
+#: ../mail/em-format-html-display.c:729 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "署名なし"
 
-#: ../mail/em-format-html-display.c:712
+#: ../mail/em-format-html-display.c:729
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr ""
 "このメッセージは署名されていません。このメッセージの信頼性を保証できません。"
 
-#: ../mail/em-format-html-display.c:713 ../mail/em-format-html.c:598
+#: ../mail/em-format-html-display.c:730 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "妥当な署名"
 
-#: ../mail/em-format-html-display.c:713
+#: ../mail/em-format-html-display.c:730
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11572,21 +11566,21 @@ msgstr ""
 "このメッセージには署名が付与されています。このメッセージは非常に信頼できるも"
 "のであることを意味します。"
 
-#: ../mail/em-format-html-display.c:714 ../mail/em-format-html.c:599
+#: ../mail/em-format-html-display.c:731 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "不正な署名"
 
-#: ../mail/em-format-html-display.c:714
+#: ../mail/em-format-html-display.c:731
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "転送中に改鼠されているので、このメッセージの署名を検証できません。"
 
-#: ../mail/em-format-html-display.c:715
+#: ../mail/em-format-html-display.c:732
 msgid "Valid signature, cannot verify sender"
 msgstr "署名は妥当ですが、差出人を検証できません"
 
-#: ../mail/em-format-html-display.c:715
+#: ../mail/em-format-html-display.c:732
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11594,118 +11588,122 @@ msgstr ""
 "このメッセージには妥当な署名が付与されていますが、メッセージの差出人を検証で"
 "きません。"
 
-#: ../mail/em-format-html-display.c:721 ../mail/em-format-html.c:606
+#: ../mail/em-format-html-display.c:738 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "暗号化なし"
 
-#: ../mail/em-format-html-display.c:721
+#: ../mail/em-format-html-display.c:738
 msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
+"This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 "このメッセージは暗号化されていません。その内容がインターネットを介して閲覧さ"
 "れる可能性があります。"
 
-#: ../mail/em-format-html-display.c:722 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:739 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "暗号化済み (レベルは不十分)"
 
-#: ../mail/em-format-html-display.c:722
+#: ../mail/em-format-html-display.c:739
 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 "
+"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:723 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:740 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "暗号化済み"
 
-#: ../mail/em-format-html-display.c:723
+#: ../mail/em-format-html-display.c:740
 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:724 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:741 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "暗号化済み (レベルは強力)"
 
-#: ../mail/em-format-html-display.c:724
+#: ../mail/em-format-html-display.c:741
 msgid ""
-"This message is encrypted, with a strong encryption algorithm.  It would be "
+"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:825 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:842 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "証明書の表示(_V)"
 
-#: ../mail/em-format-html-display.c:840
+#: ../mail/em-format-html-display.c:857
 msgid "This certificate is not viewable"
 msgstr "この証明書は表示可能な形式ではありません"
 
-#: ../mail/em-format-html-display.c:1122
+#: ../mail/em-format-html-display.c:1145
 msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "%Y年%B%e日 %p %l:%M に完了"
+msgstr "%Y年%B%e日 %p%l:%M に完了"
 
-#: ../mail/em-format-html-display.c:1130
+#: ../mail/em-format-html-display.c:1153
 msgid "Overdue:"
 msgstr "期限切れ:"
 
-#: ../mail/em-format-html-display.c:1133
+#: ../mail/em-format-html-display.c:1156
 msgid "by %B %d, %Y, %l:%M %p"
-msgstr "%Y年%B%e日 %p %l:%M まで"
+msgstr "%Y年%B%e日 %p%l:%M まで"
 
-#: ../mail/em-format-html-display.c:1193
+#: ../mail/em-format-html-display.c:1216
 msgid "_View Inline"
 msgstr "インライン表示(_V)"
 
-#: ../mail/em-format-html-display.c:1194
+#: ../mail/em-format-html-display.c:1217
 msgid "_Hide"
 msgstr "隠す(_H)"
 
-#: ../mail/em-format-html-display.c:1195
+#: ../mail/em-format-html-display.c:1218
 msgid "_Fit to Width"
 msgstr "幅を合わせる(_F)"
 
-#: ../mail/em-format-html-display.c:1196
+#: ../mail/em-format-html-display.c:1219
 msgid "Show _Original Size"
 msgstr "通常のサイズ(_O)"
 
-#: ../mail/em-format-html-display.c:1566
+#: ../mail/em-format-html-display.c:1596
 msgid "Attachment Button"
 msgstr "添付ボタン"
 
-#: ../mail/em-format-html-display.c:1773
+#: ../mail/em-format-html-display.c:1803
 msgid "Select folder to save all attachments..."
 msgstr "添付ファイルを全て保存するフォルダの選択..."
 
-#: ../mail/em-format-html-display.c:1820
+#: ../mail/em-format-html-display.c:1850
 msgid "Save Selected..."
 msgstr "選択範囲の保存..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1887
+#: ../mail/em-format-html-display.c:1917
 #, c-format
 msgid "%d attachment"
 msgid_plural "%d attachments"
 msgstr[0] "%d 個の添付ファイル"
 msgstr[1] "%d 個の添付ファイル"
 
-#: ../mail/em-format-html-display.c:1951
+#: ../mail/em-format-html-display.c:1980
+msgid "Toggle Attachment Bar"
+msgstr "添付ファイル・バーの表示/非表示"
+
+#: ../mail/em-format-html-display.c:1982
 msgid "No Attachment"
 msgstr "添付ファイルなし"
 
-#: ../mail/em-format-html-display.c:1954
+#: ../mail/em-format-html-display.c:1985
 msgid "Save All"
 msgstr "全て保存"
 
@@ -11714,99 +11712,99 @@ msgstr "全て保存"
 msgid "Page %d of %d"
 msgstr "%d / %d ページ"
 
-#: ../mail/em-format-html.c:473 ../mail/em-format-html.c:475
+#: ../mail/em-format-html.c:483 ../mail/em-format-html.c:485
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "'%s' の取得中"
 
-#: ../mail/em-format-html.c:600
+#: ../mail/em-format-html.c:610
 msgid "Valid signature but cannot verify sender"
 msgstr "署名は妥当ですが、差出人を検証できません"
 
-#: ../mail/em-format-html.c:870
+#: ../mail/em-format-html.c:880
 msgid "Malformed external-body part."
 msgstr "おかしな external-body 部分です。"
 
-#: ../mail/em-format-html.c:900
+#: ../mail/em-format-html.c:910
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP サイト (%s) を指しています"
 
-#: ../mail/em-format-html.c:911
+#: ../mail/em-format-html.c:921
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "ローカル・ファイル (%s) はサイト \"%s\" に正しくリンクしています"
 
-#: ../mail/em-format-html.c:913
+#: ../mail/em-format-html.c:923
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "ローカル・ファイル (%s) にリンクしています"
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:944
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "リモート・データ (%s) にリンクしています"
 
-#: ../mail/em-format-html.c:945
+#: ../mail/em-format-html.c:955
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "不明な外部データ (\"%s\" タイプ) にリンクしています"
 
-#: ../mail/em-format-html.c:1171
+#: ../mail/em-format-html.c:1181
 msgid "Formatting message"
 msgstr "メッセージの整形"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:83
+#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
 #: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
 msgid "From"
 msgstr "差出人"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:84
+#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
 msgid "Reply-To"
 msgstr "返信先"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:85
+#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
 #: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "宛先"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:86
+#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:87
+#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
 msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1576 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:992
+#: ../mail/em-format-html.c:1586 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1000
 msgid "Mailer"
 msgstr "メーラー"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1603
+#: ../mail/em-format-html.c:1613
 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:1606
+#: ../mail/em-format-html.c:1616
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1616 ../mail/em-format-quote.c:329
-#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:89
+#: ../mail/em-format-html.c:1626 ../mail/em-format-quote.c:329
+#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
 #: ../mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "日付"
 
-#: ../mail/em-format-html.c:1639 ../mail/em-format.c:851
-#: ../mail/em-mailer-prefs.c:90
+#: ../mail/em-format-html.c:1649 ../mail/em-format.c:851
+#: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
 msgstr "ニュースグループ"
 
@@ -11839,23 +11837,23 @@ msgstr "署名を検証する際にエラーが発生しました"
 msgid "Unknown error verifying signature"
 msgstr "署名を検証する際に不明なエラーが発生しました"
 
-#: ../mail/em-mailer-prefs.c:101
+#: ../mail/em-mailer-prefs.c:103
 msgid "Every time"
 msgstr "毎回"
 
-#: ../mail/em-mailer-prefs.c:102
+#: ../mail/em-mailer-prefs.c:104
 msgid "Once per day"
 msgstr "日に一度"
 
-#: ../mail/em-mailer-prefs.c:103
+#: ../mail/em-mailer-prefs.c:105
 msgid "Once per week"
 msgstr "週に一度"
 
-#: ../mail/em-mailer-prefs.c:104
+#: ../mail/em-mailer-prefs.c:106
 msgid "Once per month"
 msgstr "月に一度"
 
-#: ../mail/em-migrate.c:1198
+#: ../mail/em-migrate.c:1208
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -11867,47 +11865,47 @@ msgstr ""
 "\n"
 "Evolution がお使いのフォルダを移行している間、少々お待ち下さい..."
 
-#: ../mail/em-migrate.c:1632
+#: ../mail/em-migrate.c:1647
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "新しいフォルダ '%s' を作成できません: %s"
 
-#: ../mail/em-migrate.c:1658
+#: ../mail/em-migrate.c:1673
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "フォルダ '%s' を '%s' へコピーできません: %s"
 
-#: ../mail/em-migrate.c:1843
+#: ../mail/em-migrate.c:1858
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "'%s' にある受信箱をスキャンできません: %s"
 
-#: ../mail/em-migrate.c:2047
+#: ../mail/em-migrate.c:2062
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "POP keep-on-server のデータ '%s' を開けません: %s"
 
-#: ../mail/em-migrate.c:2061
+#: ../mail/em-migrate.c:2076
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "POP3 keep-on-server のデータ・フォルダ '%s' を作成できません: %s"
 
-#: ../mail/em-migrate.c:2090
+#: ../mail/em-migrate.c:2105
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "POP3 keep-on-server のデータ '%s' をコピーできません: %s"
 
-#: ../mail/em-migrate.c:2561 ../mail/em-migrate.c:2573
+#: ../mail/em-migrate.c:2576 ../mail/em-migrate.c:2588
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "ローカルのメール・フォルダ '%s' の作成に失敗しました: %s"
 
-#: ../mail/em-migrate.c:2693
+#: ../mail/em-migrate.c:2711
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "'%s' にあるローカルのメール・フォルダを作成できません: %s"
 
-#: ../mail/em-migrate.c:2711
+#: ../mail/em-migrate.c:2730
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -11920,6 +11918,7 @@ msgid "_Reply to sender"
 msgstr "差出人へ返信(_R)"
 
 #: ../mail/em-popup.c:557 ../mail/em-popup.c:568
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Reply to _List"
 msgstr "メーリング・リストへ返信(_L)"
 
@@ -11935,58 +11934,58 @@ msgstr "新しいメッセージの送信(_S)..."
 msgid "_Add to Addressbook"
 msgstr "アドレス帳に追加(_A)"
 
-#: ../mail/em-subscribe-editor.c:614
+#: ../mail/em-subscribe-editor.c:615
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "この格納場所は購読をサポートしていないか、有効になっていません。"
 
-#: ../mail/em-subscribe-editor.c:643
+#: ../mail/em-subscribe-editor.c:644
 msgid "Subscribed"
 msgstr "購読済み"
 
-#: ../mail/em-subscribe-editor.c:647
+#: ../mail/em-subscribe-editor.c:648
 msgid "Folder"
 msgstr "フォルダ"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:862
+#: ../mail/em-subscribe-editor.c:869
 msgid "Please select a server."
 msgstr "サーバを一つ選択して下さい。"
 
-#: ../mail/em-subscribe-editor.c:883
+#: ../mail/em-subscribe-editor.c:890
 msgid "No server has been selected"
 msgstr "サーバが指定されていません"
 
-#: ../mail/em-utils.c:106
-msgid "Don't show this message again."
+#: ../mail/em-utils.c:123
+msgid "Do not show this message again."
 msgstr "このメッセージを二度と表示しない"
 
-#: ../mail/em-utils.c:338
+#: ../mail/em-utils.c:356
 msgid "Filters"
 msgstr "フィルタ"
 
-#: ../mail/em-utils.c:481 ../mail/em-utils.c:518
+#: ../mail/em-utils.c:499 ../mail/em-utils.c:536
 msgid "message"
 msgstr "メッセージ"
 
-#: ../mail/em-utils.c:653
+#: ../mail/em-utils.c:671
 msgid "Save Message..."
 msgstr "メッセージの保存..."
 
-#: ../mail/em-utils.c:702
+#: ../mail/em-utils.c:720
 msgid "Add address"
 msgstr "住所の追加"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1181
+#: ../mail/em-utils.c:1204
 #, c-format
 msgid "Messages from %s"
 msgstr "%s からのメッセージ"
 
-#: ../mail/em-vfolder-editor.c:104
+#: ../mail/em-vfolder-editor.c:112
 msgid "Search _Folders"
 msgstr "仮想フォルダ(_F)"
 
-#: ../mail/em-vfolder-rule.c:575
+#: ../mail/em-vfolder-rule.c:576
 msgid "Search Folder source"
 msgstr "仮想フォルダのソース"
 
@@ -12213,8 +12212,8 @@ msgid "Message Window default width"
 msgstr "メッセージ・ウィンドウの幅 (デフォルト)"
 
 #: ../mail/evolution-mail.schemas.in.in.h:50
-msgid "Message-display style (normal, full headers, source)"
-msgstr "メッセージの表示スタイル (標準、全てのヘッダ、ソース)"
+msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
+msgstr "メッセージの表示スタイル (\"標準\"、\"全てのヘッダ\"、\"ソース\")"
 
 #: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
@@ -12610,104 +12609,104 @@ msgstr "Evolution Pine インポータ"
 msgid "Import mail from Pine."
 msgstr "Pine からのメールのインポート"
 
-#: ../mail/mail-autofilter.c:78
+#: ../mail/mail-autofilter.c:79
 #, c-format
 msgid "Mail to %s"
 msgstr "宛先が %s のメール"
 
-#: ../mail/mail-autofilter.c:242 ../mail/mail-autofilter.c:281
+#: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
 #, c-format
 msgid "Mail from %s"
 msgstr "差出人が %s のメール"
 
-#: ../mail/mail-autofilter.c:265
+#: ../mail/mail-autofilter.c:266
 #, c-format
 msgid "Subject is %s"
 msgstr "件名が %s のメール"
 
-#: ../mail/mail-autofilter.c:300
+#: ../mail/mail-autofilter.c:301
 #, c-format
 msgid "%s mailing list"
 msgstr "メーリング・リストが %s のメール"
 
-#: ../mail/mail-autofilter.c:369
+#: ../mail/mail-autofilter.c:372
 msgid "Add Filter Rule"
 msgstr "フィルタ・ルールの追加"
 
-#: ../mail/mail-component.c:509
+#: ../mail/mail-component.c:520
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "削除済 %d 通"
 msgstr[1] "削除済 %d 通"
 
-#: ../mail/mail-component.c:511
+#: ../mail/mail-component.c:522
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "ジャンク %d 通"
 msgstr[1] "ジャンク %d 通"
 
-#: ../mail/mail-component.c:534
+#: ../mail/mail-component.c:545
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "草案 %d 通"
 msgstr[1] "草案 %d 通"
 
-#: ../mail/mail-component.c:536
+#: ../mail/mail-component.c:547
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "送信済 %d 通"
 msgstr[1] "送信済 %d 通"
 
-#: ../mail/mail-component.c:538
+#: ../mail/mail-component.c:549
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "未送信 %d 通"
 msgstr[1] "未送信 %d 通"
 
-#: ../mail/mail-component.c:542
+#: ../mail/mail-component.c:553
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "合計 %d 通"
 msgstr[1] "合計 %d 通"
 
-#: ../mail/mail-component.c:544
+#: ../mail/mail-component.c:555
 #, c-format
 msgid ", %d unread"
 msgid_plural ", %d unread"
 msgstr[0] ", 未読 %d 通"
 msgstr[1] ", 未読 %d 通"
 
-#: ../mail/mail-component.c:765
+#: ../mail/mail-component.c:778
 msgid "New Mail Message"
 msgstr "新しいメッセージ"
 
-#: ../mail/mail-component.c:766
+#: ../mail/mail-component.c:779
 msgid "_Mail Message"
 msgstr "メッセージ(_M)"
 
-#: ../mail/mail-component.c:767
+#: ../mail/mail-component.c:780
 msgid "Compose a new mail message"
 msgstr "新しいメッセージを作成します"
 
-#: ../mail/mail-component.c:773
+#: ../mail/mail-component.c:786
 msgid "New Mail Folder"
 msgstr "新しいメール・フォルダ"
 
-#: ../mail/mail-component.c:774
+#: ../mail/mail-component.c:787
 msgid "Mail _Folder"
 msgstr "メールのフォルダ(_F)"
 
-#: ../mail/mail-component.c:775
+#: ../mail/mail-component.c:788
 msgid "Create a new mail folder"
 msgstr "新しいメール・フォルダを作成します"
 
-#: ../mail/mail-component.c:919
+#: ../mail/mail-component.c:932
 msgid "Failed upgrading Mail settings or folders."
 msgstr "メールの設定または関連フォルダのアップグレードに失敗しました。"
 
@@ -12726,8 +12725,8 @@ msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>この Evolution は SSL サポート付きでビルドされていません</b>"
 
 #: ../mail/mail-config.glade.h:5
-msgid "<b>S_ignatures</b>"
-msgstr "<b>署名(_I)</b> "
+msgid "<b>Sig_natures</b>"
+msgstr "<b>署名(_N)</b>"
 
 #: ../mail/mail-config.glade.h:6
 msgid "<b>_Languages</b>"
@@ -12741,10 +12740,6 @@ msgstr "<small>これは、より信頼性の高いフィルタですが低速�
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">アカウント情報</span>"
 
-#: ../mail/mail-config.glade.h:9
-msgid "<span weight=\"bold\">Alerts</span>"
-msgstr "<span weight=\"bold\">警告</span>"
-
 #: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">認証方式の種類</span>"
@@ -12777,11 +12772,6 @@ msgstr "<span weight=\"bold\">表示するヘッダの項目(_H)</span>"
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">フィルタリングのオプション</span>"
 
-#: ../mail/mail-config.glade.h:18
-#: ../plugins/itip-formatter/itip-formatter.c:1977
-msgid "<span weight=\"bold\">General</span>"
-msgstr "<span weight=\"bold\">全般</span>"
-
 #: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">ラベルと色</span>"
@@ -12807,6 +12797,7 @@ msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">新着メールの通知</span>"
 
 #: ../mail/mail-config.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.glade.h:3
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">追加情報</span>"
 
@@ -12844,7 +12835,7 @@ msgstr "<span weight=\"bold\">サーバの設定</span>"
 
 #: ../mail/mail-config.glade.h:35
 msgid "Account Management"
-msgstr "アカウント管理"
+msgstr "アカウントの管理"
 
 #: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
@@ -12887,8 +12878,8 @@ msgid "Attachment"
 msgstr "ファイルの添付"
 
 #: ../mail/mail-config.glade.h:46
-msgid "Automatically _insert smiley images"
-msgstr "スマイリー・アイコンを自動的に挿入する(_I)"
+msgid "Automatically insert _smiley images"
+msgstr "スマイリー・アイコンを自動的に挿入する(_S)"
 
 #: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
@@ -12911,8 +12902,8 @@ msgid "Ch_eck for Supported Types "
 msgstr "サポートしているかチェックする(_E) "
 
 #: ../mail/mail-config.glade.h:52
-msgid "Check _incoming mail for junk"
-msgstr "ジャンク・メールをチェックする(_I)"
+msgid "Check in_coming mail for junk"
+msgstr "受信したメールがジャンクかどうかチェックする(_C)"
 
 #: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
@@ -13004,21 +12995,21 @@ msgid "Encrypt out_going messages (by default)"
 msgstr "送信メッセージを暗号化する (デフォルト)(_G)"
 
 #: ../mail/mail-config.glade.h:81
-msgid "Execute Command..."
-msgstr "コマンドの実行..."
-
-#: ../mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
 msgstr "固定幅(_X):"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:82
 msgid "Font Properties"
 msgstr "フォントのプロパティ"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:83
 msgid "Format messages in _HTML"
 msgstr "HTML の中のメッセージを整形する(_H)"
 
+#: ../mail/mail-config.glade.h:84
+msgid "Full Nam_e:"
+msgstr "氏名(_E):"
+
 #: ../mail/mail-config.glade.h:86
 msgid "HTML Mail"
 msgstr "HTML 形式のメール"
@@ -13159,64 +13150,68 @@ msgid "Select HTML variable width font for printing"
 msgstr "印刷時の可変幅フォントの選択"
 
 #: ../mail/mail-config.glade.h:127
+msgid "Select sound file"
+msgstr "サウンド・ファイルの選択"
+
+#: ../mail/mail-config.glade.h:128
 msgid "Send message receipts:"
 msgstr "開封通知の送信:"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "Sending Mail"
 msgstr "メールの送信"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "Sent _Messages Folder:"
 msgstr "送信済フォルダ(_M):"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Ser_ver requires authentication"
 msgstr "サーバ認証を行う(_V)"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Server _Type: "
 msgstr "サーバ種別(_T):"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Sig_ning certificate:"
 msgstr "署名する証明書(_N):"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Signat_ure:"
 msgstr "署名(_U):"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Signatures"
 msgstr "署名"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Signatures Table"
 msgstr "署名の一覧"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Specify _filename:"
 msgstr "ファイル名の指定(_F):"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Spell Checking"
 msgstr "スペル・チェック"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "T_erminal Font:"
 msgstr "端末のフォント(_E):"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "T_ype: "
 msgstr "種別(_Y): "
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "お使いのシステムにインストールした辞書 (言語) だけ一覧に表示されます。"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:143
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13225,7 +13220,7 @@ msgstr ""
 "このスクリプトの出力を署名として使用します。\n"
 "\"名前\" は表示の目的でのみ使用されます。"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:147
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13233,15 +13228,15 @@ msgstr ""
 "このアカウントにお好みの名前を付けて下さい:\n"
 "(例: \"仕事\" や \"プライベート\")"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:149
 msgid "User_name:"
-msgstr "ユーザ名:"
+msgstr "ユーザ名(_N):"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "可変幅(_A):"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13251,30 +13246,26 @@ msgstr ""
 "\n"
 "[進む] ボタンをクリックして下さい。"
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:155
 msgid "_Add Signature"
 msgstr "署名の追加(_A)"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:156
 msgid "_Always load images from the Internet"
 msgstr "常に画像を読み込む(_A)"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:157
 msgid "_Do not notify me when new mail arrives"
 msgstr "新着メールが届いても通知しない(_D)"
 
-#: ../mail/mail-config.glade.h:157
-msgid "_Don't sign meeting requests (for Outlook compatibility)"
-msgstr "会議開催要求に署名しない (Outlook 互換)(_D)"
+#: ../mail/mail-config.glade.h:158
+msgid "_Do not sign meeting requests (for Outlook compatibility)"
+msgstr "会議開催要求には署名しない (Outlook 互換用)(_D)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:160
 msgid "_Forward style:"
 msgstr "転送方式(_F):"
 
-#: ../mail/mail-config.glade.h:160
-msgid "_Full Name:"
-msgstr "氏名(_F):"
-
 #: ../mail/mail-config.glade.h:161
 msgid "_Load images in mail from contacts"
 msgstr "連絡先に登録されている差出人の場合は画像を読み込む(_L)"
@@ -13296,8 +13287,8 @@ msgid "_Path:"
 msgstr "パス(_P):"
 
 #: ../mail/mail-config.glade.h:167
-msgid "_Prompt when sending HTML messages to contacts that don't want them"
-msgstr "HTML 形式を希望しない連絡先へ送信する場合は確認する(_P)"
+msgid "_Prompt when sending HTML messages to contacts that do not want them"
+msgstr "HTML 形式を希望しない連絡先に送信する場合は確認する(_P)"
 
 #: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending messages with an empty subject line"
@@ -13344,7 +13335,7 @@ msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<span weight=\"bold\">暗号化</span>"
 
 #: ../mail/mail-dialogs.glade.h:5
-msgid "Case _Sensitive"
+msgid "Case _sensitive"
 msgstr "大/小文字を区別する(_S)"
 
 #: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
@@ -13357,7 +13348,7 @@ msgstr "検索(_I):"
 
 #: ../mail/mail-dialogs.glade.h:9
 msgid "Find in Message"
-msgstr "メッセージの検索"
+msgstr "メッセージ内の検索"
 
 #: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:297
 #: ../mail/message-tags.glade.h:3
@@ -13433,7 +13424,7 @@ msgstr "全てのローカル・フォルダと有効なリモート・フォル
 msgid "with all local folders"
 msgstr "全てのローカル・フォルダ"
 
-#: ../mail/mail-folder-cache.c:855
+#: ../mail/mail-folder-cache.c:860
 #, c-format
 msgid "Pinging %s"
 msgstr "%s への ping 中に"
@@ -13658,7 +13649,7 @@ msgid "Checking for new mail"
 msgstr "新着メールのチェック中"
 
 #: ../mail/mail-session.c:204
-#: ../plugins/exchange-operations/exchange-config-listener.c:601
+#: ../plugins/exchange-operations/exchange-config-listener.c:604
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s のパスワードを入力して下さい"
@@ -13668,7 +13659,7 @@ msgid "Enter Password"
 msgstr "パスワードの入力"
 
 #: ../mail/mail-session.c:241
-msgid "User canceled operation."
+msgid "User cancelled operation."
 msgstr "ユーザによって操作がキャンセルされました"
 
 #: ../mail/mail-signature-editor.c:384
@@ -13751,10 +13742,11 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
-"A read receipt notification has been requested for &quot;{1}&quot;.  Send "
-"the reciept notification to {0}?"
+"A read receipt notification has been requested for &quot;{1}&quot;. Send the "
+"receipt notification to {0}?"
 msgstr ""
-"&quot;{1}&quot; へ開封通知を要求しています。{0}へ開封通知を送信しますか？"
+"&quot;{1}&quot; さんが開封通知を要求しています。{0} さんへ開封通知を送信しま"
+"すか？"
 
 #: ../mail/mail.error.xml.h:7
 msgid ""
@@ -13768,8 +13760,8 @@ msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
 msgstr ""
-"意味のある件名を記述しておくと、メッセージを受け取る人がメールの内容を理解し"
-"やすくなります。"
+"メッセージに件名を追加しておくと、メッセージを受け取る人がメールの内容を理解"
+"しやすくなります。"
 
 #: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account and all its proxies?"
@@ -13780,236 +13772,250 @@ msgid "Are you sure you want to delete this account?"
 msgstr "このアカウントを削除してもよろしいですか？"
 
 #: ../mail/mail.error.xml.h:11
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
+msgstr ""
+"このアカウントを無効にしてそのプロキシの設定を全て削除してもよろしいですか？"
+
+#: ../mail/mail.error.xml.h:12
 msgid "Are you sure you want to open {0} messages at once?"
 msgstr "本当に {0} 通のメッセージを一度に開いてもよろしいですか？"
 
-#: ../mail/mail.error.xml.h:12
+#: ../mail/mail.error.xml.h:13
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr ""
-"全てのフォルダにある削除マーク付きメッセージの全てを永久に抹消してもよろしい"
+"全てのフォルダにある削除マーク付きメッセージの全てを完全に抹消してもよろしい"
 "ですか？"
 
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder &quot;{0}&quot;?"
 msgstr ""
-"本当に &quot;{0}&quot; というフォルダにある、全ての削除マーク付きメッセージを"
-"永久に抹消してもよろしいですか？"
+"本当にフォルダ &quot;{0}&quot; にある削除マーク付きメッセージを完全に抹消して"
+"もよろしいですか？"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "本当に HTML 形式でメッセージを送信してもよろしいですか？"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "BCC のみ付与してメッセージを送信してもよろしいですか？"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "件名を付けずにメッセージを送信してもよろしいですか？"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{0}&quot;."
 msgstr "理由は &quot;{0}&quot; です。"
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:20
 msgid "Because &quot;{2}&quot;."
 msgstr "理由は &quot;{2}&quot; です。"
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:21
 msgid "Blank Signature"
 msgstr "空の署名"
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:22
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "&quot;{0}&quot; という仮想フォルダを追加できません。"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "&quot;{0}&quot; というフォルダを &quot;{1}&quot; へコピーできません。"
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "&quot;{0}&quot; というフォルダを作成できません。"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create temporary save directory."
 msgstr "作業フォルダを作成できません。"
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "&quot;{1}&quot; のため、保存フォルダを作成できません。"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "&quot;{0}&quot; というフォルダを削除できません。"
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "&quot;{0}&quot; というシステム・フォルダを削除できません。"
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr "&quot;{0}&quot; という仮想フォルダは存在していないので編集できません。"
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "&quot;{0}&quot; というフォルダを &quot;{1}&quot; へ移動できません。"
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "&quot;{1}&quot; というソースを開けません。"
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "&quot;{2}&quot; というソースを開けません。"
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "&quot;{2}&quot; というターゲットを開けません。"
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:34
 msgid ""
 "Cannot read the license file &quot;{0}&quot;, due to an installation "
-"problem.  You will not be able to use this provider until you can accept its "
+"problem. You will not be able to use this provider until you can accept its "
 "license."
 msgstr ""
 "&quot;{0}&quot; というライセンス・ファイルを読み込めません。インストールに問"
 "題があるようです。そのライセンスを受諾しない限り、このプロバイダを利用するこ"
 "とはできません。"
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "&quot;{0}&quot; から &quot;{1}&quot; へ名前を変更できません。"
+msgstr "&quot;{0}&quot; から &quot;{1}&quot; に名前を変更できません。"
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr ""
 "&quot;{0}&quot; というシステム・フォルダの名前の変更または移動はできません。"
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot save changes to account."
 msgstr "変更したアカウント情報を保存できません。"
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "&quot;{0}&quot; というフォルダへ保存できません。"
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to file &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; というファイルへ保存できません。"
+msgstr "&quot;{0}&quot; というファイルに保存できません。"
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "&quot;{0}&quot; という署名スクリプトをセットできません。"
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:41
 msgid ""
-"Check to make sure your password is spelled correctly.  Remember that many "
+"Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
 msgstr ""
-"パスワードの綴りが正しいか確認して下さい。パスワードは大文字/小文字を区別する"
-"ことに留意して下さい ([Caps Lock] キーが押下されているかもしれません)。"
+"パスワードの綴りが正しいか確認して下さい。パスワードは大/小文字を区別すること"
+"に留意して下さい ([Caps Lock] キーが押下されているかもしれません)。"
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:42
 msgid "Could not save signature file."
 msgstr "署名ファイルを保存できませんでした。"
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
 msgid "Delete &quot;{0}&quot;?"
 msgstr "&quot;{0}&quot; を削除しますか？"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:44
 msgid "Delete account?"
 msgstr "アカウントを削除しますか？"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:45
 msgid "Discard changes?"
 msgstr "変更を破棄しますか？"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:46
+msgid "Do not delete"
+msgstr "削除しない"
+
+#: ../mail/mail.error.xml.h:47
+msgid "Do not disable"
+msgstr "無効にしない"
+
+#: ../mail/mail.error.xml.h:48
 msgid "Do you want the operation to be performed in the subfolders?"
 msgstr "サブフォルダに対して操作を実行しますか？"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:49
 msgid "Do you wish to save your changes?"
 msgstr "変更を保存しますか？"
 
-#: ../mail/mail.error.xml.h:47
-msgid "Don't delete"
-msgstr "削除しない"
-
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:50
 msgid "Enter password."
 msgstr "パスワードを入力して下さい。"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:51
 msgid "Error loading filter definitions."
 msgstr "フィルタ定義を読み込む際にエラーが発生しました。"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:52
 msgid "Error while performing operation."
 msgstr "操作を実行する際にエラーが発生しました。"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:53
 msgid "Error while {0}."
 msgstr "{0}する際にエラーが発生しました。"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:54
 msgid "File exists but cannot overwrite it."
 msgstr "ファイルが存在していますが、上書きできません。"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:55
 msgid "File exists but is not a regular file."
 msgstr "ファイルが存在していますが、通常のファイルではありません。"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:56
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "続行すると、これらのメッセージを復旧することができなくなります。"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:57
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
 msgstr ""
-"このフォルダを削除すると、そのフォルダの内容とそのサブフォルダの内容の全てが"
-"永久に削除されることになります。"
+"このフォルダを削除すると、そのフォルダの内容とそのサブフォルダの内容が全て完"
+"全に削除されます。"
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:58
+msgid "If you proceed, all proxy accounts will be deleted permanently."
+msgstr "続行すると、全てのプロキシ・アカウントが完全に削除されます。"
+
+#: ../mail/mail.error.xml.h:59
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
 msgstr ""
 "続行すると、アカウント情報と\n"
-"全てのプロキシ情報が永久に削除されます。"
+"全てのプロキシ情報が完全に削除されます。"
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:61
 msgid "If you proceed, the account information will be deleted permanently."
-msgstr "続行すると、アカウント情報が永久に削除されます。"
+msgstr "続行すると、アカウント情報が完全に削除されます。"
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr ""
 "終了すると、これらのメッセージは Evolution を再起動するまで送信されません。"
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:63
 msgid "Ignore"
 msgstr "無視する"
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:64
 msgid "Invalid authentication"
 msgstr "不正な認証"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:65
 msgid "Mail filters automatically updated."
 msgstr "メールのフィルタが自動的に更新されました。"
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:66
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -14021,35 +14027,35 @@ msgstr ""
 "先が記述されます。これを回避するために、少なくとも \"宛先\" または \"Cc:\" に"
 "宛先を追加して下さい。"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:67
 msgid "Mark all messages as read"
 msgstr "全て既読にする"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:68
 msgid "Mark all messages as read in the selected folder"
 msgstr "選択したフォルダにあるメッセージの全てに既読マークを付与します"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:69
 msgid "Missing folder."
 msgstr "フォルダがありません。"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:71
 msgid "No sources selected."
 msgstr "ソースが選択されていません。"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:72
 msgid "Opening too many messages at once may take a long time."
 msgstr "一度にたくさんのメッセージを開くには時間がかかります。"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:73
 msgid "Please check your account settings and try again."
 msgstr "アカウントの設定を確認して、もう一度試してみて下さい。"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:74
 msgid "Please enable the account or send using another account."
 msgstr "アカウントを有効にするか、または別のアカウントで送信してみて下さい。"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:75
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -14057,7 +14063,7 @@ msgstr ""
 "\"宛先\" のフィールドに正しい E-メール・アドレスを入力して下さい。ボタン [宛"
 "先] をクリックして表示されるダイアログで、E-メール・アドレスを検索できます。"
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14068,49 +14074,49 @@ msgstr ""
 "{0}\n"
 "とにかく送信しますか？"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:79
 msgid "Please provide an unique name to identify this signature."
 msgstr "この署名を一意に識別するために重複しない名前を指定して下さい。"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:80
 msgid "Please wait."
 msgstr "少々お待ち下さい。"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:81
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr ""
 "&quot;{0}&quot; という古いメール・フォルダを移行する際に問題が発生しました。"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:82
 msgid "Querying server"
-msgstr "問い合わせサーバ"
+msgstr "サーバへ問い合わせ中"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server for a list of supported authentication mechanisms."
-msgstr "サポートする認証メカニズムのリストを持つ問い合わせサーバです。"
+msgstr "サポートしている認証メカニズムの一覧をサーバに問い合わせています。"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:84
 msgid "Read receipt requested."
 msgstr "開封通知を要求しました"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:85
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr ""
 "本当に &quot;{0}&quot; というフォルダとそのサブフォルダの全てを削除しますか？"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:86
 msgid "Search Folders automatically updated."
 msgstr "仮想フォルダを自動的に更新しました。"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:87
 msgid "Send Receipt"
 msgstr "送信通知"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:88
 msgid "Signature Already Exists"
 msgstr "既に署名があります"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:89
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -14118,7 +14124,7 @@ msgstr ""
 "システム・フォルダは Ximian Evolution を正しく機能させるために必要なので、名"
 "前の変更、移動または削除することはできません。"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14134,7 +14140,7 @@ msgstr ""
 "先が記述されます。これを回避するために、少なくとも \"宛先:\" または \"Cc:\" "
 "に宛先を追加して下さい。"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:93
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14148,7 +14154,7 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "また、そのフォルダは更新済です。"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14162,23 +14168,23 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "また、そのフォルダは更新済みです。"
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:103
 msgid ""
-"The message was sent via the &quot;sendmail&quot; external application.  "
+"The message was sent via the &quot;sendmail&quot; external application. "
 "Sendmail reports the following error: status 67: mail not sent.\n"
-"The message is stored in the Outbox folder.  Check the message for errors "
-"and resend."
+"The message is stored in the Outbox folder. Check the message for errors and "
+"resend."
 msgstr ""
-"外部アプリケーション &quot;sendmail&quot; を介してメッセージが送信されました"
-"が、Sendmail は次のエラーを報告してきました: status 67: mail no sent\n"
-"送信済みボックスにメッセージを保存しました。エラーと再送信のためメッセージを"
-"確認して下さい。"
+"外部アプリケーションの &quot;Sendmail&quot; を介してメッセージが送信されまし"
+"たが、Sendmail は次のエラーを報告してきました: status 67: mail no sent\n"
+"送信済みフォルダにメッセージを保存しました。エラー・メッセージを確認して、も"
+"う一度送信して下さい。"
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:105
 msgid "The script file must exist and be executable."
 msgstr "スクリプト・ファイルが存在し実行可能でなければなりません。"
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14186,7 +14192,7 @@ msgstr ""
 "このフォルダは自動的に追加されたかもしれません。必要であれば、仮想フォルダの"
 "エディタを起動して明示的に追加して下さい。"
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:108
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -14194,12 +14200,12 @@ msgstr ""
 "選択したアカウントが有効ではないので、このメッセージを送信することはできませ"
 "ん。"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This message cannot be sent because you have not specified any Recipients"
 msgstr "宛先を指定していないので、このメッセージを送信することはできません。"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14207,55 +14213,55 @@ msgstr ""
 "このサーバではこの種類の認証をサポートしていないので、全ての認証をサポートし"
 "ていないかもしれません。"
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:111
 msgid "This signature has been changed, but has not been saved."
 msgstr "この署名は変更されていますが保存されていません。"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:112
 msgid "Unable to connect to the GroupWise server."
 msgstr "GroupWise サーバへ接続できません。"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:113
 msgid ""
-"Unable to open the drafts folder for this account.  Use the system drafts "
+"Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr ""
 "このアカウントの草案フォルダを開けません。代わりにシステムの草案フォルダを使"
 "用しますか？"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:114
 msgid "Unable to read license file."
 msgstr "ライセンス・ファイルを読み込めません。"
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:115
 msgid "Use _Default"
 msgstr "デフォルトを使用する(_D)"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:116
 msgid "Use default drafts folder?"
 msgstr "デフォルトの草案フォルダを使用しますか？"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:117
 msgid "You have not filled in all of the required information."
 msgstr "必要な情報の全てを埋めていません。"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:118
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "送信していないメッセージがあります。それでも終了しますか？"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:119
 msgid "You may not create two accounts with the same name."
 msgstr "同じ名前のアカウントを二つ作れません。"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:120
 msgid "You must name this Search Folder."
 msgstr "この仮装フォルダに名前を付けて下さい。"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:121
 msgid "You must specify a folder."
 msgstr "フォルダを指定して下さい。"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14266,29 +14272,29 @@ msgstr ""
 "全てのローカル・フォルダ、全てのリモート・フォルダ、\n"
 "またはその両方を選択して下さい。"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:124
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr ""
 "サーバ &quot;{0}&quot; というサーバへの (&quot;{0}&quot; としての) ログインに"
 "失敗しました。"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:125
 msgid "Your message with the subject &quot;{0}&quot; was not delivered."
 msgstr "件名が &quot;{0}&quot; というメッセージは配送されませんでした。"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:126
 msgid "_Append"
 msgstr "追加する(_A)"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:127
 msgid "_Discard changes"
 msgstr "変更を破棄する(_D)"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:129
 msgid "_Expunge"
 msgstr "抹消する(_E)"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:130
 msgid "_Open Messages"
 msgstr "メッセージを開く(_O)"
 
@@ -14337,19 +14343,19 @@ msgstr "?"
 #: ../mail/message-list.c:1353 ../plugins/itip-formatter/itip-view.c:197
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
-msgstr "今日の %p %l時%M分"
+msgstr "今日の%p%l時%M分"
 
 #: ../mail/message-list.c:1362 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
-msgstr "昨日の %p %l時%M分"
+msgstr "昨日の%p%l時%M分"
 
 #: ../mail/message-list.c:1374 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
-msgstr "%p %l時%M分 (%a)"
+msgstr "%p%l時%M分 (%a)"
 
 #: ../mail/message-list.c:1382 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
-msgstr "%B%e日 %p %l時%M分"
+msgstr "%B%e日 %p%l時%M分"
 
 #: ../mail/message-list.c:1384 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
@@ -14388,6 +14394,7 @@ msgid "Received"
 msgstr "受信済み"
 
 #: ../mail/message-list.etspec.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "サイズ"
 
@@ -14451,6 +14458,14 @@ msgstr "件名が次のものを含む"
 msgid "Subject or Sender contains"
 msgstr "件名または差出人が次のものを含む"
 
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
+msgid "Local Address Books"
+msgstr "ローカルのアドレス帳"
+
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
+msgid "Provides core functionality for local address books."
+msgstr "ローカルのアドレス帳を操作するために必要なプラグインです。"
+
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
@@ -14519,6 +14534,7 @@ msgid "Restore Settings..."
 msgstr "リストアの設定..."
 
 #: ../plugins/bbdb/bbdb.c:410
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "連絡先の自動生成"
 
@@ -14534,31 +14550,28 @@ msgstr "メールに返信したら自動的にアドレス帳の中に連絡先
 
 #: ../plugins/bbdb/bbdb.c:450
 msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
-msgstr "<span weight=\"bold\">インスタント・メッセンジャの連絡先</span>"
+msgstr "<span weight=\"bold\">インスタント・メッセンジャーの連絡先</span>"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:463
 msgid ""
 "Periodically synchronize contact information and images from my _instant "
 "messenger"
-msgstr "インスタント・メッセンジャと周期的に連絡先と画像を同期する(_I)"
+msgstr "インスタント・メッセンジャーと周期的に連絡先と画像を同期する(_I)"
 
 #. Synchronize now button.
 #: ../plugins/bbdb/bbdb.c:470
 msgid "Synchronize with _buddy list now"
 msgstr "今すぐ仲間リストを同期する(_B)"
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
-msgid "Automatic contacts"
-msgstr "連絡先の自動生成"
-
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
 msgid ""
 "Automatically fills your addressbook with names and email addresses as you "
 "reply to mails. Also fills in IM contact information from your buddy lists."
 msgstr ""
-"リプライする宛先と E-メール・アドレスを自動的にアドレス帳へ登録します。さら"
-"に、インスタント・メッセンジャーの仲間リストから連絡先の情報も取得します。"
+"返信する宛先と E-メール・アドレスを自動的にアドレス帳へ登録するプラグインで"
+"す。さらに、インスタント・メッセンジャーの仲間リストから連絡先の情報も取得し"
+"ます。"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid "BBDB"
@@ -14663,7 +14676,7 @@ msgstr "Evolution を起動するたびに、デフォルトのメーラーか�
 msgid "Checks whether Evolution is the default mail client on startup."
 msgstr ""
 "Evolution がデフォルトのメーラー (メール・クライアント) かどうかを起動時に確"
-"認します。"
+"認するプラグインです。"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
 msgid "Default Mail Client "
@@ -14678,6 +14691,16 @@ msgstr "Evolution をデフォルトのメーラーにしますか？"
 msgid "Mark as default folder"
 msgstr "デフォルトのフォルダにする"
 
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
+msgid "Default Sources"
+msgstr "デフォルトのソース"
+
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
+msgid ""
+"Provides functionallity for marking a calendar or addressbook as the default "
+"one."
+msgstr "デフォルトのカレンダまたはアドレス帳を設定するためのプラグインです。"
+
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
 msgstr "他のユーザのフォルダを開く"
@@ -14720,11 +14743,11 @@ msgstr ""
 "標準的なプレーンテキストのパスワード認証を用いて Exchange サーバと接続するオ"
 "プションです。"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:253
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
 msgid "Out Of Office"
 msgstr "外出中"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:260
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -14732,66 +14755,67 @@ msgstr ""
 "下で選択したメッセージは、あなたが外出した時に\n"
 "メールを送信してきた人達へ自動的に送付されます。"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:272
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid "I am out of the office"
 msgstr "現在、私は外出中です"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:273
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid "I am in the office"
 msgstr "現在、私は在席中です"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:324
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 msgid "Change the password for Exchange account"
 msgstr "Exchange アカウントのパスワードの変更"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:326
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:2
 msgid "Change Password"
 msgstr "パスワードの変更"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:331
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Exchange アカウントのデリゲート設定の管理"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:333
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Delegation Assitant"
 msgstr "デリゲート設定のアシスタント"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:345
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Miscelleneous"
 msgstr "その他"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:355
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "View the size of all Exchange folders"
 msgstr "全ての Exchange フォルダのサイズを表示する"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:357
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "Folders Size"
 msgstr "フォルダのサイズ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:364
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Exchange の設定"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:613
-msgid "_OWA Url:"
-msgstr "OWA URI(_O):"
+#: ../plugins/exchange-operations/exchange-account-setup.c:619
+msgid "_OWA URL:"
+msgstr "OWA URL(_O):"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:638
+#: ../plugins/exchange-operations/exchange-account-setup.c:645
 msgid "A_uthenticate"
 msgstr "認証(_U)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:825
+#: ../plugins/exchange-operations/exchange-account-setup.c:833
 msgid "Authentication Type"
 msgstr "認証の種類"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:839
+#: ../plugins/exchange-operations/exchange-account-setup.c:847
 msgid "Ch_eck for Supported Types"
 msgstr "サポートしているかチェックする(_E)"
 
@@ -14841,6 +14865,11 @@ msgid "Custom"
 msgstr "カスタム"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:191
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+msgid "Delegate Permissions"
+msgstr "DeleGate の権限"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:202
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
 #, c-format
 msgid "Permissions for %s"
@@ -14890,35 +14919,33 @@ msgstr "DeleGate の一覧を読み込む際にエラー"
 msgid "Author (read, create)"
 msgstr "作者 (読み込み可/作成可)"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
+#. Translators: This is used for permissions for <user> for the folder Calendar.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
 msgid "C_alendar:"
 msgstr "カレンダ(_A):"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
+#. Translators: This is used for permissions for <user> for the folder Contacts.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
 msgid "Co_ntacts:"
 msgstr "連絡先(_N):"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
-msgid "Delegate Permissions"
-msgstr "DeleGate の権限"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
 msgid "Delegates"
 msgstr "DeleGate"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "編集者 (読み込み可/作成可/編集可)"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
 msgid "Permissions for"
 msgstr "機能別の権限"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "レビューア (読み込みのみ)"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
 msgid ""
 "These users will be able to send mail on your behalf\n"
 "and access your folders with the permissions you give them."
@@ -14926,15 +14953,17 @@ msgstr ""
 "ここに表示されているユーザはあなたの代わりにメールを送信でき、\n"
 "あなたが与えた権限を使ってフォルダにアクセスすることができます。"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
 msgid "_Delegate can see private items"
 msgstr "DeleGate は個人的なアイテムを参照できる(_D)"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
+#. Translators: This is used for permissions for <user> for the folder Inbox.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:17
 msgid "_Inbox:"
 msgstr "受信箱(_I):"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
+#. Translators: This is used for permissions for <user> for the folder Tasks.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:19
 msgid "_Tasks:"
 msgstr "タスク(_T):"
 
@@ -14951,28 +14980,29 @@ msgstr "フォルダ名"
 msgid "Folder Size"
 msgstr "フォルダのサイズ"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:180
-msgid "Subscribe to Other User's"
-msgstr "他ユーザの購読"
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:181
+#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
+msgid "Subscribe to Other User's Folder"
+msgstr "他ユーザのフォルダの購読"
 
 #: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
 msgid "Exchange Folder Tree"
 msgstr "Exchange フォルダのツリー"
 
 #: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:227
-#: ../plugins/exchange-operations/exchange-folder.c:237
+#: ../plugins/exchange-operations/exchange-folder.c:229
+#: ../plugins/exchange-operations/exchange-folder.c:239
 msgid "Unsubscribe Folder..."
 msgstr "フォルダの購読停止..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:464
-#: ../plugins/exchange-operations/exchange-folder.c:524
+#: ../plugins/exchange-operations/exchange-folder.c:466
+#: ../plugins/exchange-operations/exchange-folder.c:526
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "本当にフォルダ \"%s\" の購読を停止しますか？"
 
-#: ../plugins/exchange-operations/exchange-folder.c:476
-#: ../plugins/exchange-operations/exchange-folder.c:536
+#: ../plugins/exchange-operations/exchange-folder.c:478
+#: ../plugins/exchange-operations/exchange-folder.c:538
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "フォルダ \"%s\" の購読停止"
@@ -15061,6 +15091,16 @@ msgstr "他ユーザの連絡先の購読"
 msgid "Subscribe to Other User's Calendar"
 msgstr "他ユーザのカレンダの購読"
 
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
+msgid ""
+"A plugin that handles a collection of Exchange account specific operations "
+"and features."
+msgstr "Exchange アカウントの収集に関する操作と機能を提供するプラグインです。"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
+msgid "Exchange Operations"
+msgstr "Exchange の操作"
+
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
 msgid "Cannot change password due to configuration problems."
 msgstr "設定上の問題のためパスワードを変更できません。"
@@ -15148,10 +15188,10 @@ msgstr "Exchange アカウントはオフラインです。"
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
-"to be disabled or blocked.  (This is usually \n"
-"unintentional.)  Your Exchange Administrator will \n"
+"to be disabled or blocked. (This is usually \n"
+"unintentional.) Your Exchange Administrator will \n"
 "need to enable this functionality in order for \n"
-"you to be able to use Ximian Connector.\n"
+"you to be able to use Evolution Exchange Connector.\n"
 "\n"
 "For information to provide to your Exchange \n"
 "administrator, please follow the link below:\n"
@@ -15159,15 +15199,15 @@ msgid ""
 "{0}\n"
 "  "
 msgstr ""
-"Exchange コネクタが Exchange サーバ上の機能に\n"
-"アクセス要求を出していますが、その機能が無効か\n"
-"あるいはブロックされていると思われます (通常、\n"
-"この要求は意図したものではありません)。\n"
-"Exchange サーバの管理者に問い合わせを行いて、\n"
-"Ximian コネクタから接続できるような設定に\n"
-"変更してもらって下さい。\n"
+"Exchange コネクタが Exchange サーバ上にある機能に\n"
+"アクセス要求を出していますが、その機能が無効か、\n"
+"またはブロックされているようです\n"
+"(一般的に、この要求は意図したものではありません)。\n"
+"Exchange サーバの管理者に問い合わせを行って\n"
+"Evolution Exchange コネクタから接続できるような\n"
+"設定に変更してもらって下さい。\n"
 "\n"
-"同時にサーバ管理者に提供すべき情報については\n"
+"その際にサーバ管理者に提供すべき情報については\n"
 "次のリンクを参照して下さい:\n"
 "\n"
 "{0}\n"
@@ -15190,7 +15230,7 @@ msgid "Folder offline"
 msgstr "フォルダはオフラインです"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
-#: ../shell/e-shell.c:1263
+#: ../shell/e-shell.c:1277
 msgid "Generic error"
 msgstr "一般的なエラー"
 
@@ -15260,7 +15300,7 @@ msgstr "その Exchange サーバは Exchange コネクタと互換性があり�
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid ""
-"The server is runinng Exchange 5.5. Exchange Connector \n"
+"The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
 msgstr ""
 "実行中のサーバは Exchange 5.5 です。\n"
@@ -15330,26 +15370,26 @@ msgstr "単一の Exchange アカウントを設定した方が良いかもし�
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid ""
-"Your current usage is : {0}KB. Try to clear up some space by deleting some "
+"Your current usage is: {0}KB. Try to clear up some space by deleting some "
 "mails."
 msgstr ""
-"現在の利用サイズは {0}Kバイトです。不用なメールを削除して空き容量を確保してみ"
+"現在使用中の容量は {0}Kバイトです。不用なメールを削除して空き容量を確保してみ"
 "て下さい。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid ""
-"Your current usage is : {0}KB. You will not be able to either send or "
-"recieve mails now."
+"Your current usage is: {0}KB. You will not be able to either send or recieve "
+"mails now."
 msgstr ""
-"現在の利用サイズは {0}Kバイトです。この状態ではメールの送信も受信も行うことは"
+"現在使用中の容量は {0}Kバイトです。この状態ではメールの送信/受信を行うことは"
 "できません。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
-"Your current usage is : {0}KB. You will not be able to send mails till you "
+"Your current usage is: {0}KB. You will not be able to send mails till you "
 "clear up some space by deleting some mails."
 msgstr ""
-"現在の利用サイズは {0}Kバイトです。不用なメールを削除して空き容量を確保しない"
+"現在使用中の容量は {0}Kバイトです。不用なメールを削除して空き容量を確保しない"
 "限り、メールを送信することはできません。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
@@ -15376,10 +15416,6 @@ msgstr "他ユーザのタスクの購読"
 msgid "Check folder permissions"
 msgstr "フォルダ権限の確認"
 
-#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
-msgid "Subscribe to Other User's Folder"
-msgstr "他ユーザのフォルダの購読"
-
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
@@ -15405,7 +15441,7 @@ msgstr "Groupwise アカウントの設定"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:77
 msgid "Junk Settings"
-msgstr "ジャンクの設定"
+msgstr "ジャンク・メールの設定"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:90
 msgid "<b>Junk Mail Settings</b>"
@@ -15416,8 +15452,8 @@ msgid "Junk Mail Settings..."
 msgstr "ジャンク・メールの設定..."
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:1
-msgid "<b>Junk List :</b>"
-msgstr "<b>ジャンクの一覧:</b>"
+msgid "<b>Junk List:</b>"
+msgstr "<b>ジャンク・メールの一覧:</b>"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:2
 msgid "Email:"
@@ -15438,14 +15474,14 @@ msgstr "有効にする(_E)"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:7
 msgid "_Junk List"
-msgstr "ジャンクの一覧(_J)"
+msgstr "ジャンク・メールの一覧(_J)"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to groupwise messages"
 msgstr "Groupwise メッセージの送信オプションの追加"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:8
+#: ../ui/evolution-event-editor.xml.h:14 ../ui/evolution-task-editor.xml.h:8
 #: ../widgets/misc/e-send-options.glade.h:17
 msgid "Send Options"
 msgstr "送信オプション"
@@ -15460,10 +15496,10 @@ msgstr "Groupwise の機能"
 
 #: ../plugins/groupwise-features/process-meeting.c:49
 msgid "Accept Tentatively"
-msgstr "暫定的に受諾"
+msgstr "仮承認する"
 
 #: ../plugins/groupwise-features/properties.glade.h:2
-msgid "<b>Users :</b>"
+msgid "<b>Users:</b>"
 msgstr "<b>ユーザ:</b>"
 
 #: ../plugins/groupwise-features/properties.glade.h:4
@@ -15484,7 +15520,7 @@ msgid "_Contacts..."
 msgstr "連絡先(_C)..."
 
 #: ../plugins/groupwise-features/properties.glade.h:12
-msgid "_Cutomize notification message"
+msgid "_Customize notification message"
 msgstr "通知メッセージのカスタマイズ(_C)"
 
 #: ../plugins/groupwise-features/properties.glade.h:13
@@ -15536,7 +15572,7 @@ msgid "Subscribe to my _notifications"
 msgstr "自分の notification に登録する(_N)"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:124
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Read"
 msgstr "既読(_R)"
 
@@ -15549,6 +15585,7 @@ msgid "Proxy"
 msgstr "プロキシ"
 
 #: ../plugins/groupwise-features/proxy-listing.glade.h:2
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
 #: ../smime/gui/smime-ui.glade.h:49
 #: ../widgets/table/e-table-config-no-group.glade.h:20
 #: ../widgets/table/e-table-config.glade.h:21
@@ -15666,6 +15703,43 @@ msgid "Could not open the Evolution calendar/todo list to export data."
 msgstr ""
 "データを出力する Evolution カレンダ/ToDo の一覧をオープンできませんでした。"
 
+#: ../plugins/itip-formatter/itip-formatter.c:275
+#: ../plugins/itip-formatter/itip-formatter.c:392
+#, c-format
+msgid "Failed to load the calendar '%s'"
+msgstr "カレンダ '%s' を開けません"
+
+#: ../plugins/itip-formatter/itip-formatter.c:407
+#, c-format
+msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgstr "カレンダ '%s' の予定がこの会議の時間と重なっています"
+
+#: ../plugins/itip-formatter/itip-formatter.c:433
+#, c-format
+msgid "Found the appointment in the calendar '%s'"
+msgstr "カレンダ '%s' の中に予定がありました"
+
+#: ../plugins/itip-formatter/itip-formatter.c:487
+msgid "Unable to find any calendars"
+msgstr "カレンダが見つかりませんでした"
+
+#: ../plugins/itip-formatter/itip-formatter.c:494
+msgid "Unable to find this meeting in any calendar"
+msgstr "この会議の予定を記録したカレンダが見つかりませんでした"
+
+#: ../plugins/itip-formatter/itip-formatter.c:498
+msgid "Unable to find this task in any task list"
+msgstr "このタスクを記録したタスク一覧が見つかりませんでした"
+
+#: ../plugins/itip-formatter/itip-formatter.c:502
+msgid "Unable to find this journal entry in any journal"
+msgstr "このジャーナル・エントリはどのジャーナルにもありません"
+
+# 要再考
+#: ../plugins/itip-formatter/itip-formatter.c:528
+msgid "Searching for an existing version of this appointment"
+msgstr "この予定の保存してあるバージョンの検索"
+
 #: ../plugins/itip-formatter/itip-formatter.c:724
 msgid "Unable to parse item"
 msgstr "アイテムを解析できません"
@@ -15673,27 +15747,27 @@ msgstr "アイテムを解析できません"
 #: ../plugins/itip-formatter/itip-formatter.c:780
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
-msgstr "アイテムをカレンダ '%s' へ送信できません。%s"
+msgstr "アイテムをカレンダ '%s' に保存できません (%s)"
 
 #: ../plugins/itip-formatter/itip-formatter.c:791
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
-msgstr "カレンダ '%s' へ送信完了 (承認済)"
+msgstr "承認したものとしてカレンダ '%s' に保存しました"
 
 #: ../plugins/itip-formatter/itip-formatter.c:795
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
-msgstr "カレンダ '%s' へ送信完了 (仮承認)"
+msgstr "仮承認したものとしてカレンダ '%s' に保存しました"
 
 #: ../plugins/itip-formatter/itip-formatter.c:800
 #, c-format
 msgid "Sent to calendar '%s' as declined"
-msgstr "カレンダ '%s' へ送信完了 (辞退)"
+msgstr "辞退したものとしてカレンダ '%s' に保存しました"
 
 #: ../plugins/itip-formatter/itip-formatter.c:805
 #, c-format
 msgid "Sent to calendar '%s' as cancelled"
-msgstr "カレンダ '%s' へ送信完了 (キャンセル)"
+msgstr "キャンセルしたものとしてカレンダ '%s' に保存しました"
 
 #: ../plugins/itip-formatter/itip-formatter.c:898
 #, c-format
@@ -15727,7 +15801,7 @@ msgstr "添付されたカレンダが不正です"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1149
 msgid ""
-"The message claims to contain a calendar, but the calendar is not valid "
+"The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr ""
 "メッセージにカレンダが添付されていますが、そのカレンダは妥当な iCalendar 形式"
@@ -15781,7 +15855,7 @@ msgid "Conflict Search Table"
 msgstr "Conflict Search Table"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:183 ../ui/evolution-calendar.xml.h:34
+#: ../plugins/itip-formatter/itip-view.c:183 ../ui/evolution-calendar.xml.h:32
 #: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:466
 msgid "Today"
 msgstr "今日"
@@ -15790,19 +15864,19 @@ msgstr "今日"
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:188
 msgid "Today %H:%M"
-msgstr "今日の %k:%M"
+msgstr "今日の%k:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:192
 msgid "Today %H:%M:%S"
-msgstr "今日の %k:%M:%S"
+msgstr "今日の%k:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:201
 msgid "Today %l:%M:%S %p"
-msgstr "今日の %p %l時%M分%S秒"
+msgstr "今日の%p%l時%M分%S秒"
 
 #. strftime format of a weekday and a date.
 #: ../plugins/itip-formatter/itip-view.c:211
@@ -15813,25 +15887,25 @@ msgstr "明日"
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:216
 msgid "Tomorrow %H:%M"
-msgstr "明日の %k:%M"
+msgstr "明日の%k:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:220
 msgid "Tomorrow %H:%M:%S"
-msgstr "明日の %k:%M:%S"
+msgstr "明日の%k:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:225
 msgid "Tomorrow %l:%M %p"
-msgstr "明日の %p %l時%M分"
+msgstr "明日の%p%l時%M分"
 
 #. strftime format of a time,
 #. in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:229
 msgid "Tomorrow %l:%M:%S %p"
-msgstr "明日の %p %l時%M分%S秒"
+msgstr "明日の%p%l時%M分%S秒"
 
 #. strftime format of a weekday.
 #: ../plugins/itip-formatter/itip-view.c:248
@@ -15843,25 +15917,25 @@ msgstr "%A"
 #. time, in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:253
 msgid "%A %H:%M"
-msgstr "%A の %k:%M"
+msgstr "%Aの%k:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:257
 msgid "%A %H:%M:%S"
-msgstr "%A の %k:%M:%S"
+msgstr "%Aの%k:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:262
 msgid "%A %l:%M %p"
-msgstr "%A の %p %l時%M分"
+msgstr "%Aの%p%l:%M"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:266
 msgid "%A %l:%M:%S %p"
-msgstr "%A の %p %l時%M分%S秒"
+msgstr "%Aの%p%l:%M:%S"
 
 #. strftime format of a weekday and a date
 #. without a year.
@@ -15886,13 +15960,13 @@ msgstr "%B%e日 %A %k:%M:%S"
 #. and a time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:290
 msgid "%A, %B %e %l:%M %p"
-msgstr "%B%e日 %A %p %l時%M分"
+msgstr "%B%e日 %A %p%l時%M分"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:294
 msgid "%A, %B %e %l:%M:%S %p"
-msgstr "%B%e日 %A %p %l時%M分%S秒"
+msgstr "%B%e日 %A %p%l:%M:%S"
 
 #. strftime format of a weekday and a date.
 #: ../plugins/itip-formatter/itip-view.c:300
@@ -15915,13 +15989,13 @@ msgstr "%Y年 %B%e日 %A %k:%M:%S"
 #. time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:314
 msgid "%A, %B %e, %Y %l:%M %p"
-msgstr "%Y年%B%e日 %A %p %l時%M分"
+msgstr "%Y年%B%e日 %A %p%l時%M分"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:318
 msgid "%A, %B %e, %Y %l:%M:%S %p"
-msgstr "%Y年%B%e日 %A %p %l時%M分%S秒"
+msgstr "%Y年%B%e日 %A %p%l時%M分%S秒"
 
 #: ../plugins/itip-formatter/itip-view.c:343
 #, c-format
@@ -16069,6 +16143,60 @@ msgstr "<b>%s</b> さんは %s さんが次のタスク割り当てを辞退す�
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> さん次のタスク割り当てを辞退しました:"
 
+#. Everything gets the open button
+#: ../plugins/itip-formatter/itip-view.c:704
+msgid "_Open Calendar"
+msgstr "カレンダを開く(_O)"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:709
+#: ../plugins/itip-formatter/itip-view.c:714
+#: ../plugins/itip-formatter/itip-view.c:719
+#: ../plugins/itip-formatter/itip-view.c:735
+#: ../plugins/itip-formatter/itip-view.c:740
+msgid "_Accept"
+msgstr "受諾する(_A)"
+
+#: ../plugins/itip-formatter/itip-view.c:712
+msgid "_Decline all"
+msgstr "全て辞退する(_D)"
+
+#: ../plugins/itip-formatter/itip-view.c:712
+#: ../plugins/itip-formatter/itip-view.c:717
+#: ../plugins/itip-formatter/itip-view.c:733
+#: ../plugins/itip-formatter/itip-view.c:738
+msgid "_Decline"
+msgstr "辞退する(_D)"
+
+#: ../plugins/itip-formatter/itip-view.c:713
+msgid "_Tentative all"
+msgstr "全て仮承認する(_T)"
+
+#: ../plugins/itip-formatter/itip-view.c:713
+#: ../plugins/itip-formatter/itip-view.c:718
+#: ../plugins/itip-formatter/itip-view.c:734
+#: ../plugins/itip-formatter/itip-view.c:739
+msgid "_Tentative"
+msgstr "仮承認する(_T)"
+
+#: ../plugins/itip-formatter/itip-view.c:714
+msgid "_Accept all"
+msgstr "全て受諾する(_A)"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:723
+msgid "_Send Information"
+msgstr "情報を送信する(_S)"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:727
+msgid "_Update Attendee Status"
+msgstr "出席者の状態を更新する(_U)"
+
+#: ../plugins/itip-formatter/itip-view.c:730
+msgid "_Update"
+msgstr "更新する(_U)"
+
 #. Start time
 #: ../plugins/itip-formatter/itip-view.c:891
 msgid "Start time:"
@@ -16169,7 +16297,7 @@ msgstr "メッセージの内容から会議開催通知を生成するための
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
 msgid "Con_vert to Meeting"
-msgstr "会議へ変換(_V)"
+msgstr "会議の予定に変換する(_V)"
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
 msgid "Mail to meeting"
@@ -16183,7 +16311,7 @@ msgstr "メッセージの内容からタスク情報を生成するためのプ
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
 msgid "Con_vert to Task"
-msgstr "タスクへ変換(_V)"
+msgstr "タスクに変換する(_V)"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
 msgid "Mail to task"
@@ -16192,7 +16320,7 @@ msgstr "メールからタスクへ"
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
 msgid "Contact list _owner"
-msgstr "管理者へ連絡(_O)"
+msgstr "管理者に連絡する(_O)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
@@ -16218,8 +16346,8 @@ msgid ""
 "Provide actions for common mailing list commands (subscribe, "
 "unsubscribe, ...)."
 msgstr ""
-"メーリング・リストで共通なコマンド (subscribe, unsubscribe 等) に対してアク"
-"ションを定義します"
+"メーリング・リストに共通なコマンド (購読とか購読解除など) を提供するプラグイ"
+"ンです。"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
@@ -16338,13 +16466,25 @@ msgstr "このメーリング・リストを購読します"
 msgid "Unsubscribe to the mailing list this message belongs to"
 msgstr "このメーリング・リストの購読を停止します"
 
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
+msgid "Mark All Read"
+msgstr "全て既読にする"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
+msgid "Mark me_ssages as read"
+msgstr "既読にする(_S)"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
+msgid "Used for marking all the messages under a folder as read"
+msgstr "フォルダ内にある全てのメッセージに既読マークを付けるプラグインです。"
+
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
 msgid "Mark calendar offline"
-msgstr "カレンダをオフラインにする"
+msgstr "カレンダをオフラインで表示"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
 msgid "Marks the selected calendar for offline viewing."
-msgstr "選択したカレンダをオフライン表示としてマークします。"
+msgstr "選択したカレンダをオフラインで表示するためのプラグインです。"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
 msgid "_Do not make this available offline"
@@ -16378,8 +16518,10 @@ msgstr "新着メールの通知"
 msgid "A plugin for managing which plugins are enabled or disabled."
 msgstr "どのプラグインが有効か無効かを管理するためのプラグインです。"
 
+#. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-msgid "Plugin manager"
+#: ../plugins/plugin-manager/plugin-manager.c:188
+msgid "Plugin Manager"
 msgstr "プラグイン・マネージャ"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
@@ -16408,11 +16550,6 @@ msgstr "パス"
 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 ""
@@ -16462,10 +16599,11 @@ msgstr "HTML モード"
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
 msgid "Gives an option to print mail from composer"
 msgstr ""
-"メッセージを印刷するためのオプション機能をメール作成ウィンドウに追加します。"
+"メッセージを印刷するためのオプション機能をメール作成ウィンドウに追加するプラ"
+"グインです。"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:18 ../ui/evolution-calendar.xml.h:20
+#: ../ui/evolution-addressbook.xml.h:18 ../ui/evolution-calendar.xml.h:19
 #: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-memos.xml.h:12
 #: ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
@@ -16475,6 +16613,100 @@ msgstr "印刷プレビュー(_V)"
 msgid "Prints the message"
 msgstr "メッセージの印刷"
 
+#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
+msgid "Evolution Profiler"
+msgstr "Evolution プロファイラ"
+
+#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
+msgid "Writes a log of profiling data events."
+msgstr ""
+"データ操作のイベントをプロファイリングして、その結果をログに記録するプラグイ"
+"ンです。"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+msgid "Allows calendars to be published to the web"
+msgstr "Evolution カレンダをウェブ上に公開できるようにするプラグインです。"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
+msgid "Calendar Publishing"
+msgstr "カレンダの公開"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+msgid "Locations"
+msgstr "公開する場所"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
+msgid "_Publish Calendar Information"
+msgstr "カレンダ情報を公開する(_P)"
+
+#: ../plugins/publish-calendar/publish-calendar.c:371
+msgid "Are you sure you want to remove this URL?"
+msgstr "本当にこの URL を削除してもよろしいですか？"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:2
+msgid "<span weight=\"bold\">Location</span>"
+msgstr "<span weight=\"bold\">公開する場所</span>"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:4
+msgid "<span weight=\"bold\">Sources</span>"
+msgstr "<span weight=\"bold\">公開するカレンダ</span>"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:6
+msgid ""
+"Daily\n"
+"Weekly\n"
+"Manual (via Actions menu)"
+msgstr ""
+"毎日\n"
+"毎週\n"
+"手動 (メニューから)"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:10
+msgid "Publishing Location"
+msgstr "公開する場所"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:11
+msgid "Publishing _Frequency:"
+msgstr "公開する頻度(_F):"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:12
+msgid ""
+"SSH\n"
+"Public FTP\n"
+"FTP (with login)\n"
+"Windows share\n"
+"WebDAV (HTTP)\n"
+"Secure WebDAV (HTTPS)\n"
+"Custom Location"
+msgstr ""
+"SSH\n"
+"パブリック FTP\n"
+"FTP (ログイン有り)\n"
+"Windows 共有\n"
+"WebDAV (HTTP)\n"
+"セキュア WebDAV (HTTPS)\n"
+"その他"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:19
+msgid "Service _type:"
+msgstr "サービスの種類(_T):"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+msgid "_File:"
+msgstr "ファイル(_F):"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+msgid "_Publish as:"
+msgstr "公開方法(_P):"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:29
+msgid ""
+"iCal\n"
+"Free/Busy"
+msgstr ""
+"iCal 形式\n"
+"Free/Busy 形式"
+
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:99
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (内蔵)"
@@ -16529,9 +16761,9 @@ msgstr "保存"
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:385
-msgid "Uid"
-msgstr "Uid"
+#: ../plugins/save-calendar/csv-format.c:385 ../smime/lib/e-cert.c:678
+msgid "UID"
+msgstr "UID"
 
 #: ../plugins/save-calendar/csv-format.c:387
 msgid "Description List"
@@ -16566,8 +16798,8 @@ msgid "percent Done"
 msgstr "%% 完了"
 
 #: ../plugins/save-calendar/csv-format.c:398
-msgid "Url"
-msgstr "Url"
+msgid "URL"
+msgstr "URL"
 
 #: ../plugins/save-calendar/csv-format.c:399
 msgid "Attendees List"
@@ -16650,8 +16882,12 @@ msgid "_Show only this Task List"
 msgstr "このタスク一覧だけ表示する(_S)"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
+msgid "A plugin that handles the Startup wizard."
+msgstr "起動時のウィザードを提供するためのプラグインです。"
+
+#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
 msgid "Startup wizard"
-msgstr "ウィザードの起動"
+msgstr "ウィザードの起動プラグイン"
 
 #: ../plugins/startup-wizard/startup-wizard.c:85
 msgid "Evolution Setup Assistant"
@@ -16668,9 +16904,9 @@ msgid ""
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
-"Evolution へようこそ。次のいくつかのステップでは、Evolution をお使いの E-メー"
-"ル・アカウントへ接続させて、他のアプリケーションからファイルをインポートでき"
-"るようにします。\n"
+"Evolution へようこそ。これ以降のステップでは Evolution をお使いの E-メール・"
+"アカウントへ接続して、他のアプリケーションからファイルをインポートできるよう"
+"にします。\n"
 "\n"
 "[進む] ボタンをクリックすると続行します。"
 
@@ -16692,7 +16928,7 @@ msgstr "データのインポート中"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Indicates if threading of messages should fall back to subject."
-msgstr "メッセージのスレッド表示を件名表示に戻すかどうかを表します。"
+msgstr "メッセージのスレッド表示を件名表示に戻すプラグインです。"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
 msgid "Subject Threading"
@@ -16955,74 +17191,74 @@ msgstr "Bug buddy を実行できませんでした"
 #. 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:533
+#: ../shell/e-shell-window-commands.c:530
 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>"
+"日本GNOMEユーザー会 http://www.gnome.gr.jp"
 
-#: ../shell/e-shell-window-commands.c:547
+#: ../shell/e-shell-window-commands.c:544
 msgid "Groupware Suite"
 msgstr "グループウェア・スイートです。"
 
-#: ../shell/e-shell-window-commands.c:778
+#: ../shell/e-shell-window-commands.c:775
 msgid "_Work Online"
 msgstr "オンラインで動作(_W)"
 
-#: ../shell/e-shell-window-commands.c:791 ../ui/evolution.xml.h:52
+#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:52
 msgid "_Work Offline"
 msgstr "オフラインで動作(_W)"
 
-#: ../shell/e-shell-window-commands.c:804
+#: ../shell/e-shell-window-commands.c:801
 msgid "Work Offline"
 msgstr "オフラインで動作"
 
-#: ../shell/e-shell-window.c:343
-msgid "Evolution is currently online.  Click on this button to work offline."
+#: ../shell/e-shell-window.c:370
+msgid "Evolution is currently online.Click on this button to work offline."
 msgstr ""
-"現在 Evolution はオンラインです (オフラインにする場合はこのボタンをクリックし"
+"Evolution は現在オンラインです (オフラインにする時は、このボタンをクリックし"
 "て下さい)"
 
-#: ../shell/e-shell-window.c:351
+#: ../shell/e-shell-window.c:378
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution はオフラインのままで処理します"
 
-#: ../shell/e-shell-window.c:358
-msgid "Evolution is currently offline.  Click on this button to work online."
+#: ../shell/e-shell-window.c:385
+msgid "Evolution is currently offline.Click on this button to work online."
 msgstr ""
-"現在 Evolution はオフラインです (オンラインにする場合はこのボタンをクリックし"
+"Evolution は現在オフラインです (オンラインにする時は、このボタンをクリックし"
 "て下さい)"
 
-#: ../shell/e-shell-window.c:735
+#: ../shell/e-shell-window.c:775
 #, c-format
 msgid "Switch to %s"
 msgstr "\"%s\" へ切り替えます"
 
-#: ../shell/e-shell.c:625
+#: ../shell/e-shell.c:633
 msgid "Uknown system error."
 msgstr "特定できないシステム・エラーです。"
 
-#: ../shell/e-shell.c:823 ../shell/e-shell.c:824
+#: ../shell/e-shell.c:831 ../shell/e-shell.c:832
 #, c-format
 msgid "%ld KB"
 msgstr "%ld Kバイト"
 
-#: ../shell/e-shell.c:1255 ../widgets/misc/e-cell-date-edit.c:257
+#: ../shell/e-shell.c:1269 ../widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
 msgstr "OK"
 
-#: ../shell/e-shell.c:1257
+#: ../shell/e-shell.c:1271
 msgid "Invalid arguments"
 msgstr "不正な引数"
 
-#: ../shell/e-shell.c:1259
+#: ../shell/e-shell.c:1273
 msgid "Cannot register on OAF"
 msgstr "OAF に登録できません"
 
-#: ../shell/e-shell.c:1261
+#: ../shell/e-shell.c:1275
 msgid "Configuration Database not found"
 msgstr "データベースの設定がありません"
 
@@ -17180,10 +17416,10 @@ msgstr "Evolution を起動できません。"
 #: ../shell/shell.error.xml.h:5
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
-"reprompted next time they are needed. "
+"reprompted next time they are needed."
 msgstr ""
-"パスワードを破棄すると、今まで保存していた全てのパスワードをクリアします。そ"
-"して次回再びパスワードの入力を要求するダイアログが表示されます。"
+"パスワードの紛失を実行すると、今まで保存していた全てのパスワードをクリアしま"
+"す。そして次回再びパスワードの入力を要求するダイアログが表示されます。"
 
 #: ../shell/shell.error.xml.h:7
 msgid "Insufficient disk space for upgrade."
@@ -17195,7 +17431,7 @@ msgstr "本当に古いデータを削除しますか？"
 
 #: ../shell/shell.error.xml.h:9
 msgid ""
-"The entire contents of the &quot;evolution&quot; directory is about to be be "
+"The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
 "\n"
 "It is suggested you manually verify that all of your mail, contact, and "
@@ -17207,27 +17443,27 @@ msgid ""
 msgstr ""
 "&quot;evolution&quot; というフォルダを完全に削除しようとしています。\n"
 "\n"
-"この古いデータを削除する前に、フォルダ下にあるメールや連絡先、カレンダ情報な"
-"どの全てを手動で確認し、このバージョンの Evolution の処理が正しいか確認するこ"
-"とをお奨めいたします。\n"
+"この古いデータを削除する前に、そのフォルダの中にあるメールや連絡先、カレンダ"
+"情報などの有無を目で見て確認し、このバージョンの Evolution の処理が正しいか確"
+"認することをお奨めいたします。\n"
 "\n"
-"一度削除してしまうと、手動でないと前バージョンの Evolution へダウングレードす"
-"ることはできません。\n"
+"一度削除してしまうと、手動でないと前バージョンの Evolution へ戻すことはできま"
+"せん。\n"
 
 #: ../shell/shell.error.xml.h:15
 msgid ""
 "The previous version of evolution stored its data in a different location.\n"
 "\n"
 "If you choose to remove this data, the entire contents of the &quot;"
-"evolution&quot; directory will be removed permanently.  If you choose to "
-"keep this data, then you may manually remove the contents of &quot;"
+"evolution&quot; directory will be removed permanently. If you choose to keep "
+"this data, then you may manually remove the contents of &quot;"
 "evolution&quot; at your convenience.\n"
 msgstr ""
-"前バージョンの Evolution がデータを別の場所に保存していました。\n"
+"前のバージョンの Evolution がデータを別の場所に保存していました。\n"
 "\n"
-"このデータの削除を選択すると、&quot;evolution&quot; というフォルダを完全に失"
-"うことになります。このデータをそのままにしておくことを選択すると、都合のよい"
-"ときにフォルダ &quot;evolution&quot; の内容を手動で削除できます。\n"
+"このデータの削除を選択すると、&quot;evolution&quot; というフォルダを完全に削"
+"除することになります。このデータをそのままにしておくことを選択すると、都合の"
+"良い時にフォルダ &quot;evolution&quot; の内容を手動で削除できます。\n"
 
 #: ../shell/shell.error.xml.h:19
 msgid "Upgrade from previous version failed: {0}"
@@ -17273,7 +17509,7 @@ msgstr ""
 
 #: ../shell/shell.error.xml.h:31
 msgid "_Forget"
-msgstr "破棄(_F)"
+msgstr "破棄する(_F)"
 
 #: ../shell/shell.error.xml.h:32
 msgid "_Keep Data"
@@ -17294,7 +17530,7 @@ msgstr ""
 "\n"
 "続行すると、いくつかの古いデータへアクセスできなくなるかもしれません。\n"
 
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:104
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -17305,7 +17541,7 @@ msgstr ""
 "\n"
 "信用度を設定して下さい:"
 
-#: ../smime/gui/cert-trust-dialog.c:145
+#: ../smime/gui/cert-trust-dialog.c:153
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -17314,7 +17550,7 @@ msgstr ""
 "この証明書を発行した認証局を信用したので、ここで表示された他のものを除いて、"
 "この証明書の信憑性を信用することになります。"
 
-#: ../smime/gui/cert-trust-dialog.c:149
+#: ../smime/gui/cert-trust-dialog.c:157
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -17323,40 +17559,40 @@ msgstr ""
 "この証明書を発行した認証局を信用しなかったので、ここで表示された他のものを除"
 "いて、この証明書の信憑性を信用しないことになります。"
 
-#: ../smime/gui/certificate-manager.c:134
-#: ../smime/gui/certificate-manager.c:142
-#: ../smime/gui/certificate-manager.c:377
-#: ../smime/gui/certificate-manager.c:385
-#: ../smime/gui/certificate-manager.c:597
-#: ../smime/gui/certificate-manager.c:605
+#: ../smime/gui/certificate-manager.c:136
+#: ../smime/gui/certificate-manager.c:144
+#: ../smime/gui/certificate-manager.c:375
+#: ../smime/gui/certificate-manager.c:383
+#: ../smime/gui/certificate-manager.c:595
+#: ../smime/gui/certificate-manager.c:603
 msgid "Select a certificate to import..."
 msgstr "インポートする証明書の選択..."
 
-#: ../smime/gui/certificate-manager.c:265
-#: ../smime/gui/certificate-manager.c:474
-#: ../smime/gui/certificate-manager.c:692
+#: ../smime/gui/certificate-manager.c:267
+#: ../smime/gui/certificate-manager.c:472
+#: ../smime/gui/certificate-manager.c:690
 msgid "Certificate Name"
 msgstr "証明書の名前"
 
-#: ../smime/gui/certificate-manager.c:274
-#: ../smime/gui/certificate-manager.c:492
+#: ../smime/gui/certificate-manager.c:276
+#: ../smime/gui/certificate-manager.c:490
 msgid "Purposes"
 msgstr "利用の目的"
 
-#: ../smime/gui/certificate-manager.c:283 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/gui/certificate-manager.c:285 ../smime/gui/smime-ui.glade.h:37
 #: ../smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "シリアル番号"
 
-#: ../smime/gui/certificate-manager.c:291
+#: ../smime/gui/certificate-manager.c:293
 msgid "Expires"
 msgstr "有効期限"
 
-#: ../smime/gui/certificate-manager.c:483
+#: ../smime/gui/certificate-manager.c:481
 msgid "E-Mail Address"
 msgstr "E-メール・アドレス"
 
-#: ../smime/gui/certificate-viewer.c:334
+#: ../smime/gui/certificate-viewer.c:342
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "証明書ビューア: %s"
@@ -17376,7 +17612,7 @@ msgid "Enter new password"
 msgstr "新しいパスワードの入力"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:119
+#: ../smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -17385,7 +17621,7 @@ msgstr ""
 "発行先:\n"
 "  件名: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:120
+#: ../smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -17394,7 +17630,7 @@ msgstr ""
 "発行元:\n"
 "  件名: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:167
+#: ../smime/gui/e-cert-selector.c:174
 msgid "Select certificate"
 msgstr "証明書の選択"
 
@@ -17580,7 +17816,7 @@ msgid "_Edit CA Trust"
 msgstr "CA トラストの編集(_E)"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:651
+#: ../smime/lib/e-cert-db.c:654
 msgid "Certificate already exists"
 msgstr "既に証明書があります"
 
@@ -17673,10 +17909,6 @@ msgstr "Netscape 証明書の種類"
 msgid "Certificate Authority Key Identifier"
 msgstr "認証局の鍵の識別子"
 
-#: ../smime/lib/e-cert.c:678
-msgid "UID"
-msgstr "UID"
-
 #: ../smime/lib/e-cert.c:681
 msgid "E"
 msgstr "東"
@@ -17787,15 +18019,15 @@ msgstr "件名の重複しない ID"
 msgid "Certificate Signature Value"
 msgstr "証明書の署名の値"
 
-#: ../smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS12 ファイルのパスワード"
 
-#: ../smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:266
 msgid "Enter password for PKCS12 file:"
 msgstr "PKCS12 ファイルのパスワードを入力して下さい:"
 
-#: ../smime/lib/e-pkcs12.c:363
+#: ../smime/lib/e-pkcs12.c:365
 msgid "Imported Certificate"
 msgstr "インポートした証明書"
 
@@ -17882,7 +18114,7 @@ msgstr "フォルダへ移動..."
 msgid "Paste"
 msgstr "貼り付け"
 
-#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:15
 msgid "Paste the clipboard"
 msgstr "クリップボードへ貼り付けます"
 
@@ -17934,7 +18166,7 @@ msgstr "読み込みを停止します"
 msgid "View the current contact"
 msgstr "この連絡先を表示します"
 
-#: ../ui/evolution-addressbook.xml.h:31 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-addressbook.xml.h:31 ../ui/evolution-calendar.xml.h:36
 #: ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr "アクション(_A)"
@@ -17968,106 +18200,98 @@ msgid "Delete this Occurrence"
 msgstr "このイベントの削除"
 
 #: ../ui/evolution-calendar.xml.h:9
-msgid "Delete this occurrence"
-msgstr "このイベントを削除します"
-
-#: ../ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "移動"
 
-#: ../ui/evolution-calendar.xml.h:11
+#: ../ui/evolution-calendar.xml.h:10
 msgid "Go back"
 msgstr "前へ戻ります"
 
-#: ../ui/evolution-calendar.xml.h:12
+#: ../ui/evolution-calendar.xml.h:11
 msgid "Go forward"
 msgstr "次へ進みます"
 
-#: ../ui/evolution-calendar.xml.h:13
+#: ../ui/evolution-calendar.xml.h:12
 msgid "List"
 msgstr "一覧"
 
-#: ../ui/evolution-calendar.xml.h:14
+#: ../ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "月"
 
-#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:59
+#: ../ui/evolution-calendar.xml.h:14 ../ui/evolution-mail-message.xml.h:59
 msgid "Next"
 msgstr "次へ"
 
-#: ../ui/evolution-calendar.xml.h:17
+#: ../ui/evolution-calendar.xml.h:16
 msgid "Previews the calendar to be printed"
 msgstr "印刷されるカレンダのプレビューを表示します"
 
-#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-calendar.xml.h:17 ../ui/evolution-mail-message.xml.h:75
 msgid "Previous"
 msgstr "前へ"
 
-#: ../ui/evolution-calendar.xml.h:21
+#: ../ui/evolution-calendar.xml.h:20
 msgid "Print this calendar"
 msgstr "このカレンダを印刷します"
 
-#: ../ui/evolution-calendar.xml.h:22
-msgid "Publish Free/Busy information for this calendar"
-msgstr "このカレンダの予定の有無を公開します"
-
-#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "抹消(_E)"
 
-#: ../ui/evolution-calendar.xml.h:24
+#: ../ui/evolution-calendar.xml.h:22
 msgid "Purge old appointments and meetings"
 msgstr "古い予定と会議を完全に削除します"
 
-#: ../ui/evolution-calendar.xml.h:25
+#: ../ui/evolution-calendar.xml.h:23
 msgid "Select _Date"
 msgstr "日付の選択(_D)"
 
-#: ../ui/evolution-calendar.xml.h:26
+#: ../ui/evolution-calendar.xml.h:24
 msgid "Select _Today"
 msgstr "今日にする(_T)"
 
-#: ../ui/evolution-calendar.xml.h:27
+#: ../ui/evolution-calendar.xml.h:25
 msgid "Select a specific date"
 msgstr "指定日に移動します"
 
-#: ../ui/evolution-calendar.xml.h:28
+#: ../ui/evolution-calendar.xml.h:26
 msgid "Select today"
 msgstr "今日に移動します"
 
-#: ../ui/evolution-calendar.xml.h:29
+#: ../ui/evolution-calendar.xml.h:27
 msgid "Show as list"
 msgstr "一覧形式で表示します"
 
-#: ../ui/evolution-calendar.xml.h:30
+#: ../ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "1 日を表示します"
 
-#: ../ui/evolution-calendar.xml.h:31
+#: ../ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "1 ヶ月を表示します"
 
-#: ../ui/evolution-calendar.xml.h:32
+#: ../ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "1 週間を表示します"
 
-#: ../ui/evolution-calendar.xml.h:33
+#: ../ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "平日を表示します"
 
-#: ../ui/evolution-calendar.xml.h:35
+#: ../ui/evolution-calendar.xml.h:33
 msgid "View the current appointment"
 msgstr "現在の予定の表示"
 
-#: ../ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-calendar.xml.h:34
 msgid "Week"
 msgstr "週"
 
-#: ../ui/evolution-calendar.xml.h:37
+#: ../ui/evolution-calendar.xml.h:35
 msgid "Work Week"
 msgstr "平日"
 
-#: ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-calendar.xml.h:40
 msgid "_Open Appointment"
 msgstr "予定を開く(_O)"
 
@@ -18092,6 +18316,10 @@ msgstr "全て選択(_A)"
 msgid "Select all text"
 msgstr "全てのテキストを選択します"
 
+#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
+msgid "Attach"
+msgstr "添付"
+
 #: ../ui/evolution-editor.xml.h:2
 msgid "Click here to attach a file"
 msgstr "ファイルを添付します"
@@ -18105,7 +18333,7 @@ msgid "Click here to save the current window"
 msgstr "この内容を保存します"
 
 #: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help availabe"
+msgid "Click here to view help available"
 msgstr "利用可能なヘルプを表示します"
 
 #.
@@ -18119,9 +18347,9 @@ msgstr "利用可能なヘルプを表示します"
 msgid "Close"
 msgstr "閉じる"
 
-#: ../ui/evolution-editor.xml.h:14
-msgid "_Attachments"
-msgstr "ファイルの添付(_A)"
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:40
+msgid "_Attachment..."
+msgstr "ファイルの添付(_A)..."
 
 #: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:43 ../ui/evolution-subscribe.xml.h:9
@@ -18131,11 +18359,11 @@ msgstr "閉じる(_C)"
 #: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:46
 #: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:37
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:38
 msgid "_File"
 msgstr "ファイル(_F)"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:38
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:39
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
@@ -18164,102 +18392,102 @@ msgstr "非公開として分類"
 msgid "Classify as public"
 msgstr "公開として分類"
 
-#: ../ui/evolution-event-editor.xml.h:7 ../ui/evolution-task-editor.xml.h:5
+#: ../ui/evolution-event-editor.xml.h:6
+msgid "Click here to set or unset alarms for this event"
+msgstr "このイベントにアラームをセットしたり解除します"
+
+#: ../ui/evolution-event-editor.xml.h:8 ../ui/evolution-task-editor.xml.h:5
 msgid "Insert advanced send options"
 msgstr "送信用の拡張オプションを挿入します"
 
-#: ../ui/evolution-event-editor.xml.h:8
+#: ../ui/evolution-event-editor.xml.h:9
 msgid "Make this a recurring event"
 msgstr "このイベントを繰り返します"
 
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:6
+#: ../ui/evolution-event-editor.xml.h:10 ../ui/evolution-task-editor.xml.h:6
 msgid "Pu_blic"
 msgstr "公開(_B)"
 
-#: ../ui/evolution-event-editor.xml.h:10
+#: ../ui/evolution-event-editor.xml.h:11
 msgid "Query free / busy information for the attendees"
 msgstr "この出席者の予定を調べてみます"
 
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-task-editor.xml.h:7
+#: ../ui/evolution-event-editor.xml.h:12 ../ui/evolution-task-editor.xml.h:7
 msgid "R_ole Field"
 msgstr "役割フィールド(_O)"
 
-#: ../ui/evolution-event-editor.xml.h:14 ../ui/evolution-task-editor.xml.h:9
+#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:9
 msgid "Show Time _Zone"
 msgstr "タイムゾーン(_Z)"
 
-#: ../ui/evolution-event-editor.xml.h:15
+#: ../ui/evolution-event-editor.xml.h:16
 msgid "Show time as b_usy"
 msgstr "\"予定あり\"にする(_U)"
 
-#: ../ui/evolution-event-editor.xml.h:16 ../ui/evolution-task-editor.xml.h:12
+#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:12
 msgid "Toggles whether the Attendee Type field is displayed"
 msgstr "出席者の所属 (種類) の表示/非表示を切り替えます"
 
-#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:13
+#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:13
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "RSVP の表示/非表示を切り替えます"
 
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:14
+#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:14
 msgid "Toggles whether the Role field is displayed"
 msgstr "役割の表示/非表示を切り替えます"
 
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:15
+#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:15
 msgid "Toggles whether the Status field is displayed"
 msgstr "ステータスの表示/非表示を切り替えます"
 
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:16
+#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:16
 msgid "Toggles whether the time zone is displayed"
 msgstr "タイムゾーンの表示/非表示を切り替えます"
 
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:17
+#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:17
 msgid "Toggles whether to display categories"
 msgstr "カテゴリの表示/非表示を切り替えます"
 
-#: ../ui/evolution-event-editor.xml.h:22
+#: ../ui/evolution-event-editor.xml.h:23
 msgid "Toggles whether to have All day Event"
 msgstr "終日のイベントにするかどうかを切り替えます"
 
-#: ../ui/evolution-event-editor.xml.h:23
+#: ../ui/evolution-event-editor.xml.h:24
 msgid "Toggles whether to show time as busy"
 msgstr "予定ありと表示するかどうかを切り替えます"
 
-#: ../ui/evolution-event-editor.xml.h:24
+#: ../ui/evolution-event-editor.xml.h:25
 msgid "_Alarms"
 msgstr "アラーム(_A)"
 
-#: ../ui/evolution-event-editor.xml.h:25
+#: ../ui/evolution-event-editor.xml.h:26
 msgid "_All day Event"
 msgstr "終日のイベントにする(_A)"
 
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-task-editor.xml.h:19
+#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
 msgstr "区分(_C)"
 
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-task-editor.xml.h:20
+#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-task-editor.xml.h:20
 msgid "_Confidential"
 msgstr "極秘(_C)"
 
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-task-editor.xml.h:21
+#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-task-editor.xml.h:21
 msgid "_Private"
 msgstr "非公開(_P)"
 
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-task-editor.xml.h:22
+#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-task-editor.xml.h:22
 msgid "_RSVP"
 msgstr "RSVP(_R)"
 
-#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-task-editor.xml.h:24
+#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:24
 msgid "_Status Field"
 msgstr "ステータス(_S)"
 
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:25
+#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:25
 msgid "_Type Field"
 msgstr "所属(_T)"
 
-#: ../ui/evolution-executive-summary.xml.h:1
-msgid "Customize My Evolution"
-msgstr "My Evolution のカスタマイズ"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "現在のメール操作を取り消します"
@@ -18308,7 +18536,7 @@ msgstr "全てのフォルダで削除マークが付いたメッセージを完
 
 #: ../ui/evolution-mail-global.xml.h:14
 msgid "Search F_olders"
-msgstr "フォルダの検索(_O)"
+msgstr "仮想フォルダの編集(_O)"
 
 #: ../ui/evolution-mail-global.xml.h:15
 msgid "Show message preview window"
@@ -18316,7 +18544,7 @@ msgstr "プレビュー・ウィンドウの表示/非表示を切り替えま�
 
 #: ../ui/evolution-mail-global.xml.h:16
 msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "リモート・サーバにあるフォルダの購読を開始/停止を切り替えます"
+msgstr "リモート・サーバにあるフォルダの購読の開始/停止を切り替えます"
 
 #: ../ui/evolution-mail-global.xml.h:17
 msgid "_Copy Folder To..."
@@ -18377,7 +18605,7 @@ msgstr "既読メッセージを隠す(_R)"
 #: ../ui/evolution-mail-list.xml.h:12
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
-msgstr "表示しているメッセージではなく削除されたメッセージを隠します"
+msgstr "表示しているメッセージではなく削除したメッセージを隠します"
 
 #: ../ui/evolution-mail-list.xml.h:13
 msgid "Mar_k Messages as Read"
@@ -18435,7 +18663,7 @@ msgstr "選択したメッセージを一時的に隠します"
 msgid "Threaded Message list"
 msgstr "メッセージの一覧をスレッド表示にします"
 
-#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:117
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "メッセージ(_M)"
@@ -18466,8 +18694,8 @@ msgid "Check for _Junk"
 msgstr "ジャンクかチェックする(_J)"
 
 #: ../ui/evolution-mail-message.xml.h:8
-msgid "Compose _New Message..."
-msgstr "新しいメッセージの作成(_N)..."
+msgid "Compose _New Message"
+msgstr "新しいメッセージの作成(_N)"
 
 #: ../ui/evolution-mail-message.xml.h:9
 msgid "Compose a reply to all of the recipients of the selected message"
@@ -18667,7 +18895,7 @@ msgstr "ジャンクではない"
 
 #: ../ui/evolution-mail-message.xml.h:64
 msgid "Open a window for composing a mail message"
-msgstr "メール・メッセージを作成するためのウィンドウを開きます"
+msgstr "メッセージを作成するためのウィンドウを開きます"
 
 #: ../ui/evolution-mail-message.xml.h:65
 msgid "Open the selected message in a new window"
@@ -18682,12 +18910,12 @@ msgid "P_revious Unread Message"
 msgstr "前の未読メッセージへ(_R)"
 
 #: ../ui/evolution-mail-message.xml.h:69
-msgid "Pos_t New Message to Folder..."
-msgstr "フォルダへ新しいメッセージの投稿(_T)..."
+msgid "Pos_t New Message to Folder"
+msgstr "フォルダへ新しいメッセージの投稿(_T)"
 
 #: ../ui/evolution-mail-message.xml.h:70
-msgid "Post a Repl_y..."
-msgstr "返信の投稿(_Y)..."
+msgid "Post a Repl_y"
+msgstr "返信の投稿(_Y)"
 
 #: ../ui/evolution-mail-message.xml.h:71
 msgid "Post a message to a Public folder"
@@ -18710,21 +18938,13 @@ msgid "Print this message"
 msgstr "メッセージを印刷します"
 
 #: ../ui/evolution-mail-message.xml.h:79
-msgid "Re_direct..."
-msgstr "リダイレクト(_D)..."
+msgid "Re_direct"
+msgstr "リダイレクト(_D)"
 
 #: ../ui/evolution-mail-message.xml.h:80
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "選択したメッセージを誰かに転送します"
 
-#: ../ui/evolution-mail-message.xml.h:83
-msgid "Reply to _All..."
-msgstr "全員へ返信(_A)..."
-
-#: ../ui/evolution-mail-message.xml.h:84
-msgid "Reply to _List..."
-msgstr "メーリング・リストへ返信(_L)..."
-
 #: ../ui/evolution-mail-message.xml.h:85
 msgid "Reset the text to its original size"
 msgstr "文字のサイズを初期サイズに戻します"
@@ -18767,7 +18987,7 @@ msgstr "現在のプリンタのページ設定を行います"
 
 #: ../ui/evolution-mail-message.xml.h:95
 msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "表示されたメッセージ本体に点滅するカーソルを表示します"
+msgstr "表示したメッセージの本文に点滅するカーソルを表示します"
 
 #: ../ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
@@ -18801,79 +19021,79 @@ msgstr "添付する(_A)"
 msgid "_Caret Mode"
 msgstr "カーソル・モード(_C)"
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:104
+msgid "_Clear Flag"
+msgstr "フラグの解除(_C)"
+
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Delete Message"
 msgstr "削除マークの付与(_D)"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Find in Message..."
 msgstr "メッセージから検索(_F)..."
 
-#: ../ui/evolution-mail-message.xml.h:109
-msgid "_Forward..."
-msgstr "転送(_F)..."
-
 #: ../ui/evolution-mail-message.xml.h:110
+msgid "_Flag Completed"
+msgstr "完了フラグの付与(_F)"
+
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "ジャンプ(_G)"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Important"
 msgstr "重要(_I)"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Inline"
 msgstr "インライン(_I)"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:115
 msgid "_Junk"
 msgstr "ジャンク(_J)"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Load Images"
 msgstr "画像の読み込み(_L)"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Next Message"
 msgstr "次のメッセージへ(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Normal Size"
 msgstr "通常のサイズ(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Not Junk"
 msgstr "ジャンクではない(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Open in New Window"
 msgstr "新しいウィンドウで開く(_O)"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:123
 msgid "_Previous Message"
 msgstr "前のメッセージへ(_P)"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:125
 msgid "_Quoted"
 msgstr "引用する(_Q)"
 
-#: ../ui/evolution-mail-message.xml.h:125
-msgid "_Reply to Sender..."
-msgstr "差出人へ返信(_R)..."
-
-#: ../ui/evolution-mail-message.xml.h:126
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
 msgstr "メッセージの保存(_S)..."
 
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
 msgstr "削除マークの解除(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:128
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
 msgstr "未読(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:131
 msgid "_Zoom In"
 msgstr "拡大(_Z)"
 
@@ -18915,11 +19135,7 @@ msgstr "選択したメモを表示します"
 
 #: ../ui/evolution-memos.xml.h:18
 msgid "_Open Memo"
-msgstr "めもを開く(_O)"
-
-#: ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "添付"
+msgstr "メモを開く(_O)"
 
 #: ../ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
@@ -19035,11 +19251,11 @@ msgstr "メッセージの優先度を高くします"
 
 #: ../ui/evolution-message-composer.xml.h:32
 msgid "Sign this message with your PGP key"
-msgstr "PGP鍵でこのメッセージにサインします"
+msgstr "PGP 鍵でこのメッセージに署名します"
 
 #: ../ui/evolution-message-composer.xml.h:33
 msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "S/MIME 署名証明書でこのメッセージにサインします"
+msgstr "S/MIME 署名証明書でこのメッセージに署名します"
 
 #: ../ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the BCC field is displayed"
@@ -19065,10 +19281,6 @@ msgstr "返信先の表示/非表示を切り替えます"
 msgid "Toggles whether the To field is displayed"
 msgstr "宛先の表示/非表示を切り替えます"
 
-#: ../ui/evolution-message-composer.xml.h:40
-msgid "_Attachment..."
-msgstr "ファイルの添付(_A)..."
-
 #: ../ui/evolution-message-composer.xml.h:41
 msgid "_Bcc Field"
 msgstr "Bcc フィールド(_B)"
@@ -19138,11 +19350,11 @@ msgstr "購読フォルダのリストへフォルダを追加"
 
 #: ../ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
-msgstr "リストを更新"
+msgstr "リストの更新"
 
 #: ../ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
-msgstr "フォルダリストを更新"
+msgstr "フォルダ一覧の更新"
 
 #: ../ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
@@ -19297,18 +19509,22 @@ msgid "Send / Receive"
 msgstr "送受信"
 
 #: ../ui/evolution.xml.h:20
+msgid "Send / _Receive"
+msgstr "送受信(_R)"
+
+#: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
 msgstr "キューにあるメッセージを送信して、新着メッセージを受信します"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:22
 msgid "Set up Pilot configuration"
 msgstr "GNOME パイロットを設定してデータを同期します"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:23
 msgid "Show information about Evolution"
 msgstr "Evolution についての情報を表示します"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "バグ報告の提出"
 
@@ -19316,62 +19532,58 @@ msgstr "バグ報告の提出"
 #. _label="Evolution _FAQ"/>
 #.
 #. <separator/>
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:29
 msgid "Submit _Bug Report"
 msgstr "バグ報告の提出(_B)"
 
-#: ../ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:30
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug Buddy を使ってバグを報告します"
 
-#: ../ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:31
 msgid "Toggle whether we are working offline."
 msgstr "オフライン/オンライン動作を切り替えます"
 
-#: ../ui/evolution.xml.h:31
+#: ../ui/evolution.xml.h:32
 msgid "Tool_bar"
 msgstr "ツールバー(_B)"
 
-#: ../ui/evolution.xml.h:32
+#: ../ui/evolution.xml.h:33
 msgid "Tool_bar style"
 msgstr "ツールバーのスタイル(_B)"
 
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:34
 msgid "View/Hide the Status Bar"
 msgstr "ステータスバーの表示/非表示を切り替えます"
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:35
 msgid "_About Evolution..."
 msgstr "Evolution について(_A)..."
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:36
 msgid "_Close Window"
 msgstr "ウィンドウを閉じる(_C)"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:40
 msgid "_Hide buttons"
 msgstr "ボタンを隠す(_H)"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Icons only"
 msgstr "アイコンのみ(_I)"
 
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:42
 msgid "_Import..."
 msgstr "インポート(_I)..."
 
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:43
 msgid "_New"
 msgstr "新規(_N)"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Quick Reference"
 msgstr "クィック・リファレンス(_Q)"
 
-#: ../ui/evolution.xml.h:45
-msgid "_Send / Receive"
-msgstr "送受信(_S)"
-
 #: ../ui/evolution.xml.h:46
 msgid "_Switcher Appearance"
 msgstr "ボタンのスタイル(_S)"
@@ -19460,8 +19672,8 @@ msgstr "期日(_D)"
 msgid "With _Status"
 msgstr "ステータス(_S)"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:195
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:637
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:197
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -19540,16 +19752,16 @@ msgid "_Replace existing view"
 msgstr "既存のビューと置き換え(_R)"
 
 #. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:585
+#: ../widgets/menus/gal-view-instance.c:586
 #: ../widgets/menus/gal-view-menus.c:350
 msgid "Custom View"
 msgstr "カスタム表示"
 
-#: ../widgets/menus/gal-view-instance.c:586
+#: ../widgets/menus/gal-view-instance.c:587
 msgid "Save Custom View"
 msgstr "カスタム表示の保存"
 
-#: ../widgets/menus/gal-view-instance.c:590
+#: ../widgets/menus/gal-view-instance.c:591
 #: ../widgets/menus/gal-view-menus.c:372
 msgid "Define Views..."
 msgstr "ビューの定義..."
@@ -19597,17 +19809,17 @@ msgstr "前へのボタン"
 msgid "Month Calendar"
 msgstr "月別カレンダ"
 
-#: ../widgets/misc/e-canvas-background.c:456
-#: ../widgets/misc/e-canvas-background.c:457 ../widgets/text/e-entry.c:1284
+#: ../widgets/misc/e-canvas-background.c:459
+#: ../widgets/misc/e-canvas-background.c:460 ../widgets/text/e-entry.c:1284
 #: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3540
 #: ../widgets/text/e-text.c:3541
 msgid "Fill color"
 msgstr "色で塗りつぶす"
 
-#: ../widgets/misc/e-canvas-background.c:463
-#: ../widgets/misc/e-canvas-background.c:464
-#: ../widgets/misc/e-canvas-background.c:470
-#: ../widgets/misc/e-canvas-background.c:471 ../widgets/text/e-entry.c:1291
+#: ../widgets/misc/e-canvas-background.c:466
+#: ../widgets/misc/e-canvas-background.c:467
+#: ../widgets/misc/e-canvas-background.c:473
+#: ../widgets/misc/e-canvas-background.c:474 ../widgets/text/e-entry.c:1291
 #: ../widgets/text/e-entry.c:1292 ../widgets/text/e-entry.c:1298
 #: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3547
 #: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3555
@@ -19615,30 +19827,30 @@ msgstr "色で塗りつぶす"
 msgid "GDK fill color"
 msgstr "GDK で色を塗りつぶす"
 
-#: ../widgets/misc/e-canvas-background.c:477
-#: ../widgets/misc/e-canvas-background.c:478 ../widgets/text/e-entry.c:1305
+#: ../widgets/misc/e-canvas-background.c:480
+#: ../widgets/misc/e-canvas-background.c:481 ../widgets/text/e-entry.c:1305
 #: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3562
 #: ../widgets/text/e-text.c:3563
 msgid "Fill stipple"
 msgstr "点で埋める"
 
-#: ../widgets/misc/e-canvas-background.c:484
-#: ../widgets/misc/e-canvas-background.c:485
+#: ../widgets/misc/e-canvas-background.c:487
+#: ../widgets/misc/e-canvas-background.c:488
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:491
-#: ../widgets/misc/e-canvas-background.c:492
+#: ../widgets/misc/e-canvas-background.c:494
+#: ../widgets/misc/e-canvas-background.c:495
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:498
-#: ../widgets/misc/e-canvas-background.c:499
+#: ../widgets/misc/e-canvas-background.c:501
+#: ../widgets/misc/e-canvas-background.c:502
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:505
-#: ../widgets/misc/e-canvas-background.c:506
+#: ../widgets/misc/e-canvas-background.c:508
+#: ../widgets/misc/e-canvas-background.c:509
 msgid "Y2"
 msgstr "Y2"
 
@@ -19798,7 +20010,7 @@ msgstr "%k時%M分"
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: ../widgets/misc/e-dateedit.c:1447 ../widgets/misc/e-dateedit.c:1774
 msgid "%I:%M %p"
-msgstr "%p %l時%M分"
+msgstr "%p%l時%M分"
 
 #: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
@@ -19857,8 +20069,8 @@ msgid "_Searches"
 msgstr "検索(_S)"
 
 #: ../widgets/misc/e-filter-bar.c:203
-msgid "Search Editor"
-msgstr "検索エディタ"
+msgid "Searches"
+msgstr "検索"
 
 #. FIXME: get the toplevel window...
 #: ../widgets/misc/e-filter-bar.c:226
@@ -19881,11 +20093,11 @@ msgstr "拡張検索(_A)..."
 msgid "Choose Image"
 msgstr "画像の選択"
 
-#: ../widgets/misc/e-map.c:647
+#: ../widgets/misc/e-map.c:651
 msgid "World Map"
 msgstr "世界地図"
 
-#: ../widgets/misc/e-map.c:649
+#: ../widgets/misc/e-map.c:653
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should select the timezone from the below combo box instead."
@@ -19919,41 +20131,41 @@ msgstr "カラムの幅"
 
 #. To translators: This is the accessibility name of
 #. the search bar's text entry widget
-#: ../widgets/misc/e-search-bar.c:357
+#: ../widgets/misc/e-search-bar.c:372
 msgid "Search Text Entry"
 msgstr "検索用のテキスト・エントリ"
 
-#: ../widgets/misc/e-search-bar.c:576
+#: ../widgets/misc/e-search-bar.c:591
 msgid "_Search"
 msgstr "検索(_S)"
 
-#: ../widgets/misc/e-search-bar.c:582
+#: ../widgets/misc/e-search-bar.c:597
 msgid "_Find Now"
 msgstr "今すぐ見つける(_F)"
 
-#: ../widgets/misc/e-search-bar.c:583 ../widgets/misc/e-search-bar.c:970
+#: ../widgets/misc/e-search-bar.c:598 ../widgets/misc/e-search-bar.c:985
 msgid "_Clear"
 msgstr "クリア(_C)"
 
-#: ../widgets/misc/e-search-bar.c:674
+#: ../widgets/misc/e-search-bar.c:689
 msgid "Search Type"
 msgstr "検索の種類"
 
-#: ../widgets/misc/e-search-bar.c:878
+#: ../widgets/misc/e-search-bar.c:893
 msgid "Item ID"
-msgstr "アイテム ID"
+msgstr "アイテムの ID"
 
-#: ../widgets/misc/e-search-bar.c:885
+#: ../widgets/misc/e-search-bar.c:900
 msgid "Subitem ID"
-msgstr "サブアイテム ID"
+msgstr "サブアイテムの ID"
 
-#: ../widgets/misc/e-search-bar.c:892 ../widgets/text/e-entry.c:1249
+#: ../widgets/misc/e-search-bar.c:907 ../widgets/text/e-entry.c:1249
 #: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3462
 #: ../widgets/text/e-text.c:3463
 msgid "Text"
 msgstr "テキスト"
 
-#: ../widgets/misc/e-search-bar.c:972
+#: ../widgets/misc/e-search-bar.c:987
 msgid "Find _Now"
 msgstr "今すぐ見つける(_N)"
 
@@ -19979,7 +20191,7 @@ msgstr "選択モード"
 msgid "Cursor Mode"
 msgstr "カーソル・モード"
 
-#: ../widgets/misc/e-send-options.c:521
+#: ../widgets/misc/e-send-options.c:524
 msgid "When de_leted:"
 msgstr "削除した時(_L):"
 
@@ -20058,21 +20270,21 @@ msgstr ""
 "低い"
 
 #: ../widgets/misc/e-send-options.glade.h:23
-msgid "W_ithin"
-msgstr "次の日まで(_I): "
-
-#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When acce_pted:"
 msgstr "受諾した時(_P):"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When co_mpleted:"
 msgstr "完了した時(_M):"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When decli_ned:"
 msgstr "辞退した時(_N):"
 
+#: ../widgets/misc/e-send-options.glade.h:26
+msgid "Wi_thin"
+msgstr "次の日まで(_T)"
+
 #: ../widgets/misc/e-send-options.glade.h:27
 msgid "_After:"
 msgstr "次の日以降(_A):"
@@ -20116,7 +20328,7 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完了)"
 
 #: ../widgets/misc/e-url-entry.c:107
-msgid "click here to go to url"
+msgid "Click here to go to URL"
 msgstr "ここをクリックすると URL へジャンプします"
 
 #: ../widgets/misc/gal-categories.glade.h:2
@@ -20141,7 +20353,7 @@ msgstr "ポップアップの一覧"
 
 #: ../widgets/table/e-cell-date.c:64
 msgid "%l:%M %p"
-msgstr "%p %l:%M"
+msgstr "%p%l:%M"
 
 #: ../widgets/table/e-cell-pixbuf.c:397
 msgid "Selected Column"
@@ -20155,23 +20367,23 @@ msgstr "フォーカスした項目"
 msgid "Unselected Column"
 msgstr "未選択の項目"
 
-#: ../widgets/table/e-cell-text.c:1740
+#: ../widgets/table/e-cell-text.c:1742
 msgid "Strikeout Column"
 msgstr "取消し線つきの項目"
 
-#: ../widgets/table/e-cell-text.c:1747
+#: ../widgets/table/e-cell-text.c:1749
 msgid "Underline Column"
 msgstr "下線つきの項目"
 
-#: ../widgets/table/e-cell-text.c:1754
+#: ../widgets/table/e-cell-text.c:1756
 msgid "Bold Column"
 msgstr "太字の項目"
 
-#: ../widgets/table/e-cell-text.c:1761
+#: ../widgets/table/e-cell-text.c:1763
 msgid "Color Column"
 msgstr "色つきの項目"
 
-#: ../widgets/table/e-cell-text.c:1775
+#: ../widgets/table/e-cell-text.c:1777
 msgid "BG Color Column"
 msgstr "背景色つきの項目"
 
@@ -20494,8 +20706,9 @@ msgstr "表のモデル"
 msgid "Cursor row"
 msgstr "カーソル行"
 
-#: ../widgets/table/e-table.c:3330
-msgid "Always Search"
+#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3304
+#: ../widgets/table/e-tree.c:3305
+msgid "Always search"
 msgstr "常に検索する"
 
 #: ../widgets/table/e-table.c:3337
@@ -20506,10 +20719,6 @@ msgstr "クリックして追加する"
 msgid "ETree table adapter"
 msgstr "ETree テーブル・アダプタ"
 
-#: ../widgets/table/e-tree.c:3304 ../widgets/table/e-tree.c:3305
-msgid "Always search"
-msgstr "常に検索する"
-
 #: ../widgets/table/e-tree.c:3311
 msgid "Retro Look"
 msgstr "レトロな外観"
author	Takeshi AIHANA <aihana@gnome.gr.jp>	2006-01-04 00:40:40 +0800
committer	Takeshi Aihana <aihana@src.gnome.org>	2006-01-04 00:40:40 +0800
commit	31611aad52d469804801a624e79e52721b77360f (patch)
tree	d3d607be957e2c16cae0f76ee293f69b0459ac9d /po/ja.po
parent	6e64033d4c4c4728e21a686a251aafed65440b69 (diff)
download	gsoc2013-evolution-31611aad52d469804801a624e79e52721b77360f.tar.gz gsoc2013-evolution-31611aad52d469804801a624e79e52721b77360f.tar.zst gsoc2013-evolution-31611aad52d469804801a624e79e52721b77360f.zip