l10n: Update Japanese translation

author: Jiro Matsuzawa <jmatsuzawa@gnome.org> 2014-03-24 20:42:54 +0800
committer: Jiro Matsuzawa <jmatsuzawa@gnome.org> 2014-03-24 20:42:54 +0800
commit: 1b9db74cf09a353a6e55c57d3b35d8d97ec3134f (patch)
tree: c1d72b51c3defe7599782a8d9483b4a9b7da6d61 /po
parent: d86e8e30b85791ee8b2dc0c2ddefcf684beb1676 (diff)
download: gsoc2013-evolution-1b9db74cf09a353a6e55c57d3b35d8d97ec3134f.tar
gsoc2013-evolution-1b9db74cf09a353a6e55c57d3b35d8d97ec3134f.tar.gz
gsoc2013-evolution-1b9db74cf09a353a6e55c57d3b35d8d97ec3134f.tar.bz2
gsoc2013-evolution-1b9db74cf09a353a6e55c57d3b35d8d97ec3134f.tar.lz
gsoc2013-evolution-1b9db74cf09a353a6e55c57d3b35d8d97ec3134f.tar.xz
gsoc2013-evolution-1b9db74cf09a353a6e55c57d3b35d8d97ec3134f.tar.zst
gsoc2013-evolution-1b9db74cf09a353a6e55c57d3b35d8d97ec3134f.zip
1 files changed, 4803 insertions, 4279 deletions
diff --git a/po/ja.po b/po/ja.po
index c1e7fb8a35..dcad1acef3 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,13 +10,13 @@
 # Shushi Kurose <md81bird@hitaki.net>, 2011.
 # Hideki Yamane <henrich@debian.org>, 2011.
 #
-#: ../shell/main.c:557
+#: ../shell/main.c:554
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2013-09-22 11:13+0000\n"
-"PO-Revision-Date: 2013-09-24:05:37+0900\n"
+"POT-Creation-Date: 2014-03-23 16:31+0000\n"
+"PO-Revision-Date: 2014-03-24 21:40+0900\n"
 "Last-Translator: Jiro Matsuzawa <jmatsuzawa@gnome.org>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
 "Language: ja\n"
@@ -96,8 +96,8 @@ msgid "Category editor not available."
 msgstr "カテゴリエディターは利用できません。"
 
 #: ../addressbook/addressbook.error.xml.h:18
-msgid "Unable to open address book"
-msgstr "アドレス帳を開けません"
+msgid "Unable to open address book '{0}'"
+msgstr "アドレス帳 '{0}' を開けません"
 
 #: ../addressbook/addressbook.error.xml.h:19
 msgid "Unable to perform search."
@@ -156,7 +156,21 @@ msgid "A contact already exists with this address. Would you like to add a new c
 msgstr "このアドレスは既に連絡先に存在しています。とにかく同じアドレスを新しいカードに追加しますか?"
 
 #: ../addressbook/addressbook.error.xml.h:33
-#: ../e-util/e-name-selector-dialog.c:997 ../mail/em-vfolder-editor-rule.c:397
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
+#: ../addressbook/gui/widgets/eab-contact-merging.c:626
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:19
+#: ../calendar/gui/dialogs/task-page.ui.h:30 ../e-util/filter.ui.h:16
+#: ../e-util/e-mail-signature-manager.c:327
+#: ../e-util/e-name-selector-dialog.c:995 ../mail/e-mail-account-manager.c:719
+#: ../mail/e-mail-label-manager.c:373 ../mail/em-vfolder-editor-rule.c:392
+#: ../mail/em-vfolder-editor-rule.c:622 ../mail/mail-config.ui.h:51
+#: ../modules/mail/em-composer-prefs.c:443
+#: ../plugins/attachment-reminder/attachment-reminder.c:557
+#: ../plugins/email-custom-header/email-custom-header.c:838
+#: ../plugins/publish-calendar/publish-calendar.ui.h:32
+#: ../plugins/templates/templates.c:453
 msgid "_Add"
 msgstr "追加する(_A)"
 
@@ -185,7 +199,7 @@ msgid "A contact list named '{0}' is already in this contact list. Would you lik
 msgstr "この連絡先一覧と同じ名前の連絡先一覧が既に存在しています。とにかく追加しますか?"
 
 #: ../addressbook/addressbook.error.xml.h:40
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1251
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1250
 msgid "Failed to delete contact"
 msgstr "連絡先の削除に失敗しました"
 
@@ -202,10 +216,19 @@ msgstr "新しい連絡先を追加できません"
 msgid "'{0}' is a read-only address book and cannot be modified. Please select a different address book from the side bar in the Contacts view."
 msgstr "'{0}' は読み込み専用のアドレス帳で変更はできません。左側の連絡先のビューから別のアドレス帳を選択してください。"
 
+#: ../addressbook/addressbook.error.xml.h:45
+msgid "Cannot save a contact, address book is still opening"
+msgstr "連絡先を保存できません。アドレス帳が開いたままです"
+
+#. For Translators: {0} is the name of the address book source
+#: ../addressbook/addressbook.error.xml.h:47
+msgid "Cannot save a contact to the address book '{0}', because it is still opening. Either wait till it's opened, or select a different address book."
+msgstr "連絡先をアドレス帳 '{0}' に保存できません。アドレス帳がまだ開かれた状態にあるためです。こちらで開かれるのを待つか、別のアドレス帳を選択してください。"
+
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:650
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:672
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2958
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:734
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:756
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3037
 msgid "Contact Editor"
 msgstr "連絡先エディター"
 
@@ -242,11 +265,10 @@ msgid "_Wants to receive HTML mail"
 msgstr "HTML メールの受信を許可する(_W)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:409
+#: ../addressbook/gui/widgets/eab-contact-merging.c:408
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:590
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:942
-#: ../smime/lib/e-asn1-object.c:395
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:596
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:980
 msgid "Email"
 msgstr "メール"
 
@@ -259,7 +281,7 @@ msgid "Instant Messaging"
 msgstr "インスタントメッセンジャー"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/importers/evolution-vcard-importer.c:1003
+#: ../addressbook/importers/evolution-vcard-importer.c:971
 msgid "Contact"
 msgstr "連絡先"
 
@@ -269,8 +291,8 @@ msgstr "ホームページ(_H):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 #: ../calendar/gui/dialogs/event-page.c:709
-#: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../modules/itip-formatter/itip-view.c:1877
+#: ../calendar/gui/dialogs/event-page.ui.h:25
+#: ../modules/itip-formatter/itip-view.c:1891
 msgid "_Calendar:"
 msgstr "カレンダー(_C):"
 
@@ -287,7 +309,7 @@ msgid "Home Page:"
 msgstr "ホームページ:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
-#: ../modules/cal-config-google/evolution-cal-config-google.c:97
+#: ../modules/cal-config-google/evolution-cal-config-google.c:96
 msgid "Calendar:"
 msgstr "カレンダー:"
 
@@ -334,21 +356,21 @@ msgid "_Department:"
 msgstr "担当部署(_D):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
+msgid "_Office:"
+msgstr "オフィス(_O):"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
 msgid "_Manager:"
 msgstr "マネージャー(_M):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
 msgid "_Assistant:"
 msgstr "アシスタント(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "Job"
 msgstr "仕事"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-msgid "_Office:"
-msgstr "オフィス(_O):"
-
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_Spouse:"
 msgstr "配偶者(_S):"
@@ -362,8 +384,8 @@ msgid "_Anniversary:"
 msgstr "記念日(_A):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:685
-#: ../calendar/gui/e-calendar-view.c:2278
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:692
+#: ../calendar/gui/e-calendar-view.c:2288
 msgid "Anniversary"
 msgstr "記念日"
 
@@ -373,8 +395,8 @@ msgstr "記念日"
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:684
-#: ../calendar/gui/e-calendar-view.c:2277 ../shell/main.c:128
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:691
+#: ../calendar/gui/e-calendar-view.c:2287 ../shell/main.c:127
 msgid "Birthday"
 msgstr "誕生日"
 
@@ -411,27 +433,28 @@ msgid "_Address:"
 msgstr "住所(_A):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/e-contact-map.c:306
-#: ../addressbook/gui/widgets/eab-contact-display.c:357
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:81
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
+#: ../addressbook/gui/widgets/e-contact-map.c:371
+#: ../addressbook/gui/widgets/eab-contact-display.c:356
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:80
 msgid "Home"
 msgstr "自宅"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/e-contact-map.c:314
-#: ../addressbook/gui/widgets/eab-contact-display.c:354
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:80
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:666
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
+#: ../addressbook/gui/widgets/e-contact-map.c:384
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:79
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:673
 msgid "Work"
 msgstr "仕事"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:82
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:368
-#: ../calendar/gui/e-cal-model.c:3963
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:81
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:367
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:726
+#: ../calendar/gui/e-cal-model.c:3957
 msgid "Other"
 msgstr "その他"
 
@@ -443,79 +466,172 @@ msgstr "住所"
 msgid "Notes"
 msgstr "注釈"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:593
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:52
+#: ../calendar/gui/dialogs/comp-editor.c:1250
+#: ../calendar/gui/dialogs/comp-editor.c:1336 ../e-util/e-send-options.ui.h:41
+#: ../e-util/e-preferences-window.c:379
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
+#: ../shell/e-shell-window-actions.c:1086
+msgid "_Help"
+msgstr "ヘルプ(_H)"
+
+#. This is only shown if the EActivity has a GCancellable.
+#. no flags
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:53
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3575
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:223
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
+#: ../addressbook/gui/contact-editor/fullname.ui.h:14
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:17
+#: ../addressbook/gui/widgets/eab-contact-merging.c:362
+#: ../addressbook/gui/widgets/eab-contact-merging.c:621
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
+#: ../addressbook/gui/widgets/eab-gui-util.c:318
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:15
+#: ../calendar/gui/dialogs/recurrence-page.c:2322
+#: ../composer/e-composer-actions.c:204 ../e-util/e-send-options.ui.h:42
+#: ../e-util/e-table-config.ui.h:1 ../e-util/e-timezone-dialog.ui.h:2
+#: ../e-util/e-activity-bar.c:299 ../e-util/e-attachment-dialog.c:311
+#: ../e-util/e-attachment-store.c:464 ../e-util/e-attachment-store.c:545
+#: ../e-util/e-attachment-view.c:370 ../e-util/e-categories-dialog.c:82
+#: ../e-util/e-category-editor.c:138 ../e-util/e-category-editor.c:208
+#: ../e-util/e-charset-combo-box.c:101 ../e-util/e-filter-datespec.c:291
+#: ../e-util/e-mail-signature-script-dialog.c:366 ../e-util/e-passwords.c:468
+#: ../e-util/e-rule-context.c:815 ../e-util/e-rule-editor.c:180
+#: ../e-util/e-rule-editor.c:282 ../e-util/e-rule-editor.c:776
+#: ../e-util/e-source-config-dialog.c:375
+#: ../e-util/e-source-selector-dialog.c:348 ../e-util/e-table-config.c:548
+#: ../e-util/e-web-view.c:3092 ../e-util/evolution-source-viewer.c:832
+#: ../e-util/gal-view-instance-save-as-dialog.c:269
+#: ../mail/e-mail-config-window.c:331 ../mail/e-mail-label-dialog.c:196
+#: ../mail/e-mail-tag-editor.c:242 ../mail/em-folder-selector.c:278
+#: ../mail/mail-config.ui.h:2 ../mail/mail-send-recv.c:635
+#: ../mail/mail-send-recv.c:717 ../mail/mail-vfolder-ui.c:148
+#: ../mail/mail-vfolder-ui.c:270
+#: ../modules/backup-restore/evolution-backup-tool.c:949
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:278
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:188
+#: ../modules/calendar/e-cal-attachment-handler.c:317
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
+#: ../plugins/face/face.c:291 ../plugins/mail-to-task/mail-to-task.c:593
+#: ../plugins/publish-calendar/publish-calendar.c:806
+#: ../plugins/publish-calendar/url-editor-dialog.c:421
+#: ../plugins/save-calendar/save-calendar.c:189 ../shell/e-shell-content.c:659
+#: ../shell/e-shell-content.c:766 ../shell/e-shell-utils.c:70
+#: ../shell/e-shell-utils.c:134 ../smime/gui/certificate-manager.c:623
+#: ../smime/gui/e-cert-selector.c:232 ../smime/gui/smime-ui.ui.h:23
+#, fuzzy
+#| msgid "Cancel"
+msgid "_Cancel"
+msgstr "キャンセル"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:54
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
+#: ../addressbook/gui/widgets/eab-contact-merging.c:624
+#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/gui/dialogs/comp-editor.c:1278
+#: ../composer/e-composer-actions.c:205 ../composer/e-composer-actions.c:296
+#: ../e-util/e-attachment-store.c:546
+#: ../e-util/e-mail-signature-script-dialog.c:370 ../e-util/e-web-view.c:3093
+#: ../e-util/gal-view-instance-save-as-dialog.c:270
+#: ../shell/e-shell-content.c:660 ../shell/e-shell-utils.c:135
+msgid "_Save"
+msgstr "保存(_S)"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:599
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:596
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:602
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:598
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:604
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:599
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:605
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:597
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:603
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:595
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:601
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:594
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:600
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:600
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:606
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:601
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:607
 msgid "Twitter"
 msgstr "Twitter"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:271
+#: ../calendar/gui/dialogs/comp-editor.c:1301 ../e-util/e-focus-tracker.c:121
+msgid "Undo"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:278
+#: ../calendar/gui/dialogs/comp-editor.c:1308 ../e-util/e-focus-tracker.c:137
+msgid "Redo"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
 #: ../addressbook/gui/widgets/eab-gui-util.c:503
 msgid "Error adding contact"
 msgstr "連絡先を追加する際にエラーが発生しました"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:330
 msgid "Error modifying contact"
 msgstr "連絡先を修正する際にエラーが発生しました"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:350
 msgid "Error removing contact"
 msgstr "連絡先を削除する際にエラーが発生しました"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:666
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2952
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:750
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3031
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "連絡先エディター - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3485
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3572
 msgid "Please select an image for this contact"
 msgstr "この連絡先の画像を選択してください"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3486
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3576
+#: ../e-util/e-category-editor.c:146 ../plugins/face/face.c:292
+#: ../shell/e-shell-utils.c:71 ../smime/gui/certificate-manager.c:624
+#, fuzzy
+#| msgid "Open"
+msgid "_Open"
+msgstr "開く"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3577
 msgid "_No image"
 msgstr "画像なし(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3827
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3926
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -523,48 +639,78 @@ msgstr ""
 "連絡先データが間違っています:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3833
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3932
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' の書式が間違っています"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3841
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3940
 #, c-format
 msgid "'%s' cannot be a future date"
 msgstr "'%s' は未来の日付になり得ません"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3849
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3948
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' の書式が間違っています"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3862
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3876
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3961
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3975
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' は空です"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3891
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3990
 msgid "Invalid contact."
 msgstr "連絡先が正しくありません。"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:224
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:456
+#: ../addressbook/gui/contact-editor/fullname.ui.h:13
+#: ../addressbook/gui/widgets/eab-gui-util.c:319
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:3
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
+#: ../calendar/gui/dialogs/recurrence-page.c:2323
+#: ../e-util/e-send-options.ui.h:43 ../e-util/e-table-config.ui.h:3
+#: ../e-util/e-timezone-dialog.ui.h:3 ../e-util/e-attachment-dialog.c:313
+#: ../e-util/e-categories-dialog.c:83 ../e-util/e-category-editor.c:209
+#: ../e-util/e-charset-combo-box.c:102 ../e-util/e-filter-datespec.c:292
+#: ../e-util/e-passwords.c:469 ../e-util/e-rule-context.c:816
+#: ../e-util/e-rule-editor.c:181 ../e-util/e-rule-editor.c:283
+#: ../e-util/e-rule-editor.c:777 ../e-util/e-source-config-dialog.c:376
+#: ../e-util/e-source-selector-dialog.c:349 ../e-util/e-table-config.c:549
+#: ../mail/e-mail-config-window.c:332 ../mail/e-mail-tag-editor.c:243
+#: ../mail/em-folder-selector.c:279 ../mail/mail-config.ui.h:3
+#: ../mail/mail-dialogs.ui.h:26 ../mail/mail-vfolder-ui.c:149
+#: ../mail/mail-vfolder-ui.c:271
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
+#: ../plugins/publish-calendar/url-editor-dialog.c:422
+#: ../shell/e-shell-content.c:661 ../shell/e-shell-content.c:767
+#: ../shell/main.c:167 ../smime/gui/e-cert-selector.c:233
+#: ../smime/gui/smime-ui.ui.h:24
+#, fuzzy
+#| msgid "OK"
+msgid "_OK"
+msgstr "OK"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:451
 msgid "Contact Quick-Add"
 msgstr "連絡先の簡易追加"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:454
 msgid "_Edit Full"
 msgstr "すべて編集(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:508
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:507
 msgid "_Full name"
 msgstr "氏名(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:521
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:520
 msgid "E_mail"
 msgstr "メール(_M)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:534
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:533
 msgid "_Select Address Book"
 msgstr "アドレス帳の選択(_S)"
 
@@ -617,29 +763,29 @@ msgstr "様"
 msgid "Full Name"
 msgstr "氏名"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:13
+#: ../addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_First:"
 msgstr "名(_F):"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:14
+#: ../addressbook/gui/contact-editor/fullname.ui.h:16
 msgctxt "FullName"
 msgid "_Title:"
 msgstr "敬称(前つけ)(_T):"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:15
+#: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Middle:"
 msgstr "ミドルネーム(_M):"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:16
+#: ../addressbook/gui/contact-editor/fullname.ui.h:18
 msgid "_Last:"
 msgstr "姓(_L):"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:17
+#: ../addressbook/gui/contact-editor/fullname.ui.h:19
 msgid "_Suffix:"
 msgstr "敬称(後つけ)(_S):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:818
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:817
 msgid "Contact List Editor"
 msgstr "連絡先の一覧エディター"
 
@@ -663,177 +809,239 @@ msgstr "メールをこの一覧に送信したらアドレスを隠す(_H)"
 msgid "Add an email to the List"
 msgstr "一覧にメールアドレスを追加"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
 msgid "Remove an email address from the List"
 msgstr "メールアドレスを一覧から削除"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:23
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:21
+#: ../calendar/gui/dialogs/task-page.ui.h:31 ../e-util/filter.ui.h:18
+#: ../e-util/e-attachment-view.c:424 ../e-util/e-filter-rule.c:224
+#: ../e-util/e-mail-signature-manager.c:367
+#: ../e-util/e-name-selector-dialog.c:999 ../mail/e-mail-label-manager.c:391
+#: ../mail/em-filter-rule.c:440 ../mail/em-vfolder-editor-rule.c:627
+#: ../mail/mail-config.ui.h:52
+#: ../plugins/attachment-reminder/attachment-reminder.c:567
+#: ../plugins/email-custom-header/email-custom-header.c:848
+#: ../plugins/publish-calendar/publish-calendar.c:807
+#: ../plugins/publish-calendar/publish-calendar.ui.h:34
+#: ../plugins/templates/templates.c:463
+msgid "_Remove"
+msgstr "削除(_R)"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
 msgid "Insert email addresses from Address Book"
 msgstr "アドレス帳からメールアドレスを挿入"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:12
 msgid "_Select..."
 msgstr "選択(_S)..."
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:941
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:13
+#: ../e-util/filter.ui.h:19
+msgid "_Top"
+msgstr ""
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:14
+#: ../e-util/filter.ui.h:20
+#, fuzzy
+#| msgid "_Update"
+msgid "_Up"
+msgstr "更新する(_U)"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:15
+#: ../e-util/filter.ui.h:21
+msgid "_Down"
+msgstr ""
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:16
+#: ../e-util/filter.ui.h:22
+msgid "_Bottom"
+msgstr ""
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:942
 msgid "Contact List Members"
 msgstr "連絡先の一覧のメンバー"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1475
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1486
 msgid "_Members"
 msgstr "メンバー(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1597
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1626
 msgid "Error adding list"
 msgstr "一覧を追加する際にエラーが発生しました"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1617
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1646
 msgid "Error modifying list"
 msgstr "一覧を修正する際にエラーが発生しました"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1637
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1666
 msgid "Error removing list"
 msgstr "一覧を削除する際にエラーが発生しました"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
-msgid "Duplicate Contact Detected"
-msgstr "重複する連絡先を検出しました"
-
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:2
-msgid "The name or email of this contact already exists in this folder. Would you like to save the changes anyway?"
-msgstr "この連絡先と同じ名前あるいはメールアドレスが既にこのフォルダーにあります。とにかく変更を保存しますか?"
-
-#. Translators: Heading of the contact which has same name or email address in this folder already.
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
-msgid "Conflicting Contact:"
-msgstr "重複している連絡先:"
+#: ../addressbook/gui/widgets/eab-contact-merging.c:243
+#: ../calendar/gui/tasktypes.xml.h:14
+msgid "Cancelled"
+msgstr "キャンセルされた"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
-msgid "Changed Contact:"
-msgstr "変更後の連絡先:"
+#: ../addressbook/gui/widgets/eab-contact-merging.c:345
+msgid "Merge Contact"
+msgstr "連絡先のマージ"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
-#: ../addressbook/gui/merging/eab-contact-merging.c:364
+#: ../addressbook/gui/widgets/eab-contact-merging.c:363
+#: ../addressbook/gui/widgets/eab-contact-merging.c:627
 msgid "_Merge"
 msgstr "マージする(_M)"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:3
+#: ../addressbook/gui/widgets/eab-contact-merging.c:616
+msgid "Duplicate Contact Detected"
+msgstr "重複する連絡先を検出しました"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:674
+#, fuzzy
+#| msgid "The name or email of this contact already exists in this folder. Would you like to save the changes anyway?"
 msgid ""
 "The name or email address of this contact already exists\n"
-"in this folder.  Would you like to add it anyway?"
+"in this folder. Would you like to save the changes anyway?"
+msgstr "この連絡先と同じ名前あるいはメールアドレスが既にこのフォルダーにあります。とにかく変更を保存しますか?"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:677
+#, fuzzy
+#| msgid ""
+#| "The name or email address of this contact already exists\n"
+#| "in this folder.  Would you like to add it anyway?"
+msgid ""
+"The name or email address of this contact already exists\n"
+"in this folder. Would you like to add it anyway?"
 msgstr ""
 "この連絡先と同じ名前あるいはメールアドレスが\n"
 "既にこのフォルダーにあります。とにかく追加しますか?"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:5
-msgid "Original Contact:"
-msgstr "元の連絡先:"
+#: ../addressbook/gui/widgets/eab-contact-merging.c:692
+msgid "Changed Contact:"
+msgstr "変更後の連絡先:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
+#: ../addressbook/gui/widgets/eab-contact-merging.c:694
 msgid "New Contact:"
 msgstr "新しい連絡先:"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:244
-#: ../calendar/gui/tasktypes.xml.h:14
-msgid "Cancelled"
-msgstr "キャンセルされた"
+#: ../addressbook/gui/widgets/eab-contact-merging.c:733
+msgid "Conflicting Contact:"
+msgstr "重複している連絡先:"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:346
-msgid "Merge Contact"
-msgstr "連絡先のマージ"
+#: ../addressbook/gui/widgets/eab-contact-merging.c:735
+#, fuzzy
+#| msgid "Contact: "
+msgid "Old Contact:"
+msgstr "連絡先: "
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1154
+#: ../modules/addressbook/e-book-shell-view-actions.c:1150
 msgid "Name contains"
 msgstr "氏名が次を含む"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1147
+#: ../modules/addressbook/e-book-shell-view-actions.c:1143
 msgid "Email begins with"
 msgstr "メールが次で始まる"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
 #: ../calendar/gui/tasktypes.xml.h:30
-#: ../modules/addressbook/e-book-shell-view-actions.c:1140
-#: ../modules/calendar/e-cal-shell-view-actions.c:1771
-#: ../modules/calendar/e-memo-shell-view-actions.c:791
-#: ../modules/calendar/e-task-shell-view-actions.c:990
+#: ../modules/addressbook/e-book-shell-view-actions.c:1136
+#: ../modules/calendar/e-cal-shell-view-actions.c:1770
+#: ../modules/calendar/e-memo-shell-view-actions.c:790
+#: ../modules/calendar/e-task-shell-view-actions.c:989
 msgid "Any field contains"
 msgstr "いずれかの項目が次を含む"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:163
+#: ../addressbook/gui/widgets/e-addressbook-model.c:162
 msgid "No contacts"
 msgstr "連絡先なし"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:167
+#: ../addressbook/gui/widgets/e-addressbook-model.c:166
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d個の連絡先"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:373
+#: ../addressbook/gui/widgets/e-addressbook-model.c:372
 msgid "Error getting book view"
 msgstr "ブックビューの取得でエラーが発生しました"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:820
+#: ../addressbook/gui/widgets/e-addressbook-model.c:819
 msgid "Search Interrupted"
 msgstr "検索が中断されました"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:204
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:203
 msgid "Error modifying card"
 msgstr "カードの修正中にエラーが発生しました"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:649
+#: ../addressbook/gui/widgets/e-addressbook-view.c:648
 msgid "Cut selected contacts to the clipboard"
 msgstr "選択した連絡先をカットして、クリップボードにコピーします"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:655
+#: ../addressbook/gui/widgets/e-addressbook-view.c:654
 msgid "Copy selected contacts to the clipboard"
 msgstr "選択した連絡先をコピーして、クリップボードにコピーします"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:661
+#: ../addressbook/gui/widgets/e-addressbook-view.c:660
 msgid "Paste contacts from the clipboard"
 msgstr "クリップボードからタスクを貼り付けます"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:667
-#: ../modules/addressbook/e-book-shell-view-actions.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:666
+#: ../modules/addressbook/e-book-shell-view-actions.c:950
 msgid "Delete selected contacts"
 msgstr "選択した連絡先を削除します"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:673
+#: ../addressbook/gui/widgets/e-addressbook-view.c:672
 msgid "Select all visible contacts"
 msgstr "すべての表示されている連絡先を選択します"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1298
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "これらの連絡先の一覧を本当に削除してもよろしいですか?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1302
 msgid "Are you sure you want to delete this contact list?"
 msgstr "この連絡先の一覧を本当に削除してもよろしいですか?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1307
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1306
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "この連絡先の一覧 (%s) を本当に削除してもよろしいですか?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
 msgid "Are you sure you want to delete these contacts?"
 msgstr "これらの連絡先を本当に削除してもよろしいですか?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1317
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1316
 msgid "Are you sure you want to delete this contact?"
 msgstr "この連絡先を本当に削除してもよろしいですか?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1321
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "この連絡先 (%s) を本当に削除してもよろしいですか?"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1331
+#: ../calendar/gui/dialogs/comp-editor.c:1243
+#: ../e-util/e-categories-editor.c:282 ../e-util/e-focus-tracker.c:740
+#: ../e-util/evolution-source-viewer.c:803
+#: ../mail/e-mail-account-manager.c:737
+#: ../modules/addressbook/e-book-shell-view-actions.c:1022
+#: ../modules/calendar/e-cal-shell-view-actions.c:1593
+#: ../modules/calendar/e-memo-shell-view-actions.c:692
+#: ../modules/calendar/e-task-shell-view-actions.c:844
+#: ../modules/mail/e-mail-shell-view-actions.c:1561
+#: ../shell/e-shell-window-actions.c:944 ../smime/gui/smime-ui.ui.h:10
+msgid "_Delete"
+msgstr "削除(_D)"
+
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1477
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1476
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -845,11 +1053,11 @@ msgstr[0] ""
 "%d 個の連絡先を %d 個の新しいウィンドウで開こうとしています。\n"
 "本当にこれらの連絡先をすべて表示してもよろしいですか?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1485
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1484
 msgid "_Don't Display"
 msgstr "表示しない(_D)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1486
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1485
 msgid "Display _All Contacts"
 msgstr "すべての連絡先の表示(_A)"
 
@@ -866,7 +1074,7 @@ msgid "Family Name"
 msgstr "苗字"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:592
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:598
 msgid "Nickname"
 msgstr "あだ名"
 
@@ -923,7 +1131,7 @@ msgid "ISDN Phone"
 msgstr "ISDN 電話"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:682
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:689
 msgid "Mobile Phone"
 msgstr "携帯電話"
 
@@ -962,7 +1170,7 @@ msgid "TTYTDD"
 msgstr "TTYTDD"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:645
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:651
 msgid "Company"
 msgstr "会社"
 
@@ -971,6 +1179,7 @@ msgid "Unit"
 msgstr "単位"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:653
 msgid "Office"
 msgstr "事務所"
 
@@ -985,12 +1194,12 @@ msgid "Role"
 msgstr "役割"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:649
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:656
 msgid "Manager"
 msgstr "マネージャー"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:650
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:657
 msgid "Assistant"
 msgstr "アシスタント"
 
@@ -1006,25 +1215,46 @@ msgstr "ジャーナル"
 #: ../calendar/gui/dialogs/event-page.ui.h:20
 #: ../calendar/gui/e-calendar-table.etspec.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:6
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../e-util/e-categories-dialog.c:89
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../e-util/e-categories-dialog.c:87
 msgid "Categories"
 msgstr "カテゴリ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:686
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:693
 msgid "Spouse"
 msgstr "配偶者"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:718
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:748
 msgid "Note"
 msgstr "ノート"
 
-#: ../addressbook/gui/widgets/e-contact-map-window.c:363
+#: ../addressbook/gui/widgets/e-contact-map-window.c:375
 msgid "Contacts Map"
 msgstr "連絡先の地図"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#. Zoom-in button
+#: ../addressbook/gui/widgets/e-contact-map-window.c:410
+#, fuzzy
+#| msgid "_Zoom In"
+msgid "Zoom _In"
+msgstr "拡大(_Z)"
+
+#. Zoom-out button
+#: ../addressbook/gui/widgets/e-contact-map-window.c:418
+#: ../mail/e-mail-reader.c:2226
+msgid "Zoom _Out"
+msgstr "縮小(_O)"
+
+#. Search button
+#: ../addressbook/gui/widgets/e-contact-map-window.c:448
+#: ../shell/e-shell-window-actions.c:1021
+#, fuzzy
+#| msgid "_Find Now"
+msgid "_Find"
+msgstr "今すぐ検索(_F)"
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:190
 msgid ""
 "\n"
 "\n"
@@ -1034,7 +1264,7 @@ msgstr ""
 "\n"
 "連絡先の検索中..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:194
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -1048,7 +1278,7 @@ msgstr ""
 "\n"
 "または、ダブルクリックして新しい連絡先を作成してください。"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:197
+#: ../addressbook/gui/widgets/e-minicard-view.c:196
 msgid ""
 "\n"
 "\n"
@@ -1062,7 +1292,7 @@ msgstr ""
 "\n"
 "ダブルクリックをして新しい連絡先を作成してください。"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:201
+#: ../addressbook/gui/widgets/e-minicard-view.c:200
 msgid ""
 "\n"
 "\n"
@@ -1072,7 +1302,7 @@ msgstr ""
 "\n"
 "連絡先の検索です。"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:203
+#: ../addressbook/gui/widgets/e-minicard-view.c:202
 msgid ""
 "\n"
 "\n"
@@ -1082,180 +1312,181 @@ msgstr ""
 "\n"
 "このビューの中に表示できるアイテムはありません。"
 
-#: ../addressbook/gui/widgets/e-minicard.c:93
+#: ../addressbook/gui/widgets/e-minicard.c:92
 msgid "Work Email"
 msgstr "勤務先のメール"
 
-#: ../addressbook/gui/widgets/e-minicard.c:94
+#: ../addressbook/gui/widgets/e-minicard.c:93
 msgid "Home Email"
 msgstr "自宅のメール"
 
-#: ../addressbook/gui/widgets/e-minicard.c:95
-#: ../addressbook/gui/widgets/e-minicard.c:828
+#: ../addressbook/gui/widgets/e-minicard.c:94
+#: ../addressbook/gui/widgets/e-minicard.c:827
 msgid "Other Email"
 msgstr "その他のメール"
 
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:95
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:104
-#: ../addressbook/gui/widgets/ea-minicard-view.c:194
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:94
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:103
+#: ../addressbook/gui/widgets/ea-minicard-view.c:193
 msgid "evolution address book"
 msgstr "Evolution アドレス帳"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:36
+#: ../addressbook/gui/widgets/ea-minicard-view.c:35
 msgid "New Contact"
 msgstr "新しい連絡先"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:37
+#: ../addressbook/gui/widgets/ea-minicard-view.c:36
 msgid "New Contact List"
 msgstr "新しい連絡先の一覧"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:177
+#: ../addressbook/gui/widgets/ea-minicard-view.c:176
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "このアドレス帳フォルダー (%s) には %d個のカードがあります"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:34
+#: ../addressbook/gui/widgets/ea-minicard.c:33
 msgid "Open"
 msgstr "開く"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:160
+#: ../addressbook/gui/widgets/ea-minicard.c:159
 msgid "Contact List: "
 msgstr "連絡先の一覧: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:161
+#: ../addressbook/gui/widgets/ea-minicard.c:160
 msgid "Contact: "
 msgstr "連絡先: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:188
+#: ../addressbook/gui/widgets/ea-minicard.c:187
 msgid "evolution minicard"
 msgstr "Evolution ミニカード"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:150
+#: ../addressbook/gui/widgets/eab-contact-display.c:149
 msgid "Copy _Email Address"
 msgstr "メールアドレスのコピー(_E)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:152
-#: ../e-util/e-web-view-gtkhtml.c:428 ../e-util/e-web-view.c:307
+#: ../addressbook/gui/widgets/eab-contact-display.c:151
+#: ../e-util/e-web-view-gtkhtml.c:427 ../e-util/e-web-view.c:304
 msgid "Copy the email address to the clipboard"
 msgstr "メールアドレスをクリップボードにコピー"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:157
-#: ../e-util/e-web-view-gtkhtml.c:433 ../e-util/e-web-view.c:312
+#: ../addressbook/gui/widgets/eab-contact-display.c:156
+#: ../e-util/e-web-view-gtkhtml.c:432 ../e-util/e-web-view.c:309
 msgid "_Send New Message To..."
 msgstr "新しいメッセージの送信(_S)..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:159
-#: ../e-util/e-web-view-gtkhtml.c:435 ../e-util/e-web-view.c:314
+#: ../addressbook/gui/widgets/eab-contact-display.c:158
+#: ../e-util/e-web-view-gtkhtml.c:434 ../e-util/e-web-view.c:311
 msgid "Send a mail message to this address"
 msgstr "このアドレスにメールのメッセージを送信"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:291
-#: ../e-util/e-web-view-gtkhtml.c:970 ../e-util/e-web-view.c:990
+#: ../addressbook/gui/widgets/eab-contact-display.c:290
+#: ../e-util/e-web-view-gtkhtml.c:969 ../e-util/e-web-view.c:992
 #, c-format
 msgid "Click to mail %s"
 msgstr "クリックすると %s さんにメールします"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:137
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:136
 msgid "Open map"
 msgstr "地図を開く"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:529
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:535
 msgid "List Members:"
 msgstr "リストのメンバー:"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:646
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:652
 msgid "Department"
 msgstr "担当部署"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:647
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:654
 msgid "Profession"
 msgstr "団体"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:648
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:655
 msgid "Position"
 msgstr "役職"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:651
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:658
 msgid "Video Chat"
 msgstr "ビデオチャット"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:652
-#: ../e-util/e-send-options.c:546
-#: ../modules/calendar/e-cal-shell-view-actions.c:216
-#: ../modules/calendar/e-cal-shell-view-actions.c:245
-#: ../modules/calendar/e-cal-shell-view.c:591
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:659
+#: ../e-util/e-send-options.c:545
+#: ../modules/calendar/e-cal-shell-view-actions.c:215
+#: ../modules/calendar/e-cal-shell-view-actions.c:244
+#: ../modules/calendar/e-cal-shell-view.c:590
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
 msgid "Calendar"
 msgstr "カレンダー"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:653
-#: ../calendar/gui/dialogs/event-editor.c:116
-#: ../calendar/gui/dialogs/event-editor.c:343
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:660
+#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../calendar/gui/dialogs/event-editor.c:342
 #: ../plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "スケジュール"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:654
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:661
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:688
 msgid "Phone"
 msgstr "電話"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:655
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:662
 msgid "Fax"
 msgstr "FAX"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:656
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:683
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:663
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:690
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:716
 msgid "Address"
 msgstr "住所"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:679
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:686
 msgid "Home Page"
 msgstr "ホームページ"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:680
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:687
 msgid "Web Log"
 msgstr "ブログ"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:696
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:703
 msgid "Personal"
 msgstr "プライベート"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:906
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:944
 msgid "List Members"
 msgstr "メンバーのリスト化"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:927
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:965
 msgid "Job Title"
 msgstr "勤務先"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:968
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1006
 msgid "Home page"
 msgstr "ホームページ"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:978
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1016
 msgid "Blog"
 msgstr "ブログ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:123
+#: ../addressbook/gui/widgets/eab-gui-util.c:121
 msgid "This address book cannot be opened. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the address book once in online mode to download its contents."
 msgstr "このアドレス帳を開けませんでした。考えられる原因としては、このアドレス帳がオフライン用にマークされていないか、またはオフライン用に未だダウンロードしていないかのどちらかです。まずはオンラインモードでアドレス帳を読み込んでアドレス帳の内容をダウンロードしてみてください。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:142
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
 #, c-format
 msgid "This address book cannot be opened.  Please check that the path %s exists and that permissions are set to access it."
 msgstr "このアドレス帳を開けませんでした。%s というパスが存在しているか、そしてそのパスへのアクセス権が正しいか確認してください。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:155
+#: ../addressbook/gui/widgets/eab-gui-util.c:153
 msgid "This version of Evolution does not have LDAP support compiled in to it.  To use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
 msgstr "このバージョンの Evolution は LDAP のサポートが無効になっています。Evolution で LDAP を利用するには、LDAP を有効にした Evolution パッケージをインストールする必要があります。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
+#: ../addressbook/gui/widgets/eab-gui-util.c:162
 msgid "This address book cannot be opened.  This either means that an incorrect URI was entered, or the server is unreachable."
 msgstr "このアドレス帳を開けませんでした。考えられる原因としては誤った URI を指定したか、またはサーバーがダウンしているかのどちらかです。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:174
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 msgid "Detailed error message:"
 msgstr "エラーの詳細:"
 
@@ -1331,110 +1562,110 @@ msgstr "複数の連絡先の移動先"
 msgid "Copy contacts to"
 msgstr "複数の連絡先のコピー先"
 
-#: ../addressbook/importers/evolution-csv-importer.c:747
-#: ../addressbook/importers/evolution-ldif-importer.c:549
-#: ../addressbook/importers/evolution-vcard-importer.c:281
-#: ../calendar/importers/icalendar-importer.c:440
-#: ../calendar/importers/icalendar-importer.c:935
-#: ../calendar/importers/icalendar-importer.c:974 ../shell/shell.error.xml.h:1
+#: ../addressbook/importers/evolution-csv-importer.c:746
+#: ../addressbook/importers/evolution-ldif-importer.c:548
+#: ../addressbook/importers/evolution-vcard-importer.c:249
+#: ../calendar/importers/icalendar-importer.c:439
+#: ../calendar/importers/icalendar-importer.c:934
+#: ../calendar/importers/icalendar-importer.c:973 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "インポート中..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1082
+#: ../addressbook/importers/evolution-csv-importer.c:1081
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "Outlook の連絡先 CSV/Tab ファイル (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1083
+#: ../addressbook/importers/evolution-csv-importer.c:1082
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Outlook 連絡先 CSV/Tab インポーター"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1091
+#: ../addressbook/importers/evolution-csv-importer.c:1090
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "Mozilla の連絡先 CSV/Tab ファイル (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1092
+#: ../addressbook/importers/evolution-csv-importer.c:1091
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Mozilla 連絡先 CSV/Tab インポーター"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1100
+#: ../addressbook/importers/evolution-csv-importer.c:1099
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "Evolution の連絡先 CSV/Tab ファイル (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1101
+#: ../addressbook/importers/evolution-csv-importer.c:1100
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Evolution 連絡先 CSV/Tab インポーター"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:807
+#: ../addressbook/importers/evolution-ldif-importer.c:806
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP データ交換フォーマット (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:808
+#: ../addressbook/importers/evolution-ldif-importer.c:807
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF インポーター"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:666
+#: ../addressbook/importers/evolution-vcard-importer.c:634
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf、.gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:667
+#: ../addressbook/importers/evolution-vcard-importer.c:635
 msgid "Evolution vCard Importer"
 msgstr "Evolution vCard インポーター"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:764
+#: ../addressbook/printing/e-contact-print.c:763
 #, c-format
 msgid "Page %d"
 msgstr "ページ %d"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:58
 msgid "Specify the output file instead of standard output"
 msgstr "標準出力のかわりに出力するファイルを指定する"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "OUTPUTFILE"
 msgstr "OUTPUTFILE"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:62
 msgid "List local address book folders"
 msgstr "ローカルにあるアドレス帳フォルダーの一覧を出力する"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:66
+#: ../addressbook/tools/evolution-addressbook-export.c:65
 msgid "Show cards as vcard or csv file"
 msgstr "表示するカードの種類を指定する (vCard または CSV 形式)"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:67
+#: ../addressbook/tools/evolution-addressbook-export.c:66
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:136
+#: ../addressbook/tools/evolution-addressbook-export.c:133
 msgid "Command line arguments error, please use --help option to see the usage."
 msgstr "コマンドラインの引数エラーです (`--help` を指定してオプションを確認してください)"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:150
+#: ../addressbook/tools/evolution-addressbook-export.c:147
 msgid "Only support csv or vcard format."
 msgstr "CSV または vCard のフォーマットのみサポートしています"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:181
+#: ../addressbook/tools/evolution-addressbook-export.c:178
 msgid "Unhandled error"
 msgstr "処理できないエラー"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:625
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:46
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:624
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
 msgid "Can not open file"
 msgstr "ファイルを開けません"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:76
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:75
 #, c-format
 msgid "Failed to open client '%s': %s"
 msgstr "クライアント '%s' を開けません: %s"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:106
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:105
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分間"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:119
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:118
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "時間"
@@ -1442,13 +1673,13 @@ msgstr[0] "時間"
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:132
-#: ../calendar/gui/dialogs/recurrence-page.c:1248
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/dialogs/recurrence-page.c:1249
 msgid "day"
 msgid_plural "days"
 msgstr[0] "日"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:329
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:343
 msgid "Start time"
 msgstr "開始時刻"
 
@@ -1464,83 +1695,119 @@ msgstr "すべて停止(_A)"
 msgid "_Snooze"
 msgstr "再通知(_S)"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:4 ../e-util/e-alert-dialog.c:166
+#: ../calendar/alarm-notify/alarm-notify.ui.h:4
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:6
+#: ../calendar/gui/dialogs/comp-editor.c:1322
+#: ../calendar/gui/dialogs/event-page.ui.h:24
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
+#: ../calendar/gui/dialogs/task-page.ui.h:32 ../e-util/filter.ui.h:17
+#: ../e-util/e-categories-editor.c:278
+#: ../e-util/e-mail-signature-manager.c:357
+#: ../mail/e-mail-account-manager.c:728 ../mail/e-mail-browser.c:170
+#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:56
+#: ../plugins/attachment-reminder/attachment-reminder.c:562
+#: ../plugins/email-custom-header/email-custom-header.c:843
+#: ../plugins/mail-to-task/mail-to-task.c:594
+#: ../plugins/publish-calendar/publish-calendar.ui.h:33
+#: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:1072
+#: ../smime/gui/smime-ui.ui.h:13
+msgid "_Edit"
+msgstr "編集(_E)"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:5
+#, fuzzy
+#| msgid "Print"
+msgid "_Print"
+msgstr "印刷"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:6 ../e-util/e-alert-dialog.c:165
 msgid "_Dismiss"
 msgstr "停止(_D)"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:5
-#: ../calendar/alarm-notify/alarm-queue.c:1823
-#: ../calendar/alarm-notify/alarm-queue.c:1833
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:190
-#: ../modules/itip-formatter/itip-view.c:1489
-#: ../modules/itip-formatter/itip-view.c:1600
+#: ../calendar/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/alarm-notify/alarm-queue.c:1835
+#: ../calendar/alarm-notify/alarm-queue.c:1845
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:249
+#: ../modules/itip-formatter/itip-view.c:1503
+#: ../modules/itip-formatter/itip-view.c:1614
 msgid "Location:"
 msgstr "場所:"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:6
+#: ../calendar/alarm-notify/alarm-notify.ui.h:8
 msgid "location of appointment"
 msgstr "予定の場所"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/alarm-notify/alarm-notify.ui.h:9
 msgid "Snooze _time:"
 msgstr "再通知時間(_T):"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/alarm-notify/alarm-notify.ui.h:8
+#: ../calendar/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../e-util/filter.ui.h:8
-#: ../e-util/e-interval-chooser.c:143
-#: ../modules/calendar/e-cal-shell-view-actions.c:352
+#: ../e-util/e-interval-chooser.c:142
+#: ../modules/calendar/e-cal-shell-view-actions.c:351
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "days"
 msgstr "日"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:9
+#: ../calendar/alarm-notify/alarm-notify.ui.h:11
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
 #: ../calendar/gui/dialogs/event-page.ui.h:18 ../e-util/filter.ui.h:7
-#: ../e-util/e-interval-chooser.c:141
+#: ../e-util/e-interval-chooser.c:140
 msgid "hours"
 msgstr "時間"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:10
+#: ../calendar/alarm-notify/alarm-notify.ui.h:12
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 #: ../calendar/gui/dialogs/event-page.ui.h:19 ../e-util/filter.ui.h:6
-#: ../e-util/e-interval-chooser.c:139
-#: ../mail/e-mail-config-provider-page.c:527
+#: ../e-util/e-interval-chooser.c:138
+#: ../mail/e-mail-config-provider-page.c:526
 msgid "minutes"
 msgstr "分"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1665
-#: ../calendar/alarm-notify/alarm-queue.c:1803
+#: ../calendar/alarm-notify/alarm-queue.c:1678
+#: ../calendar/alarm-notify/alarm-queue.c:1815
 msgid "No summary available."
 msgstr "サマリはありません。"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1674
-#: ../calendar/alarm-notify/alarm-queue.c:1676
+#: ../calendar/alarm-notify/alarm-queue.c:1687
+#: ../calendar/alarm-notify/alarm-queue.c:1689
 msgid "No description available."
 msgstr "説明はありません。"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1684
+#: ../calendar/alarm-notify/alarm-queue.c:1697
 msgid "No location information available."
 msgstr "場所の情報はありません。"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1689
-#: ../calendar/alarm-notify/alarm-queue.c:1794
-#: ../calendar/alarm-notify/alarm-queue.c:2135
+#: ../calendar/alarm-notify/alarm-queue.c:1702
+#: ../calendar/alarm-notify/alarm-queue.c:1806
+#: ../calendar/alarm-notify/alarm-queue.c:2147
 msgid "Evolution Reminders"
 msgstr "Evolution リマインダー"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1733
+#: ../calendar/alarm-notify/alarm-queue.c:1746
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "%d個のリマインダーがあります"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1955
+#: ../calendar/alarm-notify/alarm-queue.c:1965
 msgid "Warning"
 msgstr "警告"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1961
+#: ../calendar/alarm-notify/alarm-queue.c:1966 ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail.error.xml.h:139
+#: ../modules/mailto-handler/evolution-mailto-handler.c:114
+msgid "_No"
+msgstr "いいえ(_N)"
+
+#: ../calendar/alarm-notify/alarm-queue.c:1967 ../mail/mail.error.xml.h:138
+#: ../modules/mailto-handler/evolution-mailto-handler.c:115
+msgid "_Yes"
+msgstr "はい(_Y)"
+
+#: ../calendar/alarm-notify/alarm-queue.c:1971
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
@@ -1555,25 +1822,25 @@ msgstr ""
 "\n"
 "本当に、このプログラムを起動してもよろしいですか?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1976
+#: ../calendar/alarm-notify/alarm-queue.c:1986
 msgid "Do not ask me about this program again."
 msgstr "このメッセージを二度と表示しない"
 
-#: ../calendar/alarm-notify/util.c:44
+#: ../calendar/alarm-notify/util.c:43
 msgid "invalid time"
 msgstr "時間が正しくありません"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/alarm-notify/util.c:70 ../calendar/gui/e-alarm-list.c:370
-#: ../calendar/gui/misc.c:96
+#: ../calendar/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:369
+#: ../calendar/gui/misc.c:103
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d時間"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:376
-#: ../calendar/gui/misc.c:102
+#: ../calendar/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:375
+#: ../calendar/gui/misc.c:109
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -1582,8 +1849,8 @@ msgstr[0] "%d分間"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/alarm-notify/util.c:80 ../calendar/gui/e-alarm-list.c:382
-#: ../calendar/gui/misc.c:106
+#: ../calendar/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:381
+#: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1606,7 +1873,7 @@ msgid "_Send Notice"
 msgstr "通知する(_S)"
 
 #: ../calendar/calendar.error.xml.h:5
-#: ../calendar/gui/dialogs/delete-comp.c:193
+#: ../calendar/gui/dialogs/delete-comp.c:192
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "本当にこの会議を削除してもよろしいですか?"
@@ -1620,7 +1887,7 @@ msgid "If you do not send a cancelation notice, the other participants may not k
 msgstr "キャンセル通知を送信しないと、タスクが削除されたことが他の出席者には周知されないかもしれません。"
 
 #: ../calendar/calendar.error.xml.h:9
-#: ../calendar/gui/dialogs/delete-comp.c:196
+#: ../calendar/gui/dialogs/delete-comp.c:195
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "本当にこのタスクを削除してもよろしいですか?"
@@ -1638,7 +1905,7 @@ msgid "If you do not send a cancelation notice, the other participants may not k
 msgstr "キャンセル通知を送信しないと、メモが削除されたことが他の出席者には周知されないかもしれません。"
 
 #: ../calendar/calendar.error.xml.h:13
-#: ../calendar/gui/dialogs/delete-comp.c:199
+#: ../calendar/gui/dialogs/delete-comp.c:198
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "本当にこのメモを削除してもよろしいですか?"
@@ -1778,10 +2045,6 @@ msgstr "ダウンロード中です。タスクを保存しますか?"
 msgid "Some attachments are being downloaded. Saving the task would result in the loss of these attachments."
 msgstr "添付ファイルをダウンロードしています。ここでタスクを保存してしまうと、いくつかの添付ファイルが失われてしまいます。"
 
-#: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:297
-msgid "_Save"
-msgstr "保存(_S)"
-
 #: ../calendar/calendar.error.xml.h:48
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "ダウンロード中です。予定を保存しますか?"
@@ -1979,24 +2242,24 @@ msgstr "メモ一覧 '{0}' にメモを移動しています"
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:2 ../calendar/gui/memotypes.xml.h:1
-#: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:376
+#: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:375
 msgid "Summary"
 msgstr "サマリ"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2 ../mail/em-filter-i18n.h:11
+#: ../calendar/gui/tasktypes.xml.h:2 ../mail/em-filter-i18n.h:55
 msgid "contains"
 msgstr "が次を含む"
 
 #: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3 ../mail/em-filter-i18n.h:17
+#: ../calendar/gui/tasktypes.xml.h:3 ../mail/em-filter-i18n.h:56
 msgid "does not contain"
 msgstr "が次を含まない"
 
 #: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/e-cal-list-view.etspec.h:4
 #: ../calendar/gui/memotypes.xml.h:4 ../calendar/gui/tasktypes.xml.h:4
-#: ../e-util/e-table-config.ui.h:4 ../e-util/e-attachment-tree-view.c:528
-#: ../modules/plugin-manager/evolution-plugin-manager.c:69
+#: ../e-util/e-table-config.ui.h:7 ../e-util/e-attachment-tree-view.c:527
+#: ../modules/plugin-manager/evolution-plugin-manager.c:68
 msgid "Description"
 msgstr "説明"
 
@@ -2010,34 +2273,34 @@ msgid "Classification"
 msgstr "区分"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:8
-#: ../calendar/gui/tasktypes.xml.h:9 ../mail/em-filter-i18n.h:34
+#: ../calendar/gui/tasktypes.xml.h:9 ../mail/em-filter-i18n.h:75
 msgid "is"
 msgstr "が次である"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:10 ../mail/em-filter-i18n.h:40
+#: ../calendar/gui/tasktypes.xml.h:10 ../mail/em-filter-i18n.h:73
 msgid "is not"
 msgstr "が次ではない"
 
 #. To Translators: This is task classification
 #: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/dialogs/task-page.ui.h:2
-#: ../calendar/gui/e-cal-list-view.c:250 ../calendar/gui/e-cal-model.c:454
-#: ../calendar/gui/e-cal-model.c:461 ../calendar/gui/e-task-table.c:547
+#: ../calendar/gui/e-cal-list-view.c:249 ../calendar/gui/e-cal-model.c:453
+#: ../calendar/gui/e-cal-model.c:460 ../calendar/gui/e-task-table.c:546
 #: ../calendar/gui/memotypes.xml.h:10
 msgid "Public"
 msgstr "公開"
 
 #. To Translators: This is task classification
 #: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/dialogs/task-page.ui.h:4
-#: ../calendar/gui/e-cal-list-view.c:251 ../calendar/gui/e-cal-model.c:463
-#: ../calendar/gui/e-task-table.c:548 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/e-cal-list-view.c:250 ../calendar/gui/e-cal-model.c:462
+#: ../calendar/gui/e-task-table.c:547 ../calendar/gui/memotypes.xml.h:11
 msgid "Private"
 msgstr "非公開"
 
 #. To Translators: This is task classification
 #: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/dialogs/task-page.ui.h:6
-#: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:465
-#: ../calendar/gui/e-task-table.c:549 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/e-cal-list-view.c:251 ../calendar/gui/e-cal-model.c:464
+#: ../calendar/gui/e-task-table.c:548 ../calendar/gui/memotypes.xml.h:12
 #: ../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "機密"
@@ -2055,37 +2318,37 @@ msgstr "出席者"
 
 #: ../calendar/gui/caltypes.xml.h:14
 #: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:14
-#: ../plugins/publish-calendar/publish-calendar.c:897
+#: ../plugins/publish-calendar/publish-calendar.c:903
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../plugins/save-calendar/csv-format.c:389
 msgid "Location"
 msgstr "場所"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:23 ../e-util/e-categories-selector.c:328
+#: ../calendar/gui/tasktypes.xml.h:23 ../e-util/e-categories-selector.c:326
 msgid "Category"
 msgstr "カテゴリ"
 
 #: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:54
-#: ../em-format/e-mail-formatter-print-headers.c:204
+#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:53
+#: ../em-format/e-mail-formatter-print-headers.c:203
 #: ../mail/em-filter-i18n.h:6
 msgid "Attachments"
 msgstr "添付ファイル"
 
 #: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:27
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:18
 msgid "Exist"
 msgstr "がある"
 
 #: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:24
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:16
 msgid "Do Not Exist"
 msgstr "がない"
 
 #: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/dialogs/event-editor.c:310
-#: ../calendar/gui/dialogs/event-editor.c:331
+#: ../calendar/gui/dialogs/event-editor.c:309
+#: ../calendar/gui/dialogs/event-editor.c:330
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:15
 msgid "Recurrence"
 msgstr "繰り返し"
@@ -2116,43 +2379,43 @@ msgstr "サマリが次のものを含む"
 msgid "Description Contains"
 msgstr "説明が次のものを含む"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:669
+#: ../calendar/gui/dialogs/alarm-dialog.c:668
 msgid "Edit Reminder"
 msgstr "リマインダーを編集する"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:897
-#: ../calendar/gui/e-alarm-list.c:412
+#: ../calendar/gui/dialogs/alarm-dialog.c:896
+#: ../calendar/gui/e-alarm-list.c:411
 msgid "Pop up an alert"
 msgstr "警告をポップアップする"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:898
-#: ../calendar/gui/e-alarm-list.c:408
+#: ../calendar/gui/dialogs/alarm-dialog.c:897
+#: ../calendar/gui/e-alarm-list.c:407
 msgid "Play a sound"
 msgstr "サウンドを演奏する"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:899
-#: ../calendar/gui/e-alarm-list.c:420
+#: ../calendar/gui/dialogs/alarm-dialog.c:898
+#: ../calendar/gui/e-alarm-list.c:419
 msgid "Run a program"
 msgstr "プログラムを実行する"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:900
-#: ../calendar/gui/e-alarm-list.c:416
+#: ../calendar/gui/dialogs/alarm-dialog.c:899
+#: ../calendar/gui/e-alarm-list.c:415
 msgid "Send an email"
 msgstr "メールを送信する"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:909
+#: ../calendar/gui/dialogs/alarm-dialog.c:908
 msgid "before"
 msgstr "前"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:910
+#: ../calendar/gui/dialogs/alarm-dialog.c:909
 msgid "after"
 msgstr "後"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:919
+#: ../calendar/gui/dialogs/alarm-dialog.c:918
 msgid "start of appointment"
 msgstr "予定開始"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:920
+#: ../calendar/gui/dialogs/alarm-dialog.c:919
 msgid "end of appointment"
 msgstr "予定終了"
 
@@ -2172,450 +2435,500 @@ msgstr "日"
 msgid "Add Reminder"
 msgstr "リマインダーを追加する"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
-#: ../calendar/gui/dialogs/event-editor.c:353
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
+#: ../calendar/gui/dialogs/event-editor.c:352
 msgid "Reminder"
 msgstr "リマインダー"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
 msgid "Repeat"
 msgstr "繰り返し"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
 msgid "_Repeat the reminder"
 msgstr "リマインダーを繰り返す(_R)"
 
 #. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
 msgid "extra times every"
 msgstr "回 / "
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13 ../mail/mail-config.ui.h:30
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15 ../mail/mail-config.ui.h:32
 msgid "Options"
 msgstr "オプション"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
 msgid "Custom _message"
 msgstr "メッセージをカスタマイズ(_M)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17
 msgid "Mes_sage:"
 msgstr "メッセージ(_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
 msgid "Custom reminder sound"
 msgstr "リマインダー音をカスタマイズする"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
 msgid "_Sound:"
 msgstr "サウンド(_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "Select A File"
 msgstr "ファイルの選択"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 msgid "_Program:"
 msgstr "プログラム(_P):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
 msgid "_Arguments:"
 msgstr "引数(_A):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
 msgid "Send To:"
 msgstr "送信先:"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:240
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:239
 msgid "Action/Trigger"
 msgstr "アクション"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
-#: ../calendar/gui/dialogs/event-page.ui.h:25
+#: ../calendar/gui/dialogs/event-page.ui.h:28
 #: ../modules/calendar/e-calendar-preferences.ui.h:62
 msgid "Reminders"
 msgstr "リマインダー"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-msgid "A_dd"
-msgstr "追加(_D)"
-
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "このイベントは削除されました。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "このタスクは削除されました。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:67
 msgid "This memo has been deleted."
 msgstr "このメモは削除されました。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:78
+#: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  変更しました。これらの変更を無視してエディターを閉じますか?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:80
+#: ../calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  何も変更していませんが、エディターを閉じますか?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:85
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "このイベントは変更されました。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:89
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "このタスクは変更されました。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:93
+#: ../calendar/gui/dialogs/changed-comp.c:92
 msgid "This memo has been changed."
 msgstr "このメモは変更されました。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  変更しました。この変更を無視してエディターを更新しますか?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:105
+#: ../calendar/gui/dialogs/changed-comp.c:104
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  何も変更していませんが、エディターを更新しますか?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:266
+#: ../calendar/gui/dialogs/comp-editor.c:271
 msgid "Could not save attachments"
 msgstr "添付ファイルを保存できませでした"
 
-#: ../calendar/gui/dialogs/comp-editor.c:620
+#: ../calendar/gui/dialogs/comp-editor.c:626
 msgid "Could not update object"
 msgstr "オブジェクトを更新できませんでした"
 
-#: ../calendar/gui/dialogs/comp-editor.c:754
+#: ../calendar/gui/dialogs/comp-editor.c:760
 msgid "Edit Appointment"
 msgstr "予定の編集"
 
-#: ../calendar/gui/dialogs/comp-editor.c:761
+#: ../calendar/gui/dialogs/comp-editor.c:767
 #, c-format
 msgid "Meeting - %s"
 msgstr "会議 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:763
+#: ../calendar/gui/dialogs/comp-editor.c:769
 #, c-format
 msgid "Appointment - %s"
 msgstr "予定 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:769
+#: ../calendar/gui/dialogs/comp-editor.c:775
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "タスクの割当て - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:771
+#: ../calendar/gui/dialogs/comp-editor.c:777
 #, c-format
 msgid "Task - %s"
 msgstr "タスク - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:776
+#: ../calendar/gui/dialogs/comp-editor.c:782
 #, c-format
 msgid "Memo - %s"
 msgstr "メモ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:792
+#: ../calendar/gui/dialogs/comp-editor.c:798
 msgid "No Summary"
 msgstr "サマリ無し"
 
-#: ../calendar/gui/dialogs/comp-editor.c:913
+#: ../calendar/gui/dialogs/comp-editor.c:919
 msgid "Keep original item?"
 msgstr "アイテムをそのままにしておきますか?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1080
-#: ../calendar/gui/dialogs/comp-editor.c:1108
+#: ../calendar/gui/dialogs/comp-editor.c:1082
+#: ../calendar/gui/dialogs/comp-editor.c:1110
 msgid "Unable to synchronize with the server"
 msgstr "サーバーと同期できません"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1222
+#: ../calendar/gui/dialogs/event-editor.c:116
+#: ../calendar/gui/dialogs/event-editor.c:310
+#: ../calendar/gui/dialogs/event-page.ui.h:29
+#: ../composer/e-composer-actions.c:275
+#: ../e-util/e-mail-signature-editor.c:307
+#: ../e-util/e-name-selector-dialog.c:551 ../e-util/e-preferences-window.c:388
+#: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:126
+#: ../mail/em-folder-properties.c:418 ../mail/em-subscription-editor.c:1714
+#: ../modules/plugin-manager/evolution-plugin-manager.c:256
+#: ../shell/e-shell-window-actions.c:343 ../shell/e-shell-window-actions.c:909
+#: ../smime/gui/certificate-manager.c:1182
+msgid "_Close"
+msgstr "閉じる(_C)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1224
 msgid "Close the current window"
 msgstr "現在のウィンドウを閉じます"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1229 ../e-util/e-focus-tracker.c:121
-#: ../e-util/e-focus-tracker.c:558 ../e-util/e-web-view-gtkhtml.c:455
-#: ../e-util/e-web-view-gtkhtml.c:1296 ../e-util/e-web-view.c:341
-#: ../e-util/e-web-view.c:1305 ../mail/e-mail-browser.c:136
-#: ../shell/e-shell-window-actions.c:888
+#. copy menu item
+#: ../calendar/gui/dialogs/comp-editor.c:1229 ../e-util/e-focus-tracker.c:730
+#: ../e-util/e-text.c:2085 ../e-util/e-web-view-gtkhtml.c:452
+#: ../e-util/e-web-view.c:336 ../mail/e-mail-browser.c:133
+#: ../shell/e-shell-window-actions.c:930
+#, fuzzy
+#| msgid "_Copy..."
+msgid "_Copy"
+msgstr "コピー(_C)..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1231 ../e-util/e-focus-tracker.c:174
+#: ../e-util/e-focus-tracker.c:230 ../e-util/e-focus-tracker.c:731
+#: ../e-util/e-web-view-gtkhtml.c:454 ../e-util/e-web-view-gtkhtml.c:1295
+#: ../e-util/e-web-view.c:338 ../e-util/e-web-view.c:1307
+#: ../mail/e-mail-browser.c:135 ../shell/e-shell-window-actions.c:932
 msgid "Copy the selection"
 msgstr "選択した連絡先/予定をコピーします"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1236 ../e-util/e-focus-tracker.c:114
-#: ../e-util/e-focus-tracker.c:553 ../e-util/e-web-view-gtkhtml.c:1290
-#: ../e-util/e-web-view.c:1299 ../mail/e-mail-browser.c:143
-#: ../shell/e-shell-window-actions.c:895
+#. cut menu item
+#: ../calendar/gui/dialogs/comp-editor.c:1236 ../e-util/e-focus-tracker.c:725
+#: ../e-util/e-text.c:2071 ../mail/e-mail-browser.c:140
+#: ../shell/e-shell-window-actions.c:937
+msgid "Cu_t"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1238 ../e-util/e-focus-tracker.c:167
+#: ../e-util/e-focus-tracker.c:223 ../e-util/e-focus-tracker.c:726
+#: ../e-util/e-web-view-gtkhtml.c:1289 ../e-util/e-web-view.c:1301
+#: ../mail/e-mail-browser.c:142 ../shell/e-shell-window-actions.c:939
 msgid "Cut the selection"
 msgstr "選択した連絡先/予定を切り取ります"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1243 ../e-util/e-focus-tracker.c:135
-#: ../e-util/e-focus-tracker.c:568 ../shell/e-shell-window-actions.c:902
+#: ../calendar/gui/dialogs/comp-editor.c:1245 ../e-util/e-focus-tracker.c:188
+#: ../e-util/e-focus-tracker.c:244 ../e-util/e-focus-tracker.c:741
+#: ../shell/e-shell-window-actions.c:946
 msgid "Delete the selection"
 msgstr "選択したものを削除"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1250
+#: ../calendar/gui/dialogs/comp-editor.c:1252
 msgid "View help"
 msgstr "ヘルプを表示する"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1257 ../e-util/e-focus-tracker.c:128
-#: ../e-util/e-focus-tracker.c:563 ../e-util/e-web-view-gtkhtml.c:1302
-#: ../e-util/e-web-view.c:1311 ../mail/e-mail-browser.c:150
-#: ../shell/e-shell-window-actions.c:923
+#. paste menu item
+#: ../calendar/gui/dialogs/comp-editor.c:1257 ../e-util/e-focus-tracker.c:735
+#: ../e-util/e-text.c:2097 ../mail/e-mail-browser.c:147
+#: ../shell/e-shell-window-actions.c:965
+#, fuzzy
+#| msgid "_Pascal"
+msgid "_Paste"
+msgstr "_Pascal"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1259 ../e-util/e-focus-tracker.c:181
+#: ../e-util/e-focus-tracker.c:237 ../e-util/e-focus-tracker.c:736
+#: ../e-util/e-web-view-gtkhtml.c:1301 ../e-util/e-web-view.c:1313
+#: ../mail/e-mail-browser.c:149 ../shell/e-shell-window-actions.c:967
 msgid "Paste the clipboard"
 msgstr "クリップボードへ貼り付けます"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1278
+#: ../calendar/gui/dialogs/comp-editor.c:1264
+#: ../composer/e-composer-actions.c:329 ../mail/e-mail-reader.c:2128
+#: ../modules/addressbook/e-book-shell-view-actions.c:1160
+#: ../modules/addressbook/e-book-shell-view-actions.c:1174
+msgid "_Print..."
+msgstr "印刷(_P)..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1271 ../mail/e-mail-reader.c:2135
+#: ../modules/addressbook/e-book-shell-view-actions.c:1167
+#: ../modules/calendar/e-cal-shell-view-actions.c:1801
+#: ../modules/calendar/e-memo-shell-view-actions.c:821
+#: ../modules/calendar/e-task-shell-view-actions.c:1020
+#, fuzzy
+#| msgid "Preview"
+msgid "Pre_view..."
+msgstr "プレビュー"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1280
 msgid "Save current changes"
 msgstr "現在の変更を保存"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1283
-#: ../e-util/e-mail-signature-editor.c:317
+#: ../calendar/gui/dialogs/comp-editor.c:1285
+#: ../e-util/e-mail-signature-editor.c:316
 msgid "Save and Close"
 msgstr "保存して閉じる"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1285
+#: ../calendar/gui/dialogs/comp-editor.c:1287
 msgid "Save current changes and close editor"
 msgstr "現在の変更を保存してエディターを閉じる"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1292 ../e-util/e-focus-tracker.c:142
-#: ../e-util/e-focus-tracker.c:573 ../mail/e-mail-browser.c:157
-#: ../shell/e-shell-window-actions.c:1000
+#: ../calendar/gui/dialogs/comp-editor.c:1292 ../e-util/e-focus-tracker.c:745
+#: ../e-util/e-web-view-gtkhtml.c:462 ../e-util/e-web-view.c:346
+#: ../mail/e-mail-browser.c:154 ../shell/e-shell-window-actions.c:1042
+#, fuzzy
+#| msgid "Select All"
+msgid "Select _All"
+msgstr "すべて選択"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1294 ../e-util/e-focus-tracker.c:195
+#: ../e-util/e-focus-tracker.c:251 ../e-util/e-focus-tracker.c:746
+#: ../mail/e-mail-browser.c:156 ../shell/e-shell-window-actions.c:1044
 msgid "Select all text"
 msgstr "すべての文字列を選択します"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1299
+#: ../calendar/gui/dialogs/comp-editor.c:1315
 msgid "_Classification"
 msgstr "区分(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1306
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../e-util/filter.ui.h:16
-#: ../mail/e-mail-browser.c:171
-#: ../plugins/publish-calendar/publish-calendar.ui.h:32
-#: ../shell/e-shell-window-actions.c:1028
-msgid "_Edit"
-msgstr "編集(_E)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1313
-#: ../e-util/e-mail-signature-editor.c:322 ../mail/e-mail-browser.c:164
-#: ../shell/e-shell-window-actions.c:1035
+#: ../calendar/gui/dialogs/comp-editor.c:1329
+#: ../e-util/e-mail-signature-editor.c:321 ../mail/e-mail-browser.c:163
+#: ../shell/e-shell-window-actions.c:1079
 msgid "_File"
 msgstr "ファイル(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1320
-#: ../shell/e-shell-window-actions.c:1042
-msgid "_Help"
-msgstr "ヘルプ(_H)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1327
+#: ../calendar/gui/dialogs/comp-editor.c:1343
 msgid "_Insert"
 msgstr "添付(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1334
-#: ../composer/e-composer-actions.c:320
+#: ../calendar/gui/dialogs/comp-editor.c:1350
+#: ../composer/e-composer-actions.c:319
 msgid "_Options"
 msgstr "オプション(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1341 ../mail/e-mail-browser.c:178
-#: ../shell/e-shell-window-actions.c:1077 ../smime/gui/smime-ui.ui.h:5
+#: ../calendar/gui/dialogs/comp-editor.c:1357 ../mail/e-mail-browser.c:177
+#: ../shell/e-shell-window-actions.c:1121 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "表示(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1351
-#: ../composer/e-composer-actions.c:269
+#: ../calendar/gui/dialogs/comp-editor.c:1367
+#: ../composer/e-composer-actions.c:268
 msgid "_Attachment..."
 msgstr "ファイルの添付(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1353
-#: ../composer/e-composer-actions.c:271 ../e-util/e-attachment-view.c:413
+#: ../calendar/gui/dialogs/comp-editor.c:1369
+#: ../composer/e-composer-actions.c:270 ../e-util/e-attachment-view.c:412
 msgid "Attach a file"
 msgstr "ファイルを添付します"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1361
+#: ../calendar/gui/dialogs/comp-editor.c:1377
 msgid "_Categories"
 msgstr "カテゴリ(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1363
+#: ../calendar/gui/dialogs/comp-editor.c:1379
 msgid "Toggles whether to display categories"
 msgstr "カテゴリの表示/非表示を切り替えます"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1369
+#: ../calendar/gui/dialogs/comp-editor.c:1385
 msgid "Time _Zone"
 msgstr "タイムゾーン(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1371
+#: ../calendar/gui/dialogs/comp-editor.c:1387
 msgid "Toggles whether the time zone is displayed"
 msgstr "タイムゾーンの表示/非表示を切り替えます"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1380
+#: ../calendar/gui/dialogs/comp-editor.c:1396
 msgid "Pu_blic"
 msgstr "公開(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1382
+#: ../calendar/gui/dialogs/comp-editor.c:1398
 msgid "Classify as public"
 msgstr "公開として分類"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1387
+#: ../calendar/gui/dialogs/comp-editor.c:1403
 msgid "_Private"
 msgstr "非公開(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
+#: ../calendar/gui/dialogs/comp-editor.c:1405
 msgid "Classify as private"
 msgstr "非公開としての分類"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1394
+#: ../calendar/gui/dialogs/comp-editor.c:1410
 msgid "_Confidential"
 msgstr "極秘(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../calendar/gui/dialogs/comp-editor.c:1412
 msgid "Classify as confidential"
 msgstr "極秘としての分類"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1404
+#: ../calendar/gui/dialogs/comp-editor.c:1420
 msgid "R_ole Field"
 msgstr "役割(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1406
+#: ../calendar/gui/dialogs/comp-editor.c:1422
 msgid "Toggles whether the Role field is displayed"
 msgstr "役割の表示/非表示を切り替えます"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1412
+#: ../calendar/gui/dialogs/comp-editor.c:1428
 msgid "_RSVP"
 msgstr "RSVP(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1414
+#: ../calendar/gui/dialogs/comp-editor.c:1430
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "RSVP の表示/非表示を切り替えます"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1420
+#: ../calendar/gui/dialogs/comp-editor.c:1436
 msgid "_Status Field"
 msgstr "ステータス(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1422
+#: ../calendar/gui/dialogs/comp-editor.c:1438
 msgid "Toggles whether the Status field is displayed"
 msgstr "ステータスの表示/非表示を切り替えます"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1428
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "_Type Field"
 msgstr "種類(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1430
+#: ../calendar/gui/dialogs/comp-editor.c:1446
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "出席者の種類の表示/非表示を切り替えます"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2211
-#: ../composer/e-composer-actions.c:488
+#: ../calendar/gui/dialogs/comp-editor.c:2233
+#: ../composer/e-composer-actions.c:487
 msgid "Attach"
 msgstr "添付"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2541
-#: ../calendar/gui/dialogs/comp-editor.c:2751
-#: ../calendar/gui/dialogs/comp-editor.c:3764
+#: ../calendar/gui/dialogs/comp-editor.c:2563
+#: ../calendar/gui/dialogs/comp-editor.c:2773
+#: ../calendar/gui/dialogs/comp-editor.c:3786
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "更新が届いたらこのアイテムに対する変更を破棄する"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3726
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:121
+#: ../calendar/gui/dialogs/comp-editor.c:3748
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:120
 msgid "attachment"
 msgstr "添付"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3796
+#: ../calendar/gui/dialogs/comp-editor.c:3818
 msgid "Unable to use current version!"
 msgstr "現在のバージョンを使用できません!"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:441
+#: ../calendar/gui/dialogs/comp-editor-page.c:440
 #, c-format
 msgid "Validation error: %s"
 msgstr "整合性のエラー: %s"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:121
+#: ../calendar/gui/dialogs/copy-source-dialog.c:120
 msgid "Could not open destination"
 msgstr "転送先ソースを開けませんでした"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:131
+#: ../calendar/gui/dialogs/copy-source-dialog.c:130
 msgid "Destination is read only"
 msgstr "転送先は読み込み専用"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:173
+#: ../calendar/gui/dialogs/copy-source-dialog.c:172
 msgid "Cannot create object"
 msgstr "オブジェクトを作成できません"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:204
+#: ../calendar/gui/dialogs/copy-source-dialog.c:203
 msgid "Could not open source"
 msgstr "送信元ソースを開けませんでした"
 
-#: ../calendar/gui/dialogs/delete-comp.c:216
+#: ../calendar/gui/dialogs/delete-comp.c:215
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "このアイテムを他のすべての受信箱から削除しますか?(_D)"
 
-#: ../calendar/gui/dialogs/delete-comp.c:219
+#: ../calendar/gui/dialogs/delete-comp.c:218
 msgid "_Retract comment"
 msgstr "コメントを取り消し(_R)"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:55
+#: ../calendar/gui/dialogs/delete-error.c:54
 #, c-format
 msgid "The event could not be deleted due to a dbus error: %s"
 msgstr "D-Bus のエラーのためイベントを削除できませんでした: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:59
+#: ../calendar/gui/dialogs/delete-error.c:58
 #, c-format
 msgid "The task could not be deleted due to a dbus error: %s"
 msgstr "D-Bus のエラーのためタスクを削除できませんでした: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:62
 #, c-format
 msgid "The memo could not be deleted due to a dbus error: %s"
 msgstr "D-Bus のエラーのためメモを削除できませんでした: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:67
+#: ../calendar/gui/dialogs/delete-error.c:66
 #, c-format
 msgid "The item could not be deleted due to a dbus error: %s"
 msgstr "D-Bus のエラーのためアイテムを削除できませんでした: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:74
+#: ../calendar/gui/dialogs/delete-error.c:73
 msgid "The event could not be deleted because permission was denied"
 msgstr "権限がないのでイベントを削除できませんでした"
 
-#: ../calendar/gui/dialogs/delete-error.c:77
+#: ../calendar/gui/dialogs/delete-error.c:76
 msgid "The task could not be deleted because permission was denied"
 msgstr "権限がないのでタスクを削除できませんでした"
 
-#: ../calendar/gui/dialogs/delete-error.c:80
+#: ../calendar/gui/dialogs/delete-error.c:79
 msgid "The memo could not be deleted because permission was denied"
 msgstr "権限がないのでメモを削除できませんでした"
 
-#: ../calendar/gui/dialogs/delete-error.c:83
+#: ../calendar/gui/dialogs/delete-error.c:82
 msgid "The item could not be deleted because permission was denied"
 msgstr "権限がないのでアイテムを削除できませんでした"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:91
+#: ../calendar/gui/dialogs/delete-error.c:90
 #, c-format
 msgid "The event could not be deleted due to an error: %s"
 msgstr "エラーのためイベントを削除できませんでした: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:94
 #, c-format
 msgid "The task could not be deleted due to an error: %s"
 msgstr "エラーのためタスクを削除できませんでした: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:99
+#: ../calendar/gui/dialogs/delete-error.c:98
 #, c-format
 msgid "The memo could not be deleted due to an error: %s"
 msgstr "エラーのためメモを削除できませんでした: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:103
+#: ../calendar/gui/dialogs/delete-error.c:102
 #, c-format
 msgid "The item could not be deleted due to an error: %s"
 msgstr "エラーのためアイテムを削除できませんでした: %s"
@@ -2624,74 +2937,74 @@ msgstr "エラーのためアイテムを削除できませんでした: %s"
 msgid "Enter Delegate"
 msgstr "委任先の入力"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:4
 msgid "Delegate To:"
 msgstr "委任先:"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:5
 msgid "Contacts..."
 msgstr "連絡先..."
 
-#: ../calendar/gui/dialogs/event-editor.c:205
+#: ../calendar/gui/dialogs/event-editor.c:204
 msgid "_Reminders"
 msgstr "リマインダー(_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:207
+#: ../calendar/gui/dialogs/event-editor.c:206
 msgid "Set or unset reminders for this event"
 msgstr "このイベントのリマインダーをセットしたり解除します"
 
-#: ../calendar/gui/dialogs/event-editor.c:215
+#: ../calendar/gui/dialogs/event-editor.c:214
 msgid "Show Time as _Busy"
 msgstr "予定ありにする(_B)"
 
-#: ../calendar/gui/dialogs/event-editor.c:217
+#: ../calendar/gui/dialogs/event-editor.c:216
 msgid "Toggles whether to show time as busy"
 msgstr "予定ありとして時刻を表示するかどうかを切り替えます"
 
-#: ../calendar/gui/dialogs/event-editor.c:226
+#: ../calendar/gui/dialogs/event-editor.c:225
 msgid "_Recurrence"
 msgstr "繰り返す(_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:227
 msgid "Make this a recurring event"
 msgstr "このイベントを繰り返します"
 
-#: ../calendar/gui/dialogs/event-editor.c:233 ../e-util/e-send-options.ui.h:14
+#: ../calendar/gui/dialogs/event-editor.c:232 ../e-util/e-send-options.ui.h:14
 msgid "Send Options"
 msgstr "送信オプション"
 
-#: ../calendar/gui/dialogs/event-editor.c:235
-#: ../calendar/gui/dialogs/task-editor.c:96
+#: ../calendar/gui/dialogs/event-editor.c:234
+#: ../calendar/gui/dialogs/task-editor.c:95
 msgid "Insert advanced send options"
 msgstr "送信用の拡張オプションを挿入します"
 
-#: ../calendar/gui/dialogs/event-editor.c:243
+#: ../calendar/gui/dialogs/event-editor.c:242
 msgid "All _Day Event"
 msgstr "終日のイベントにする(_D)"
 
-#: ../calendar/gui/dialogs/event-editor.c:245
+#: ../calendar/gui/dialogs/event-editor.c:244
 msgid "Toggles whether to have All Day Event"
 msgstr "終日のイベントにするかどうかを切り替えます"
 
-#: ../calendar/gui/dialogs/event-editor.c:254
+#: ../calendar/gui/dialogs/event-editor.c:253
 msgid "_Free/Busy"
 msgstr "予定の有無(_F)"
 
-#: ../calendar/gui/dialogs/event-editor.c:256
+#: ../calendar/gui/dialogs/event-editor.c:255
 msgid "Query free / busy information for the attendees"
 msgstr "この出席者の予定を調べてみます"
 
-#: ../calendar/gui/dialogs/event-editor.c:307 ../calendar/gui/print.c:3505
+#: ../calendar/gui/dialogs/event-editor.c:306 ../calendar/gui/print.c:3496
 msgid "Appointment"
 msgstr "予定"
 
-#: ../calendar/gui/dialogs/event-editor.c:377
-#: ../calendar/gui/dialogs/event-page.ui.h:24
-#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/dialogs/event-editor.c:376
+#: ../calendar/gui/dialogs/event-page.ui.h:27
+#: ../calendar/gui/e-meeting-list-view.c:164
 msgid "Attendees"
 msgstr "出席者"
 
-#: ../calendar/gui/dialogs/event-editor.c:574
+#: ../calendar/gui/dialogs/event-editor.c:573
 msgid "Print this event"
 msgstr "このイベントを印刷"
 
@@ -2708,7 +3021,7 @@ msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "イベントのすべてを編集することはできません。あなたは主催者ではありません"
 
 #: ../calendar/gui/dialogs/event-page.c:650
-#: ../calendar/gui/dialogs/event-page.c:3168
+#: ../calendar/gui/dialogs/event-page.c:3171
 msgid "This event has reminders"
 msgstr "このイベントにはリマインダーがあります"
 
@@ -2717,75 +3030,75 @@ msgstr "このイベントにはリマインダーがあります"
 msgid "Or_ganizer:"
 msgstr "主催者(_G):"
 
-#: ../calendar/gui/dialogs/event-page.c:1303
+#: ../calendar/gui/dialogs/event-page.c:1302
 msgid "Event with no start date"
 msgstr "開始日のないイベント"
 
-#: ../calendar/gui/dialogs/event-page.c:1306
+#: ../calendar/gui/dialogs/event-page.c:1305
 msgid "Event with no end date"
 msgstr "終了日のないイベント"
 
-#: ../calendar/gui/dialogs/event-page.c:1479
-#: ../calendar/gui/dialogs/memo-page.c:726
-#: ../calendar/gui/dialogs/task-page.c:1026
+#: ../calendar/gui/dialogs/event-page.c:1483
+#: ../calendar/gui/dialogs/memo-page.c:732
+#: ../calendar/gui/dialogs/task-page.c:1030
 msgid "Start date is wrong"
 msgstr "開始日が間違っています"
 
-#: ../calendar/gui/dialogs/event-page.c:1490
+#: ../calendar/gui/dialogs/event-page.c:1494
 msgid "End date is wrong"
 msgstr "終了日が間違っています"
 
-#: ../calendar/gui/dialogs/event-page.c:1514
+#: ../calendar/gui/dialogs/event-page.c:1518
 msgid "Start time is wrong"
 msgstr "開始時刻が間違っています"
 
-#: ../calendar/gui/dialogs/event-page.c:1522
+#: ../calendar/gui/dialogs/event-page.c:1526
 msgid "End time is wrong"
 msgstr "終了時刻が間違っています"
 
-#: ../calendar/gui/dialogs/event-page.c:1686
-#: ../calendar/gui/dialogs/memo-page.c:765
-#: ../calendar/gui/dialogs/task-page.c:1080
+#: ../calendar/gui/dialogs/event-page.c:1690
+#: ../calendar/gui/dialogs/memo-page.c:771
+#: ../calendar/gui/dialogs/task-page.c:1084
 msgid "An organizer is required."
 msgstr "主催者が必要です。"
 
-#: ../calendar/gui/dialogs/event-page.c:1721
-#: ../calendar/gui/dialogs/task-page.c:1115
+#: ../calendar/gui/dialogs/event-page.c:1725
+#: ../calendar/gui/dialogs/task-page.c:1119
 msgid "At least one attendee is required."
 msgstr "最低一名の出席者が必要です。"
 
-#: ../calendar/gui/dialogs/event-page.c:1927
+#: ../calendar/gui/dialogs/event-page.c:1931
 msgid "_Delegatees"
 msgstr "委任者(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:1929
+#: ../calendar/gui/dialogs/event-page.c:1933
 msgid "Atte_ndees"
 msgstr "出席者(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:3448
+#: ../calendar/gui/dialogs/event-page.c:3451
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "予定の %d日前"
 
-#: ../calendar/gui/dialogs/event-page.c:3454
+#: ../calendar/gui/dialogs/event-page.c:3457
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "予定の %d時間前"
 
-#: ../calendar/gui/dialogs/event-page.c:3460
+#: ../calendar/gui/dialogs/event-page.c:3463
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "予定の %d分前"
 
-#: ../calendar/gui/dialogs/event-page.c:3481
+#: ../calendar/gui/dialogs/event-page.c:3484
 msgid "Customize"
 msgstr "その他"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3488
+#: ../calendar/gui/dialogs/event-page.c:3491
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "なし"
@@ -2827,7 +3140,7 @@ msgstr "場所(_L):"
 #: ../calendar/gui/dialogs/event-page.ui.h:12
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 #: ../calendar/gui/dialogs/task-page.ui.h:29
-#: ../e-util/e-attachment-dialog.c:357
+#: ../e-util/e-attachment-dialog.c:356
 msgid "_Description:"
 msgstr "説明(_D):"
 
@@ -2848,17 +3161,17 @@ msgstr "サマリ(_S):"
 msgid "Event Description"
 msgstr "イベントの内容"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:23
-#: ../calendar/gui/dialogs/task-page.ui.h:30
+#: ../calendar/gui/dialogs/event-page.ui.h:26
+#: ../calendar/gui/dialogs/task-page.ui.h:33
 #: ../calendar/gui/e-meeting-time-sel.c:547
 msgid "Atte_ndees..."
 msgstr "出席者(_N)..."
 
-#: ../calendar/gui/dialogs/event-page.ui.h:26
+#: ../calendar/gui/dialogs/event-page.ui.h:30
 msgid "_Reminder"
 msgstr "リマインダー(_R)"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:27
+#: ../calendar/gui/dialogs/event-page.ui.h:31
 msgid "Custom Reminder:"
 msgstr "独自のリマインダー:"
 
@@ -2915,41 +3228,41 @@ msgid "Select Date"
 msgstr "日付の選択"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-view-actions.c:1378
 msgid "Select _Today"
 msgstr "今日にする(_T)"
 
-#: ../calendar/gui/dialogs/memo-editor.c:106 ../calendar/gui/print.c:3509
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3500
 msgid "Memo"
 msgstr "メモ"
 
-#: ../calendar/gui/dialogs/memo-editor.c:156
+#: ../calendar/gui/dialogs/memo-editor.c:155
 msgid "Print this memo"
 msgstr "このメモを印刷"
 
-#: ../calendar/gui/dialogs/memo-page.c:421
+#: ../calendar/gui/dialogs/memo-page.c:424
 msgid "Memo's start date is in the past"
 msgstr "メモの開始日が過去です"
 
-#: ../calendar/gui/dialogs/memo-page.c:457
+#: ../calendar/gui/dialogs/memo-page.c:460
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "メモは編集できません。選択したメモは読み込み専用です"
 
-#: ../calendar/gui/dialogs/memo-page.c:461
+#: ../calendar/gui/dialogs/memo-page.c:464
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "メモのすべてを編集することはできません。あなたは主催者ではありません"
 
-#: ../calendar/gui/dialogs/memo-page.c:1160
-#: ../em-format/e-mail-formatter-utils.c:203
-#: ../em-format/e-mail-formatter-utils.c:220
-#: ../em-format/e-mail-part-headers.c:49 ../mail/em-filter-i18n.h:78
-#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:66
+#: ../calendar/gui/dialogs/memo-page.c:1166
+#: ../em-format/e-mail-formatter-utils.c:201
+#: ../em-format/e-mail-formatter-utils.c:218
+#: ../em-format/e-mail-part-headers.c:48 ../mail/em-filter-i18n.h:52
+#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:65
 msgid "To"
 msgstr "宛先"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:3
 #: ../calendar/gui/dialogs/task-page.c:426
-#: ../calendar/gui/dialogs/task-page.ui.h:31
+#: ../calendar/gui/dialogs/task-page.ui.h:34
 msgid "_List:"
 msgstr "一覧(_L):"
 
@@ -2973,57 +3286,57 @@ msgstr "開始日(_R):"
 msgid "Su_mmary:"
 msgstr "サマリ(_M):"
 
-#: ../calendar/gui/dialogs/recur-comp.c:53
+#: ../calendar/gui/dialogs/recur-comp.c:52
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "繰り返しのイベントを修正中です。何を修正しますか?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "繰り返しのイベントを委任中です。何を委任しますか?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:58
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "繰り返しのタスクを修正中です。何を修正しますか?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:63
+#: ../calendar/gui/dialogs/recur-comp.c:62
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "繰り返しのメモを修正中です。何を修正しますか?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:89
+#: ../calendar/gui/dialogs/recur-comp.c:88
 msgid "This Instance Only"
 msgstr "このインスタンスのみ"
 
-#: ../calendar/gui/dialogs/recur-comp.c:93
+#: ../calendar/gui/dialogs/recur-comp.c:92
 msgid "This and Prior Instances"
 msgstr "これと以前のインスタンス"
 
-#: ../calendar/gui/dialogs/recur-comp.c:99
+#: ../calendar/gui/dialogs/recur-comp.c:98
 msgid "This and Future Instances"
 msgstr "これと将来のインスタンス"
 
-#: ../calendar/gui/dialogs/recur-comp.c:104
+#: ../calendar/gui/dialogs/recur-comp.c:103
 msgid "All Instances"
 msgstr "すべてのインスタンス"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:575
+#: ../calendar/gui/dialogs/recurrence-page.c:574
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "この予定には Evolution が編集できない繰り返しがあります。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1000
+#: ../calendar/gui/dialogs/recurrence-page.c:1001
 msgid "Recurrence date is invalid"
 msgstr "繰り返しの日付が間違っています"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/dialogs/recurrence-page.c:1045
 msgid "End time of the recurrence was before event's start"
 msgstr "繰り返しを終える時間がイベントを開始する時間より前です"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:1073
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "on"
 msgstr "の"
 
@@ -3031,7 +3344,7 @@ msgstr "の"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1154
+#: ../calendar/gui/dialogs/recurrence-page.c:1155
 msgid "first"
 msgstr "最初の"
 
@@ -3040,7 +3353,7 @@ msgstr "最初の"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1160
+#: ../calendar/gui/dialogs/recurrence-page.c:1161
 msgid "second"
 msgstr "二番目の"
 
@@ -3048,7 +3361,7 @@ msgstr "二番目の"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1165
+#: ../calendar/gui/dialogs/recurrence-page.c:1166
 msgid "third"
 msgstr "三番目の"
 
@@ -3056,7 +3369,7 @@ msgstr "三番目の"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1170
+#: ../calendar/gui/dialogs/recurrence-page.c:1171
 msgid "fourth"
 msgstr "四番目の"
 
@@ -3064,7 +3377,7 @@ msgstr "四番目の"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1175
+#: ../calendar/gui/dialogs/recurrence-page.c:1176
 msgid "fifth"
 msgstr "五番目の"
 
@@ -3072,13 +3385,13 @@ msgstr "五番目の"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1180
+#: ../calendar/gui/dialogs/recurrence-page.c:1181
 msgid "last"
 msgstr "最後の"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1204
+#: ../calendar/gui/dialogs/recurrence-page.c:1205
 msgid "Other Date"
 msgstr "その他の日"
 
@@ -3086,7 +3399,7 @@ msgstr "その他の日"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1210
+#: ../calendar/gui/dialogs/recurrence-page.c:1211
 msgid "1st to 10th"
 msgstr "1日〜10日"
 
@@ -3094,7 +3407,7 @@ msgstr "1日〜10日"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1216
+#: ../calendar/gui/dialogs/recurrence-page.c:1217
 msgid "11th to 20th"
 msgstr "11日〜20日"
 
@@ -3102,41 +3415,41 @@ msgstr "11日〜20日"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1222
+#: ../calendar/gui/dialogs/recurrence-page.c:1223
 msgid "21st to 31st"
 msgstr "21日〜31日"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1249
+#: ../calendar/gui/dialogs/recurrence-page.c:1250
 #: ../modules/calendar/e-calendar-preferences.ui.h:25
 msgid "Monday"
 msgstr "月曜日"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1250
+#: ../calendar/gui/dialogs/recurrence-page.c:1251
 #: ../modules/calendar/e-calendar-preferences.ui.h:28
 msgid "Tuesday"
 msgstr "火曜日"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1251
+#: ../calendar/gui/dialogs/recurrence-page.c:1252
 #: ../modules/calendar/e-calendar-preferences.ui.h:31
 msgid "Wednesday"
 msgstr "水曜日"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1252
+#: ../calendar/gui/dialogs/recurrence-page.c:1253
 #: ../modules/calendar/e-calendar-preferences.ui.h:34
 msgid "Thursday"
 msgstr "木曜日"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1253
+#: ../calendar/gui/dialogs/recurrence-page.c:1254
 #: ../modules/calendar/e-calendar-preferences.ui.h:37
 msgid "Friday"
 msgstr "金曜日"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1254
+#: ../calendar/gui/dialogs/recurrence-page.c:1255
 #: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "Saturday"
 msgstr "土曜日"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1255
+#: ../calendar/gui/dialogs/recurrence-page.c:1256
 #: ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Sunday"
 msgstr "日曜日"
@@ -3144,31 +3457,31 @@ msgstr "日曜日"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1386
+#: ../calendar/gui/dialogs/recurrence-page.c:1387
 msgid "on the"
 msgstr "の"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1571
+#: ../calendar/gui/dialogs/recurrence-page.c:1572
 msgid "occurrences"
 msgstr "繰り返す"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2341
+#: ../calendar/gui/dialogs/recurrence-page.c:2342
 msgid "Add exception"
 msgstr "対象外の日の追加"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2383
+#: ../calendar/gui/dialogs/recurrence-page.c:2384
 msgid "Could not get a selection to modify."
 msgstr "変更する内容を取得できませんでした"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2389
+#: ../calendar/gui/dialogs/recurrence-page.c:2390
 msgid "Modify exception"
 msgstr "対象外の日の変更"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2435
+#: ../calendar/gui/dialogs/recurrence-page.c:2436
 msgid "Could not get a selection to delete."
 msgstr "削除する内容を取得できませんでした"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2576
+#: ../calendar/gui/dialogs/recurrence-page.c:2577
 msgid "Date/Time"
 msgstr "日付/時刻"
 
@@ -3226,30 +3539,30 @@ msgstr "毎"
 msgid "Exceptions"
 msgstr "対象外の日"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:22
 msgid "Preview"
 msgstr "プレビュー"
 
-#: ../calendar/gui/dialogs/send-comp.c:173
-#: ../calendar/gui/dialogs/send-comp.c:255
+#: ../calendar/gui/dialogs/send-comp.c:172
+#: ../calendar/gui/dialogs/send-comp.c:254
 msgid "Send my reminders with this event"
 msgstr "このイベントと一緒にリマインダーを送信する"
 
-#: ../calendar/gui/dialogs/send-comp.c:175
-#: ../calendar/gui/dialogs/send-comp.c:257
+#: ../calendar/gui/dialogs/send-comp.c:174
+#: ../calendar/gui/dialogs/send-comp.c:256
 msgid "Notify new attendees _only"
 msgstr "新しい参加者のみに通知(_O)"
 
-#: ../calendar/gui/dialogs/task-editor.c:94
+#: ../calendar/gui/dialogs/task-editor.c:93
 msgid "_Send Options"
 msgstr "送信オプション(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:149 ../calendar/gui/print.c:3507
-#: ../e-util/e-send-options.c:553
+#: ../calendar/gui/dialogs/task-editor.c:148 ../calendar/gui/print.c:3498
+#: ../e-util/e-send-options.c:552
 msgid "Task"
 msgstr "タスク"
 
-#: ../calendar/gui/dialogs/task-editor.c:286
+#: ../calendar/gui/dialogs/task-editor.c:285
 msgid "Print this task"
 msgstr "このタスクを印刷"
 
@@ -3273,88 +3586,88 @@ msgstr "タスクのすべてを編集することはできません。あなた
 msgid "Task cannot be edited, because the selected task list does not support assigned tasks"
 msgstr "タスクを編集できません。選択したタスク一覧はタスク割り当てをサポートしていません。"
 
-#: ../calendar/gui/dialogs/task-page.c:1007
+#: ../calendar/gui/dialogs/task-page.c:1011
 msgid "Due date is wrong"
 msgstr "期日が間違っています"
 
-#: ../calendar/gui/dialogs/task-page.c:1175
-#: ../calendar/gui/dialogs/task-page.c:1200
+#: ../calendar/gui/dialogs/task-page.c:1179
+#: ../calendar/gui/dialogs/task-page.c:1204
 msgid "Completed date is wrong"
 msgstr "完了日が間違っています"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:337
-#: ../calendar/gui/e-task-table.c:573 ../calendar/gui/tasktypes.xml.h:19
-#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:320
+#: ../calendar/gui/e-cal-component-preview.c:336
+#: ../calendar/gui/e-task-table.c:572 ../calendar/gui/tasktypes.xml.h:19
+#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:309
 msgid "High"
 msgstr "高い"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:339
-#: ../calendar/gui/e-cal-model.c:1666 ../calendar/gui/e-task-table.c:574
+#: ../calendar/gui/e-cal-component-preview.c:338
+#: ../calendar/gui/e-cal-model.c:1665 ../calendar/gui/e-task-table.c:573
 #: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
-#: ../mail/message-list.c:319
+#: ../mail/message-list.c:308
 msgid "Normal"
 msgstr "普通"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:12
-#: ../calendar/gui/e-cal-component-preview.c:341
-#: ../calendar/gui/e-task-table.c:575 ../calendar/gui/tasktypes.xml.h:21
-#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:318
+#: ../calendar/gui/e-cal-component-preview.c:340
+#: ../calendar/gui/e-task-table.c:574 ../calendar/gui/tasktypes.xml.h:21
+#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:307
 msgid "Low"
 msgstr "低い"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:14
-#: ../calendar/gui/e-task-table.c:576 ../calendar/gui/tasktypes.xml.h:22
+#: ../calendar/gui/e-task-table.c:575 ../calendar/gui/tasktypes.xml.h:22
 #: ../e-util/e-send-options.ui.h:1
 msgid "Undefined"
 msgstr "未定義"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:16
-#: ../calendar/gui/e-cal-component-preview.c:322
-#: ../calendar/gui/e-cal-model-tasks.c:311
-#: ../calendar/gui/e-cal-model-tasks.c:553 ../calendar/gui/e-task-table.c:214
-#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:656
-#: ../calendar/gui/print.c:3591 ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/e-cal-component-preview.c:321
+#: ../calendar/gui/e-cal-model-tasks.c:310
+#: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:655
+#: ../calendar/gui/print.c:3582 ../calendar/gui/tasktypes.xml.h:11
 msgid "Not Started"
 msgstr "開始していない"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:18
-#: ../calendar/gui/e-cal-component-preview.c:312
-#: ../calendar/gui/e-cal-model-tasks.c:313
-#: ../calendar/gui/e-cal-model-tasks.c:555
-#: ../calendar/gui/e-cal-model-tasks.c:633 ../calendar/gui/e-task-table.c:216
-#: ../calendar/gui/e-task-table.c:231 ../calendar/gui/e-task-table.c:657
-#: ../calendar/gui/print.c:3594
+#: ../calendar/gui/e-cal-component-preview.c:311
+#: ../calendar/gui/e-cal-model-tasks.c:312
+#: ../calendar/gui/e-cal-model-tasks.c:554
+#: ../calendar/gui/e-cal-model-tasks.c:635 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:656
+#: ../calendar/gui/print.c:3585
 msgid "In Progress"
 msgstr "進行中"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:20
-#: ../calendar/gui/e-cal-component-preview.c:315
-#: ../calendar/gui/e-cal-model-tasks.c:315
-#: ../calendar/gui/e-cal-model-tasks.c:557
-#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
-#: ../calendar/gui/e-task-table.c:218 ../calendar/gui/e-task-table.c:233
-#: ../calendar/gui/e-task-table.c:658 ../calendar/gui/print.c:3597
+#: ../calendar/gui/e-cal-component-preview.c:314
+#: ../calendar/gui/e-cal-model-tasks.c:314
+#: ../calendar/gui/e-cal-model-tasks.c:556
+#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
+#: ../calendar/gui/e-task-table.c:217 ../calendar/gui/e-task-table.c:232
+#: ../calendar/gui/e-task-table.c:657 ../calendar/gui/print.c:3588
 #: ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:380
+#: ../plugins/save-calendar/csv-format.c:379
 msgid "Completed"
 msgstr "完了"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:22
-#: ../calendar/gui/e-cal-component-preview.c:318
-#: ../calendar/gui/e-cal-model-tasks.c:317
-#: ../calendar/gui/e-cal-model-tasks.c:559 ../calendar/gui/e-task-table.c:220
-#: ../calendar/gui/e-task-table.c:235 ../calendar/gui/e-task-table.c:659
-#: ../calendar/gui/print.c:3600 ../mail/mail-send-recv.c:878
+#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-cal-model-tasks.c:316
+#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:219
+#: ../calendar/gui/e-task-table.c:234 ../calendar/gui/e-task-table.c:658
+#: ../calendar/gui/print.c:3591 ../mail/mail-send-recv.c:855
 msgid "Canceled"
 msgstr "キャンセル済み"
 
@@ -3366,80 +3679,80 @@ msgstr "期日(_U):"
 msgid "Time zone:"
 msgstr "タイムゾーン:"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:32
+#: ../calendar/gui/dialogs/task-page.ui.h:35
 msgid "_Status:"
 msgstr "ステータス(_S):"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:33
+#: ../calendar/gui/dialogs/task-page.ui.h:36
 msgid "Date _completed:"
 msgstr "完了日(_C):"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:34
+#: ../calendar/gui/dialogs/task-page.ui.h:37
 msgid "_Percent complete:"
 msgstr "達成率(_P):"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:35
+#: ../calendar/gui/dialogs/task-page.ui.h:38
 msgid "Priorit_y:"
 msgstr "優先度(_Y):"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:36
+#: ../calendar/gui/dialogs/task-page.ui.h:39
 msgid "C_lassification:"
 msgstr "分類(_L)"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:37
+#: ../calendar/gui/dialogs/task-page.ui.h:40
 msgid "_Web Page:"
 msgstr "ウェブページ(_W):"
 
-#: ../calendar/gui/ea-cal-view.c:324
+#: ../calendar/gui/ea-cal-view.c:281
 msgid "New Appointment"
 msgstr "新しい予定"
 
-#: ../calendar/gui/ea-cal-view.c:325
+#: ../calendar/gui/ea-cal-view.c:282
 msgid "New All Day Event"
 msgstr "新しい終日のイベント"
 
-#: ../calendar/gui/ea-cal-view.c:326
+#: ../calendar/gui/ea-cal-view.c:283
 msgid "New Meeting"
 msgstr "新しい会議"
 
-#: ../calendar/gui/ea-cal-view.c:327
+#: ../calendar/gui/ea-cal-view.c:284
 msgid "Go to Today"
 msgstr "今日へ移動"
 
-#: ../calendar/gui/ea-cal-view.c:328
+#: ../calendar/gui/ea-cal-view.c:285
 msgid "Go to Date"
 msgstr "指定日へ移動"
 
-#: ../calendar/gui/ea-cal-view-event.c:298
+#: ../calendar/gui/ea-cal-view-event.c:297
 msgid "It has reminders."
 msgstr "リマインダーがあります。"
 
-#: ../calendar/gui/ea-cal-view-event.c:301
+#: ../calendar/gui/ea-cal-view-event.c:300
 msgid "It has recurrences."
 msgstr "繰り返しがあります。"
 
-#: ../calendar/gui/ea-cal-view-event.c:304
+#: ../calendar/gui/ea-cal-view-event.c:303
 msgid "It is a meeting."
 msgstr "会議です。"
 
-#: ../calendar/gui/ea-cal-view-event.c:311
+#: ../calendar/gui/ea-cal-view-event.c:310
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "カレンダーのイベント: サマリは %s"
 
-#: ../calendar/gui/ea-cal-view-event.c:314
+#: ../calendar/gui/ea-cal-view-event.c:313
 msgid "Calendar Event: It has no summary."
 msgstr "カレンダーのイベント: サマリなし。"
 
-#: ../calendar/gui/ea-cal-view-event.c:337
+#: ../calendar/gui/ea-cal-view-event.c:336
 msgid "calendar view event"
 msgstr "カレンダーの表示イベント"
 
-#: ../calendar/gui/ea-cal-view-event.c:569
+#: ../calendar/gui/ea-cal-view-event.c:568
 msgid "Grab Focus"
 msgstr "フォーカスの取得"
 
-#: ../calendar/gui/ea-day-view.c:154 ../calendar/gui/ea-week-view.c:154
+#: ../calendar/gui/ea-day-view.c:111 ../calendar/gui/ea-week-view.c:110
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -3447,41 +3760,41 @@ msgstr[0] "%d個のイベントあり"
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:161 ../calendar/gui/ea-week-view.c:157
+#: ../calendar/gui/ea-day-view.c:118 ../calendar/gui/ea-week-view.c:113
 msgid "It has no events."
 msgstr "イベントなし"
 
-#: ../calendar/gui/ea-day-view.c:169
+#: ../calendar/gui/ea-day-view.c:126
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "平日ビュー: %s (%s)"
 
-#: ../calendar/gui/ea-day-view.c:176
+#: ../calendar/gui/ea-day-view.c:133
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "日間ビュー: %s (%s)"
 
-#: ../calendar/gui/ea-day-view.c:210
+#: ../calendar/gui/ea-day-view.c:167
 msgid "calendar view for a work week"
 msgstr "平日のカレンダー表示"
 
-#: ../calendar/gui/ea-day-view.c:212
+#: ../calendar/gui/ea-day-view.c:169
 msgid "calendar view for one or more days"
 msgstr "一日以上のカレンダー表示"
 
-#: ../calendar/gui/ea-day-view-main-item.c:327
-#: ../calendar/gui/ea-week-view-main-item.c:354
+#: ../calendar/gui/ea-day-view-main-item.c:266
+#: ../calendar/gui/ea-week-view-main-item.c:293
 msgid "a table to view and select the current time range"
 msgstr "現在時刻の範囲を表示/選択するためのテーブル"
 
-#: ../calendar/gui/ea-gnome-calendar.c:48
-#: ../calendar/gui/ea-gnome-calendar.c:56
-#: ../calendar/importers/icalendar-importer.c:1114
+#: ../calendar/gui/ea-gnome-calendar.c:47
+#: ../calendar/gui/ea-gnome-calendar.c:55
+#: ../calendar/importers/icalendar-importer.c:1107
 msgid "Gnome Calendar"
 msgstr "GNOME カレンダー"
 
-#: ../calendar/gui/ea-gnome-calendar.c:204
-#: ../modules/calendar/e-cal-shell-view-private.c:1225
+#: ../calendar/gui/ea-gnome-calendar.c:206
+#: ../modules/calendar/e-cal-shell-view-private.c:1190
 msgid "%A %d %b %Y"
 msgstr "%Y年%B%e日 %A"
 
@@ -3491,30 +3804,30 @@ msgstr "%Y年%B%e日 %A"
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:208 ../calendar/gui/e-day-view.c:2793
-#: ../calendar/gui/e-day-view-top-item.c:859
-#: ../calendar/gui/e-week-view-main-item.c:219
-#: ../modules/calendar/e-cal-shell-view-private.c:1229
+#: ../calendar/gui/ea-gnome-calendar.c:210 ../calendar/gui/e-day-view.c:2796
+#: ../calendar/gui/e-day-view-top-item.c:858
+#: ../calendar/gui/e-week-view-main-item.c:218
+#: ../modules/calendar/e-cal-shell-view-private.c:1194
 msgid "%a %d %b"
 msgstr "%m/%d (%a)"
 
-#: ../calendar/gui/ea-gnome-calendar.c:211
-#: ../calendar/gui/ea-gnome-calendar.c:217
-#: ../calendar/gui/ea-gnome-calendar.c:220
-#: ../modules/calendar/e-cal-shell-view-private.c:1232
-#: ../modules/calendar/e-cal-shell-view-private.c:1238
-#: ../modules/calendar/e-cal-shell-view-private.c:1241
+#: ../calendar/gui/ea-gnome-calendar.c:213
+#: ../calendar/gui/ea-gnome-calendar.c:219
+#: ../calendar/gui/ea-gnome-calendar.c:222
+#: ../modules/calendar/e-cal-shell-view-private.c:1197
+#: ../modules/calendar/e-cal-shell-view-private.c:1203
+#: ../modules/calendar/e-cal-shell-view-private.c:1206
 msgid "%a %d %b %Y"
 msgstr "%Y/%m/%d (%a)"
 
-#: ../calendar/gui/ea-gnome-calendar.c:239
-#: ../calendar/gui/ea-gnome-calendar.c:247
-#: ../calendar/gui/ea-gnome-calendar.c:254
-#: ../calendar/gui/ea-gnome-calendar.c:257
-#: ../modules/calendar/e-cal-shell-view-private.c:1258
-#: ../modules/calendar/e-cal-shell-view-private.c:1269
-#: ../modules/calendar/e-cal-shell-view-private.c:1276
-#: ../modules/calendar/e-cal-shell-view-private.c:1279
+#: ../calendar/gui/ea-gnome-calendar.c:241
+#: ../calendar/gui/ea-gnome-calendar.c:249
+#: ../calendar/gui/ea-gnome-calendar.c:256
+#: ../calendar/gui/ea-gnome-calendar.c:259
+#: ../modules/calendar/e-cal-shell-view-private.c:1223
+#: ../modules/calendar/e-cal-shell-view-private.c:1234
+#: ../modules/calendar/e-cal-shell-view-private.c:1241
+#: ../modules/calendar/e-cal-shell-view-private.c:1244
 msgid "%d %b %Y"
 msgstr "%Y年%B%e日"
 
@@ -3523,149 +3836,163 @@ msgstr "%Y年%B%e日"
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:244 ../calendar/gui/e-day-view.c:2809
-#: ../calendar/gui/e-day-view-top-item.c:863
-#: ../calendar/gui/e-week-view-main-item.c:233
-#: ../modules/calendar/e-cal-shell-view-private.c:1265
+#: ../calendar/gui/ea-gnome-calendar.c:246 ../calendar/gui/e-day-view.c:2812
+#: ../calendar/gui/e-day-view-top-item.c:862
+#: ../calendar/gui/e-week-view-main-item.c:232
+#: ../modules/calendar/e-cal-shell-view-private.c:1230
 msgid "%d %b"
 msgstr "%B%e日"
 
-#: ../calendar/gui/ea-jump-button.c:151
+#: ../calendar/gui/ea-jump-button.c:150
 msgid "Jump button"
 msgstr "ジャンプボタン"
 
-#: ../calendar/gui/ea-jump-button.c:160
+#: ../calendar/gui/ea-jump-button.c:159
 msgid "Click here, you can find more events."
 msgstr "ここをクリックすると、他のイベントを検索できます"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:358
+#: ../calendar/gui/e-alarm-list.c:357 ../calendar/gui/misc.c:97
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d日間"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:364
+#: ../calendar/gui/e-alarm-list.c:363
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d週間"
 
-#: ../calendar/gui/e-alarm-list.c:426
+#: ../calendar/gui/e-alarm-list.c:425
 msgid "Unknown action to be performed"
 msgstr "実行するアクションが不明です"
 
-#: ../calendar/gui/e-alarm-list.c:441
+#: ../calendar/gui/e-alarm-list.c:440
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "予定を開始する %2$s前に%1$s"
 
-#: ../calendar/gui/e-alarm-list.c:447
+#: ../calendar/gui/e-alarm-list.c:446
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "予定を開始する %2$s後に%1$s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:453
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "予定を開始した時点で%s"
 
-#: ../calendar/gui/e-alarm-list.c:466
+#: ../calendar/gui/e-alarm-list.c:465
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "予定を終了する %2$s前に%1$s"
 
-#: ../calendar/gui/e-alarm-list.c:472
+#: ../calendar/gui/e-alarm-list.c:471
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "予定を終了する %2$s後に%1$s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:479
+#: ../calendar/gui/e-alarm-list.c:478
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "予定を終了した時点で%s"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:503
+#: ../calendar/gui/e-alarm-list.c:502
 #, c-format
 msgid "%s at %s"
 msgstr "%2$sの時点で%1$s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:511
+#: ../calendar/gui/e-alarm-list.c:510
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "トリガーの種類が不明な %s"
 
-#: ../calendar/gui/ea-week-view.c:163
+#: ../calendar/gui/ea-week-view.c:119
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "月間ビュー: %s (%s)"
 
-#: ../calendar/gui/ea-week-view.c:168
+#: ../calendar/gui/ea-week-view.c:124
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "週間ビュー: %s (%s)"
 
-#: ../calendar/gui/ea-week-view.c:202
+#: ../calendar/gui/ea-week-view.c:158
 msgid "calendar view for a month"
 msgstr "一ヶ月のカレンダー表示"
 
-#: ../calendar/gui/ea-week-view.c:204
+#: ../calendar/gui/ea-week-view.c:160
 msgid "calendar view for one or more weeks"
 msgstr "一週間以上のカレンダー表示"
 
-#: ../calendar/gui/e-cal-component-preview.c:223 ../e-util/e-filter-rule.c:750
-#: ../mail/e-mail-config-page.c:126
+#: ../calendar/gui/e-cal-component-preview.c:222 ../e-util/e-filter-rule.c:757
+#: ../mail/e-mail-config-page.c:125
 msgid "Untitled"
 msgstr "タイトルなし"
 
-#: ../calendar/gui/e-cal-component-preview.c:231
+#: ../calendar/gui/e-cal-component-preview.c:230
 msgid "Categories:"
 msgstr "カテゴリ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:263
+#: ../calendar/gui/e-cal-component-preview.c:262
 msgid "Summary:"
 msgstr "サマリ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-cal-component-preview.c:271
 msgid "Start Date:"
 msgstr "開始日:"
 
-#: ../calendar/gui/e-cal-component-preview.c:284
+#: ../calendar/gui/e-cal-component-preview.c:283
 msgid "End Date:"
 msgstr "終了日:"
 
-#: ../calendar/gui/e-cal-component-preview.c:296
+#: ../calendar/gui/e-cal-component-preview.c:295
 msgid "Due Date:"
 msgstr "期日:"
 
-#: ../calendar/gui/e-cal-component-preview.c:308
-#: ../modules/itip-formatter/itip-view.c:1492
-#: ../modules/itip-formatter/itip-view.c:1609
+#: ../calendar/gui/e-cal-component-preview.c:307
+#: ../modules/itip-formatter/itip-view.c:1506
+#: ../modules/itip-formatter/itip-view.c:1623
 msgid "Status:"
 msgstr "ステータス:"
 
-#: ../calendar/gui/e-cal-component-preview.c:335
+#: ../calendar/gui/e-cal-component-preview.c:334
 msgid "Priority:"
 msgstr "優先度:"
 
-#: ../calendar/gui/e-cal-component-preview.c:360
-#: ../mail/e-mail-config-service-page.c:672
+#: ../calendar/gui/e-cal-component-preview.c:359
+#: ../mail/e-mail-config-service-page.c:671
 msgid "Description:"
 msgstr "説明:"
 
-#: ../calendar/gui/e-cal-component-preview.c:391
+#: ../calendar/gui/e-cal-component-preview.c:390
 msgid "Web Page:"
 msgstr "ウェブページ:"
 
+#: ../calendar/gui/e-calendar-selector.c:356
+#: ../modules/calendar/e-cal-shell-view-private.c:1096
+#, fuzzy, c-format
+#| msgid "Copying an event into the calendar '{0}'"
+msgid "Copying an event into the calendar %s"
+msgstr "カレンダー '{0}' にイベントをコピーしています"
+
+#: ../calendar/gui/e-calendar-selector.c:357
+#: ../modules/calendar/e-cal-shell-view-private.c:1095
+#, fuzzy, c-format
+#| msgid "Moving an event into the calendar '{0}'"
+msgid "Moving an event into the calendar %s"
+msgstr "カレンダー '{0}' にイベントを移動しています"
+
 #: ../calendar/gui/e-calendar-table.etspec.h:1
 msgid "Click to add a task"
 msgstr "<ここをクリックしてタスクを追加してください>"
@@ -3678,8 +4005,8 @@ msgstr "開始日"
 #: ../calendar/gui/e-meeting-list-view.c:652
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../e-util/e-attachment-tree-view.c:586
-#: ../mail/e-mail-account-tree-view.c:159
+#: ../e-util/e-attachment-tree-view.c:585
+#: ../mail/e-mail-account-tree-view.c:158
 msgid "Type"
 msgstr "種類"
 
@@ -3687,7 +4014,7 @@ msgstr "種類"
 msgid "Completion date"
 msgstr "完了日"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:880
+#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:857
 msgid "Complete"
 msgstr "完了の状態"
 
@@ -3702,17 +4029,17 @@ msgstr "完了 (%)"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:18
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:386
 msgid "Priority"
 msgstr "優先度"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. * Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-cal-model.c:4017
+#: ../calendar/gui/e-cal-model.c:4011
 #: ../calendar/gui/e-meeting-list-view.c:695
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:75
+#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:49
 #: ../mail/message-list.etspec.h:1
 msgid "Status"
 msgstr "状態"
@@ -3720,7 +4047,7 @@ msgstr "状態"
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-cal-list-view.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:6
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:380
 msgid "Created"
 msgstr "作成済"
 
@@ -3730,37 +4057,37 @@ msgstr "作成済"
 msgid "Last modified"
 msgstr "最終更新日時"
 
-#: ../calendar/gui/e-calendar-view.c:446
+#: ../calendar/gui/e-calendar-view.c:448
 msgid "Cut selected events to the clipboard"
 msgstr "選択したイベントを切り取ってクリップボードにコピーします"
 
-#: ../calendar/gui/e-calendar-view.c:452
+#: ../calendar/gui/e-calendar-view.c:454
 msgid "Copy selected events to the clipboard"
 msgstr "選択したイベントをクリップボードにコピーします"
 
-#: ../calendar/gui/e-calendar-view.c:458
+#: ../calendar/gui/e-calendar-view.c:460
 msgid "Paste events from the clipboard"
 msgstr "クリップボードからイベントを貼り付けます"
 
-#: ../calendar/gui/e-calendar-view.c:464
+#: ../calendar/gui/e-calendar-view.c:466
 msgid "Delete selected events"
 msgstr "選択したイベントを削除します"
 
-#: ../calendar/gui/e-calendar-view.c:484 ../calendar/gui/e-memo-table.c:183
-#: ../calendar/gui/e-task-table.c:270
+#: ../calendar/gui/e-calendar-view.c:486 ../calendar/gui/e-memo-table.c:182
+#: ../calendar/gui/e-task-table.c:269
 msgid "Deleting selected objects"
 msgstr "指定したオブジェクトを削除します"
 
-#: ../calendar/gui/e-calendar-view.c:646 ../calendar/gui/e-memo-table.c:878
-#: ../calendar/gui/e-task-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:648 ../calendar/gui/e-memo-table.c:877
+#: ../calendar/gui/e-task-table.c:1175
 msgid "Updating objects"
 msgstr "オブジェクトの更新"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2084 ../calendar/gui/e-memo-table.c:553
-#: ../calendar/gui/e-task-table.c:840
+#: ../calendar/gui/e-calendar-view.c:2094 ../calendar/gui/e-memo-table.c:552
+#: ../calendar/gui/e-task-table.c:839
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "主催者: %s <%s>"
@@ -3768,21 +4095,21 @@ msgstr "主催者: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:2088 ../calendar/gui/e-memo-table.c:558
-#: ../calendar/gui/e-task-table.c:844
+#: ../calendar/gui/e-calendar-view.c:2098 ../calendar/gui/e-memo-table.c:557
+#: ../calendar/gui/e-task-table.c:843
 #, c-format
 msgid "Organizer: %s"
 msgstr "主催者: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2104
-#: ../calendar/gui/e-meeting-time-sel.c:2664 ../calendar/gui/print.c:3545
+#: ../calendar/gui/e-calendar-view.c:2114
+#: ../calendar/gui/e-meeting-time-sel.c:2664 ../calendar/gui/print.c:3536
 #, c-format
 msgid "Location: %s"
 msgstr "場所: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2135
+#: ../calendar/gui/e-calendar-view.c:2145
 #, c-format
 msgid "Time: %s %s"
 msgstr "時刻: %s %s"
@@ -3796,81 +4123,81 @@ msgstr "開始日"
 msgid "End Date"
 msgstr "終了日"
 
-#: ../calendar/gui/e-cal-model.c:467 ../calendar/gui/e-meeting-list-view.c:185
-#: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:170
-#: ../calendar/gui/e-meeting-store.c:233 ../calendar/gui/print.c:1251
-#: ../calendar/gui/print.c:1268 ../e-util/e-charset.c:52
-#: ../modules/itip-formatter/itip-view.c:3496
-#: ../modules/itip-formatter/itip-view.c:6080
-#: ../modules/plugin-manager/evolution-plugin-manager.c:100
+#: ../calendar/gui/e-cal-model.c:466 ../calendar/gui/e-meeting-list-view.c:184
+#: ../calendar/gui/e-meeting-list-view.c:198
+#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:169
+#: ../calendar/gui/e-meeting-store.c:232 ../calendar/gui/print.c:1250
+#: ../calendar/gui/print.c:1267 ../e-util/e-charset.c:51
+#: ../modules/itip-formatter/itip-view.c:3510
+#: ../modules/itip-formatter/itip-view.c:6097
+#: ../modules/plugin-manager/evolution-plugin-manager.c:99
 msgid "Unknown"
 msgstr "不明"
 
-#: ../calendar/gui/e-cal-model.c:1668
+#: ../calendar/gui/e-cal-model.c:1667
 msgid "Recurring"
 msgstr "繰り返し"
 
-#: ../calendar/gui/e-cal-model.c:1670
+#: ../calendar/gui/e-cal-model.c:1669
 msgid "Assigned"
 msgstr "割当て済み"
 
-#: ../calendar/gui/e-cal-model.c:1672 ../calendar/gui/e-cal-model-tasks.c:1163
-#: ../calendar/gui/e-meeting-list-view.c:209
-#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:187
-#: ../calendar/gui/e-meeting-store.c:1024
+#: ../calendar/gui/e-cal-model.c:1671 ../calendar/gui/e-cal-model-tasks.c:1165
+#: ../calendar/gui/e-meeting-list-view.c:208
+#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:186
+#: ../calendar/gui/e-meeting-store.c:1023
 msgid "Yes"
 msgstr "はい"
 
-#: ../calendar/gui/e-cal-model.c:1672 ../calendar/gui/e-cal-model-tasks.c:1163
-#: ../calendar/gui/e-meeting-list-view.c:210
-#: ../calendar/gui/e-meeting-store.c:189
+#: ../calendar/gui/e-cal-model.c:1671 ../calendar/gui/e-cal-model-tasks.c:1165
+#: ../calendar/gui/e-meeting-list-view.c:209
+#: ../calendar/gui/e-meeting-store.c:188
 msgid "No"
 msgstr "いいえ"
 
-#: ../calendar/gui/e-cal-model.c:3958
-#: ../calendar/gui/e-meeting-list-view.c:221
-#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
-#: ../modules/itip-formatter/itip-view.c:6068
+#: ../calendar/gui/e-cal-model.c:3952
+#: ../calendar/gui/e-meeting-list-view.c:220
+#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../modules/itip-formatter/itip-view.c:6085
 msgid "Accepted"
 msgstr "受諾済"
 
-#: ../calendar/gui/e-cal-model.c:3959
-#: ../calendar/gui/e-meeting-list-view.c:222
-#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
-#: ../modules/itip-formatter/itip-view.c:6074
+#: ../calendar/gui/e-cal-model.c:3953
+#: ../calendar/gui/e-meeting-list-view.c:221
+#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#: ../modules/itip-formatter/itip-view.c:6091
 msgid "Declined"
 msgstr "辞退済"
 
-#: ../calendar/gui/e-cal-model.c:3960
-#: ../calendar/gui/e-meeting-list-view.c:223
-#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-cal-model.c:3954
+#: ../calendar/gui/e-meeting-list-view.c:222
+#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
+#: ../calendar/gui/e-meeting-time-sel.c:527
 msgid "Tentative"
 msgstr "仮承認"
 
-#: ../calendar/gui/e-cal-model.c:3961
-#: ../calendar/gui/e-meeting-list-view.c:224
-#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
-#: ../modules/itip-formatter/itip-view.c:6077
+#: ../calendar/gui/e-cal-model.c:3955
+#: ../calendar/gui/e-meeting-list-view.c:223
+#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
+#: ../modules/itip-formatter/itip-view.c:6094
 msgid "Delegated"
 msgstr "委任済"
 
-#: ../calendar/gui/e-cal-model.c:3962
+#: ../calendar/gui/e-cal-model.c:3956
 msgid "Needs action"
 msgstr "要アクション"
 
-#: ../calendar/gui/e-cal-model-calendar.c:125
-#: ../calendar/gui/e-task-table.c:631
+#: ../calendar/gui/e-cal-model-calendar.c:124
+#: ../calendar/gui/e-task-table.c:630
 msgid "Free"
 msgstr "予定なし"
 
-#: ../calendar/gui/e-cal-model-calendar.c:128
-#: ../calendar/gui/e-meeting-time-sel.c:527 ../calendar/gui/e-task-table.c:632
+#: ../calendar/gui/e-cal-model-calendar.c:127
+#: ../calendar/gui/e-meeting-time-sel.c:528 ../calendar/gui/e-task-table.c:631
 msgid "Busy"
 msgstr "予定あり"
 
-#: ../calendar/gui/e-cal-model-tasks.c:499
+#: ../calendar/gui/e-cal-model-tasks.c:498
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3881,22 +4208,22 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:551
+#: ../calendar/gui/e-cal-model-tasks.c:550
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "なし"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:159
+#: ../calendar/gui/e-cell-date-edit-text.c:158
 msgid "%a %m/%d/%Y %H:%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:162
+#: ../calendar/gui/e-cell-date-edit-text.c:161
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p%l:%M:%S"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:170
+#: ../calendar/gui/e-cell-date-edit-text.c:169
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -3906,16 +4233,16 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1983 ../calendar/gui/e-week-view.c:1554
-#: ../calendar/gui/print.c:1074 ../calendar/gui/print.c:1093
-#: ../calendar/gui/print.c:2637 ../calendar/gui/print.c:2657
+#: ../calendar/gui/e-day-view.c:1986 ../calendar/gui/e-week-view.c:1540
+#: ../calendar/gui/print.c:1073 ../calendar/gui/print.c:1092
+#: ../calendar/gui/print.c:2633 ../calendar/gui/print.c:2653
 msgid "am"
 msgstr "午前"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1986 ../calendar/gui/e-week-view.c:1557
-#: ../calendar/gui/print.c:1079 ../calendar/gui/print.c:1095
-#: ../calendar/gui/print.c:2642 ../calendar/gui/print.c:2659
+#: ../calendar/gui/e-day-view.c:1989 ../calendar/gui/e-week-view.c:1543
+#: ../calendar/gui/print.c:1078 ../calendar/gui/print.c:1094
+#: ../calendar/gui/print.c:2638 ../calendar/gui/print.c:2655
 msgid "pm"
 msgstr "午後"
 
@@ -3925,13 +4252,13 @@ msgstr "午後"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../calendar/gui/e-day-view.c:2776 ../calendar/gui/e-day-view-top-item.c:855
-#: ../calendar/gui/e-week-view-main-item.c:210 ../calendar/gui/print.c:2093
+#: ../calendar/gui/e-day-view.c:2779 ../calendar/gui/e-day-view-top-item.c:854
+#: ../calendar/gui/e-week-view-main-item.c:209 ../calendar/gui/print.c:2089
 msgid "%A %d %B"
 msgstr "%B%e日 %A"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:3433
+#: ../calendar/gui/e-day-view.c:3443
 #, c-format
 msgid "Week %d"
 msgstr "第%d週"
@@ -3942,97 +4269,97 @@ msgstr "第%d週"
 #. * day view, e.g. a day is displayed in
 #. * 24 "60 minute divisions" or
 #. * 48 "30 minute divisions".
-#: ../calendar/gui/e-day-view-time-item.c:801
+#: ../calendar/gui/e-day-view-time-item.c:800
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i分間隔"
 
-#: ../calendar/gui/e-day-view-time-item.c:826
+#: ../calendar/gui/e-day-view-time-item.c:825
 msgid "Show the second time zone"
 msgstr "別のタイムゾーンを表示する"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:843
-#: ../modules/calendar/e-calendar-preferences.c:306
-#: ../modules/calendar/e-calendar-preferences.c:358
+#: ../calendar/gui/e-day-view-time-item.c:842
+#: ../modules/calendar/e-calendar-preferences.c:305
+#: ../modules/calendar/e-calendar-preferences.c:357
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "なし"
 
-#: ../calendar/gui/e-day-view-time-item.c:877
-#: ../calendar/gui/e-timezone-entry.c:324
-#: ../modules/calendar/e-calendar-preferences.c:389
+#: ../calendar/gui/e-day-view-time-item.c:876
+#: ../calendar/gui/e-timezone-entry.c:323
+#: ../modules/calendar/e-calendar-preferences.c:388
 msgid "Select..."
 msgstr "選択..."
 
-#: ../calendar/gui/e-meeting-list-view.c:64
+#: ../calendar/gui/e-meeting-list-view.c:63
 msgid "Chair Persons"
 msgstr "議長"
 
-#: ../calendar/gui/e-meeting-list-view.c:65
+#: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Required Participants"
 msgstr "必須の参加者"
 
-#: ../calendar/gui/e-meeting-list-view.c:66
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Optional Participants"
 msgstr "任意の参加者"
 
-#: ../calendar/gui/e-meeting-list-view.c:67
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Resources"
 msgstr "リソース"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:127
-#: ../calendar/gui/e-meeting-store.c:1018 ../calendar/gui/print.c:1247
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:126
+#: ../calendar/gui/e-meeting-store.c:1017 ../calendar/gui/print.c:1246
 msgid "Individual"
 msgstr "個人"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:112 ../calendar/gui/e-meeting-store.c:129
-#: ../calendar/gui/print.c:1248 ../e-util/e-table-config.ui.h:5
+#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
+#: ../calendar/gui/print.c:1247 ../e-util/e-table-config.ui.h:8
 msgid "Group"
 msgstr "グループ"
 
-#: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
-#: ../calendar/gui/print.c:1249
+#: ../calendar/gui/e-meeting-list-view.c:182
+#: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
+#: ../calendar/gui/print.c:1248
 msgid "Resource"
 msgstr "リソース"
 
-#: ../calendar/gui/e-meeting-list-view.c:184
-#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
-#: ../calendar/gui/print.c:1250
+#: ../calendar/gui/e-meeting-list-view.c:183
+#: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
+#: ../calendar/gui/print.c:1249
 msgid "Room"
 msgstr "ルーム"
 
-#: ../calendar/gui/e-meeting-list-view.c:195
-#: ../calendar/gui/e-meeting-store.c:145 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/print.c:1264
+#: ../calendar/gui/e-meeting-list-view.c:194
+#: ../calendar/gui/e-meeting-store.c:144 ../calendar/gui/e-meeting-store.c:161
+#: ../calendar/gui/print.c:1263
 msgid "Chair"
 msgstr "議長"
 
-#: ../calendar/gui/e-meeting-list-view.c:196
-#: ../calendar/gui/e-meeting-store.c:147 ../calendar/gui/e-meeting-store.c:164
-#: ../calendar/gui/e-meeting-store.c:1021 ../calendar/gui/print.c:1265
+#: ../calendar/gui/e-meeting-list-view.c:195
+#: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/e-meeting-store.c:1020 ../calendar/gui/print.c:1264
 msgid "Required Participant"
 msgstr "必須の参加者"
 
-#: ../calendar/gui/e-meeting-list-view.c:197
-#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/print.c:1266
+#: ../calendar/gui/e-meeting-list-view.c:196
+#: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/print.c:1265
 msgid "Optional Participant"
 msgstr "任意の参加者"
 
-#: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
-#: ../calendar/gui/print.c:1267
+#: ../calendar/gui/e-meeting-list-view.c:197
+#: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
+#: ../calendar/gui/print.c:1266
 msgid "Non-Participant"
 msgstr "不参加者"
 
-#: ../calendar/gui/e-meeting-list-view.c:220
-#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
-#: ../calendar/gui/e-meeting-store.c:1031
+#: ../calendar/gui/e-meeting-list-view.c:219
+#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-meeting-store.c:1030
 msgid "Needs Action"
 msgstr "要アクション"
 
@@ -4045,83 +4372,83 @@ msgstr "出席者                          "
 msgid "RSVP"
 msgstr "返信の有無"
 
-#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
+#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
 msgid "In Process"
 msgstr "進行中"
 
-#: ../calendar/gui/e-meeting-store.c:1910
+#: ../calendar/gui/e-meeting-store.c:1909
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr "サーバー %s にユーザー %s でスケジュール情報にアクセスするためのパスワードを入力してください"
 
-#: ../calendar/gui/e-meeting-store.c:1920
+#: ../calendar/gui/e-meeting-store.c:1919
 #, c-format
 msgid "Failure reason: %s"
 msgstr "失敗しました。原因: %s"
 
-#: ../calendar/gui/e-meeting-store.c:1925
+#: ../calendar/gui/e-meeting-store.c:1924
 #: ../plugins/publish-calendar/publish-calendar.c:351
-#: ../smime/gui/component.c:64
+#: ../smime/gui/component.c:63
 msgid "Enter password"
 msgstr "パスワードの入力"
 
-#: ../calendar/gui/e-meeting-time-sel.c:528
+#: ../calendar/gui/e-meeting-time-sel.c:529
 msgid "Out of Office"
 msgstr "外出中"
 
-#: ../calendar/gui/e-meeting-time-sel.c:530
+#: ../calendar/gui/e-meeting-time-sel.c:531
 msgid "No Information"
 msgstr "情報なし"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:566
 msgid "O_ptions"
 msgstr "オプション(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:590
+#: ../calendar/gui/e-meeting-time-sel.c:586
 msgid "Show _only working hours"
 msgstr "仕事中の時間だけ表示する(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:603
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "Show _zoomed out"
 msgstr "縮小して表示する(_Z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:621
+#: ../calendar/gui/e-meeting-time-sel.c:617
 msgid "_Update free/busy"
 msgstr "スケジュールの更新(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:634
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:658
+#: ../calendar/gui/e-meeting-time-sel.c:654
 msgid "_Autopick"
 msgstr "自動ピックアップ(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:675
+#: ../calendar/gui/e-meeting-time-sel.c:671
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:696
+#: ../calendar/gui/e-meeting-time-sel.c:692
 msgid "_All people and resources"
 msgstr "すべての人達とリソース(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:707
+#: ../calendar/gui/e-meeting-time-sel.c:703
 msgid "All _people and one resource"
 msgstr "すべての人達とひとつのリソース(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:718
+#: ../calendar/gui/e-meeting-time-sel.c:714
 msgid "_Required people"
 msgstr "必須な人達(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:728
+#: ../calendar/gui/e-meeting-time-sel.c:724
 msgid "Required people and _one resource"
 msgstr "必須な人達とひとつのリソース(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:767
+#: ../calendar/gui/e-meeting-time-sel.c:763
 msgid "_Start time:"
 msgstr "開始時刻(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:796
+#: ../calendar/gui/e-meeting-time-sel.c:792
 msgid "_End time:"
 msgstr "終了時刻(_E):"
 
@@ -4134,7 +4461,7 @@ msgstr ""
 "サマリ: %s\n"
 "場所: %s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2662 ../calendar/gui/print.c:3534
+#: ../calendar/gui/e-meeting-time-sel.c:2662 ../calendar/gui/print.c:3525
 #, c-format
 msgid "Summary: %s"
 msgstr "サマリ: %s"
@@ -4163,46 +4490,46 @@ msgstr "共通の名前"
 msgid "Language"
 msgstr "言語"
 
-#: ../calendar/gui/e-memo-table.c:434
-#: ../modules/calendar/e-cal-shell-content.c:482
-#: ../modules/calendar/e-memo-shell-view-actions.c:212
-#: ../modules/calendar/e-memo-shell-view-actions.c:227
-#: ../modules/calendar/e-memo-shell-view.c:307
+#: ../calendar/gui/e-memo-table.c:433
+#: ../modules/calendar/e-cal-shell-content.c:481
+#: ../modules/calendar/e-memo-shell-view-actions.c:211
+#: ../modules/calendar/e-memo-shell-view-actions.c:226
+#: ../modules/calendar/e-memo-shell-view.c:306
 msgid "Memos"
 msgstr "メモ"
 
-#: ../calendar/gui/e-memo-table.c:515 ../calendar/gui/e-task-table.c:803
+#: ../calendar/gui/e-memo-table.c:514 ../calendar/gui/e-task-table.c:802
 msgid "* No Summary *"
 msgstr "* サマリ無し *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:602 ../calendar/gui/e-task-table.c:887
+#: ../calendar/gui/e-memo-table.c:601 ../calendar/gui/e-task-table.c:886
 msgid "Start: "
 msgstr "開始: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:621 ../calendar/gui/e-task-table.c:905
+#: ../calendar/gui/e-memo-table.c:620 ../calendar/gui/e-task-table.c:904
 msgid "Due: "
 msgstr "期日: "
 
-#: ../calendar/gui/e-memo-table.c:742
+#: ../calendar/gui/e-memo-table.c:741
 msgid "Cut selected memos to the clipboard"
 msgstr "選択したメモを切り取ってクリップボードにコピーします"
 
-#: ../calendar/gui/e-memo-table.c:748
+#: ../calendar/gui/e-memo-table.c:747
 msgid "Copy selected memos to the clipboard"
 msgstr "選択したメモをクリップボードにコピーします"
 
-#: ../calendar/gui/e-memo-table.c:754
+#: ../calendar/gui/e-memo-table.c:753
 msgid "Paste memos from the clipboard"
 msgstr "クリップボードからメモを貼り付けます"
 
-#: ../calendar/gui/e-memo-table.c:760
-#: ../modules/calendar/e-memo-shell-view-actions.c:589
+#: ../calendar/gui/e-memo-table.c:759
+#: ../modules/calendar/e-memo-shell-view-actions.c:588
 msgid "Delete selected memos"
 msgstr "選択したメモを削除します"
 
-#: ../calendar/gui/e-memo-table.c:766
+#: ../calendar/gui/e-memo-table.c:765
 msgid "Select all visible memos"
 msgstr "すべての表示されているメモを選択します"
 
@@ -4214,84 +4541,84 @@ msgstr "<ここをクリックしてメモを追加してください>"
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:604
+#: ../calendar/gui/e-task-table.c:603
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:721 ../calendar/gui/print.c:2418
-#: ../calendar/importers/icalendar-importer.c:79
-#: ../calendar/importers/icalendar-importer.c:1078
+#: ../calendar/gui/e-task-table.c:720 ../calendar/gui/print.c:2414
+#: ../calendar/importers/icalendar-importer.c:78
+#: ../calendar/importers/icalendar-importer.c:1071
 #: ../modules/calendar/e-calendar-preferences.ui.h:61
-#: ../modules/calendar/e-cal-shell-content.c:439
-#: ../modules/calendar/e-task-shell-view-actions.c:235
-#: ../modules/calendar/e-task-shell-view-actions.c:250
-#: ../modules/calendar/e-task-shell-view.c:462
+#: ../modules/calendar/e-cal-shell-content.c:438
+#: ../modules/calendar/e-task-shell-view-actions.c:234
+#: ../modules/calendar/e-task-shell-view-actions.c:249
+#: ../modules/calendar/e-task-shell-view.c:461
 msgid "Tasks"
 msgstr "タスク"
 
-#: ../calendar/gui/e-task-table.c:1040
+#: ../calendar/gui/e-task-table.c:1039
 msgid "Cut selected tasks to the clipboard"
 msgstr "選択したタスクを切り取ってクリップボードにコピーします"
 
-#: ../calendar/gui/e-task-table.c:1046
+#: ../calendar/gui/e-task-table.c:1045
 msgid "Copy selected tasks to the clipboard"
 msgstr "選択したタスクをクリップボードにコピーします"
 
-#: ../calendar/gui/e-task-table.c:1052
+#: ../calendar/gui/e-task-table.c:1051
 msgid "Paste tasks from the clipboard"
 msgstr "クリップボードからタスクを貼り付けます"
 
-#: ../calendar/gui/e-task-table.c:1058
-#: ../modules/calendar/e-task-shell-view-actions.c:713
+#: ../calendar/gui/e-task-table.c:1057
+#: ../modules/calendar/e-task-shell-view-actions.c:712
 msgid "Delete selected tasks"
 msgstr "選択したタスクを削除します"
 
-#: ../calendar/gui/e-task-table.c:1064
+#: ../calendar/gui/e-task-table.c:1063
 msgid "Select all visible tasks"
 msgstr "すべての表示されているタスクを選択します"
 
-#: ../calendar/gui/e-timezone-entry.c:335
+#: ../calendar/gui/e-timezone-entry.c:334
 msgid "Select Timezone"
 msgstr "タイムゾーンの選択"
 
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:227 ../calendar/gui/print.c:2072
+#: ../calendar/gui/e-week-view-main-item.c:226 ../calendar/gui/print.c:2068
 msgid "%d %B"
 msgstr "%B%e日"
 
-#: ../calendar/gui/gnome-cal.c:2369
+#: ../calendar/gui/gnome-cal.c:2371
 msgid "Purging"
 msgstr "抹消中"
 
-#: ../calendar/gui/itip-utils.c:646 ../calendar/gui/itip-utils.c:704
-#: ../calendar/gui/itip-utils.c:838
+#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:707
+#: ../calendar/gui/itip-utils.c:841
 msgid "An organizer must be set."
 msgstr "主催者をセットしてください"
 
-#: ../calendar/gui/itip-utils.c:695
+#: ../calendar/gui/itip-utils.c:698
 msgid "At least one attendee is necessary"
 msgstr "最低一名の出席者が必要です"
 
-#: ../calendar/gui/itip-utils.c:926 ../calendar/gui/itip-utils.c:1087
+#: ../calendar/gui/itip-utils.c:929 ../calendar/gui/itip-utils.c:1090
 msgid "Event information"
 msgstr "イベントの情報"
 
-#: ../calendar/gui/itip-utils.c:929 ../calendar/gui/itip-utils.c:1090
+#: ../calendar/gui/itip-utils.c:932 ../calendar/gui/itip-utils.c:1093
 msgid "Task information"
 msgstr "タスクの情報"
 
-#: ../calendar/gui/itip-utils.c:932 ../calendar/gui/itip-utils.c:1093
+#: ../calendar/gui/itip-utils.c:935 ../calendar/gui/itip-utils.c:1096
 msgid "Memo information"
 msgstr "メモの情報"
 
-#: ../calendar/gui/itip-utils.c:935 ../calendar/gui/itip-utils.c:1111
+#: ../calendar/gui/itip-utils.c:938 ../calendar/gui/itip-utils.c:1114
 msgid "Free/Busy information"
 msgstr "スケジュールの情報"
 
-#: ../calendar/gui/itip-utils.c:938
+#: ../calendar/gui/itip-utils.c:941
 msgid "Calendar information"
 msgstr "カレンダーの情報"
 
@@ -4299,7 +4626,7 @@ msgstr "カレンダーの情報"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:975
+#: ../calendar/gui/itip-utils.c:978
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "受諾済"
@@ -4308,7 +4635,7 @@ msgstr "受諾済"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:982
+#: ../calendar/gui/itip-utils.c:985
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "(仮)受諾済"
@@ -4320,7 +4647,7 @@ msgstr "(仮)受諾済"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:989 ../calendar/gui/itip-utils.c:1037
+#: ../calendar/gui/itip-utils.c:992 ../calendar/gui/itip-utils.c:1040
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "辞退済"
@@ -4329,7 +4656,7 @@ msgstr "辞退済"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:996
+#: ../calendar/gui/itip-utils.c:999
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "委任済"
@@ -4337,7 +4664,7 @@ msgstr "委任済"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1009
+#: ../calendar/gui/itip-utils.c:1012
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "更新済"
@@ -4345,7 +4672,7 @@ msgstr "更新済"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1016
+#: ../calendar/gui/itip-utils.c:1019
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "キャンセル"
@@ -4353,7 +4680,7 @@ msgstr "キャンセル"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1023
+#: ../calendar/gui/itip-utils.c:1026
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "更新"
@@ -4361,154 +4688,154 @@ msgstr "更新"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1030
+#: ../calendar/gui/itip-utils.c:1033
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "反対案"
 
-#: ../calendar/gui/itip-utils.c:1108
+#: ../calendar/gui/itip-utils.c:1111
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "スケジュールの情報 (%s から %s)"
 
-#: ../calendar/gui/itip-utils.c:1116
+#: ../calendar/gui/itip-utils.c:1119
 msgid "iCalendar information"
 msgstr "iCalendar 情報"
 
-#: ../calendar/gui/itip-utils.c:1144
+#: ../calendar/gui/itip-utils.c:1147
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "リソースを予約できません。新しいイベントが他のとかちあってます。"
 
-#: ../calendar/gui/itip-utils.c:1152
+#: ../calendar/gui/itip-utils.c:1155
 #, c-format
 msgid "Unable to book a resource, error: %s"
 msgstr "リソースを予約できません。エラー: %s"
 
-#: ../calendar/gui/itip-utils.c:1324
+#: ../calendar/gui/itip-utils.c:1327
 msgid "You must be an attendee of the event."
 msgstr "イベントに出席しなければなりません。"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:660
 msgid "1st"
 msgstr "1日"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:660
 msgid "2nd"
 msgstr "2日"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:660
 msgid "3rd"
 msgstr "3日"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:660
 msgid "4th"
 msgstr "4日"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:660
 msgid "5th"
 msgstr "5日"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:661
 msgid "6th"
 msgstr "6日"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:661
 msgid "7th"
 msgstr "7日"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:661
 msgid "8th"
 msgstr "8日"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:661
 msgid "9th"
 msgstr "9日"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:661
 msgid "10th"
 msgstr "10日"
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:662
 msgid "11th"
 msgstr "11日"
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:662
 msgid "12th"
 msgstr "12日"
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:662
 msgid "13th"
 msgstr "13日"
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:662
 msgid "14th"
 msgstr "14日"
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:662
 msgid "15th"
 msgstr "15日"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "16th"
 msgstr "16日"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "17th"
 msgstr "17日"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "18th"
 msgstr "18日"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "19th"
 msgstr "19日"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "20th"
 msgstr "20日"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "21st"
 msgstr "21日"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "22nd"
 msgstr "22日"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "23rd"
 msgstr "23日"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "24th"
 msgstr "24日"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "25th"
 msgstr "25日"
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "26th"
 msgstr "26日"
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "27th"
 msgstr "27日"
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "28th"
 msgstr "28日"
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "29th"
 msgstr "29日"
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "30th"
 msgstr "30日"
 
-#: ../calendar/gui/print.c:667
+#: ../calendar/gui/print.c:666
 msgid "31st"
 msgstr "31日"
 
@@ -4516,102 +4843,102 @@ msgstr "31日"
 #. * e.g. Su=Sunday and Th=thursday
 #. G_DATE_BAD_WEEKDAY
 #. G_DATE_MONDAY
-#: ../calendar/gui/print.c:727
+#: ../calendar/gui/print.c:726
 msgid "Mo"
 msgstr "月"
 
 #. G_DATE_TUESDAY
-#: ../calendar/gui/print.c:728
+#: ../calendar/gui/print.c:727
 msgid "Tu"
 msgstr "火"
 
 #. G_DATE_WEDNESDAY
-#: ../calendar/gui/print.c:729
+#: ../calendar/gui/print.c:728
 msgid "We"
 msgstr "水"
 
 #. G_DATE_THURSDAY
-#: ../calendar/gui/print.c:730
+#: ../calendar/gui/print.c:729
 msgid "Th"
 msgstr "木"
 
 #. G_DATE_FRIDAY
-#: ../calendar/gui/print.c:731
+#: ../calendar/gui/print.c:730
 msgid "Fr"
 msgstr "金"
 
 #. G_DATE_SATURDAY
-#: ../calendar/gui/print.c:732
+#: ../calendar/gui/print.c:731
 msgid "Sa"
 msgstr "土"
 
 #. G_DATE_SUNDAY
-#: ../calendar/gui/print.c:733
+#: ../calendar/gui/print.c:732
 msgid "Su"
 msgstr "日"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3328
+#: ../calendar/gui/print.c:3319
 msgid " to "
 msgstr " から "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3338
+#: ../calendar/gui/print.c:3329
 msgid " (Completed "
 msgstr " (完了 "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3344
+#: ../calendar/gui/print.c:3335
 msgid "Completed "
 msgstr "完了しました "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3354
+#: ../calendar/gui/print.c:3345
 msgid " (Due "
 msgstr " (期日 "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3361
+#: ../calendar/gui/print.c:3352
 msgid "Due "
 msgstr "期日 "
 
-#: ../calendar/gui/print.c:3564
+#: ../calendar/gui/print.c:3555
 msgid "Attendees: "
 msgstr "出席者: "
 
-#: ../calendar/gui/print.c:3608
+#: ../calendar/gui/print.c:3599
 #, c-format
 msgid "Status: %s"
 msgstr "状態: %s"
 
-#: ../calendar/gui/print.c:3624
+#: ../calendar/gui/print.c:3615
 #, c-format
 msgid "Priority: %s"
 msgstr "優先度: %s"
 
-#: ../calendar/gui/print.c:3642
+#: ../calendar/gui/print.c:3633
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "達成率: %i"
 
-#: ../calendar/gui/print.c:3656
+#: ../calendar/gui/print.c:3647
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3670
+#: ../calendar/gui/print.c:3661
 #, c-format
 msgid "Categories: %s"
 msgstr "カテゴリ: %s"
 
-#: ../calendar/gui/print.c:3681
+#: ../calendar/gui/print.c:3672
 msgid "Contacts: "
 msgstr "連絡先: "
 
@@ -4624,207 +4951,206 @@ msgstr "進行中である"
 msgid "% Completed"
 msgstr "進捗率"
 
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:38
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:69
 msgid "is greater than"
 msgstr "が次より大きい"
 
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:39
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:70
 msgid "is less than"
 msgstr "が次より小さい"
 
-#: ../calendar/importers/icalendar-importer.c:78
+#: ../calendar/importers/icalendar-importer.c:77
 msgid "Appointments and Meetings"
 msgstr "予定と会議"
 
-#: ../calendar/importers/icalendar-importer.c:462
-#: ../calendar/importers/icalendar-importer.c:901
+#: ../calendar/importers/icalendar-importer.c:461
+#: ../calendar/importers/icalendar-importer.c:900
 msgid "Opening calendar"
 msgstr "カレンダーを開く"
 
-#: ../calendar/importers/icalendar-importer.c:610
+#: ../calendar/importers/icalendar-importer.c:609
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar ファイル (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:611
+#: ../calendar/importers/icalendar-importer.c:610
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar インポーター"
 
-#: ../calendar/importers/icalendar-importer.c:703
+#: ../calendar/importers/icalendar-importer.c:702
 msgid "Reminder!"
 msgstr "リマインダーです!"
 
-#: ../calendar/importers/icalendar-importer.c:787
+#: ../calendar/importers/icalendar-importer.c:786
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar ファイル (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:788
+#: ../calendar/importers/icalendar-importer.c:787
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar インポーター"
 
-#: ../calendar/importers/icalendar-importer.c:1071
+#: ../calendar/importers/icalendar-importer.c:1064
 msgid "Calendar Events"
 msgstr "カレンダーのイベント"
 
-#: ../calendar/importers/icalendar-importer.c:1115
+#: ../calendar/importers/icalendar-importer.c:1108
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution カレンダーの高度なインポート用ツール"
 
-#: ../calendar/importers/icalendar-importer.c:1186
-#: ../calendar/importers/icalendar-importer.c:1500
+#: ../calendar/importers/icalendar-importer.c:1179
+#: ../calendar/importers/icalendar-importer.c:1493
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "会議"
 
-#: ../calendar/importers/icalendar-importer.c:1186
-#: ../calendar/importers/icalendar-importer.c:1500
+#: ../calendar/importers/icalendar-importer.c:1179
+#: ../calendar/importers/icalendar-importer.c:1493
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "イベント"
 
-#: ../calendar/importers/icalendar-importer.c:1189
-#: ../calendar/importers/icalendar-importer.c:1501
+#: ../calendar/importers/icalendar-importer.c:1182
+#: ../calendar/importers/icalendar-importer.c:1494
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "タスク"
 
-#: ../calendar/importers/icalendar-importer.c:1192
-#: ../calendar/importers/icalendar-importer.c:1502
+#: ../calendar/importers/icalendar-importer.c:1185
+#: ../calendar/importers/icalendar-importer.c:1495
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "メモ"
 
-#: ../calendar/importers/icalendar-importer.c:1201
+#: ../calendar/importers/icalendar-importer.c:1194
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "繰り返しあり"
 
-#: ../calendar/importers/icalendar-importer.c:1206
+#: ../calendar/importers/icalendar-importer.c:1199
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "繰り返しのインスタンス"
 
-#: ../calendar/importers/icalendar-importer.c:1211
+#: ../calendar/importers/icalendar-importer.c:1204
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "リマインダーあり"
 
-#: ../calendar/importers/icalendar-importer.c:1216
+#: ../calendar/importers/icalendar-importer.c:1209
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "添付ファイルあり"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1229
+#: ../calendar/importers/icalendar-importer.c:1222
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "公開"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1232
+#: ../calendar/importers/icalendar-importer.c:1225
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "非公開"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1235
+#: ../calendar/importers/icalendar-importer.c:1228
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "極秘"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1239
+#: ../calendar/importers/icalendar-importer.c:1232
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "区分"
 
 #. Translators: Appointment's summary
-#: ../calendar/importers/icalendar-importer.c:1244
-#: ../calendar/importers/icalendar-importer.c:1544
+#: ../calendar/importers/icalendar-importer.c:1237
+#: ../calendar/importers/icalendar-importer.c:1537
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "サマリ"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1250
+#: ../calendar/importers/icalendar-importer.c:1243
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "場所"
 
 #. Translators: Appointment's start time
-#: ../calendar/importers/icalendar-importer.c:1258
-#: ../calendar/importers/icalendar-importer.c:1539
+#: ../calendar/importers/icalendar-importer.c:1251
+#: ../calendar/importers/icalendar-importer.c:1532
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "開始"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1269
+#: ../calendar/importers/icalendar-importer.c:1262
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "期日"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1281
+#: ../calendar/importers/icalendar-importer.c:1274
 msgctxt "iCalImp"
 msgid "End"
 msgstr "終了"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1291
+#: ../calendar/importers/icalendar-importer.c:1284
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "カテゴリ"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1315
+#: ../calendar/importers/icalendar-importer.c:1308
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "完了"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1323
+#: ../calendar/importers/icalendar-importer.c:1316
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1334
-#: ../calendar/importers/icalendar-importer.c:1337
+#: ../calendar/importers/icalendar-importer.c:1327
+#: ../calendar/importers/icalendar-importer.c:1330
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "主催者"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1357
-#: ../calendar/importers/icalendar-importer.c:1360
+#: ../calendar/importers/icalendar-importer.c:1350
+#: ../calendar/importers/icalendar-importer.c:1353
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "出席者"
 
-#: ../calendar/importers/icalendar-importer.c:1374
+#: ../calendar/importers/icalendar-importer.c:1367
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "説明"
 
-#: ../calendar/importers/icalendar-importer.c:1534
+#: ../calendar/importers/icalendar-importer.c:1527
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "種類"
 
 #.
 #. *
-#. * This program is free software; you can redistribute it and/or
-#. * modify it under the terms of the GNU Lesser General Public
-#. * License as published by the Free Software Foundation; either
-#. * version 2 of the License, or (at your option) version 3.
+#. * This program is free software; you can redistribute it and/or modify it
+#. * under the terms of the GNU Lesser General Public License as published by
+#. * the Free Software Foundation.
 #. *
-#. * This program is distributed in the hope that it will be useful,
-#. * but WITHOUT ANY WARRANTY; without even the implied warranty of
-#. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#. * Lesser General Public License for more details.
+#. * This program is distributed in the hope that it will be useful, but
+#. * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+#. * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#. * for more details.
 #. *
-#. * You should have received a copy of the GNU Lesser General Public
-#. * License along with the program; if not, see <http://www.gnu.org/licenses/>
+#. * You should have received a copy of the GNU Lesser General Public License
+#. * along with this program; if not, see <http://www.gnu.org/licenses/>.
 #. *
 #. *
 #. * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
@@ -4835,1752 +5161,1749 @@ msgstr "種類"
 #. * We only place them here so gettext picks them up for translation.
 #. * Don't include in any C files.
 #.
-#: ../calendar/zones.h:26
+#: ../calendar/zones.h:25
 msgid "Africa/Abidjan"
 msgstr "アフリカ/アビジャン"
 
-#: ../calendar/zones.h:27
+#: ../calendar/zones.h:26
 msgid "Africa/Accra"
 msgstr "アフリカ/アッカ"
 
-#: ../calendar/zones.h:28
+#: ../calendar/zones.h:27
 msgid "Africa/Addis_Ababa"
 msgstr "アフリカ/アジスアベバ"
 
-#: ../calendar/zones.h:29
+#: ../calendar/zones.h:28
 msgid "Africa/Algiers"
 msgstr "アフリカ/アルジェリア"
 
-#: ../calendar/zones.h:30
+#: ../calendar/zones.h:29
 msgid "Africa/Asmera"
 msgstr "アフリカ/アスメラ"
 
-#: ../calendar/zones.h:31
+#: ../calendar/zones.h:30
 msgid "Africa/Bamako"
 msgstr "アフリカ/バマコ"
 
-#: ../calendar/zones.h:32
+#: ../calendar/zones.h:31
 msgid "Africa/Bangui"
 msgstr "アフリカ/バングイ"
 
-#: ../calendar/zones.h:33
+#: ../calendar/zones.h:32
 msgid "Africa/Banjul"
 msgstr "アフリカ/バンジュル"
 
-#: ../calendar/zones.h:34
+#: ../calendar/zones.h:33
 msgid "Africa/Bissau"
 msgstr "アフリカ/ビサウ"
 
-#: ../calendar/zones.h:35
+#: ../calendar/zones.h:34
 msgid "Africa/Blantyre"
 msgstr "アフリカ/ブランティール"
 
-#: ../calendar/zones.h:36
+#: ../calendar/zones.h:35
 msgid "Africa/Brazzaville"
 msgstr "アフリカ/ブラッザビル"
 
-#: ../calendar/zones.h:37
+#: ../calendar/zones.h:36
 msgid "Africa/Bujumbura"
 msgstr "アフリカ/ブジュンブラ"
 
-#: ../calendar/zones.h:38
+#: ../calendar/zones.h:37
 msgid "Africa/Cairo"
 msgstr "アフリカ/カイロ"
 
-#: ../calendar/zones.h:39
+#: ../calendar/zones.h:38
 msgid "Africa/Casablanca"
 msgstr "アフリカ/カサブランカ"
 
-#: ../calendar/zones.h:40
+#: ../calendar/zones.h:39
 msgid "Africa/Ceuta"
 msgstr "アフリカ/セウタ"
 
-#: ../calendar/zones.h:41
+#: ../calendar/zones.h:40
 msgid "Africa/Conakry"
 msgstr "アフリカ/コナクリ"
 
-#: ../calendar/zones.h:42
+#: ../calendar/zones.h:41
 msgid "Africa/Dakar"
 msgstr "アフリカ/ダカール"
 
-#: ../calendar/zones.h:43
+#: ../calendar/zones.h:42
 msgid "Africa/Dar_es_Salaam"
 msgstr "アフリカ/ダッサラーム"
 
-#: ../calendar/zones.h:44
+#: ../calendar/zones.h:43
 msgid "Africa/Djibouti"
 msgstr "アフリカ/ジブチ"
 
-#: ../calendar/zones.h:45
+#: ../calendar/zones.h:44
 msgid "Africa/Douala"
 msgstr "アフリカ/ドゥアーラ"
 
-#: ../calendar/zones.h:46
+#: ../calendar/zones.h:45
 msgid "Africa/El_Aaiun"
 msgstr "アフリカ/アイウン"
 
-#: ../calendar/zones.h:47
+#: ../calendar/zones.h:46
 msgid "Africa/Freetown"
 msgstr "アフリカ/フリータウン"
 
-#: ../calendar/zones.h:48
+#: ../calendar/zones.h:47
 msgid "Africa/Gaborone"
 msgstr "アフリカ/ガボローネ"
 
-#: ../calendar/zones.h:49
+#: ../calendar/zones.h:48
 msgid "Africa/Harare"
 msgstr "アフリカ/ハラレ"
 
-#: ../calendar/zones.h:50
+#: ../calendar/zones.h:49
 msgid "Africa/Johannesburg"
 msgstr "アフリカ/ヨハネスブルグ"
 
-#: ../calendar/zones.h:51
+#: ../calendar/zones.h:50
 msgid "Africa/Kampala"
 msgstr "アフリカ/カンパラ"
 
-#: ../calendar/zones.h:52
+#: ../calendar/zones.h:51
 msgid "Africa/Khartoum"
 msgstr "アフリカ/ハルツーム"
 
-#: ../calendar/zones.h:53
+#: ../calendar/zones.h:52
 msgid "Africa/Kigali"
 msgstr "アフリカ/キガリ"
 
-#: ../calendar/zones.h:54
+#: ../calendar/zones.h:53
 msgid "Africa/Kinshasa"
 msgstr "アフリカ/キンシャサ"
 
-#: ../calendar/zones.h:55
+#: ../calendar/zones.h:54
 msgid "Africa/Lagos"
 msgstr "アフリカ/ラゴス"
 
-#: ../calendar/zones.h:56
+#: ../calendar/zones.h:55
 msgid "Africa/Libreville"
 msgstr "アフリカ/リーブルヴィル"
 
-#: ../calendar/zones.h:57
+#: ../calendar/zones.h:56
 msgid "Africa/Lome"
 msgstr "アフリカ/ロメ"
 
-#: ../calendar/zones.h:58
+#: ../calendar/zones.h:57
 msgid "Africa/Luanda"
 msgstr "アフリカ/ルアンダ"
 
-#: ../calendar/zones.h:59
+#: ../calendar/zones.h:58
 msgid "Africa/Lubumbashi"
 msgstr "アフリカ/ルブンバシ"
 
-#: ../calendar/zones.h:60
+#: ../calendar/zones.h:59
 msgid "Africa/Lusaka"
 msgstr "アフリカ/ルサカ"
 
-#: ../calendar/zones.h:61
+#: ../calendar/zones.h:60
 msgid "Africa/Malabo"
 msgstr "アフリカ/マラボ"
 
-#: ../calendar/zones.h:62
+#: ../calendar/zones.h:61
 msgid "Africa/Maputo"
 msgstr "アフリカ/マプト"
 
-#: ../calendar/zones.h:63
+#: ../calendar/zones.h:62
 msgid "Africa/Maseru"
 msgstr "アフリカ/マセル"
 
-#: ../calendar/zones.h:64
+#: ../calendar/zones.h:63
 msgid "Africa/Mbabane"
 msgstr "アフリカ/ムババネ"
 
-#: ../calendar/zones.h:65
+#: ../calendar/zones.h:64
 msgid "Africa/Mogadishu"
 msgstr "アフリカ/モガディシュ"
 
-#: ../calendar/zones.h:66
+#: ../calendar/zones.h:65
 msgid "Africa/Monrovia"
 msgstr "アフリカ/モンロビア"
 
-#: ../calendar/zones.h:67
+#: ../calendar/zones.h:66
 msgid "Africa/Nairobi"
 msgstr "アフリカ/ナイロビ"
 
-#: ../calendar/zones.h:68
+#: ../calendar/zones.h:67
 msgid "Africa/Ndjamena"
 msgstr "アフリカ/ウンジャメナ"
 
-#: ../calendar/zones.h:69
+#: ../calendar/zones.h:68
 msgid "Africa/Niamey"
 msgstr "アフリカ/ニアメ"
 
-#: ../calendar/zones.h:70
+#: ../calendar/zones.h:69
 msgid "Africa/Nouakchott"
 msgstr "アフリカ/ヌアクショット"
 
-#: ../calendar/zones.h:71
+#: ../calendar/zones.h:70
 msgid "Africa/Ouagadougou"
 msgstr "アフリカ/ワガドゥグー"
 
-#: ../calendar/zones.h:72
+#: ../calendar/zones.h:71
 msgid "Africa/Porto-Novo"
 msgstr "アフリカ/ポルトノボ"
 
-#: ../calendar/zones.h:73
+#: ../calendar/zones.h:72
 msgid "Africa/Sao_Tome"
 msgstr "アフリカ/サントメ"
 
-#: ../calendar/zones.h:74
+#: ../calendar/zones.h:73
 msgid "Africa/Timbuktu"
 msgstr "アフリカ/ティンブクトゥ"
 
-#: ../calendar/zones.h:75
+#: ../calendar/zones.h:74
 msgid "Africa/Tripoli"
 msgstr "アフリカ/トリポリ"
 
-#: ../calendar/zones.h:76
+#: ../calendar/zones.h:75
 msgid "Africa/Tunis"
 msgstr "アフリカ/チュニス"
 
-#: ../calendar/zones.h:77
+#: ../calendar/zones.h:76
 msgid "Africa/Windhoek"
 msgstr "アフリカ/ヴィントホーク"
 
-#: ../calendar/zones.h:78
+#: ../calendar/zones.h:77
 msgid "America/Adak"
 msgstr "アメリカ/エイダック"
 
-#: ../calendar/zones.h:79
+#: ../calendar/zones.h:78
 msgid "America/Anchorage"
 msgstr "アメリカ/アンカーレッジ"
 
-#: ../calendar/zones.h:80
+#: ../calendar/zones.h:79
 msgid "America/Anguilla"
 msgstr "アメリカ/アングイラ"
 
-#: ../calendar/zones.h:81
+#: ../calendar/zones.h:80
 msgid "America/Antigua"
 msgstr "アメリカ/アンチグア"
 
-#: ../calendar/zones.h:82
+#: ../calendar/zones.h:81
 msgid "America/Araguaina"
 msgstr "アメリカ/アラグアイナ"
 
-#: ../calendar/zones.h:83
+#: ../calendar/zones.h:82
 msgid "America/Aruba"
 msgstr "アメリカ/アルバ"
 
-#: ../calendar/zones.h:84
+#: ../calendar/zones.h:83
 msgid "America/Asuncion"
 msgstr "アメリカ/アスンシオン"
 
-#: ../calendar/zones.h:85
+#: ../calendar/zones.h:84
 msgid "America/Barbados"
 msgstr "アメリカ/バルバドス"
 
-#: ../calendar/zones.h:86
+#: ../calendar/zones.h:85
 msgid "America/Belem"
 msgstr "アメリカ/ベレン"
 
-#: ../calendar/zones.h:87
+#: ../calendar/zones.h:86
 msgid "America/Belize"
 msgstr "アメリカ/ベリーズ"
 
-#: ../calendar/zones.h:88
+#: ../calendar/zones.h:87
 msgid "America/Boa_Vista"
 msgstr "アメリカ/ボアビスタ"
 
-#: ../calendar/zones.h:89
+#: ../calendar/zones.h:88
 msgid "America/Bogota"
 msgstr "アメリカ/ボゴタ"
 
-#: ../calendar/zones.h:90
+#: ../calendar/zones.h:89
 msgid "America/Boise"
 msgstr "アメリカ/ボイシ"
 
-#: ../calendar/zones.h:91
+#: ../calendar/zones.h:90
 msgid "America/Buenos_Aires"
 msgstr "アメリカ/ブイノスアイレス"
 
-#: ../calendar/zones.h:92
+#: ../calendar/zones.h:91
 msgid "America/Cambridge_Bay"
 msgstr "アメリカ/キャンブリッジベイ"
 
-#: ../calendar/zones.h:93
+#: ../calendar/zones.h:92
 msgid "America/Cancun"
 msgstr "アメリカ/カンクン"
 
-#: ../calendar/zones.h:94
+#: ../calendar/zones.h:93
 msgid "America/Caracas"
 msgstr "アメリカ/カラッカス"
 
-#: ../calendar/zones.h:95
+#: ../calendar/zones.h:94
 msgid "America/Catamarca"
 msgstr "アメリカ/カタマルカ"
 
-#: ../calendar/zones.h:96
+#: ../calendar/zones.h:95
 msgid "America/Cayenne"
 msgstr "アメリカ/カイエンヌ"
 
-#: ../calendar/zones.h:97
+#: ../calendar/zones.h:96
 msgid "America/Cayman"
 msgstr "アメリカ/カイマン"
 
-#: ../calendar/zones.h:98
+#: ../calendar/zones.h:97
 msgid "America/Chicago"
 msgstr "アメリカ/シカゴ"
 
-#: ../calendar/zones.h:99
+#: ../calendar/zones.h:98
 msgid "America/Chihuahua"
 msgstr "アメリカ/チワワ"
 
-#: ../calendar/zones.h:100
+#: ../calendar/zones.h:99
 msgid "America/Cordoba"
 msgstr "アメリカ/コルドバ"
 
-#: ../calendar/zones.h:101
+#: ../calendar/zones.h:100
 msgid "America/Costa_Rica"
 msgstr "アメリカ/コスタリカ"
 
-#: ../calendar/zones.h:102
+#: ../calendar/zones.h:101
 msgid "America/Cuiaba"
 msgstr "アメリカ/クイアバ"
 
-#: ../calendar/zones.h:103
+#: ../calendar/zones.h:102
 msgid "America/Curacao"
 msgstr "アメリカ/キュラーソ"
 
-#: ../calendar/zones.h:104
+#: ../calendar/zones.h:103
 msgid "America/Danmarkshavn"
 msgstr "アメリカ/Danmarkshavn"
 
-#: ../calendar/zones.h:105
+#: ../calendar/zones.h:104
 msgid "America/Dawson"
 msgstr "アメリカ/ドースン"
 
-#: ../calendar/zones.h:106
+#: ../calendar/zones.h:105
 msgid "America/Dawson_Creek"
 msgstr "アメリカ/ドースンクリーク"
 
-#: ../calendar/zones.h:107
+#: ../calendar/zones.h:106
 msgid "America/Denver"
 msgstr "アメリカ/デンバー"
 
-#: ../calendar/zones.h:108
+#: ../calendar/zones.h:107
 msgid "America/Detroit"
 msgstr "アメリカ/デトロイト"
 
-#: ../calendar/zones.h:109
+#: ../calendar/zones.h:108
 msgid "America/Dominica"
 msgstr "アメリカ/ドミニカ"
 
-#: ../calendar/zones.h:110
+#: ../calendar/zones.h:109
 msgid "America/Edmonton"
 msgstr "アメリカ/エドモートン"
 
-#: ../calendar/zones.h:111
+#: ../calendar/zones.h:110
 msgid "America/Eirunepe"
 msgstr "アメリカ/エイルネペ"
 
-#: ../calendar/zones.h:112
+#: ../calendar/zones.h:111
 msgid "America/El_Salvador"
 msgstr "アメリカ/エルサルバドル"
 
-#: ../calendar/zones.h:113
+#: ../calendar/zones.h:112
 msgid "America/Fortaleza"
 msgstr "アメリカ/フォルタレザ"
 
-#: ../calendar/zones.h:114
+#: ../calendar/zones.h:113
 msgid "America/Glace_Bay"
 msgstr "アメリカ/グレースベイ"
 
-#: ../calendar/zones.h:115
+#: ../calendar/zones.h:114
 msgid "America/Godthab"
 msgstr "アメリカ/ゴッドホーブ"
 
-#: ../calendar/zones.h:116
+#: ../calendar/zones.h:115
 msgid "America/Goose_Bay"
 msgstr "アメリカ/グースベイ"
 
-#: ../calendar/zones.h:117
+#: ../calendar/zones.h:116
 msgid "America/Grand_Turk"
 msgstr "アメリカ/グランドターク"
 
-#: ../calendar/zones.h:118
+#: ../calendar/zones.h:117
 msgid "America/Grenada"
 msgstr "アメリカ/グレナダ"
 
-#: ../calendar/zones.h:119
+#: ../calendar/zones.h:118
 msgid "America/Guadeloupe"
 msgstr "アメリカ/グアドループ"
 
-#: ../calendar/zones.h:120
+#: ../calendar/zones.h:119
 msgid "America/Guatemala"
 msgstr "アメリカ/グアテマラ"
 
-#: ../calendar/zones.h:121
+#: ../calendar/zones.h:120
 msgid "America/Guayaquil"
 msgstr "アメリカ/グアヤキル"
 
-#: ../calendar/zones.h:122
+#: ../calendar/zones.h:121
 msgid "America/Guyana"
 msgstr "アメリカ/ガイアナ"
 
-#: ../calendar/zones.h:123
+#: ../calendar/zones.h:122
 msgid "America/Halifax"
 msgstr "アメリカ/ハリファックス"
 
-#: ../calendar/zones.h:124
+#: ../calendar/zones.h:123
 msgid "America/Havana"
 msgstr "アメリカ/ハバナ"
 
-#: ../calendar/zones.h:125
+#: ../calendar/zones.h:124
 msgid "America/Hermosillo"
 msgstr "アメリカ/エルモシージョ"
 
-#: ../calendar/zones.h:126
+#: ../calendar/zones.h:125
 msgid "America/Indiana/Indianapolis"
 msgstr "アメリカ/インディアナ/インディアナポリス"
 
-#: ../calendar/zones.h:127
+#: ../calendar/zones.h:126
 msgid "America/Indiana/Knox"
 msgstr "アメリカ/インディアナ/ノックス"
 
-#: ../calendar/zones.h:128
+#: ../calendar/zones.h:127
 msgid "America/Indiana/Marengo"
 msgstr "アメリカ/インディアナ/マレンゴ"
 
 # Hermosillo
-#: ../calendar/zones.h:129
+#: ../calendar/zones.h:128
 msgid "America/Indiana/Vevay"
 msgstr "アメリカ/インディアナ/Vevay"
 
-#: ../calendar/zones.h:130
+#: ../calendar/zones.h:129
 msgid "America/Indianapolis"
 msgstr "アメリカ/インディアナポリス"
 
-#: ../calendar/zones.h:131
+#: ../calendar/zones.h:130
 msgid "America/Inuvik"
 msgstr "アメリカ/Inuvik"
 
-#: ../calendar/zones.h:132
+#: ../calendar/zones.h:131
 msgid "America/Iqaluit"
 msgstr "アメリカ/Iqaluit"
 
-#: ../calendar/zones.h:133
+#: ../calendar/zones.h:132
 msgid "America/Jamaica"
 msgstr "アメリカ/ジャマイカ"
 
-#: ../calendar/zones.h:134
+#: ../calendar/zones.h:133
 msgid "America/Jujuy"
 msgstr "アメリカ/フフイ"
 
-#: ../calendar/zones.h:135
+#: ../calendar/zones.h:134
 msgid "America/Juneau"
 msgstr "アメリカ/ジュノー"
 
-#: ../calendar/zones.h:136
+#: ../calendar/zones.h:135
 msgid "America/Kentucky/Louisville"
 msgstr "アメリカ/ケンタッキー/ルイスビル"
 
-#: ../calendar/zones.h:137
+#: ../calendar/zones.h:136
 msgid "America/Kentucky/Monticello"
 msgstr "アメリカ/ケンタッキー/モンティセロ"
 
-#: ../calendar/zones.h:138
+#: ../calendar/zones.h:137
 msgid "America/La_Paz"
 msgstr "アメリカ/ラパス"
 
-#: ../calendar/zones.h:139
+#: ../calendar/zones.h:138
 msgid "America/Lima"
 msgstr "アメリカ/リマ"
 
-#: ../calendar/zones.h:140
+#: ../calendar/zones.h:139
 msgid "America/Los_Angeles"
 msgstr "アメリカ/ロサンジェルス"
 
-#: ../calendar/zones.h:141
+#: ../calendar/zones.h:140
 msgid "America/Louisville"
 msgstr "アメリカ/ルイスビル"
 
-#: ../calendar/zones.h:142
+#: ../calendar/zones.h:141
 msgid "America/Maceio"
 msgstr "アメリカ/マセイオ"
 
-#: ../calendar/zones.h:143
+#: ../calendar/zones.h:142
 msgid "America/Managua"
 msgstr "アメリカ/マナグア"
 
-#: ../calendar/zones.h:144
+#: ../calendar/zones.h:143
 msgid "America/Manaus"
 msgstr "アメリカ/マナウス"
 
-#: ../calendar/zones.h:145
+#: ../calendar/zones.h:144
 msgid "America/Martinique"
 msgstr "アメリカ/マルチニーク"
 
-#: ../calendar/zones.h:146
+#: ../calendar/zones.h:145
 msgid "America/Mazatlan"
 msgstr "アメリカ/マサトラン"
 
-#: ../calendar/zones.h:147
+#: ../calendar/zones.h:146
 msgid "America/Mendoza"
 msgstr "アメリカ/メンドーサ"
 
-#: ../calendar/zones.h:148
+#: ../calendar/zones.h:147
 msgid "America/Menominee"
 msgstr "アメリカ/メノミニー"
 
-#: ../calendar/zones.h:149
+#: ../calendar/zones.h:148
 msgid "America/Merida"
 msgstr "アメリカ/メリダ"
 
-#: ../calendar/zones.h:150
+#: ../calendar/zones.h:149
 msgid "America/Mexico_City"
 msgstr "アメリカ/メキシコシティ"
 
-#: ../calendar/zones.h:151
+#: ../calendar/zones.h:150
 msgid "America/Miquelon"
 msgstr "アメリカ/ミクロン"
 
-#: ../calendar/zones.h:152
+#: ../calendar/zones.h:151
 msgid "America/Monterrey"
 msgstr "アメリカ/モンテレー"
 
-#: ../calendar/zones.h:153
+#: ../calendar/zones.h:152
 msgid "America/Montevideo"
 msgstr "アメリカ/モンテビデオ"
 
-#: ../calendar/zones.h:154
+#: ../calendar/zones.h:153
 msgid "America/Montreal"
 msgstr "アメリカ/モントリオール"
 
-#: ../calendar/zones.h:155
+#: ../calendar/zones.h:154
 msgid "America/Montserrat"
 msgstr "アメリカ/モントセラト"
 
-#: ../calendar/zones.h:156
+#: ../calendar/zones.h:155
 msgid "America/Nassau"
 msgstr "アメリカ/ナッサウ"
 
-#: ../calendar/zones.h:157
+#: ../calendar/zones.h:156
 msgid "America/New_York"
 msgstr "アメリカ/ニューヨーク"
 
-#: ../calendar/zones.h:158
+#: ../calendar/zones.h:157
 msgid "America/Nipigon"
 msgstr "アメリカ/ニピゴン"
 
-#: ../calendar/zones.h:159
+#: ../calendar/zones.h:158
 msgid "America/Nome"
 msgstr "アメリカ/ノーム"
 
-#: ../calendar/zones.h:160
+#: ../calendar/zones.h:159
 msgid "America/Noronha"
 msgstr "アメリカ/ノロニャ"
 
-#: ../calendar/zones.h:161
+#: ../calendar/zones.h:160
 msgid "America/North_Dakota/Center"
 msgstr "アメリカ/ノースダコタ/中央"
 
-#: ../calendar/zones.h:162
+#: ../calendar/zones.h:161
 msgid "America/Panama"
 msgstr "アメリカ/パナマ"
 
-#: ../calendar/zones.h:163
+#: ../calendar/zones.h:162
 msgid "America/Pangnirtung"
 msgstr "アメリカ/パンナータング"
 
-#: ../calendar/zones.h:164
+#: ../calendar/zones.h:163
 msgid "America/Paramaribo"
 msgstr "アメリカ/パラマリボ"
 
-#: ../calendar/zones.h:165
+#: ../calendar/zones.h:164
 msgid "America/Phoenix"
 msgstr "アメリカ/フェニックス"
 
-#: ../calendar/zones.h:166
+#: ../calendar/zones.h:165
 msgid "America/Port-au-Prince"
 msgstr "アメリカ/ポルトープランス"
 
-#: ../calendar/zones.h:167
+#: ../calendar/zones.h:166
 msgid "America/Port_of_Spain"
 msgstr "アメリカ/ポートオブスペイン"
 
-#: ../calendar/zones.h:168
+#: ../calendar/zones.h:167
 msgid "America/Porto_Velho"
 msgstr "アメリカ/ポルトベリョ"
 
-#: ../calendar/zones.h:169
+#: ../calendar/zones.h:168
 msgid "America/Puerto_Rico"
 msgstr "アメリカ/プエルトリコ"
 
-#: ../calendar/zones.h:170
+#: ../calendar/zones.h:169
 msgid "America/Rainy_River"
 msgstr "アメリカ/レイニーリバー"
 
-#: ../calendar/zones.h:171
+#: ../calendar/zones.h:170
 msgid "America/Rankin_Inlet"
 msgstr "アメリカ/ランキン湾"
 
-#: ../calendar/zones.h:172
+#: ../calendar/zones.h:171
 msgid "America/Recife"
 msgstr "アメリカ/レシフェ"
 
-#: ../calendar/zones.h:173
+#: ../calendar/zones.h:172
 msgid "America/Regina"
 msgstr "アメリカ/リジャイナ"
 
-#: ../calendar/zones.h:174
+#: ../calendar/zones.h:173
 msgid "America/Rio_Branco"
 msgstr "アメリカ/リオブランコ"
 
-#: ../calendar/zones.h:175
+#: ../calendar/zones.h:174
 msgid "America/Rosario"
 msgstr "アメリカ/ロザリオ"
 
-#: ../calendar/zones.h:176
+#: ../calendar/zones.h:175
 msgid "America/Santiago"
 msgstr "アメリカ/サンチアゴ"
 
-#: ../calendar/zones.h:177
+#: ../calendar/zones.h:176
 msgid "America/Santo_Domingo"
 msgstr "アメリカ/サントドミンゴ"
 
-#: ../calendar/zones.h:178
+#: ../calendar/zones.h:177
 msgid "America/Sao_Paulo"
 msgstr "アメリカ/サンパウロ"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:178
 msgid "America/Scoresbysund"
 msgstr "アメリカ/Scoresbysund"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:179
 msgid "America/Shiprock"
 msgstr "アメリカ/シップロック"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:180
 msgid "America/St_Johns"
 msgstr "アメリカ/セントジョーンズ"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:181
 msgid "America/St_Kitts"
 msgstr "アメリカ/セントキッツ"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:182
 msgid "America/St_Lucia"
 msgstr "アメリカ/セントルシア"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:183
 msgid "America/St_Thomas"
 msgstr "アメリカ/セントトーマス"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:184
 msgid "America/St_Vincent"
 msgstr "アメリカ/セントビンセント"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:185
 msgid "America/Swift_Current"
 msgstr "アメリカ/スウィフトカレント"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:186
 msgid "America/Tegucigalpa"
 msgstr "アメリカ/テグシガルパ"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:187
 msgid "America/Thule"
 msgstr "アメリカ/チューレ"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:188
 msgid "America/Thunder_Bay"
 msgstr "アメリカ/サンダーベイ"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:189
 msgid "America/Tijuana"
 msgstr "アメリカ/ティファナ"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:190
 msgid "America/Tortola"
 msgstr "アメリカ/トルトラ"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:191
 msgid "America/Vancouver"
 msgstr "アメリカ/バンクーバー"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:192
 msgid "America/Whitehorse"
 msgstr "アメリカ/ホワイトホース"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:193
 msgid "America/Winnipeg"
 msgstr "アメリカ/ウィニペグ"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:194
 msgid "America/Yakutat"
 msgstr "アメリカ/ヤクタット"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:195
 msgid "America/Yellowknife"
 msgstr "アメリカ/イエローナイフ"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:196
 msgid "Antarctica/Casey"
 msgstr "南極大陸/キャセイ"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:197
 msgid "Antarctica/Davis"
 msgstr "南極大陸/デービス"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:198
 msgid "Antarctica/DumontDUrville"
 msgstr "南極大陸/デュモンデュルヴィル"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:199
 msgid "Antarctica/Mawson"
 msgstr "南極大陸/モーソン"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:200
 msgid "Antarctica/McMurdo"
 msgstr "南極大陸/マックマード基地"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:201
 msgid "Antarctica/Palmer"
 msgstr "南極大陸/パーマー"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:202
 msgid "Antarctica/South_Pole"
 msgstr "南極大陸/南極"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:203
 msgid "Antarctica/Syowa"
 msgstr "南極大陸/昭和基地"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:204
 msgid "Antarctica/Vostok"
 msgstr "南極大陸/ボストーク"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:205
 msgid "Arctic/Longyearbyen"
 msgstr "北極/ロングイールビュアン"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:206
 msgid "Asia/Aden"
 msgstr "アジア/アデン"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:207
 msgid "Asia/Almaty"
 msgstr "アジア/アルマティ"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:208
 msgid "Asia/Amman"
 msgstr "アジア/アンマン"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:209
 msgid "Asia/Anadyr"
 msgstr "アジア/アナジル"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:210
 msgid "Asia/Aqtau"
 msgstr "アジア/アクタウ"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtobe"
 msgstr "アジア/アクトベ"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:212
 msgid "Asia/Ashgabat"
 msgstr "アジア/アシガバード"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:213
 msgid "Asia/Baghdad"
 msgstr "アジア/バグダッド"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:214
 msgid "Asia/Bahrain"
 msgstr "アジア/バーレン"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:215
 msgid "Asia/Baku"
 msgstr "アジア/バクー"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:216
 msgid "Asia/Bangkok"
 msgstr "アジア/バンコック"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:217
 msgid "Asia/Beirut"
 msgstr "アジア/ベイルート"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:218
 msgid "Asia/Bishkek"
 msgstr "アジア/ビシュケク"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:219
 msgid "Asia/Brunei"
 msgstr "アジア/ブルネイ"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:220
 msgid "Asia/Calcutta"
 msgstr "アジア/カルカッタ"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:221
 msgid "Asia/Choibalsan"
 msgstr "アジア/チョイバルサン"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:222
 msgid "Asia/Chongqing"
 msgstr "アジア/重慶"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:223
 msgid "Asia/Colombo"
 msgstr "アジア/コロンボ"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:224
 msgid "Asia/Damascus"
 msgstr "アジア/ダマスカス"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:225
 msgid "Asia/Dhaka"
 msgstr "アジア/ダッカ"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:226
 msgid "Asia/Dili"
 msgstr "アジア/ディリ"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:227
 msgid "Asia/Dubai"
 msgstr "アジア/ドバイ"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:228
 msgid "Asia/Dushanbe"
 msgstr "アジア/ドゥシャンベ"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:229
 msgid "Asia/Gaza"
 msgstr "アジア/ガザ"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:230
 msgid "Asia/Harbin"
 msgstr "アジア/ハルピン"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:231
 msgid "Asia/Hong_Kong"
 msgstr "アジア/香港"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:232
 msgid "Asia/Hovd"
 msgstr "アジア/ホブド"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:233
 msgid "Asia/Irkutsk"
 msgstr "アジア/イルクツーク"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:234
 msgid "Asia/Istanbul"
 msgstr "アジア/イスタンブール"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:235
 msgid "Asia/Jakarta"
 msgstr "アジア/ジャカルタ"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:236
 msgid "Asia/Jayapura"
 msgstr "アジア/ジャヤプラ"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:237
 msgid "Asia/Jerusalem"
 msgstr "アジア/エルサレム"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:238
 msgid "Asia/Kabul"
 msgstr "アジア/カブール"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:239
 msgid "Asia/Kamchatka"
 msgstr "アジア/カムチャッカ"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:240
 msgid "Asia/Karachi"
 msgstr "アジア/カラチ"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:241
 msgid "Asia/Kashgar"
 msgstr "アジア/カシュガル"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:242
 msgid "Asia/Katmandu"
 msgstr "アジア/カタマンダ"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:243
 msgid "Asia/Krasnoyarsk"
 msgstr "アジア/クラスノヤルスク"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:244
 msgid "Asia/Kuala_Lumpur"
 msgstr "アジア/クアラルンプール"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:245
 msgid "Asia/Kuching"
 msgstr "アジア/クチン"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:246
 msgid "Asia/Kuwait"
 msgstr "アジア/クェート"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:247
 msgid "Asia/Macao"
 msgstr "アジア/マカオ"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:248
 msgid "Asia/Macau"
 msgstr "アジア/マカウ"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:249
 msgid "Asia/Magadan"
 msgstr "アジア/マガダン"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:250
 msgid "Asia/Makassar"
 msgstr "アジア/マカザール"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:251
 msgid "Asia/Manila"
 msgstr "アジア/マニラ"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:252
 msgid "Asia/Muscat"
 msgstr "アジア/マスカット"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:253
 msgid "Asia/Nicosia"
 msgstr "アジア/ニコシア"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:254
 msgid "Asia/Novosibirsk"
 msgstr "アジア/ノヴォシビルスク"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:255
 msgid "Asia/Omsk"
 msgstr "アジア/オムスク"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:256
 msgid "Asia/Oral"
 msgstr "アジア/オラル"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:257
 msgid "Asia/Phnom_Penh"
 msgstr "アジア/プノンペン"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:258
 msgid "Asia/Pontianak"
 msgstr "アジア/ポンティアナク"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:259
 msgid "Asia/Pyongyang"
 msgstr "アジア/平壌"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:260
 msgid "Asia/Qatar"
 msgstr "アジア/カタール"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:261
 msgid "Asia/Qyzylorda"
 msgstr "アジア/キジルオルダ"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:262
 msgid "Asia/Rangoon"
 msgstr "アジア/ラングーン"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:263
 msgid "Asia/Riyadh"
 msgstr "アジア/リャド"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:264
 msgid "Asia/Saigon"
 msgstr "アジア/サイゴン"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:265
 msgid "Asia/Sakhalin"
 msgstr "アジア/サハリン"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:266
 msgid "Asia/Samarkand"
 msgstr "アジア/サマルカンド"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:267
 msgid "Asia/Seoul"
 msgstr "アジア/ソウル"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:268
 msgid "Asia/Shanghai"
 msgstr "アジア/上海"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:269
 msgid "Asia/Singapore"
 msgstr "アジア/シンガポール"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:270
 msgid "Asia/Taipei"
 msgstr "アジア/台北"
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:271
 msgid "Asia/Tashkent"
 msgstr "アジア/タシケント"
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:272
 msgid "Asia/Tbilisi"
 msgstr "アジア/トビリシ"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:273
 msgid "Asia/Tehran"
 msgstr "アジア/テヘラン"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:274
 msgid "Asia/Thimphu"
 msgstr "アジア/ティンプー"
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:275
 msgid "Asia/Tokyo"
 msgstr "アジア/東京"
 
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:276
 msgid "Asia/Ujung_Pandang"
 msgstr "アジア/ウジュンパンダン"
 
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:277
 msgid "Asia/Ulaanbaatar"
 msgstr "アジア/ウランバタール"
 
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:278
 msgid "Asia/Urumqi"
 msgstr "アジア/ウルムチ"
 
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:279
 msgid "Asia/Vientiane"
 msgstr "アジア/ビエンチャン"
 
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:280
 msgid "Asia/Vladivostok"
 msgstr "アジア/ウラジオストック"
 
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:281
 msgid "Asia/Yakutsk"
 msgstr "アジア/イヤクツーク"
 
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:282
 msgid "Asia/Yekaterinburg"
 msgstr "アジア/エカテリンブルク"
 
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:283
 msgid "Asia/Yerevan"
 msgstr "アジア/エレバン"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:284
 msgid "Atlantic/Azores"
 msgstr "大西洋/アゾーレス"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:285
 msgid "Atlantic/Bermuda"
 msgstr "大西洋/バーミューダ"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:286
 msgid "Atlantic/Canary"
 msgstr "大西洋/カナリア"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:287
 msgid "Atlantic/Cape_Verde"
 msgstr "大西洋/ケープバーデ"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:288
 msgid "Atlantic/Faeroe"
 msgstr "大西洋/フェロー"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:289
 msgid "Atlantic/Jan_Mayen"
 msgstr "大西洋/ヤンマイエン"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:290
 msgid "Atlantic/Madeira"
 msgstr "大西洋/マデイラ"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:291
 msgid "Atlantic/Reykjavik"
 msgstr "大西洋/レイキャビク"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:292
 msgid "Atlantic/South_Georgia"
 msgstr "大西洋/サウスジョージア"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:293
 msgid "Atlantic/St_Helena"
 msgstr "大西洋/セントヘレナ"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:294
 msgid "Atlantic/Stanley"
 msgstr "大西洋/スタンリー"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:295
 msgid "Australia/Adelaide"
 msgstr "オーストラリア/アデレード"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:296
 msgid "Australia/Brisbane"
 msgstr "オーストラリア/ブリスベン"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:297
 msgid "Australia/Broken_Hill"
 msgstr "オーストラリア/ブロークンヒル"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:298
 msgid "Australia/Darwin"
 msgstr "オーストラリア/ダーウィン"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:299
 msgid "Australia/Hobart"
 msgstr "オーストラリア/ホバート"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:300
 msgid "Australia/Lindeman"
 msgstr "オーストラリア/リンデマン"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:301
 msgid "Australia/Lord_Howe"
 msgstr "オーストラリア/Lord_Howe"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:302
 msgid "Australia/Melbourne"
 msgstr "オーストラリア/メルボルン"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:303
 msgid "Australia/Perth"
 msgstr "オーストラリア/パース"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:304
 msgid "Australia/Sydney"
 msgstr "オーストラリア/シドニー"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:305
 msgid "Europe/Amsterdam"
 msgstr "ヨーロッパ/アムステルダム"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:306
 msgid "Europe/Andorra"
 msgstr "ヨーロッパ/アンドラ"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:307
 msgid "Europe/Athens"
 msgstr "ヨーロッパ/アテネ"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:308
 msgid "Europe/Belfast"
 msgstr "ヨーロッパ/ベルファウスト"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:309
 msgid "Europe/Belgrade"
 msgstr "ヨーロッパ/ベルグラード"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:310
 msgid "Europe/Berlin"
 msgstr "ヨーロッパ/ベルリン"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:311
 msgid "Europe/Bratislava"
 msgstr "ヨーロッパ/ブラチスラバ"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:312
 msgid "Europe/Brussels"
 msgstr "ヨーロッパ/ブリュッセル"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:313
 msgid "Europe/Bucharest"
 msgstr "ヨーロッパ/ブカレスト"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:314
 msgid "Europe/Budapest"
 msgstr "ヨーロッパ/ブダペスト"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:315
 msgid "Europe/Chisinau"
 msgstr "ヨーロッパ/キシニョフ"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:316
 msgid "Europe/Copenhagen"
 msgstr "ヨーロッパ/コペンハーゲン"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:317
 msgid "Europe/Dublin"
 msgstr "ヨーロッパ/ダブリン"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:318
 msgid "Europe/Gibraltar"
 msgstr "ヨーロッパ/ジブラルタル"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:319
 msgid "Europe/Helsinki"
 msgstr "ヨーロッパ/ヘルシンキ"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:320
 msgid "Europe/Istanbul"
 msgstr "ヨーロッパ/イスタンブール"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:321
 msgid "Europe/Kaliningrad"
 msgstr "ヨーロッパ/カリーニングラード"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:322
 msgid "Europe/Kiev"
 msgstr "ヨーロッパ/キエフ"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:323
 msgid "Europe/Lisbon"
 msgstr "ヨーロッパ/リスボン"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:324
 msgid "Europe/Ljubljana"
 msgstr "ヨーロッパ/リュブリャナ"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:325
 msgid "Europe/London"
 msgstr "ヨーロッパ/ロンドン"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:326
 msgid "Europe/Luxembourg"
 msgstr "ヨーロッパ/ルクセンブルグ"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:327
 msgid "Europe/Madrid"
 msgstr "ヨーロッパ/マドリッド"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:328
 msgid "Europe/Malta"
 msgstr "ヨーロッパ/マルタ"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:329
 msgid "Europe/Minsk"
 msgstr "ヨーロッパ/ミンスク"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:330
 msgid "Europe/Monaco"
 msgstr "ヨーロッパ/モナコ"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:331
 msgid "Europe/Moscow"
 msgstr "ヨーロッパ/モスクワ"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:332
 msgid "Europe/Nicosia"
 msgstr "ヨーロッパ/ニコシア"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:333
 msgid "Europe/Oslo"
 msgstr "ヨーロッパ/オスロ"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:334
 msgid "Europe/Paris"
 msgstr "ヨーロッパ/パリ"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:335
 msgid "Europe/Prague"
 msgstr "ヨーロッパ/プラハ"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:336
 msgid "Europe/Riga"
 msgstr "ヨーロッパ/リガ"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:337
 msgid "Europe/Rome"
 msgstr "ヨーロッパ/ローマ"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:338
 msgid "Europe/Samara"
 msgstr "ヨーロッパ/サマラ"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:339
 msgid "Europe/San_Marino"
 msgstr "ヨーロッパ/サンマリノ"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:340
 msgid "Europe/Sarajevo"
 msgstr "ヨーロッパ/サラエボ"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:341
 msgid "Europe/Simferopol"
 msgstr "ヨーロッパ/シンフェローポリ"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:342
 msgid "Europe/Skopje"
 msgstr "ヨーロッパ/Skopje"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:343
 msgid "Europe/Sofia"
 msgstr "ヨーロッパ/ソフィア"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:344
 msgid "Europe/Stockholm"
 msgstr "ヨーロッパ/ストックホルム"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:345
 msgid "Europe/Tallinn"
 msgstr "ヨーロッパ/タリン"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:346
 msgid "Europe/Tirane"
 msgstr "ヨーロッパ/チラネ"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:347
 msgid "Europe/Uzhgorod"
 msgstr "ヨーロッパ/ウジゴロド"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:348
 msgid "Europe/Vaduz"
 msgstr "ヨーロッパ/ファドゥーツ"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:349
 msgid "Europe/Vatican"
 msgstr "ヨーロッパ/バチカン"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:350
 msgid "Europe/Vienna"
 msgstr "ヨーロッパ/ウィーン"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:351
 msgid "Europe/Vilnius"
 msgstr "ヨーロッパ/ヴィリニュス"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:352
 msgid "Europe/Warsaw"
 msgstr "ヨーロッパ/ワルシャワ"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:353
 msgid "Europe/Zagreb"
 msgstr "ヨーロッパ/ザグレフ"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:354
 msgid "Europe/Zaporozhye"
 msgstr "ヨーロッパ/ザポロジェ"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:355
 msgid "Europe/Zurich"
 msgstr "ヨーロッパ/チューリッヒ"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:356
 msgid "Indian/Antananarivo"
 msgstr "インド/アンタナナリボ"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:357
 msgid "Indian/Chagos"
 msgstr "インド/チャゴス"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:358
 msgid "Indian/Christmas"
 msgstr "インド/クリスマス"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:359
 msgid "Indian/Cocos"
 msgstr "インド/ココス"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:360
 msgid "Indian/Comoro"
 msgstr "インド/コモロス"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:361
 msgid "Indian/Kerguelen"
 msgstr "インド/ケルゲレーヌ"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:362
 msgid "Indian/Mahe"
 msgstr "インド/マエ"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:363
 msgid "Indian/Maldives"
 msgstr "インド/モルジブ"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:364
 msgid "Indian/Mauritius"
 msgstr "インド/マリシャス"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:365
 msgid "Indian/Mayotte"
 msgstr "インド/マイヨット"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:366
 msgid "Indian/Reunion"
 msgstr "インド/レユニオン"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:367
 msgid "Pacific/Apia"
 msgstr "太平洋/アピア"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:368
 msgid "Pacific/Auckland"
 msgstr "太平洋/オークランド"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:369
 msgid "Pacific/Chatham"
 msgstr "太平洋/チャタム"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:370
 msgid "Pacific/Easter"
 msgstr "太平洋/イースター"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:371
 msgid "Pacific/Efate"
 msgstr "太平洋/エファテ"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:372
 msgid "Pacific/Enderbury"
 msgstr "太平洋/エンダベリー"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:373
 msgid "Pacific/Fakaofo"
 msgstr "太平洋/Fakaofo"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:374
 msgid "Pacific/Fiji"
 msgstr "太平洋/フィジー"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:375
 msgid "Pacific/Funafuti"
 msgstr "太平洋/フナフティ"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:376
 msgid "Pacific/Galapagos"
 msgstr "太平洋/ガラパゴス"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:377
 msgid "Pacific/Gambier"
 msgstr "太平洋/ガンビア"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:378
 msgid "Pacific/Guadalcanal"
 msgstr "太平洋/ガダルカナル"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:379
 msgid "Pacific/Guam"
 msgstr "太平洋/グアム"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:380
 msgid "Pacific/Honolulu"
 msgstr "太平洋/ホノルル"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:381
 msgid "Pacific/Johnston"
 msgstr "太平洋/ジョンストン"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:382
 msgid "Pacific/Kiritimati"
 msgstr "太平洋/キリティマティ"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:383
 msgid "Pacific/Kosrae"
 msgstr "太平洋/コシャエ"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:384
 msgid "Pacific/Kwajalein"
 msgstr "太平洋/クワゼリン"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:385
 msgid "Pacific/Majuro"
 msgstr "太平洋/マジュロ"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:386
 msgid "Pacific/Marquesas"
 msgstr "太平洋/マルケサス"
 
-#: ../calendar/zones.h:388
+#: ../calendar/zones.h:387
 msgid "Pacific/Midway"
 msgstr "太平洋/ミッドウエイ"
 
-#: ../calendar/zones.h:389
+#: ../calendar/zones.h:388
 msgid "Pacific/Nauru"
 msgstr "太平洋/ナウル"
 
-#: ../calendar/zones.h:390
+#: ../calendar/zones.h:389
 msgid "Pacific/Niue"
 msgstr "太平洋/ニウエ"
 
-#: ../calendar/zones.h:391
+#: ../calendar/zones.h:390
 msgid "Pacific/Norfolk"
 msgstr "太平洋/ノーフォーク"
 
-#: ../calendar/zones.h:392
+#: ../calendar/zones.h:391
 msgid "Pacific/Noumea"
 msgstr "太平洋/ヌーメア"
 
-#: ../calendar/zones.h:393
+#: ../calendar/zones.h:392
 msgid "Pacific/Pago_Pago"
 msgstr "太平洋/パゴパゴ"
 
-#: ../calendar/zones.h:394
+#: ../calendar/zones.h:393
 msgid "Pacific/Palau"
 msgstr "太平洋/パラオ"
 
-#: ../calendar/zones.h:395
+#: ../calendar/zones.h:394
 msgid "Pacific/Pitcairn"
 msgstr "太平洋/ピトルケルン"
 
-#: ../calendar/zones.h:396
+#: ../calendar/zones.h:395
 msgid "Pacific/Ponape"
 msgstr "太平洋/ポナペ"
 
-#: ../calendar/zones.h:397
+#: ../calendar/zones.h:396
 msgid "Pacific/Port_Moresby"
 msgstr "太平洋/ポートモレスビー"
 
-#: ../calendar/zones.h:398
+#: ../calendar/zones.h:397
 msgid "Pacific/Rarotonga"
 msgstr "太平洋/ラロトンガ"
 
-#: ../calendar/zones.h:399
+#: ../calendar/zones.h:398
 msgid "Pacific/Saipan"
 msgstr "太平洋/サイパン"
 
-#: ../calendar/zones.h:400
+#: ../calendar/zones.h:399
 msgid "Pacific/Tahiti"
 msgstr "太平洋/タヒチ"
 
-#: ../calendar/zones.h:401
+#: ../calendar/zones.h:400
 msgid "Pacific/Tarawa"
 msgstr "太平洋/タラワ"
 
-#: ../calendar/zones.h:402
+#: ../calendar/zones.h:401
 msgid "Pacific/Tongatapu"
 msgstr "太平洋/トンガ"
 
-#: ../calendar/zones.h:403
+#: ../calendar/zones.h:402
 msgid "Pacific/Truk"
 msgstr "太平洋/トラック"
 
-#: ../calendar/zones.h:404
+#: ../calendar/zones.h:403
 msgid "Pacific/Wake"
 msgstr "太平洋/ウェーキ"
 
-#: ../calendar/zones.h:405
+#: ../calendar/zones.h:404
 msgid "Pacific/Wallis"
 msgstr "太平洋/ウォーリス"
 
-#: ../calendar/zones.h:406
+#: ../calendar/zones.h:405
 msgid "Pacific/Yap"
 msgstr "太平洋/ヤップ"
 
-#: ../composer/e-composer-actions.c:203
+#: ../composer/e-composer-actions.c:202
 msgid "Save as..."
 msgstr "名前を付けて保存..."
 
-#: ../composer/e-composer-actions.c:276
-#: ../e-util/e-mail-signature-editor.c:308
-msgid "_Close"
-msgstr "閉じる(_C)"
-
-#: ../composer/e-composer-actions.c:278
+#: ../composer/e-composer-actions.c:277
 msgid "Close the current file"
 msgstr "現在のファイルを閉じます"
 
-#: ../composer/e-composer-actions.c:283
+#: ../composer/e-composer-actions.c:282
 msgid "New _Message"
 msgstr "新しいメッセージ(_M)"
 
-#: ../composer/e-composer-actions.c:285
+#: ../composer/e-composer-actions.c:284
 msgid "Open New Message window"
 msgstr "新しいメッセージ作成ウィンドウを開きます"
 
-#: ../composer/e-composer-actions.c:292 ../shell/e-shell-window-actions.c:937
+#: ../composer/e-composer-actions.c:289 ../shell/e-shell-window-actions.c:979
+#, fuzzy
+#| msgid "Mail Preferences"
+msgid "_Preferences"
+msgstr "メールの設定"
+
+#: ../composer/e-composer-actions.c:291 ../shell/e-shell-window-actions.c:981
 msgid "Configure Evolution"
 msgstr "Evolution の設定"
 
-#: ../composer/e-composer-actions.c:299
+#: ../composer/e-composer-actions.c:298
 msgid "Save the current file"
 msgstr "現在のファイルを保存します"
 
-#: ../composer/e-composer-actions.c:304
+#: ../composer/e-composer-actions.c:303
 msgid "Save _As..."
 msgstr "名前を付けて保存(_A)..."
 
-#: ../composer/e-composer-actions.c:306
+#: ../composer/e-composer-actions.c:305
 msgid "Save the current file with a different name"
 msgstr "名前を付けて現在のファイルを保存します"
 
-#: ../composer/e-composer-actions.c:313
+#: ../composer/e-composer-actions.c:312
 msgid "Character _Encoding"
 msgstr "文字のエンコーディング(_E)"
 
-#: ../composer/e-composer-actions.c:330
-msgid "_Print..."
-msgstr "印刷(_P)..."
-
-#: ../composer/e-composer-actions.c:337
+#: ../composer/e-composer-actions.c:336
 msgid "Print Pre_view"
 msgstr "印刷プレビュー(_V)"
 
-#: ../composer/e-composer-actions.c:344
+#: ../composer/e-composer-actions.c:343
 msgid "Save as _Draft"
 msgstr "下書きとして保存(_D)"
 
-#: ../composer/e-composer-actions.c:346
+#: ../composer/e-composer-actions.c:345
 msgid "Save as draft"
 msgstr "下書きとして保存します"
 
-#: ../composer/e-composer-actions.c:351
+#: ../composer/e-composer-actions.c:350
 msgid "S_end"
 msgstr "送信(_E)"
 
-#: ../composer/e-composer-actions.c:353
+#: ../composer/e-composer-actions.c:352
 msgid "Send this message"
 msgstr "メッセージを送信します"
 
-#: ../composer/e-composer-actions.c:361
+#: ../composer/e-composer-actions.c:360
 msgid "PGP _Encrypt"
 msgstr "PGP による暗号化(_E)"
 
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:362
 msgid "Encrypt this message with PGP"
 msgstr "PGP でこのメッセージを暗号化します"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:368
 msgid "PGP _Sign"
 msgstr "PGP の署名(_S)"
 
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:370
 msgid "Sign this message with your PGP key"
 msgstr "PGP 鍵でこのメッセージに署名します"
 
-#: ../composer/e-composer-actions.c:377
+#: ../composer/e-composer-actions.c:376
 msgid "_Picture Gallery"
 msgstr "画像ギャラリー(_P)"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:378
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "メッセージにドラッグできる画像のコレクションを表示"
 
-#: ../composer/e-composer-actions.c:385
+#: ../composer/e-composer-actions.c:384
 msgid "_Prioritize Message"
 msgstr "メッセージの優先度を上げる(_P)"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:386
 msgid "Set the message priority to high"
 msgstr "メッセージの優先度を高くします"
 
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:392
 msgid "Re_quest Read Receipt"
 msgstr "開封通知を要求する(_Q)"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:394
 msgid "Get delivery notification when your message is read"
 msgstr "相手がメッセージを読んだ時に配送通知を取得します"
 
-#: ../composer/e-composer-actions.c:401
+#: ../composer/e-composer-actions.c:400
 msgid "S/MIME En_crypt"
 msgstr "S/MIME による暗号化(_C)"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:402
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "このメッセージを S/MIME 暗号認証を用いて暗号化します"
 
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:408
 msgid "S/MIME Sig_n"
 msgstr "S/MIME の署名(_N)"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:410
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "S/MIME 署名証明書でこのメッセージに署名します"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:416
 msgid "_Bcc Field"
 msgstr "Bcc(_B)"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:418
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Bcc の表示/非表示を切り替えます"
 
-#: ../composer/e-composer-actions.c:425
+#: ../composer/e-composer-actions.c:424
 msgid "_Cc Field"
 msgstr "Cc(_C)"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:426
 msgid "Toggles whether the CC field is displayed"
 msgstr "Cc の表示/非表示を切り替えます"
 
-#: ../composer/e-composer-actions.c:433
+#: ../composer/e-composer-actions.c:432
 msgid "_Reply-To Field"
 msgstr "返信先(_R)"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:434
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "返信先の表示/非表示を切り替えます"
 
-#: ../composer/e-composer-actions.c:494
+#: ../composer/e-composer-actions.c:493
 msgid "Save Draft"
 msgstr "下書きを保存します"
 
-#: ../composer/e-composer-header-table.c:39
+#: ../composer/e-composer-header-table.c:38
 msgid "Enter the recipients of the message"
 msgstr "メッセージの宛先を入力します"
 
-#: ../composer/e-composer-header-table.c:41
+#: ../composer/e-composer-header-table.c:40
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "メッセージのカーボンコピー (Cc) を受けとる人のアドレスを入力します"
 
-#: ../composer/e-composer-header-table.c:44
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message"
 msgstr "メッセージの宛先には入れずにカーボンコピー (Bcc) としてメッセージを受け取る人のアドレスを入力します"
 
-#: ../composer/e-composer-header-table.c:772
+#: ../composer/e-composer-header-table.c:771
 msgid "Fr_om:"
 msgstr "差出人(_O):"
 
-#: ../composer/e-composer-header-table.c:779
+#: ../composer/e-composer-header-table.c:778
 msgid "_Reply-To:"
 msgstr "返信先(_R):"
 
-#: ../composer/e-composer-header-table.c:784
+#: ../composer/e-composer-header-table.c:783
 msgid "_To:"
 msgstr "宛先(_T):"
 
-#: ../composer/e-composer-header-table.c:790
+#: ../composer/e-composer-header-table.c:789
 msgid "_Cc:"
 msgstr "Cc(_C):"
 
-#: ../composer/e-composer-header-table.c:796
+#: ../composer/e-composer-header-table.c:795
 msgid "_Bcc:"
 msgstr "Bcc(_B):"
 
-#: ../composer/e-composer-header-table.c:801
+#: ../composer/e-composer-header-table.c:800
 msgid "_Post To:"
 msgstr "送信先(_P):"
 
-#: ../composer/e-composer-header-table.c:805
+#: ../composer/e-composer-header-table.c:804
 msgid "S_ubject:"
 msgstr "件名(_U):"
 
-#: ../composer/e-composer-header-table.c:813
+#: ../composer/e-composer-header-table.c:812
 #: ../mail/e-mail-config-identity-page.c:488
 msgid "Si_gnature:"
 msgstr "署名(_G):"
 
-#: ../composer/e-composer-name-header.c:235
+#: ../composer/e-composer-name-header.c:234
 msgid "Click here for the address book"
 msgstr "ここをクリックするとアドレス帳が表示されます"
 
-#: ../composer/e-composer-post-header.c:184
+#: ../composer/e-composer-post-header.c:183
 msgid "Click here to select folders to post to"
 msgstr "<ここをクリックして投稿するフォルダーを選択してください>"
 
-#: ../composer/e-msg-composer.c:869
+#: ../composer/e-msg-composer.c:879
 #, c-format
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "送信メッセージに署名できません: このアカウントに対して署名付きの証明書がセットされていません"
 
-#: ../composer/e-msg-composer.c:878
+#: ../composer/e-msg-composer.c:888
 #, c-format
 msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
 msgstr "送信するメッセージを暗号化できません: このアカウントに対して暗号化された証明書がセットされていません"
 
-#: ../composer/e-msg-composer.c:1557 ../composer/e-msg-composer.c:1958
+#: ../composer/e-msg-composer.c:1569 ../composer/e-msg-composer.c:1981
 msgid "Compose Message"
 msgstr "メッセージの作成"
 
-#: ../composer/e-msg-composer.c:4213
+#: ../composer/e-msg-composer.c:4243
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "メール作成ウィンドウのメッセージの中に編集のできない、文字列ではないものが含まれています。"
 
-#: ../composer/e-msg-composer.c:4886
+#: ../composer/e-msg-composer.c:4943
 msgid "Untitled Message"
 msgstr "タイトルなしのメッセージ"
 
@@ -6721,13 +7044,21 @@ msgstr "Evolution アラーム通知"
 msgid "Calendar event notifications"
 msgstr "カレンダーのイベント通知"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1033
-#: ../modules/mailto-handler/evolution-mailto-handler.c:212
-#: ../shell/e-shell-window-private.c:243
+#: ../data/evolution.appdata.xml.in.h:1
+msgid "Evolution is a personal information management application that provides integrated mail, calendaring and address book functionality."
+msgstr "Evolution は個人情報管理アプリケーションで、メール、カレンダー、アドレス帳の機能を総合的に提供しています。"
+
+#: ../data/evolution.appdata.xml.in.h:2
+msgid "Evolution supports a wide range of industry standard data formats and network protocols for information exchange, with an emphasis on standards compliance and security. Evolution can also integrate smoothly with Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) extension."
+msgstr "Evolution は情報交換のための業界標準のデータ形式やネットワークプロトコルを幅広くサポートし、標準への準拠とセキュリティに重点を置いています。Evolution は \"Exchange Web Services\" (EWS) 拡張を通じて Microsoft Exchange と円滑に統合できます。"
+
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1032
+#: ../modules/mailto-handler/evolution-mailto-handler.c:210
+#: ../shell/e-shell-window-private.c:242
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:83
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:82
 msgid "Groupware Suite"
 msgstr "グループウェアスイートです。"
 
@@ -6740,10 +7071,8 @@ msgid "Manage your email, contacts and schedule"
 msgstr "メールや連絡先、予定などを管理します"
 
 #: ../data/evolution.desktop.in.in.h:5
-#, fuzzy
-#| msgid "mail;calendar;contact;addressbook;task;"
 msgid "email;calendar;contact;addressbook;task;"
-msgstr "mail;calendar;contact;addressbook;task;"
+msgstr "email;calendar;contact;addressbook;task;mail;E-メール;Eメール;電子メール;電子メイル;カレンダー;暦;コンタクト;連絡先;相手;相手先;アドレス帳;電話帳;タスク;作業;仕事;"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
 msgid "Enable address formatting"
@@ -6943,7 +7272,7 @@ msgstr "同時に使用するタイムゾーンの個数 (最大値)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:28
 msgid "Maximum number of recently used timezones to remember in a 'day-second-zones' list"
-msgstr "'day_second_zones' の中で同時に使用するタイムゾーンの個数 (最大値) です。"
+msgstr "'day-second-zones' の中で同時に使用するタイムゾーンの個数 (最大値) です。"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
 msgid "Default reminder value"
@@ -7650,611 +7979,607 @@ msgid "Enable animated images in HTML mail. Many users find animated images anno
 msgstr "HTML メールでアニメーション画像を有効にする。多くのユーザーはアニメーション画像を鬱陶しいと感じ、静止画像を好みます。"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
-msgid "Ellipsize mode for folder names in side bar"
-msgstr "サイドバーのフォルダー名の省略モード"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
 msgid "Enable or disable type ahead search feature"
 msgstr "インクリメンタル検索の機能を有効にするかどうか"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
 msgid "Enable the side bar search feature to allow interactive searching of folder names."
 msgstr "フォルダーの対話的な検索ができるようにサイドバーでの検索機能を有効にする。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
 msgid "Enable or disable magic space bar"
 msgstr "マジックスペースバーを有効にするかどうか"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
 msgid "Enable this to use Space bar key to scroll in message preview, message list and folders."
 msgstr "これを有効にすると、スペースバーのキーを使ってメッセージのプレビューやメッセージの一覧、メッセージのフォルダーをスクロールできるようになります。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr "すべてのフォルダーに同様のメッセージの一覧ビューの設定を使う"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr "これを有効にすると、すべてのフォルダーに同様のメッセージの一覧ビューの設定を使うようになります。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
 msgid "Mark citations in the message \"Preview\""
 msgstr "メッセージの \"プレビュー\" で引用符を表示するかどうか"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
 msgid "Mark citations in the message \"Preview\"."
 msgstr "メッセージの \"プレビュー\" で引用符を使用するかどうかです。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 msgid "Citation highlight color"
 msgstr "引用を強調表示する時の色"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 msgid "Citation highlight color."
 msgstr "引用を強調表示する時の色です。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid "Enable/disable caret mode"
 msgstr "キャレットモードにするかどうか"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "キャレットモードを有効にするかどうかです (有効にするとメールを読む際にカーソルが表示されます)。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Default charset in which to display messages"
 msgstr "メッセージ表示時のデフォルトの文字集合"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid "Default charset in which to display messages."
 msgstr "メッセージを表示する際に使用するデフォルトの文字集合です。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Automatically load images for HTML messages over HTTP"
 msgstr "HTML のメッセージにある画像を自動で読み込むかどうか"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid "Show Animations"
 msgstr "アニメーションを表示するかどうか"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Show animated images as animations."
 msgstr "アニメーション画像を動かします。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid "Show all message headers"
 msgstr "すべてのメッセージヘッダーを表示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Show all the headers when viewing a messages."
 msgstr "メッセージを表示する時にすべてのヘッダーを表示します。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid "List of headers to show when viewing a message."
 msgstr "メッセージを表示する時に表示するヘッダー一覧。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 msgid "Each header is represented as a pair: the header name, and a boolean indicating whether the header is enabled. Disabled headers are not shown when viewing a message, but are still listed in Preferences."
 msgstr "ヘッダーはそれぞれ1つの組になっています: ヘッダーの名前とそのヘッダーが有効であることを示す論理値です。無効化されているヘッダーはメッセージを表示する時には表示されませんが、Preferences の一覧には残っています。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid "Show photo of the sender"
 msgstr "送信者の FACE を表示するかどうか"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "メッセージのプレビューに送信者の FACE を表示するかどうかです。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Mark as Seen after specified timeout"
 msgstr "指定した時間が経過したら既読マークを付与するかどうか"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Mark as Seen after specified timeout."
 msgstr "指定した時間が経過したら既読マークを付与するかどうかです。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid "Timeout for marking messages as seen"
 msgstr "既読マークを付与するまでの時間"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "メッセージを選択してから既読マークを付与するまでの時間(ミリ秒)です。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "Sender email-address column in the message list"
 msgstr "メッセージの一覧に差出人のアドレスを表示するかどうか"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid "Show the email-address of the sender in a separate column in the message list."
 msgstr "メッセージの一覧に差出人のメールアドレスを表す項目を表示するかどうかです。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid "Determines whether to use the same fonts for both \"From\" and \"Subject\" lines in the \"Messages\" column in vertical view"
 msgstr "縦型の表示の際に \"メッセージ\" の項目の \"差出人\" と \"件名\" に同じフォントを使用するかどうか"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid "Determines whether to use the same fonts for both \"From\" and \"Subject\" lines in the \"Messages\" column in vertical view."
 msgstr "縦型の表示の際に \"メッセージ\" の項目の \"差出人\" と \"件名\" に同じフォントを使用するかどうか"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "Show deleted messages in the message-list"
 msgstr "メッセージの一覧に削除したメッセージを表示するかどうか"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "メッセージの一覧に削除したメッセージを (打ち消し線を付けて) 表示するかどうかです。"
 
 # "検索フォルダ"は適訳ではない
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Enable Unmatched search folder"
 msgstr "一致していない仮想フォルダーを有効にするかどうか"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid "Enable Unmatched search folder within Search Folders. It does nothing if Search Folders are disabled."
 msgstr "仮想フォルダー内の一致していない仮想フォルダーを有効にします。仮想フォルダーが無効になっている場合は何も起きません。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "フォルダー毎のプレビューを隠し選択を解除するかどうか"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid "This key is read only once and reset to \"false\" after read. This unselects the mail in the list and removes the preview for that folder."
 msgstr "これは一度だけ読み込むことが可能なキーであり、実際に読み込んだ後は \"FALSE\" に戻ります。メッセージの一覧で選択しているメールを選択解除して、そのメールがあるフォルダーのプレビューを無効にします。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid "Height of the message-list pane"
 msgstr "メッセージの一覧ペインのウィンドウの高さ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid "Height of the message-list pane."
 msgstr "メッセージの一覧ペインのウィンドウの高さです。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Whether message headers are collapsed in the user interface"
 msgstr "ユーザーインターフェース内でメッセージのヘッダーを畳んだ状態にするかどうか"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid "Width of the message-list pane"
 msgstr "メッセージの一覧ペインの幅"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Width of the message-list pane."
 msgstr "メッセージの一覧ペインの幅です。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid "Layout style"
 msgstr "レイアウトスタイル"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "The layout style determines where to place the preview pane in relation to the message list. \"0\" (Classic View) places the preview pane below the message list. \"1\" (Vertical View) places the preview pane next to the message list."
 msgstr "レイアウトスタイルはプレビューペインをメッセージの一覧に対してどう配置するかを決めます。\"0\" (クラシックビュー) ならば、プレビューペインはメッセージの一覧の下に配置されます。\"1\" (垂直ビュー) ならば、メッセージの一覧の隣にプレビューペインが配置されます。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid "Variable width font"
 msgstr "可変幅のフォント"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "The variable width font for mail display."
 msgstr "メールを表示する際の可変幅フォントです。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "Terminal font"
 msgstr "端末のフォント"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "The terminal font for mail display."
 msgstr "メールを表示する際の固定幅フォントです。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "Use custom fonts"
 msgstr "カスタムフォントを使用するかどうか"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Use custom fonts for displaying mail."
 msgstr "メールを表示する際に独自のフォントを使用するかどうかです。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "差出人/Cc/Bcc でメールアドレスの表示を隠すかどうか"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "Compress display of addresses in TO/CC/BCC to the number specified in address_count."
 msgstr "To/Cc/Bcc のメールアドレスが address_count で指定した数だけ表示します。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "差出人/Cc/Bcc で表示を制限するメールアドレスの個数"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid "This sets the number of addresses to show in default message list view, beyond which a '...' is shown."
 msgstr "メッセージの一覧表示で表示するメールアドレスの個数 (デフォルト値) で、ここで指定した以上のアドレスが存在している場合は '...' として表示が省略されます。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid "Thread the message-list based on Subject"
 msgstr "メッセージの一覧を件名でスレッド表示するかどうか"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
 msgstr "メッセージに In-Reply-To または References ヘッダーが無い場合に、件名によるスレッド表示に戻すかどうかを指定します。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid "Default value for thread expand state"
 msgstr "デフォルトでスレッドを展開した状態にするかどうか"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid "This setting specifies whether the threads should be in expanded or collapsed state by default. Evolution requires a restart."
 msgstr "メールのスレッドをデフォルトで展開した状態にするか、または畳んだ状態にするかを指定します。反映するには再起動が必要です。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Whether sort threads based on latest message in that thread"
-msgstr "スレッドの中にあるメールを最新のメッセージを基点に並び替えるかどうか"
+msgstr "スレッドの中にあるメールを最新のメッセージを基点に並べ替えるかどうか"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "This setting specifies whether the threads should be sorted based on latest message in each thread, rather than by message's date. Evolution requires a restart."
-msgstr "スレッドの中にある最新のメッセージを基点にすべてのスレッドを並び替えるかどうかを指定します。変更したら Evolution の再起動が必要になります。"
+msgstr "スレッドの中にある最新のメッセージを基点にすべてのスレッドを並べ替えるかどうかを指定します。変更したら Evolution の再起動が必要になります。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "フォルダーツリーでアカウントをアルファベット順にする"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid "Tells how to sort accounts in a folder tree used in a Mail view. When set to true accounts are sorted alphabetically, with an exception of On This Computer and Search folders, otherwise accounts are sorted based on an order given by a user"
-msgstr "メール表示でフォルダーツリー内のアカウントを表示する順序を指定します。true にするとアカウントは「On This Computer and Search folders」の例外を除いて、アルファベット順にユーザーにより指定された順序で並び替えられます。"
+msgstr "メール表示でフォルダーツリー内のアカウントを表示する順序を指定します。true にするとアカウントは「On This Computer and Search folders」の例外を除いて、アルファベット順にユーザーにより指定された順序で並べ替えられます。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid "Log filter actions"
 msgstr "ログをフィルタリングするかどうか"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid "Log filter actions to the specified log file."
 msgstr "指定したログファイルに対してログのフィルタリング処理を行うかどうかです。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Logfile to log filter actions"
 msgstr "フィルタリングするログファイル"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid "Logfile to log filter actions."
 msgstr "フィルタリング処理の対象となるログファイルです。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Flush Outbox after filtering"
 msgstr "フィルターした後、送信トレイを空にする"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid "Whether to flush Outbox after filtering is done. Outbox flush will happen only when there was used any 'Forward to' filter action and approximately one minute after the last action invocation."
 msgstr "フィルタリングが終わったら送信トレイを空にするかどうか。「転送する」フィルターが使われたか、最後のアクションの実行から約1分経過した時にのみ送信トレイを空にします"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Default forward style"
 msgstr "デフォルトの転送スタイル"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid "Default reply style"
 msgstr "デフォルトの返信スタイル"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Prompt on empty subject"
 msgstr "件名が空の場合は警告するかどうか"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "送信するメールの件名が空の場合は送信前に警告するかどうかです。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Prompt when emptying the trash"
 msgstr "ゴミ箱を空にするときに確認"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "ゴミ箱を空にしようとしたときにユーザーに警告するかどうかです。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Prompt when user expunges"
 msgstr "完全に削除する場合は警告するかどうか"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "フォルダーを完全に抹消する前にユーザーに警告するかどうかです。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr "受信者としてメールアドレスが入力されていないのに送ろうとする前に確認"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 msgid "It disables/enables the repeated prompts to warn that you are trying to send a message to recipients not entered as mail addresses"
 msgstr "受信者にメールアドレスが入力されていないメッセージを送ろうとした時に繰り返し警告するかどうか"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Prompt when user only fills Bcc"
 msgstr "ユーザーが Bcc しか入力なかったら警告するかどうか"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "ユーザーが To/Cc 先を付けずに送信しようとする時に確認するかどうかです。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "HTML をユーザーが送信する前に警告するかどうか"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
 msgstr "HTML 形式を希望しない連絡先へ HTML メールを送信する前に確認するかどうかです。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "10 通以上のメッセージを一度に開こうとしたら確認するかどうか"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid "If a user tries to open 10 or more messages at one time, ask the user if they really want to do it."
 msgstr "一度に 10 通以上のメッセージを開こうとした時に確認ダイアログを表示するかどうかです。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Prompt while marking multiple messages"
 msgstr "複数のメッセージにマークする場合は確認するかどうか"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "複数のメッセージにマークを付与する際に毎回確認するかどうか。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Prompt when deleting messages in search folder"
 msgstr "仮想フォルダーでメッセージを削除する際に確認するかどうか"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid "It disables/enables the repeated prompts to warn that deleting messages from a search folder permanently deletes the message, not simply removing it from the search results."
 msgstr "仮想フォルダーからメッセージを削除する際に、単に削除するのではなく警告ダイアログを表示するかどうかです。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
 msgstr "フォルダーツリー内でフォルダーをドラッグ &amp; ドロップしたときにコピーするかどうか尋ねる"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid "Possible values are: 'never' - do not allow copy with drag &amp; drop of folders in folder tree, 'always' - allow copy with drag &amp; drop of folders in folder tree without asking, or 'ask' - (or any other value) will ask user."
 msgstr "可能な値: never - フォルダーツリー内でフォルダーのドラッグ &amp; ドロップによるコピーを許可しない、always - フォルダーツリー内でフォルダーのドラッグ &amp; ドロップによるコピーを許可して尋ねない、ask (あるいは他の値) - ユーザーに尋ねる"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
 msgstr "フォルダーツリー内でフォルダーをドラッグ &amp; ドロップしたときに移動するかどうか尋ねる"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid "Possible values are: 'never' - do not allow move with drag &amp; drop of folders in folder tree, 'always' - allow move with drag &amp; drop of folders in folder tree without asking, or 'ask' - (or any other value) will ask user."
 msgstr "可能な値: never - フォルダーツリー内でフォルダーのドラッグ &amp; ドロップによる移動を許可しない、always - フォルダーツリー内でフォルダーのドラッグ &amp; ドロップによる移動を許可して尋ねない、ask (あるいは他の値) - ユーザーに尋ねる"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid "Prompt when replying privately to list messages"
 msgstr "メーリングリストのメッセージにプライベートに返信しようとしている時に確認"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid "It disables/enables the repeated prompts to warn that you are sending a private reply to a message which arrived via a mailing list."
 msgstr "メーリングリスト経由のメッセージへの返事をプライベートで送ろうとすると、警告を表示するかどうか。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "メーリングリストがプライベート宛の返信の設定を上書きしている時に確認"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 msgid "It disables/enables the repeated prompts to warn that you are trying sending a private reply to a message which arrived via a mailing list, but the list sets a Reply-To: header which redirects your reply back to the list"
 msgstr "メーリングリスト経由で受け取ったメールに Reply-To: でメーリングリスト宛に返信するように指定されているにもかかわらず、返信を私信として送ろうとした時に繰り返し警告するのを無効にしたり、有効にしたりします"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid "Prompt when replying to many recipients"
 msgstr "たくさんの相手に返信しようとしている時に確認"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 msgid "It disables/enables the repeated prompts to warn that you are sending a reply to many people."
 msgstr "たくさんの人に返信を送ろうとしたら、警告を表示するかどうか。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid "Policy for automatically closing the message browser window when forwarding or replying to the displayed message."
 msgstr "表示しているメッセージについて転送や返信するときにメッセージ閲覧ウィンドウを自動的に閉じるポリシー"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid "Empty Trash folders on exit"
 msgstr "終了時にゴミ箱フォルダーを空にするかどうか"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Evolution を終了する時にゴミ箱フォルダーを空にするかどうかです。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid "Minimum days between emptying the trash on exit"
 msgstr "終了時にゴミ箱を空にするまでの最短の日数"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "終了時にゴミ箱のフォルダーを空にするまでの最短の日数です。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 msgid "Last time Empty Trash was run"
 msgstr "最後にゴミ箱を空にした時間"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "最後にゴミ箱を空にした時間 (1970-01-01 からの経過日数) です。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "ステータスバーにエラーを表示しておく時間 (秒単位)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid "Level beyond which the message should be logged."
 msgstr "ログを記録すべきメッセージレベルの最小値"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid "This can have three possible values. \"0\" for errors. \"1\" for warnings. \"2\" for debug messages."
 msgstr "メッセージをログとして記録する際のレベルです。指定可能な値: '0' (エラーメッセージ)、'1' (警告メッセージ)、'2' (デバッグメッセージ)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid "Show original \"Date\" header value."
 msgstr "元の \"Date\" ヘッダーの値を表示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid "Show the original \"Date\" header (with a local time only if the time zone differs). Otherwise always show \"Date\" header value in a user preferred format and local time zone."
 msgstr "元の \"Date\" ヘッダーを表示します (タイムゾーンが異なる場合、ローカルタイムのみで表示します)。それ以外の場合、\"Date\" ヘッダーはユーザーの指定した形式で、ローカルタイムで常に表示されます。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid "List of Labels and their associated colors"
 msgstr "ラベルと対応する色のリスト"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid "List of labels known to the mail component of Evolution. The list contains strings containing name:color where color uses the HTML hex encoding."
 msgstr "Evolution メール作成ウィンドウで利用するラベルのリストです。このリストには name:color という形式で HTML で使用する色 (16形式) が含まれています。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 msgid "Check incoming mail being junk"
 msgstr "受信メールがジャンクかどうかをチェックするかどうか"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid "Run junk test on incoming mail."
 msgstr "メールを受信したらジャンクのテストを実施するかどうかです。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid "Empty Junk folders on exit"
 msgstr "終了時にジャンクフォルダーを空にするかどうか"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Evolution を終了する時にジャンクフォルダーを空にするかどうかです。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid "Minimum days between emptying the junk on exit"
 msgstr "終了時にジャンクを空にするまでの最短の日数"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "終了時にジャンクフォルダーを空にするまでの最短の日数です。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Last time Empty Junk was run"
 msgstr "最後にジャンクフォルダーを空にした時間"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 msgid "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "最後にジャンクフォルダーを空にした時間 (1970-01-01 からの経過日数) です。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "The default plugin for Junk hook"
 msgstr "ジャンクメールのテストで使用するデフォルトのプラグイン"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid "This is the default junk plugin, even though there are multiple plugins enabled. If the default listed plugin is disabled, then it won't fall back to the other available plugins."
 msgstr "これは、複数のジャンクプラグインを有効にしている時にデフォルトで使用するプラグインです。もしこのプラグインが利用できない場合は、他に利用可能なプラグインを自動的に選択します。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "差出人をアドレス帳から検索するかどうか"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid "Determines whether to lookup the sender email in address book. If found, it shouldn't be a spam. It looks up in the books marked for autocompletion. It can be slow, if remote address books (like LDAP) are marked for autocompletion."
 msgstr "メッセージの差出人をアドレス帳から検索するかどうかです。見つかった場合、そのメッセージはスパムではないと判定します。これは自動補完の設定で有効にしたアドレス帳が対象になります。そこで、リモートにあるアドレス帳を指定した場合 (例えば LDAP 上にある場合)、検索処理が遅くなることがあります。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "Determines whether to look up addresses for junk filtering in local address book only"
 msgstr "ジャンクフィルタリングする際にローカルのアドレス帳だけ検索するかどうか"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid "This option is related to the key lookup_addressbook and is used to determine whether to look up addresses in local address book only to exclude mail sent by known contacts from junk filtering."
 msgstr "このオプションは lookup_addressbook キーに関連したものであり、ローカルのアドレス帳の中からだけメールアドレスの検索を行い、ジャンクメールのフィルタリングを行う際に連絡先にあるアドレスから送信されたメールを対象外にするかどうかを指定します。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "独自のヘッダーを利用してジャンクをチェックするかどうか"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid "Determines whether to use custom headers to check for junk. If this option is enabled and the headers are mentioned, it will be improve the junk checking speed."
 msgstr "独自のヘッダーを利用してジャンクメールをチェックするかどうかです。このオプションを有効にしてそのヘッダーが記述された場合、ジャンクメールをチェックするスピードが改善されます。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "Custom headers to use while checking for junk."
 msgstr "ジャンクかどうかをチェックする際に使用する独自のヘッダー"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid "Custom headers to use while checking for junk. The list elements are string in the format \"headername=value\"."
 msgstr "ジャンクかどうか判定する際に使用する独自のヘッダーの項目からなるリストです。リストの要素は \"ヘッダー名=値\" という形式の文字列です。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid "UID string of the default account."
 msgstr "デフォルトのアカウントを表す UID (文字列)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid "Save directory"
 msgstr "保存先のフォルダー"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "Directory for saving mail component files."
 msgstr "メールに添付されたファイルを保存する先のフォルダーです。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 msgid "Composer load/attach directory"
 msgstr "Composer 読み込み/保存ディレクトリ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Directory for loading/attaching files to composer."
 msgstr "メールに添付されたファイルを読み込む/保存する先のフォルダーです。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid "Check for new messages on start"
 msgstr "起動時に新着メッセージをチェックする"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid "Whether to check for new messages when Evolution is started. This includes also sending messages from Outbox."
 msgstr "Evolution が起動した時に新着メッセージをチェックするかどうか。このオプションは送信トレイからメッセージを送信することにもなります。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid "Check for new messages in all active accounts"
 msgstr "アクティブなアカウントの新着メールをチェックする"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "Whether to check for new messages in all active accounts regardless of the account \"Check for new messages every X minutes\" option when Evolution is started. This option is used only together with 'send_recv_on_start' option."
 msgstr "アカウントの「新着メッセージをX分ごとにチェック」オプションがどうなってるかに関わらず、Evolution が起動時にすべてのアクティブなアカウントの新着メッセージをチェックするかどうか。このオプションは「起動時に送受信」オプションと一緒に使用されます。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid "Server synchronization interval"
 msgstr "サーバーと同期する間隔"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "Controls how frequently local changes are synchronized with the remote mail server. The interval must be at least 30 seconds."
 msgstr "どれぐらいの間隔でローカルでの変更点をリモートのメールサーバーと同期するかを指定します。この値は 30秒以上にしてください。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid "(Deprecated) Default forward style"
 msgstr "(非推奨) デフォルトの転送スタイル"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid "This key was deprecated in version 3.10 and should no longer be used. Use \"forward-style-name\" instead."
 msgstr "このキーはバージョン 3.10 で非推奨となっていて、もう使うべきではありません。\"forward-style-name\" を代わりに使ってください。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 msgid "(Deprecated) Default reply style"
 msgstr "(非推奨) デフォルトの返信スタイル"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 msgid "This key was deprecated in version 3.10 and should no longer be used. Use \"reply-style-name\" instead."
 msgstr "このキーはバージョン 3.10 で非推奨となっていて、もう使うべきではありません。\"reply-style-name\" を代わりに使ってください。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid "(Deprecated) List of custom headers and whether they are enabled."
 msgstr "(非推奨) 独自のヘッダーとそれらを有効にするかどうかのリスト"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid "This key was deprecated in version 3.10 and should no longer be used. Use \"show-headers\" instead."
 msgstr "このキーはバージョン 3.10 で非推奨となっていて、もう使うべきではありません。\"show-headers\" を代わりに使ってください。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 msgid "(Deprecated) Load images for HTML messages over HTTP"
 msgstr "(非推奨) HTML のメッセージにある画像を読み込むかどうか"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid "This key was deprecated in version 3.10 and should no longer be used. Use \"image-loading-policy\" instead."
 msgstr "このキーはバージョン 3.10 で非推奨となっていて、もう使うべきではありません。\"image-loading-policy\" を代わりに使ってください。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 msgid "(Deprecated) Asks whether to close the message window when the user forwards or replies to the message shown in the window"
 msgstr "(非推奨) ウィンドウで表示しているメッセージを転送、あるいは返信する時にメッセージウィンドウを閉じるかどうか確認"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 msgid "This key was deprecated in version 3.10 and should no longer be used. Use \"browser-close-on-reply-policy\" instead."
 msgstr "このキーはバージョン 3.10 で非推奨となっていて、もう使うべきではありません。\"browser-close-on-reply-policy\" を代わりに使ってください。"
 
@@ -8489,7 +8814,7 @@ msgstr "初期ファイル選択フォルダー"
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "GtkFileChooser ダイアログの初期フォルダー"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:308
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:307
 msgid "Start in offline mode"
 msgstr "オフラインモードで起動するかどうか"
 
@@ -8573,319 +8898,327 @@ msgstr "ジャンクのテストはローカルのみにするかどうか"
 msgid "Use only the local spam tests (no DNS)."
 msgstr "(DNS を使用せずに) ローカルの受信箱に対してのみジャンクメールのテストをするかどうかです。"
 
-#: ../em-format/e-mail-formatter-attachment.c:397
-#: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
-#: ../e-util/e-attachment-paned.c:176 ../e-util/e-attachment-paned.c:181
+#: ../em-format/e-mail-formatter-attachment.c:405
+#: ../e-util/e-attachment-bar.c:100 ../e-util/e-attachment-bar.c:105
+#: ../e-util/e-attachment-paned.c:175 ../e-util/e-attachment-paned.c:180
 #: ../mail/message-list.etspec.h:4
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "添付ファイル"
 
-#: ../em-format/e-mail-formatter-attachment.c:398
+#: ../em-format/e-mail-formatter-attachment.c:406
 msgid "Display as attachment"
 msgstr "添付ファイルとして表示"
 
-#: ../em-format/e-mail-formatter-headers.c:107
-#: ../em-format/e-mail-part-headers.c:47 ../mail/e-mail-tag-editor.c:272
-#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:64
+#: ../em-format/e-mail-formatter-audio.c:152
+msgid "Audio Player"
+msgstr "音楽プレーヤー"
+
+#: ../em-format/e-mail-formatter-audio.c:153
+msgid "Play the attachment in embedded audio player"
+msgstr "組み込み音楽プレーヤーで添付ファイルを再生"
+
+#: ../em-format/e-mail-formatter-headers.c:102
+#: ../em-format/e-mail-part-headers.c:46 ../mail/e-mail-tag-editor.c:273
+#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:63
 msgid "From"
 msgstr "差出人"
 
-#: ../em-format/e-mail-formatter-headers.c:133
+#: ../em-format/e-mail-formatter-headers.c:128
 msgid "(no subject)"
 msgstr "(件名無し)"
 
-#: ../em-format/e-mail-formatter-headers.c:333
+#: ../em-format/e-mail-formatter-headers.c:328
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "このメッセージは %s さんが %s さんに代わって送信したものです"
 
-#: ../em-format/e-mail-formatter-image.c:152
+#: ../em-format/e-mail-formatter-image.c:170
 msgid "Regular Image"
 msgstr "普通の画像"
 
-#: ../em-format/e-mail-formatter-image.c:153
+#: ../em-format/e-mail-formatter-image.c:171
 msgid "Display part as an image"
 msgstr "その部分を画像として表示"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:246
+#: ../em-format/e-mail-formatter-message-rfc822.c:254
 msgid "RFC822 message"
 msgstr "RFC822 メッセージ"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:247
+#: ../em-format/e-mail-formatter-message-rfc822.c:255
 msgid "Format part as an RFC822 message"
 msgstr "その部分を RFC822 メッセージとして整形"
 
-#: ../em-format/e-mail-formatter-print.c:54
-#: ../e-util/gal-view-instance-save-as-dialog.c:95
-#: ../mail/e-mail-label-tree-view.c:99
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1328
-#: ../modules/cal-config-google/e-google-chooser.c:237
-#: ../modules/plugin-manager/evolution-plugin-manager.c:67
+#: ../em-format/e-mail-formatter-print.c:53
+#: ../e-util/gal-view-instance-save-as-dialog.c:94
+#: ../mail/e-mail-label-tree-view.c:98
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1322
+#: ../modules/cal-config-google/e-google-chooser.c:236
+#: ../modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Name"
 msgstr "名前"
 
-#: ../em-format/e-mail-formatter-print.c:54
-#: ../e-util/e-attachment-tree-view.c:574 ../mail/message-list.etspec.h:10
+#: ../em-format/e-mail-formatter-print.c:53
+#: ../e-util/e-attachment-tree-view.c:573 ../mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "サイズ"
 
-#: ../em-format/e-mail-formatter-print-headers.c:144
+#: ../em-format/e-mail-formatter-print-headers.c:143
 msgid "GPG signed"
 msgstr "GPG 署名済み"
 
-#: ../em-format/e-mail-formatter-print-headers.c:150
+#: ../em-format/e-mail-formatter-print-headers.c:149
 msgid "GPG encrpyted"
 msgstr "GPG 暗号化"
 
-#: ../em-format/e-mail-formatter-print-headers.c:156
+#: ../em-format/e-mail-formatter-print-headers.c:155
 msgid "S/MIME signed"
 msgstr "S/MIME 署名済み"
 
-#: ../em-format/e-mail-formatter-print-headers.c:162
+#: ../em-format/e-mail-formatter-print-headers.c:161
 msgid "S/MIME encrpyted"
 msgstr "S/MIME 暗号化"
 
-#: ../em-format/e-mail-formatter-print-headers.c:171
-#: ../mail/e-mail-config-security-page.c:642
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:195
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:129
+#: ../em-format/e-mail-formatter-print-headers.c:170
+#: ../mail/e-mail-config-security-page.c:645
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:194
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:128
 msgid "Security"
 msgstr "セキュリティ"
 
-#: ../em-format/e-mail-formatter-quote-headers.c:168
-#: ../em-format/e-mail-part-headers.c:52 ../mail/e-mail-tag-editor.c:277
-#: ../mail/em-filter-i18n.h:77 ../mail/message-list.etspec.h:6
-#: ../modules/mail/em-mailer-prefs.c:69 ../smime/lib/e-asn1-object.c:712
+#: ../em-format/e-mail-formatter-quote-headers.c:167
+#: ../em-format/e-mail-part-headers.c:51 ../mail/e-mail-tag-editor.c:278
+#: ../mail/em-filter-i18n.h:51 ../mail/message-list.etspec.h:6
+#: ../modules/mail/em-mailer-prefs.c:68
 msgid "Subject"
 msgstr "件名"
 
 #. pseudo-header
-#: ../em-format/e-mail-formatter-quote-headers.c:187
-#: ../em-format/e-mail-formatter-utils.c:344
-#: ../modules/mail/em-mailer-prefs.c:1145
+#: ../em-format/e-mail-formatter-quote-headers.c:186
+#: ../em-format/e-mail-formatter-utils.c:342
+#: ../modules/mail/em-mailer-prefs.c:1144
 msgid "Mailer"
 msgstr "メーラー"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:91
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:94
 #: ../em-format/e-mail-formatter-text-enriched.c:98
 msgid "Richtext"
 msgstr "リッチテキスト"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:92
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:95
 #: ../em-format/e-mail-formatter-text-enriched.c:99
 msgid "Display part as enriched text"
 msgstr "表現力豊かなテキストの一部として表示"
 
-#: ../em-format/e-mail-formatter-quote-text-html.c:90
-#: ../em-format/e-mail-formatter-text-html.c:351
+#: ../em-format/e-mail-formatter-quote-text-html.c:95
+#: ../em-format/e-mail-formatter-text-html.c:359
 msgid "HTML"
 msgstr "HTML"
 
-#: ../em-format/e-mail-formatter-quote-text-html.c:91
-#: ../em-format/e-mail-formatter-text-html.c:352
+#: ../em-format/e-mail-formatter-quote-text-html.c:96
+#: ../em-format/e-mail-formatter-text-html.c:360
 msgid "Format part as HTML"
 msgstr "その部分を HTML として整形"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:115
-#: ../em-format/e-mail-formatter-text-plain.c:185
+#: ../em-format/e-mail-formatter-quote-text-plain.c:121
+#: ../em-format/e-mail-formatter-text-plain.c:197
 msgid "Plain Text"
 msgstr "プレーンテキスト"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:116
-#: ../em-format/e-mail-formatter-text-plain.c:186
+#: ../em-format/e-mail-formatter-quote-text-plain.c:122
+#: ../em-format/e-mail-formatter-text-plain.c:198
 msgid "Format part as plain text"
 msgstr "その部分をプレーンテキストとして整形"
 
-#: ../em-format/e-mail-formatter-secure-button.c:52
+#: ../em-format/e-mail-formatter-secure-button.c:51
 msgid "Unsigned"
 msgstr "署名なし"
 
-#: ../em-format/e-mail-formatter-secure-button.c:52
+#: ../em-format/e-mail-formatter-secure-button.c:51
 msgid "This message is not signed. There is no guarantee that this message is authentic."
 msgstr "このメッセージは署名されていません。このメッセージの信頼性を保証できません。"
 
-#: ../em-format/e-mail-formatter-secure-button.c:53
+#: ../em-format/e-mail-formatter-secure-button.c:52
 msgid "Valid signature"
 msgstr "妥当な署名"
 
-#: ../em-format/e-mail-formatter-secure-button.c:53
+#: ../em-format/e-mail-formatter-secure-button.c:52
 msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
 msgstr "このメッセージには署名が付与されています。このメッセージは非常に信頼できるものであることを意味します。"
 
-#: ../em-format/e-mail-formatter-secure-button.c:54
+#: ../em-format/e-mail-formatter-secure-button.c:53
 msgid "Invalid signature"
 msgstr "無効な署名です"
 
-#: ../em-format/e-mail-formatter-secure-button.c:54
+#: ../em-format/e-mail-formatter-secure-button.c:53
 msgid "The signature of this message cannot be verified, it may have been altered in transit."
 msgstr "転送中に改竄されているので、このメッセージの署名を検証できません。"
 
-#: ../em-format/e-mail-formatter-secure-button.c:55
+#: ../em-format/e-mail-formatter-secure-button.c:54
 msgid "Valid signature, but cannot verify sender"
 msgstr "署名は妥当ですが、差出人を検証できません"
 
-#: ../em-format/e-mail-formatter-secure-button.c:55
+#: ../em-format/e-mail-formatter-secure-button.c:54
 msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
 msgstr "このメッセージには妥当な署名が付与されていますが、メッセージの差出人を検証できません。"
 
-#: ../em-format/e-mail-formatter-secure-button.c:56
+#: ../em-format/e-mail-formatter-secure-button.c:55
 msgid "Signature exists, but need public key"
 msgstr "署名はありますが公開鍵が必要です"
 
-#: ../em-format/e-mail-formatter-secure-button.c:56
+#: ../em-format/e-mail-formatter-secure-button.c:55
 msgid "This message is signed with a signature, but there is no corresponding public key."
 msgstr "このメッセージは署名が付与されていますが、それに対応する公開鍵が付与されていません。"
 
-#: ../em-format/e-mail-formatter-secure-button.c:63
+#: ../em-format/e-mail-formatter-secure-button.c:62
 msgid "Unencrypted"
 msgstr "暗号化なし"
 
-#: ../em-format/e-mail-formatter-secure-button.c:63
+#: ../em-format/e-mail-formatter-secure-button.c:62
 msgid "This message is not encrypted. Its content may be viewed in transit across the Internet."
 msgstr "このメッセージは暗号化されていません。その内容がインターネットを介して閲覧される可能性があります。"
 
-#: ../em-format/e-mail-formatter-secure-button.c:64
+#: ../em-format/e-mail-formatter-secure-button.c:63
 msgid "Encrypted, weak"
 msgstr "暗号化済み (レベルは不十分)"
 
-#: ../em-format/e-mail-formatter-secure-button.c:64
+#: ../em-format/e-mail-formatter-secure-button.c:63
 msgid "This message is encrypted, but with a weak encryption algorithm. It would be difficult, but not impossible for an outsider to view the content of this message in a practical amount of time."
 msgstr "このメッセージは暗号化されていますが、その暗号化アルゴリズムのレベルが不十分です。(現実的には困難ですが)、このメッセージの内容を部外者が閲覧する可能性があります。"
 
-#: ../em-format/e-mail-formatter-secure-button.c:65
+#: ../em-format/e-mail-formatter-secure-button.c:64
 msgid "Encrypted"
 msgstr "暗号化済み"
 
-#: ../em-format/e-mail-formatter-secure-button.c:65
+#: ../em-format/e-mail-formatter-secure-button.c:64
 msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
 msgstr "このメッセージは暗号化されています。このメッセージの内容を部外者が閲覧することは困難と思われます。"
 
-#: ../em-format/e-mail-formatter-secure-button.c:66
+#: ../em-format/e-mail-formatter-secure-button.c:65
 msgid "Encrypted, strong"
 msgstr "暗号化済み (レベルは強力)"
 
-#: ../em-format/e-mail-formatter-secure-button.c:66
+#: ../em-format/e-mail-formatter-secure-button.c:65
 msgid "This message is encrypted, with a strong encryption algorithm. It would be very difficult for an outsider to view the content of this message in a practical amount of time."
 msgstr "このメッセージは強力なアルゴリズムで暗号化されています。このメッセージの内容を部外者が閲覧することは非常に困難と思われます。"
 
-#: ../em-format/e-mail-formatter-secure-button.c:182
-#: ../smime/gui/smime-ui.ui.h:20
+#: ../em-format/e-mail-formatter-secure-button.c:187
+#: ../smime/gui/smime-ui.ui.h:22
 msgid "_View Certificate"
 msgstr "証明書の表示(_V)"
 
-#: ../em-format/e-mail-formatter-secure-button.c:197
+#: ../em-format/e-mail-formatter-secure-button.c:202
 msgid "This certificate is not viewable"
 msgstr "この証明書は表示可能な形式ではありません"
 
-#: ../em-format/e-mail-formatter-source.c:115
+#: ../em-format/e-mail-formatter-source.c:120
 msgid "Source"
 msgstr "ソース"
 
-#: ../em-format/e-mail-formatter-source.c:116
+#: ../em-format/e-mail-formatter-source.c:121
 msgid "Display source of a MIME part"
 msgstr "MIME 部分のソースを表示"
 
-#: ../em-format/e-mail-formatter-utils.c:204
-#: ../em-format/e-mail-formatter-utils.c:221
-#: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:67
+#: ../em-format/e-mail-formatter-utils.c:202
+#: ../em-format/e-mail-formatter-utils.c:219
+#: ../em-format/e-mail-part-headers.c:49 ../modules/mail/em-mailer-prefs.c:66
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/e-mail-formatter-utils.c:205
-#: ../em-format/e-mail-formatter-utils.c:222
-#: ../em-format/e-mail-part-headers.c:51 ../modules/mail/em-mailer-prefs.c:68
+#: ../em-format/e-mail-formatter-utils.c:203
+#: ../em-format/e-mail-formatter-utils.c:220
+#: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:67
 msgid "Bcc"
 msgstr "Bcc"
 
-#: ../em-format/e-mail-parser-application-mbox.c:88
+#: ../em-format/e-mail-parser-application-mbox.c:87
 #, c-format
 msgid "Error parsing MBOX part: %s"
 msgstr "MBOX 部分の解析エラー: %s"
 
-#: ../em-format/e-mail-parser-application-smime.c:84
+#: ../em-format/e-mail-parser-application-smime.c:83
 #, c-format
 msgid "Could not parse S/MIME message: %s"
 msgstr "PGP/MIME メッセージを解析できませんでした: %s"
 
-#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:80
+#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:79
 #, c-format
 msgid "Could not parse PGP message: %s"
 msgstr "PGP メッセージを解析できませんでした: %s"
 
-#: ../em-format/e-mail-parser-inlinepgp-signed.c:83
-#: ../em-format/e-mail-parser-multipart-signed.c:128
+#: ../em-format/e-mail-parser-inlinepgp-signed.c:82
+#: ../em-format/e-mail-parser-multipart-signed.c:135
 #, c-format
 msgid "Error verifying signature: %s"
 msgstr "署名を検証する際にエラーが発生しました: %s"
 
-#: ../em-format/e-mail-parser-message-external.c:69
+#: ../em-format/e-mail-parser-message-external.c:68
 msgid "Malformed external-body part"
 msgstr "External-Body の部分が壊れています"
 
-#: ../em-format/e-mail-parser-message-external.c:102
+#: ../em-format/e-mail-parser-message-external.c:101
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP サイト (%s) を指しています"
 
-#: ../em-format/e-mail-parser-message-external.c:113
+#: ../em-format/e-mail-parser-message-external.c:112
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "ローカルファイル (%s) はサイト \"%s\" に正しくリンクしています"
 
-#: ../em-format/e-mail-parser-message-external.c:115
+#: ../em-format/e-mail-parser-message-external.c:114
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "ローカルファイル (%s) にリンクしています"
 
-#: ../em-format/e-mail-parser-message-external.c:134
+#: ../em-format/e-mail-parser-message-external.c:133
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "リモートデータ (%s) にリンクしています"
 
-#: ../em-format/e-mail-parser-message-external.c:152
+#: ../em-format/e-mail-parser-message-external.c:151
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "不明な外部データ (\"%s\" タイプ) にリンクしています"
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:67
-#: ../em-format/e-mail-parser-multipart-signed.c:81
+#: ../em-format/e-mail-parser-multipart-encrypted.c:66
+#: ../em-format/e-mail-parser-multipart-signed.c:83
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME メッセージを解析できませんでした。ソースを表示します。"
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:83
+#: ../em-format/e-mail-parser-multipart-encrypted.c:82
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "サポートしていない S/MIME の暗号化の種類"
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:102
+#: ../em-format/e-mail-parser-multipart-encrypted.c:101
 #, c-format
 msgid "Could not parse PGP/MIME message: %s"
 msgstr "PGP/MIME メッセージを解析できませんでした: %s"
 
-#: ../em-format/e-mail-parser-multipart-signed.c:114
+#: ../em-format/e-mail-parser-multipart-signed.c:121
 msgid "Unsupported signature format"
 msgstr "サポートしていない署名の書式"
 
-#: ../em-format/e-mail-part-headers.c:48 ../modules/mail/em-mailer-prefs.c:65
+#: ../em-format/e-mail-part-headers.c:47 ../modules/mail/em-mailer-prefs.c:64
 msgid "Reply-To"
 msgstr "返信先"
 
-#: ../em-format/e-mail-part-headers.c:53 ../e-util/e-dateedit.c:550
-#: ../e-util/e-dateedit.c:573 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:70
+#: ../em-format/e-mail-part-headers.c:52 ../e-util/e-dateedit.c:549
+#: ../e-util/e-dateedit.c:572 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:69
 msgid "Date"
 msgstr "日付"
 
-#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:71
+#: ../em-format/e-mail-part-headers.c:53 ../modules/mail/em-mailer-prefs.c:70
 msgid "Newsgroups"
 msgstr "ニュースグループ"
 
-#: ../em-format/e-mail-part-headers.c:55 ../modules/mail/em-mailer-prefs.c:72
+#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:71
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid "Face"
 msgstr "フェイス"
 
-#: ../em-format/e-mail-part-utils.c:500
+#: ../em-format/e-mail-part-utils.c:508
 #, c-format
 msgid "%s attachment"
 msgstr "添付ファイル: %s"
@@ -8938,7 +9271,7 @@ msgstr "日"
 msgid "_When convenient"
 msgstr "都合の良い時(_W)"
 
-#: ../e-util/e-send-options.ui.h:19 ../e-util/e-filter-rule.c:840
+#: ../e-util/e-send-options.ui.h:19 ../e-util/e-filter-rule.c:847
 msgid "Replies"
 msgstr "返信だけ"
 
@@ -9029,71 +9362,79 @@ msgstr "開封通知"
 msgid "Sta_tus Tracking"
 msgstr "ステータスの追跡(_T)"
 
-#: ../e-util/e-table-config.ui.h:1
+#: ../e-util/e-table-config.ui.h:2
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:282
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:192
+#, fuzzy
+#| msgid "_Append"
+msgid "_Apply"
+msgstr "追加する(_A)"
+
+#: ../e-util/e-table-config.ui.h:4
 msgid "_Sort..."
-msgstr "並び替え(_S)..."
+msgstr "並べ替え(_S)..."
 
-#: ../e-util/e-table-config.ui.h:2
+#: ../e-util/e-table-config.ui.h:5
 msgid "_Group By..."
 msgstr "グループ化(_G)..."
 
-#: ../e-util/e-table-config.ui.h:3
+#: ../e-util/e-table-config.ui.h:6
 msgid "_Fields Shown..."
 msgstr "表示する項目(_F)..."
 
-#: ../e-util/e-table-config.ui.h:6
+#: ../e-util/e-table-config.ui.h:9
 msgid "Clear _All"
 msgstr "すべてクリア(_A)"
 
-#: ../e-util/e-table-config.ui.h:7
+#: ../e-util/e-table-config.ui.h:10
 msgid "_Show field in View"
 msgstr "ビューに表示する項目(_S)"
 
-#: ../e-util/e-table-config.ui.h:8 ../e-util/e-table-header-item.c:1753
+#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1753
 msgid "Ascending"
 msgstr "昇順"
 
-#: ../e-util/e-table-config.ui.h:9 ../e-util/e-table-header-item.c:1753
+#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1753
 msgid "Descending"
 msgstr "降順"
 
-#: ../e-util/e-table-config.ui.h:10
+#: ../e-util/e-table-config.ui.h:13
 msgid "Group Items By"
 msgstr "グループ化"
 
-#: ../e-util/e-table-config.ui.h:11
+#: ../e-util/e-table-config.ui.h:14
 msgid "Show _field in View"
 msgstr "ビューに表示する項目(_F)"
 
-#: ../e-util/e-table-config.ui.h:12
+#: ../e-util/e-table-config.ui.h:15
 msgid "Then By"
 msgstr "追加の条件"
 
-#: ../e-util/e-table-config.ui.h:13
+#: ../e-util/e-table-config.ui.h:16
 msgid "Show field i_n View"
 msgstr "ビューに表示する項目(_N)"
 
-#: ../e-util/e-table-config.ui.h:14
+#: ../e-util/e-table-config.ui.h:17
 msgid "Show field in _View"
 msgstr "ビューに表示する項目(_V)"
 
-#: ../e-util/e-table-config.ui.h:15
+#: ../e-util/e-table-config.ui.h:18
 msgid "Sort"
-msgstr "並び替え"
+msgstr "並べ替え"
 
-#: ../e-util/e-table-config.ui.h:16
+#: ../e-util/e-table-config.ui.h:19
 msgid "Clear All"
 msgstr "すべてクリア"
 
-#: ../e-util/e-table-config.ui.h:17
+#: ../e-util/e-table-config.ui.h:20
 msgid "Sort Items By"
-msgstr "次で並び替え"
+msgstr "次で並べ替え"
 
 #: ../e-util/e-timezone-dialog.ui.h:1
 msgid "Select a Time Zone"
 msgstr "タイムゾーンの選択"
 
-#: ../e-util/e-timezone-dialog.ui.h:2
+#: ../e-util/e-timezone-dialog.ui.h:4
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time zone.\n"
 "Use the right mouse button to zoom out."
@@ -9101,20 +9442,20 @@ msgstr ""
 "地図の任意のエリアを拡大する場合はマウスの左ボタンを使い、タイムゾーンを選択してください。\n"
 "エリアを縮小する場合はマウスの右ボタンを使ってください。"
 
-#: ../e-util/e-timezone-dialog.ui.h:4
+#: ../e-util/e-timezone-dialog.ui.h:6
 msgid "Time Zones"
 msgstr "タイムゾーン"
 
-#: ../e-util/e-timezone-dialog.ui.h:5
+#: ../e-util/e-timezone-dialog.ui.h:7
 msgid "_Selection"
 msgstr "選択(_S)"
 
-#: ../e-util/e-timezone-dialog.ui.h:6
+#: ../e-util/e-timezone-dialog.ui.h:8
 msgid "Timezone drop-down combination box"
 msgstr "タイムゾーンを選択するためのドロップダウン式のコンボボックスです"
 
-#: ../e-util/filter.ui.h:1 ../e-util/e-filter-rule.c:1239
-#: ../mail/em-utils.c:240
+#: ../e-util/filter.ui.h:1 ../e-util/e-filter-rule.c:1243
+#: ../mail/em-utils.c:229
 msgid "Incoming"
 msgstr "受信したメッセージ"
 
@@ -9130,7 +9471,7 @@ msgstr "指定した時間"
 msgid "a time relative to the current time"
 msgstr "現在時刻との相対時間"
 
-#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:78
+#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:83
 msgid "seconds"
 msgstr "秒"
 
@@ -9159,15 +9500,15 @@ msgstr "先"
 msgid "Show filters for mail:"
 msgstr "フィルターの対象:"
 
-#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:166
+#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:165
 msgid "_Filter Rules"
 msgstr "フィルターのルール(_F)"
 
-#: ../e-util/filter.ui.h:17
+#: ../e-util/filter.ui.h:23
 msgid "Compare against"
 msgstr "次の条件で比較する: "
 
-#: ../e-util/filter.ui.h:18
+#: ../e-util/filter.ui.h:24
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -9175,7 +9516,7 @@ msgstr ""
 "メッセージの日付を、フィルターが実行された時の\n"
 "現在の時刻と比較します。"
 
-#: ../e-util/filter.ui.h:20
+#: ../e-util/filter.ui.h:26
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -9183,7 +9524,7 @@ msgstr ""
 "メッセージの日付は\n"
 "指定した日付の 0:00 と比較されます。"
 
-#: ../e-util/filter.ui.h:22
+#: ../e-util/filter.ui.h:28
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -9196,9 +9537,9 @@ msgid "_Create new view"
 msgstr "新しいビューの作成(_C)"
 
 #: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
-#: ../e-util/e-mail-signature-script-dialog.c:417
-#: ../mail/e-mail-config-identity-page.c:311
-#: ../mail/e-mail-config-summary-page.c:341
+#: ../e-util/e-mail-signature-script-dialog.c:416
+#: ../mail/e-mail-config-identity-page.c:310
+#: ../mail/e-mail-config-summary-page.c:340
 msgid "_Name:"
 msgstr "名前(_N):"
 
@@ -9206,154 +9547,179 @@ msgstr "名前(_N):"
 msgid "_Replace existing view"
 msgstr "既存のビューと置き換え(_R)"
 
-#: ../e-util/e-activity-proxy.c:311
-#: ../modules/mail/e-mail-shell-view-actions.c:1723
+#: ../e-util/e-activity-proxy.c:308
+#: ../modules/mail/e-mail-shell-view-actions.c:1724
 msgid "Cancel"
 msgstr "キャンセル"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:259
+#: ../e-util/e-activity.c:258
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (キャンセルされた)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:262
+#: ../e-util/e-activity.c:261
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (完了)"
 
 #. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:265
+#: ../e-util/e-activity.c:264
 #, c-format
 msgid "%s (waiting)"
 msgstr "%s (実行待ち)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
-#: ../e-util/e-activity.c:269
+#: ../e-util/e-activity.c:268
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (キャンセルされた)"
 
-#: ../e-util/e-activity.c:271
+#: ../e-util/e-activity.c:270
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../e-util/e-activity.c:276
+#: ../e-util/e-activity.c:275
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完了)"
 
 #. Translators: Escape is a keyboard binding.
-#: ../e-util/e-alert-bar.c:121
+#: ../e-util/e-alert-bar.c:118
 msgid "Close this message (Escape)"
 msgstr "メッセージを閉じる (エスケープ)"
 
-#: ../e-util/e-attachment-bar.c:660 ../e-util/e-attachment-paned.c:703
+#: ../e-util/e-attachment-bar.c:659 ../e-util/e-attachment-paned.c:702
 msgid "Icon View"
 msgstr "アイコンビュー"
 
-#: ../e-util/e-attachment-bar.c:662 ../e-util/e-attachment-paned.c:705
+#: ../e-util/e-attachment-bar.c:661 ../e-util/e-attachment-paned.c:704
 msgid "List View"
 msgstr "一覧ビュー"
 
-#: ../e-util/e-attachment-dialog.c:318
+#: ../e-util/e-attachment-dialog.c:317
 msgid "Attachment Properties"
 msgstr "添付ファイルのプロパティ"
 
-#: ../e-util/e-attachment-dialog.c:340 ../e-util/e-import-assistant.c:273
+#: ../e-util/e-attachment-dialog.c:339 ../e-util/e-import-assistant.c:273
 msgid "F_ilename:"
 msgstr "ファイル名(_I):"
 
-#: ../e-util/e-attachment-dialog.c:375
+#: ../e-util/e-attachment-dialog.c:374
 msgid "MIME Type:"
 msgstr "MIME 型"
 
-#: ../e-util/e-attachment-dialog.c:383 ../e-util/e-attachment-store.c:483
+#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:482
 msgid "_Suggest automatic display of attachment"
 msgstr "添付ファイルを自動的に表示するか提示する(_S)"
 
-#: ../e-util/e-attachment-handler-image.c:97
+#: ../e-util/e-attachment-handler-image.c:96
 msgid "Could not set as background"
 msgstr "壁紙にセットできませんでした"
 
-#: ../e-util/e-attachment-handler-image.c:147
+#: ../e-util/e-attachment-handler-image.c:146
 msgid "Set as _Background"
 msgstr "壁紙にセットする(_B)"
 
-#: ../e-util/e-attachment-icon-view.c:166
-#: ../e-util/e-attachment-tree-view.c:549
+#: ../e-util/e-attachment-icon-view.c:165
+#: ../e-util/e-attachment-tree-view.c:548
 msgid "Loading"
 msgstr "読み込み中"
 
-#: ../e-util/e-attachment-icon-view.c:178
-#: ../e-util/e-attachment-tree-view.c:561
+#: ../e-util/e-attachment-icon-view.c:177
+#: ../e-util/e-attachment-tree-view.c:560
 msgid "Saving"
 msgstr "保存中"
 
-#: ../e-util/e-attachment-paned.c:104
+#: ../e-util/e-attachment-paned.c:103
 msgid "Hide Attachment _Bar"
 msgstr "添付ファイルバーを隠す(_B)"
 
-#: ../e-util/e-attachment-paned.c:106 ../e-util/e-attachment-paned.c:719
+#: ../e-util/e-attachment-paned.c:105 ../e-util/e-attachment-paned.c:718
 msgid "Show Attachment _Bar"
 msgstr "添付ファイルバーを表示する(_B)"
 
-#: ../e-util/e-attachment-store.c:463
+#: ../e-util/e-attachment-store.c:462
 msgid "Add Attachment"
 msgstr "添付ファイルの追加"
 
-#: ../e-util/e-attachment-store.c:466
+#: ../e-util/e-attachment-store.c:465
 msgid "A_ttach"
 msgstr "添付する(_T)"
 
-#: ../e-util/e-attachment-store.c:537
+#: ../e-util/e-attachment-store.c:536
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "添付ファイルの保存"
 
 #. Translators: Default attachment filename.
-#: ../e-util/e-attachment-store.c:568 ../e-util/e-attachment.c:2048
-#: ../e-util/e-attachment.c:2708
+#: ../e-util/e-attachment-store.c:567 ../e-util/e-attachment.c:2058
+#: ../e-util/e-attachment.c:2721
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../e-util/e-attachment-view.c:378
+#: ../e-util/e-attachment-view.c:377
 msgid "Open With Other Application..."
 msgstr "他のアプリケーションで開く..."
 
-#: ../e-util/e-attachment-view.c:385
+#: ../e-util/e-attachment-view.c:384
 msgid "S_ave All"
 msgstr "すべて保存する(_A)"
 
-#: ../e-util/e-attachment-view.c:411
+#: ../e-util/e-attachment-view.c:391
+#, fuzzy
+#| msgid "Sa_ve"
+msgid "Sa_ve As"
+msgstr "保存(_V)"
+
+#: ../e-util/e-attachment-view.c:400
+#: ../plugins/save-calendar/save-calendar.c:349
+#: ../plugins/save-calendar/save-calendar.c:380
+#: ../plugins/save-calendar/save-calendar.c:411
+#, fuzzy
+#| msgid "Save _As..."
+msgid "Save _As"
+msgstr "名前を付けて保存(_A)..."
+
+#: ../e-util/e-attachment-view.c:410
 msgid "A_dd Attachment..."
 msgstr "添付ファイルの追加(_D)..."
 
-#: ../e-util/e-attachment-view.c:435
+#: ../e-util/e-attachment-view.c:417
+#: ../modules/addressbook/e-book-shell-view-actions.c:1026
+#: ../modules/calendar/e-cal-shell-view-actions.c:1399
+#: ../modules/calendar/e-memo-shell-view-actions.c:628
+#: ../modules/calendar/e-task-shell-view-actions.c:752
+#: ../modules/mail/e-mail-shell-view-actions.c:1526
+#: ../modules/mail/e-mail-shell-view-actions.c:1596
+msgid "_Properties"
+msgstr "プロパティ(_P)"
+
+#: ../e-util/e-attachment-view.c:434
 msgid "_Hide"
 msgstr "隠す(_H)"
 
-#: ../e-util/e-attachment-view.c:442
+#: ../e-util/e-attachment-view.c:441
 msgid "Hid_e All"
 msgstr "すべて隠す(_E)"
 
-#: ../e-util/e-attachment-view.c:449
+#: ../e-util/e-attachment-view.c:448
 msgid "_View Inline"
 msgstr "インライン表示(_V)"
 
-#: ../e-util/e-attachment-view.c:456
+#: ../e-util/e-attachment-view.c:455
 msgid "Vie_w All Inline"
 msgstr "すべてインラインで表示(_W)"
 
-#: ../e-util/e-attachment-view.c:786
+#: ../e-util/e-attachment-view.c:785
 #, c-format
 msgid "Open With \"%s\""
 msgstr "\"%s\" で開く"
 
-#: ../e-util/e-attachment-view.c:789
+#: ../e-util/e-attachment-view.c:788
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "この添付ファイルを %s で開く"
@@ -9362,373 +9728,379 @@ msgstr "この添付ファイルを %s で開く"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../e-util/e-attachment.c:1103
+#: ../e-util/e-attachment.c:1108
 msgid "Attached message"
 msgstr "添付メッセージ"
 
-#: ../e-util/e-attachment.c:2129 ../e-util/e-attachment.c:3014
+#: ../e-util/e-attachment.c:2139 ../e-util/e-attachment.c:3027
 msgid "A load operation is already in progress"
 msgstr "読み込み操作が既に進行中"
 
-#: ../e-util/e-attachment.c:2137 ../e-util/e-attachment.c:3022
+#: ../e-util/e-attachment.c:2147 ../e-util/e-attachment.c:3035
 msgid "A save operation is already in progress"
 msgstr "保存操作が既に進行中"
 
-#: ../e-util/e-attachment.c:2254
+#: ../e-util/e-attachment.c:2267
 #, c-format
 msgid "Could not load '%s'"
 msgstr "'%s' を読み込めませんでした"
 
-#: ../e-util/e-attachment.c:2257
+#: ../e-util/e-attachment.c:2270
 #, c-format
 msgid "Could not load the attachment"
 msgstr "添付ファイルを読み込めませんでした"
 
-#: ../e-util/e-attachment.c:2561
+#: ../e-util/e-attachment.c:2574
 #, c-format
 msgid "Could not open '%s'"
 msgstr "'%s' を開けませんでした"
 
-#: ../e-util/e-attachment.c:2564
+#: ../e-util/e-attachment.c:2577
 #, c-format
 msgid "Could not open the attachment"
 msgstr "添付ファイルを開けませんでした"
 
-#: ../e-util/e-attachment.c:3031
+#: ../e-util/e-attachment.c:3044
 msgid "Attachment contents not loaded"
 msgstr "添付内容を読み込みませんでした"
 
-#: ../e-util/e-attachment.c:3107
+#: ../e-util/e-attachment.c:3124
 #, c-format
 msgid "Could not save '%s'"
 msgstr "'%s' を保存できませんでした"
 
-#: ../e-util/e-attachment.c:3110
+#: ../e-util/e-attachment.c:3127
 #, c-format
 msgid "Could not save the attachment"
 msgstr "添付ファイルを保存できませんでした"
 
-#: ../e-util/e-book-source-config.c:98
+#: ../e-util/e-book-source-config.c:97
 msgid "Mark as default address book"
 msgstr "デフォルトのアドレス帳にする"
 
-#: ../e-util/e-book-source-config.c:103
+#: ../e-util/e-book-source-config.c:102
 msgid "Autocomplete with this address book"
 msgstr "このアドレス帳で自動補完"
 
-#: ../e-util/e-book-source-config.c:277
+#: ../e-util/e-book-source-config.c:276
 msgid "Copy book content locally for offline operation"
 msgstr "オフライン用に連絡先の内容をローカルへコピーする"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com"
-#: ../e-util/e-buffer-tagger.c:410
+#: ../e-util/e-buffer-tagger.c:407
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl を押しながらクリックするとリンクを開きます"
 
-#: ../e-util/e-cal-source-config.c:170
+#: ../e-util/e-cal-source-config.c:169
 msgid "Mark as default calendar"
 msgstr "デフォルトのカレンダーにする"
 
-#: ../e-util/e-cal-source-config.c:173
+#: ../e-util/e-cal-source-config.c:172
 msgid "Mark as default task list"
 msgstr "デフォルトのタスク一覧にする"
 
-#: ../e-util/e-cal-source-config.c:176
+#: ../e-util/e-cal-source-config.c:175
 msgid "Mark as default memo list"
 msgstr "デフォルトのメモ一覧にする"
 
-#: ../e-util/e-cal-source-config.c:201
+#: ../e-util/e-cal-source-config.c:200
 msgid "Color:"
 msgstr "色:"
 
-#: ../e-util/e-cal-source-config.c:406
+#: ../e-util/e-cal-source-config.c:405
 msgid "Copy calendar contents locally for offline operation"
 msgstr "オフライン用にカレンダーの内容をローカルへコピーする"
 
-#: ../e-util/e-cal-source-config.c:410
+#: ../e-util/e-cal-source-config.c:409
 msgid "Copy task list contents locally for offline operation"
 msgstr "オフライン用にタスク一覧の内容をローカルへコピーする"
 
-#: ../e-util/e-cal-source-config.c:414
+#: ../e-util/e-cal-source-config.c:413
 msgid "Copy memo list contents locally for offline operation"
 msgstr "オフライン用にメモ一覧の内容をローカルへコピーする"
 
 #. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1327 ../e-util/e-calendar-item.c:2195
+#: ../e-util/e-calendar-item.c:1326 ../e-util/e-calendar-item.c:2194
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%m月"
 
 #. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1329
+#: ../e-util/e-calendar-item.c:1328
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y年"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1366
+#: ../e-util/e-calendar-item.c:1365
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%Y年%m月"
 
-#: ../e-util/e-calendar.c:190
+#: ../e-util/e-calendar.c:189
 msgid "Previous month"
 msgstr "前月へ"
 
-#: ../e-util/e-calendar.c:215
+#: ../e-util/e-calendar.c:214
 msgid "Next month"
 msgstr "翌月へ"
 
-#: ../e-util/e-calendar.c:241
+#: ../e-util/e-calendar.c:240
 msgid "Previous year"
 msgstr "前年へ"
 
-#: ../e-util/e-calendar.c:266
+#: ../e-util/e-calendar.c:265
 msgid "Next year"
 msgstr "翌年へ"
 
-#: ../e-util/e-calendar.c:290
+#: ../e-util/e-calendar.c:289
 msgid "Month Calendar"
 msgstr "月別カレンダー"
 
-#: ../e-util/e-categories-editor.c:224
+#: ../e-util/e-categories-editor.c:223
 msgid "Currently _used categories:"
 msgstr "現在利用しているカテゴリ(_U):"
 
-#: ../e-util/e-categories-editor.c:235
+#: ../e-util/e-categories-editor.c:234
 msgid "_Available Categories:"
 msgstr "利用可能な項目(_A)"
 
-#: ../e-util/e-categories-selector.c:323
+#: ../e-util/e-categories-editor.c:274 ../mail/em-folder-selector.c:269
+#: ../plugins/mail-to-task/mail-to-task.c:595
+#: ../shell/e-shell-window-actions.c:1100
+msgid "_New"
+msgstr "新規(_N)"
+
+#: ../e-util/e-categories-selector.c:321
 msgid "Icon"
 msgstr "アイコン"
 
-#: ../e-util/e-category-completion.c:300
+#: ../e-util/e-category-completion.c:299
 #, c-format
 msgid "Create category \"%s\""
 msgstr "カテゴリ \"%s\" を作成"
 
-#: ../e-util/e-category-editor.c:137
+#: ../e-util/e-category-editor.c:136
 msgid "Category Icon"
 msgstr "カテゴリアイコン"
 
-#: ../e-util/e-category-editor.c:141
+#: ../e-util/e-category-editor.c:140
 msgid "_No Image"
 msgstr "画像なし(_N)"
 
-#: ../e-util/e-category-editor.c:178
+#: ../e-util/e-category-editor.c:173
 msgid "Category _Name"
 msgstr "カテゴリ名(_N)"
 
-#: ../e-util/e-category-editor.c:190
+#: ../e-util/e-category-editor.c:185
 msgid "Category _Icon"
 msgstr "カテゴリアイコン(_I)"
 
-#: ../e-util/e-category-editor.c:216
+#: ../e-util/e-category-editor.c:211
 msgid "Category Properties"
 msgstr "カテゴリのプロパティ"
 
-#: ../e-util/e-category-editor.c:277
+#: ../e-util/e-category-editor.c:272
 #, c-format
 msgid "There is already a category '%s' in the configuration. Please use another name"
 msgstr "設定には既にカテゴリ '%s' があります。別の名前を使ってください"
 
-#: ../e-util/e-cell-combo.c:186
+#: ../e-util/e-cell-combo.c:185
 msgid "popup list"
 msgstr "ポップアップの一覧"
 
-#: ../e-util/e-cell-date-edit.c:299
+#: ../e-util/e-cell-date-edit.c:298
 msgid "Now"
 msgstr "今"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-cell-date-edit.c:307 ../e-util/e-datetime-format.c:209
-#: ../modules/calendar/e-cal-shell-view-actions.c:1900
-#: ../modules/itip-formatter/itip-view.c:230
+#: ../e-util/e-cell-date-edit.c:306 ../e-util/e-datetime-format.c:208
+#: ../modules/calendar/e-cal-shell-view-actions.c:1899
+#: ../modules/itip-formatter/itip-view.c:223
 msgid "Today"
 msgstr "今日"
 
 #. Translators: "None" as a label of a button to unset date in a
 #. * date table cell.
-#: ../e-util/e-cell-date-edit.c:317
+#: ../e-util/e-cell-date-edit.c:316
 msgctxt "table-date"
 msgid "None"
 msgstr "なし"
 
-#: ../e-util/e-cell-date-edit.c:325
+#: ../e-util/e-cell-date-edit.c:324 ../mail/e-mail-label-dialog.c:200
 msgid "OK"
 msgstr "OK"
 
-#: ../e-util/e-cell-date-edit.c:873
+#: ../e-util/e-cell-date-edit.c:872
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "時間はフォーマットに入れなければなりません: %s"
 
-#: ../e-util/e-cell-date.c:51 ../mail/message-list.c:1851
+#: ../e-util/e-cell-date.c:50 ../mail/message-list.c:1853
 msgid "?"
 msgstr "?"
 
-#: ../e-util/e-cell-percent.c:80
+#: ../e-util/e-cell-percent.c:79
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "パーセント値は 0 と 100 を含めた、その間になければなりません"
 
-#: ../e-util/e-charset-combo-box.c:100
+#: ../e-util/e-charset-combo-box.c:99
 msgid "Character Encoding"
 msgstr "エンコーディング"
 
-#: ../e-util/e-charset-combo-box.c:123
+#: ../e-util/e-charset-combo-box.c:122
 msgid "Enter the character set to use"
 msgstr "使用する文字集合を指定してください"
 
-#: ../e-util/e-charset-combo-box.c:342
+#: ../e-util/e-charset-combo-box.c:368
 msgid "Other..."
 msgstr "その他..."
 
-#: ../e-util/e-charset.c:53
+#: ../e-util/e-charset.c:52
 msgid "Arabic"
 msgstr "アラビア語"
 
-#: ../e-util/e-charset.c:54
+#: ../e-util/e-charset.c:53
 msgid "Baltic"
 msgstr "バルト語"
 
-#: ../e-util/e-charset.c:55
+#: ../e-util/e-charset.c:54
 msgid "Central European"
 msgstr "中欧"
 
-#: ../e-util/e-charset.c:56
+#: ../e-util/e-charset.c:55
 msgid "Chinese"
 msgstr "中国語"
 
-#: ../e-util/e-charset.c:57
+#: ../e-util/e-charset.c:56
 msgid "Cyrillic"
 msgstr "キリル文字"
 
-#: ../e-util/e-charset.c:58
+#: ../e-util/e-charset.c:57
 msgid "Greek"
 msgstr "ギリシア語"
 
-#: ../e-util/e-charset.c:59
+#: ../e-util/e-charset.c:58
 msgid "Hebrew"
 msgstr "ヘブライ語"
 
-#: ../e-util/e-charset.c:60
+#: ../e-util/e-charset.c:59
 msgid "Japanese"
 msgstr "日本語"
 
-#: ../e-util/e-charset.c:61
+#: ../e-util/e-charset.c:60
 msgid "Korean"
 msgstr "韓国語"
 
-#: ../e-util/e-charset.c:62
+#: ../e-util/e-charset.c:61
 msgid "Thai"
 msgstr "タイ語"
 
-#: ../e-util/e-charset.c:63
+#: ../e-util/e-charset.c:62
 msgid "Turkish"
 msgstr "トルコ語"
 
-#: ../e-util/e-charset.c:64
+#: ../e-util/e-charset.c:63
 msgid "Unicode"
 msgstr "ユニコード"
 
-#: ../e-util/e-charset.c:65
+#: ../e-util/e-charset.c:64
 msgid "Western European"
 msgstr "西欧"
 
-#: ../e-util/e-charset.c:66
+#: ../e-util/e-charset.c:65
 msgid "Western European, New"
 msgstr "西欧 (New)"
 
 #. Translators: Character set "Chinese, Traditional"
-#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
+#: ../e-util/e-charset.c:84 ../e-util/e-charset.c:86 ../e-util/e-charset.c:88
 msgid "Traditional"
 msgstr "繁体字中国語"
 
 #. Translators: Character set "Chinese, Simplified"
-#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
-#: ../e-util/e-charset.c:97
+#: ../e-util/e-charset.c:90 ../e-util/e-charset.c:92 ../e-util/e-charset.c:94
+#: ../e-util/e-charset.c:96
 msgid "Simplified"
 msgstr "簡体字中国語"
 
 #. Translators: Character set "Cyrillic, Ukrainian"
-#: ../e-util/e-charset.c:101
+#: ../e-util/e-charset.c:100
 msgid "Ukrainian"
 msgstr "ウクライナ語"
 
 #. Translators: Character set "Hebrew, Visual"
-#: ../e-util/e-charset.c:105
+#: ../e-util/e-charset.c:104
 msgid "Visual"
 msgstr "表示"
 
-#: ../e-util/e-client-cache.c:1162
+#: ../e-util/e-client-cache.c:1189
 #, c-format
 msgid "Cannot create a client object from extension name '%s'"
 msgstr "拡張子 '%s' からクライアントオブジェクトを作成することができません"
 
-#: ../e-util/e-dateedit.c:524
+#: ../e-util/e-dateedit.c:523
 msgid "Date and Time"
 msgstr "日付と時刻"
 
-#: ../e-util/e-dateedit.c:549
+#: ../e-util/e-dateedit.c:548
 msgid "Text entry to input date"
 msgstr "日付を入力するためのエントリです"
 
-#: ../e-util/e-dateedit.c:572
+#: ../e-util/e-dateedit.c:571
 msgid "Click this button to show a calendar"
 msgstr "このボタンをクリックするとカレンダーを表示します"
 
-#: ../e-util/e-dateedit.c:626
+#: ../e-util/e-dateedit.c:625
 msgid "Drop-down combination box to select time"
 msgstr "時刻を選択するためのドロップダウン式のコンボボックスです"
 
-#: ../e-util/e-dateedit.c:627
+#: ../e-util/e-dateedit.c:626
 #: ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "時刻"
 
-#: ../e-util/e-dateedit.c:701
+#: ../e-util/e-dateedit.c:700
 msgid "No_w"
 msgstr "今すぐ(_W)"
 
-#: ../e-util/e-dateedit.c:708
+#: ../e-util/e-dateedit.c:707
 msgid "_Today"
 msgstr "今日(_T)"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. * is not permitted.
-#: ../e-util/e-dateedit.c:717
+#: ../e-util/e-dateedit.c:716
 msgid "_None"
 msgstr "なし(_N)"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../e-util/e-dateedit.c:1813 ../e-util/e-dateedit.c:2061
+#: ../e-util/e-dateedit.c:1838 ../e-util/e-dateedit.c:2086
 msgctxt "date"
 msgid "None"
 msgstr "なし"
 
-#: ../e-util/e-dateedit.c:1953
+#: ../e-util/e-dateedit.c:1978
 msgid "Invalid Date Value"
 msgstr "不正な日付"
 
-#: ../e-util/e-dateedit.c:1998
+#: ../e-util/e-dateedit.c:2023
 msgid "Invalid Time Value"
 msgstr "不正な時刻"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:220 ../modules/itip-formatter/itip-view.c:258
+#: ../e-util/e-datetime-format.c:219 ../modules/itip-formatter/itip-view.c:251
 msgid "Tomorrow"
 msgstr "明日"
 
-#: ../e-util/e-datetime-format.c:222
+#: ../e-util/e-datetime-format.c:221
 msgid "Yesterday"
 msgstr "昨日"
 
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:230
+#: ../e-util/e-datetime-format.c:229
 msgctxt "DateFmt"
 msgid "Next Mon"
 msgstr "次の月曜"
@@ -9736,7 +10108,7 @@ msgstr "次の月曜"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:236
+#: ../e-util/e-datetime-format.c:235
 msgctxt "DateFmt"
 msgid "Next Tue"
 msgstr "次の火曜"
@@ -9744,7 +10116,7 @@ msgstr "次の火曜"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:242
+#: ../e-util/e-datetime-format.c:241
 msgctxt "DateFmt"
 msgid "Next Wed"
 msgstr "次の水曜"
@@ -9752,7 +10124,7 @@ msgstr "次の水曜"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:248
+#: ../e-util/e-datetime-format.c:247
 msgctxt "DateFmt"
 msgid "Next Thu"
 msgstr "次の木曜"
@@ -9760,7 +10132,7 @@ msgstr "次の木曜"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:254
+#: ../e-util/e-datetime-format.c:253
 msgctxt "DateFmt"
 msgid "Next Fri"
 msgstr "次の金曜"
@@ -9768,7 +10140,7 @@ msgstr "次の金曜"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:260
+#: ../e-util/e-datetime-format.c:259
 msgctxt "DateFmt"
 msgid "Next Sat"
 msgstr "次の土曜"
@@ -9776,162 +10148,162 @@ msgstr "次の土曜"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:266
+#: ../e-util/e-datetime-format.c:265
 msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "次の日曜"
 
-#: ../e-util/e-datetime-format.c:353 ../e-util/e-datetime-format.c:363
-#: ../e-util/e-datetime-format.c:372
+#: ../e-util/e-datetime-format.c:352 ../e-util/e-datetime-format.c:362
+#: ../e-util/e-datetime-format.c:371
 msgid "Use locale default"
 msgstr "システムのデフォルトを使用"
 
-#: ../e-util/e-datetime-format.c:577
+#: ../e-util/e-datetime-format.c:576
 msgid "Format:"
 msgstr "フォーマット:"
 
-#: ../e-util/e-file-utils.c:121
+#: ../e-util/e-file-utils.c:120
 msgid "(Unknown Filename)"
 msgstr "(ファイル名不明)"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:125
+#: ../e-util/e-file-utils.c:124
 #, c-format
 msgid "Writing \"%s\""
 msgstr "\"%s\" に書き込み中"
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
-#: ../e-util/e-file-utils.c:130
+#: ../e-util/e-file-utils.c:129
 #, c-format
 msgid "Writing \"%s\" to %s"
 msgstr "\"%s\" を %s へ書き込み中"
 
 #. Don't delete this code, since it is needed so that xgettext can extract the translations.
 #. * Please, keep these strings in sync with the strings in the timespans array
-#: ../e-util/e-filter-datespec.c:67
+#: ../e-util/e-filter-datespec.c:66
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d秒前"
 
-#: ../e-util/e-filter-datespec.c:68
+#: ../e-util/e-filter-datespec.c:67
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "%d秒後"
 
-#: ../e-util/e-filter-datespec.c:69
+#: ../e-util/e-filter-datespec.c:68
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d分前"
 
-#: ../e-util/e-filter-datespec.c:70
+#: ../e-util/e-filter-datespec.c:69
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "%d分後"
 
-#: ../e-util/e-filter-datespec.c:71
+#: ../e-util/e-filter-datespec.c:70
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d時間前"
 
-#: ../e-util/e-filter-datespec.c:72
+#: ../e-util/e-filter-datespec.c:71
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "%d時間後"
 
-#: ../e-util/e-filter-datespec.c:73
+#: ../e-util/e-filter-datespec.c:72
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d日前"
 
-#: ../e-util/e-filter-datespec.c:74
+#: ../e-util/e-filter-datespec.c:73
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "%d日後"
 
-#: ../e-util/e-filter-datespec.c:75
+#: ../e-util/e-filter-datespec.c:74
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d週間前"
 
-#: ../e-util/e-filter-datespec.c:76
+#: ../e-util/e-filter-datespec.c:75
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "%d週間後"
 
-#: ../e-util/e-filter-datespec.c:77
+#: ../e-util/e-filter-datespec.c:76
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%dヶ月前"
 
-#: ../e-util/e-filter-datespec.c:78
+#: ../e-util/e-filter-datespec.c:77
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "%dヶ月後"
 
-#: ../e-util/e-filter-datespec.c:79
+#: ../e-util/e-filter-datespec.c:78
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d年前"
 
-#: ../e-util/e-filter-datespec.c:80
+#: ../e-util/e-filter-datespec.c:79
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "%d年後"
 
-#: ../e-util/e-filter-datespec.c:130
+#: ../e-util/e-filter-datespec.c:129
 msgid "<click here to select a date>"
 msgstr "<ここをクリックして日付を選択してください>"
 
-#: ../e-util/e-filter-datespec.c:133 ../e-util/e-filter-datespec.c:144
-#: ../e-util/e-filter-datespec.c:155
+#: ../e-util/e-filter-datespec.c:132 ../e-util/e-filter-datespec.c:143
+#: ../e-util/e-filter-datespec.c:154
 msgid "now"
 msgstr "現在"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../e-util/e-filter-datespec.c:140
+#: ../e-util/e-filter-datespec.c:139
 msgid "%d-%b-%Y"
 msgstr "%Y-%m-%d"
 
-#: ../e-util/e-filter-datespec.c:289
+#: ../e-util/e-filter-datespec.c:288
 msgid "Select a time to compare against"
 msgstr "比較するもう1つの時間の選択"
 
-#: ../e-util/e-filter-file.c:187
+#: ../e-util/e-filter-file.c:186
 msgid "Choose a File"
 msgstr "ファイルの選択"
 
-#: ../e-util/e-filter-rule.c:743
+#: ../e-util/e-filter-rule.c:750
 msgid "R_ule name:"
 msgstr "ルール名(_U):"
 
-#: ../e-util/e-filter-rule.c:793
+#: ../e-util/e-filter-rule.c:800
 msgid "all the following conditions"
 msgstr "次の条件を全て満足したアイテムを検索します"
 
-#: ../e-util/e-filter-rule.c:794
+#: ../e-util/e-filter-rule.c:801
 msgid "any of the following conditions"
 msgstr "次の条件のどれかを満足したアイテムを検索します"
 
-#: ../e-util/e-filter-rule.c:800
+#: ../e-util/e-filter-rule.c:807
 msgid "_Find items which match:"
 msgstr "検索する条件(_F):"
 
-#: ../e-util/e-filter-rule.c:823
+#: ../e-util/e-filter-rule.c:830
 msgid "Find items that meet the following conditions"
 msgstr "次の条件を満足したアイテムを検索します"
 
@@ -9939,34 +10311,35 @@ msgstr "次の条件を満足したアイテムを検索します"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../e-util/e-filter-rule.c:838 ../e-util/e-mail-signature-combo-box.c:369
-#: ../libemail-engine/camel-null-store.c:28
-#: ../mail/e-mail-config-summary-page.c:139
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:622
+#: ../e-util/e-filter-rule.c:845 ../e-util/e-mail-identity-combo-box.c:473
+#: ../e-util/e-mail-signature-combo-box.c:368 ../e-util/e-proxy-editor.c:549
+#: ../libemail-engine/camel-null-store.c:27
+#: ../mail/e-mail-config-summary-page.c:138
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:621
 msgid "None"
 msgstr "なし"
 
-#: ../e-util/e-filter-rule.c:839
+#: ../e-util/e-filter-rule.c:846
 msgid "All related"
 msgstr "関係するものすべて"
 
-#: ../e-util/e-filter-rule.c:841
+#: ../e-util/e-filter-rule.c:848
 msgid "Replies and parents"
 msgstr "返信とその親"
 
-#: ../e-util/e-filter-rule.c:842
+#: ../e-util/e-filter-rule.c:849
 msgid "No reply or parent"
 msgstr "返信とその親以外"
 
-#: ../e-util/e-filter-rule.c:845
+#: ../e-util/e-filter-rule.c:852
 msgid "I_nclude threads:"
 msgstr " スレッドの種類(_N):"
 
-#: ../e-util/e-filter-rule.c:922
+#: ../e-util/e-filter-rule.c:929
 msgid "A_dd Condition"
 msgstr "条件の追加(_D)"
 
-#: ../e-util/e-filter-rule.c:1239 ../mail/em-utils.c:241
+#: ../e-util/e-filter-rule.c:1243 ../mail/em-utils.c:230
 msgid "Outgoing"
 msgstr "送信するメッセージ"
 
@@ -9982,7 +10355,7 @@ msgstr "ファイルの選択"
 msgid "File _type:"
 msgstr "ファイルの種類(_T):"
 
-#: ../e-util/e-import-assistant.c:340 ../e-util/e-import-assistant.c:921
+#: ../e-util/e-import-assistant.c:340 ../e-util/e-import-assistant.c:917
 msgid "Choose the destination for this import"
 msgstr "インポート先の選択"
 
@@ -9999,7 +10372,7 @@ msgid "Import a _single file"
 msgstr "一個のファイルをインポートする(_S)"
 
 #: ../e-util/e-import-assistant.c:403
-#: ../modules/startup-wizard/e-mail-config-import-page.c:202
+#: ../modules/startup-wizard/e-mail-config-import-page.c:201
 msgid "Please select the information that you would like to import:"
 msgstr "インポートしたい情報を選択してください:"
 
@@ -10008,7 +10381,7 @@ msgid "Evolution checked for settings to import from the following applications:
 msgstr "Evolution は Pine、Netscape、Elm、iCalendar からのインポートの設定をチェックしました。インポートできる設定は見つかりませんでした。再度チェックを実行する場合は、[戻る] をクリックしてください。"
 
 #: ../e-util/e-import-assistant.c:559
-#: ../modules/startup-wizard/e-mail-config-import-page.c:231
+#: ../modules/startup-wizard/e-mail-config-import-page.c:230
 #, c-format
 msgid "From %s:"
 msgstr "差出人 %s:"
@@ -10018,29 +10391,29 @@ msgstr "差出人 %s:"
 msgid "_Cancel Import"
 msgstr "インポートをキャンセル(_C)"
 
-#: ../e-util/e-import-assistant.c:920
+#: ../e-util/e-import-assistant.c:916
 msgid "Preview data to be imported"
 msgstr "インポートするデータのプレビューを表示します"
 
-#: ../e-util/e-import-assistant.c:926 ../e-util/e-import-assistant.c:939
-#: ../e-util/e-import-assistant.c:1292 ../e-util/e-import-assistant.c:1368
-#: ../e-util/e-import-assistant.c:1377
+#: ../e-util/e-import-assistant.c:922 ../e-util/e-import-assistant.c:935
+#: ../e-util/e-import-assistant.c:1288 ../e-util/e-import-assistant.c:1364
+#: ../e-util/e-import-assistant.c:1373
 msgid "Import Data"
 msgstr "データのインポート"
 
-#: ../e-util/e-import-assistant.c:934
+#: ../e-util/e-import-assistant.c:930
 msgid "Select what type of file you want to import from the list."
 msgstr "一覧からどの種類のファイルをインポートしたいのか選択してください"
 
-#: ../e-util/e-import-assistant.c:1282 ../e-util/e-import-assistant.c:1317
+#: ../e-util/e-import-assistant.c:1278 ../e-util/e-import-assistant.c:1313
 msgid "Evolution Import Assistant"
 msgstr "Evolution インポートアシスタント"
 
-#: ../e-util/e-import-assistant.c:1299 ../e-util/e-import-assistant.c:1355
+#: ../e-util/e-import-assistant.c:1295 ../e-util/e-import-assistant.c:1351
 msgid "Import Location"
 msgstr "インポートする場所"
 
-#: ../e-util/e-import-assistant.c:1310
+#: ../e-util/e-import-assistant.c:1306
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing external files into Evolution."
@@ -10048,43 +10421,43 @@ msgstr ""
 "Evolution インポートアシスタントへようこそ。\n"
 "このアシスタントを使って、外部のファイルを Evolution へインポートする手順をご案内します。"
 
-#: ../e-util/e-import-assistant.c:1327
+#: ../e-util/e-import-assistant.c:1323
 msgid "Importer Type"
 msgstr "インポートの種類"
 
-#: ../e-util/e-import-assistant.c:1337
+#: ../e-util/e-import-assistant.c:1333
 msgid "Select Information to Import"
 msgstr "インポートする情報の選択"
 
-#: ../e-util/e-import-assistant.c:1346
+#: ../e-util/e-import-assistant.c:1342
 msgid "Select a File"
 msgstr "ファイルの選択"
 
-#: ../e-util/e-import-assistant.c:1363
+#: ../e-util/e-import-assistant.c:1359
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "\"適用\" をクリックしてファイルの Evolution へのインポートを開始してください。"
 
-#: ../e-util/e-mail-signature-combo-box.c:378
+#: ../e-util/e-mail-signature-combo-box.c:377
 msgid "Autogenerated"
 msgstr "自動生成"
 
-#: ../e-util/e-mail-signature-editor.c:310
+#: ../e-util/e-mail-signature-editor.c:309
 msgid "Close"
 msgstr "閉じる"
 
-#: ../e-util/e-mail-signature-editor.c:315
+#: ../e-util/e-mail-signature-editor.c:314
 msgid "_Save and Close"
 msgstr "保存して閉じる(_S)"
 
-#: ../e-util/e-mail-signature-editor.c:529
+#: ../e-util/e-mail-signature-editor.c:528
 msgid "Edit Signature"
 msgstr "署名の編集"
 
-#: ../e-util/e-mail-signature-editor.c:549
+#: ../e-util/e-mail-signature-editor.c:548
 msgid "_Signature Name:"
 msgstr "署名の名称(_S):"
 
-#: ../e-util/e-mail-signature-editor.c:595
+#: ../e-util/e-mail-signature-editor.c:594
 msgid "Unnamed"
 msgstr "名前なし"
 
@@ -10092,15 +10465,15 @@ msgstr "名前なし"
 msgid "Add _Script"
 msgstr "スクリプトの追加(_S)"
 
-#: ../e-util/e-mail-signature-manager.c:422
+#: ../e-util/e-mail-signature-manager.c:419
 msgid "Add Signature Script"
 msgstr "署名スクリプトの追加"
 
-#: ../e-util/e-mail-signature-manager.c:492
+#: ../e-util/e-mail-signature-manager.c:489
 msgid "Edit Signature Script"
 msgstr "署名スクリプトの編集"
 
-#: ../e-util/e-mail-signature-script-dialog.c:395
+#: ../e-util/e-mail-signature-script-dialog.c:394
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -10110,102 +10483,98 @@ msgstr ""
 "使用されます。指定した \"名前\" は\n"
 "表示の目的でのみ使用されます。"
 
-#: ../e-util/e-mail-signature-script-dialog.c:446
+#: ../e-util/e-mail-signature-script-dialog.c:445
 msgid "S_cript:"
 msgstr "スクリプト(_C):"
 
-#: ../e-util/e-mail-signature-script-dialog.c:477
+#: ../e-util/e-mail-signature-script-dialog.c:476
 msgid "Script file must be executable."
 msgstr "スクリプトファイルは実行可能でなければなりません。"
 
-#: ../e-util/e-map.c:886
+#: ../e-util/e-map.c:885
 msgid "World Map"
 msgstr "世界地図"
 
-#: ../e-util/e-map.c:889
+#: ../e-util/e-map.c:888
 msgid "Mouse-based interactive map widget for selecting timezone. Keyboard users should instead select the timezone from the drop-down combination box below."
 msgstr "マウスでタイムゾーンを選択するための地図ウィジェットです。キーボードをご利用の際は、この下にあるタイムゾーン選択用のドロップダウン式コンボボックスをご利用ください。"
 
-#: ../e-util/e-misc-utils.c:242
+#: ../e-util/e-misc-utils.c:246
 msgid "Could not open the link."
 msgstr "リンクを開けませんでした"
 
-#: ../e-util/e-misc-utils.c:289
+#: ../e-util/e-misc-utils.c:293
 msgid "Could not display help for Evolution."
 msgstr "Evolution のヘルプを表示できませんでした。"
 
-#: ../e-util/e-name-selector-dialog.c:279
+#: ../e-util/e-name-selector-dialog.c:277
 msgid "Show Contacts"
 msgstr "連絡先を表示"
 
-#: ../e-util/e-name-selector-dialog.c:311
+#: ../e-util/e-name-selector-dialog.c:309
 msgid "Address B_ook:"
 msgstr "アドレス帳(_O):"
 
-#: ../e-util/e-name-selector-dialog.c:318
+#: ../e-util/e-name-selector-dialog.c:316
 msgid "Cat_egory:"
 msgstr "カテゴリ(_E):"
 
-#: ../e-util/e-name-selector-dialog.c:342
+#: ../e-util/e-name-selector-dialog.c:340
 msgid "_Search:"
 msgstr "検索(_S):"
 
-#: ../e-util/e-name-selector-dialog.c:368
-#: ../e-util/e-name-selector-dialog.c:1276
-#: ../modules/addressbook/e-book-shell-view-actions.c:1116
-#: ../modules/calendar/e-cal-shell-view-actions.c:1733
-#: ../modules/calendar/e-memo-shell-view-actions.c:767
-#: ../modules/calendar/e-task-shell-view-actions.c:938
+#: ../e-util/e-name-selector-dialog.c:366
+#: ../e-util/e-name-selector-dialog.c:1274
+#: ../modules/addressbook/e-book-shell-view-actions.c:1112
+#: ../modules/calendar/e-cal-shell-view-actions.c:1732
+#: ../modules/calendar/e-memo-shell-view-actions.c:766
+#: ../modules/calendar/e-task-shell-view-actions.c:937
 msgid "Any Category"
 msgstr "任意のカテゴリ"
 
-#: ../e-util/e-name-selector-dialog.c:370
+#: ../e-util/e-name-selector-dialog.c:368
 msgid "Co_ntacts"
 msgstr "連絡先(_N)"
 
-#: ../e-util/e-name-selector-dialog.c:447
+#: ../e-util/e-name-selector-dialog.c:445
 msgid "Search"
 msgstr "検索"
 
-#: ../e-util/e-name-selector-dialog.c:450
-#: ../mail/importers/pine-importer.c:426
+#: ../e-util/e-name-selector-dialog.c:448
+#: ../mail/importers/pine-importer.c:427
 msgid "Address Book"
 msgstr "アドレス帳"
 
-#: ../e-util/e-name-selector-dialog.c:453
-#: ../modules/addressbook/e-book-shell-backend.c:304
-#: ../modules/addressbook/e-book-shell-view.c:372
+#: ../e-util/e-name-selector-dialog.c:451
+#: ../modules/addressbook/e-book-shell-backend.c:303
+#: ../modules/addressbook/e-book-shell-view.c:371
 msgid "Contacts"
 msgstr "連絡先"
 
-#: ../e-util/e-name-selector-dialog.c:578
+#: ../e-util/e-name-selector-dialog.c:576
 msgid "Select Contacts from Address Book"
 msgstr "アドレス帳から連絡先を選択"
 
-#: ../e-util/e-name-selector-dialog.c:1001
-msgid "_Remove"
-msgstr "削除(_R)"
-
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../e-util/e-name-selector-entry.c:3028
+#: ../e-util/e-name-selector-entry.c:3038
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "%s をインラインに展開(_X)"
 
 #. Copy Contact Item
-#: ../e-util/e-name-selector-entry.c:3044
+#: ../e-util/e-name-selector-entry.c:3054
 #, c-format
 msgid "Cop_y %s"
 msgstr "%s をコピー(_Y)"
 
 #. Cut Contact Item
-#: ../e-util/e-name-selector-entry.c:3055
+#: ../e-util/e-name-selector-entry.c:3065
 #, c-format
 msgid "C_ut %s"
 msgstr "%s を切り取り(_U)"
 
 #. Edit Contact item
-#: ../e-util/e-name-selector-entry.c:3073
+#: ../e-util/e-name-selector-entry.c:3083
 #, c-format
 msgid "_Edit %s"
 msgstr "%s を編集(_E)"
@@ -10215,39 +10584,39 @@ msgstr "%s を編集(_E)"
 msgid "_Delete %s"
 msgstr "%s を削除(_D)"
 
-#: ../e-util/e-online-button.c:31
+#: ../e-util/e-online-button.c:30
 msgid "Evolution is currently online.  Click this button to work offline."
 msgstr "Evolution は現在オンラインです。このボタンをクリックしてオフライン動作させられます。"
 
-#: ../e-util/e-online-button.c:34
+#: ../e-util/e-online-button.c:33
 msgid "Evolution is currently offline.  Click this button to work online."
 msgstr "Evolution は現在オフラインです。このボタンをクリックしてオンラインで動作させることができます。"
 
-#: ../e-util/e-online-button.c:37
+#: ../e-util/e-online-button.c:36
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "ネットワークに接続できないため、Evolution は現在オフラインです。"
 
-#: ../e-util/e-passwords.c:127
+#: ../e-util/e-passwords.c:125
 msgid "Keyring key is unusable: no user or host name"
 msgstr "キーリングのキーが使えません: ユーザーかホストの名前がありません"
 
-#: ../e-util/e-passwords.c:447
+#: ../e-util/e-passwords.c:445
 msgid "You have the Caps Lock key on."
 msgstr "Caps Lock キーがオンになっています。"
 
-#: ../e-util/e-passwords.c:578
+#: ../e-util/e-passwords.c:576
 msgid "_Remember this passphrase"
 msgstr "このパスフレーズを記憶する(_R)"
 
-#: ../e-util/e-passwords.c:579
+#: ../e-util/e-passwords.c:577
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "このセッションのリマインダー用にこのパスフレーズを記憶します(_R)"
 
-#: ../e-util/e-passwords.c:584
+#: ../e-util/e-passwords.c:582
 msgid "_Remember this password"
 msgstr "このパスワードを記憶する(_R)"
 
-#: ../e-util/e-passwords.c:585
+#: ../e-util/e-passwords.c:583
 msgid "_Remember this password for the remainder of this session"
 msgstr "このセッションのリマインダー用にこのパスワードを記憶します(_R)"
 
@@ -10255,136 +10624,208 @@ msgstr "このセッションのリマインダー用にこのパスワードを
 msgid "Evolution Preferences"
 msgstr "Evolution の設定"
 
-#: ../e-util/e-print.c:161
+#: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "印刷する際にエラーが発生しました"
 
-#: ../e-util/e-print.c:168
+#: ../e-util/e-print.c:167
 msgid "The printing system reported the following details about the error:"
 msgstr "エラーに関して印刷システムから次のような詳細情報が報告されました:"
 
-#: ../e-util/e-print.c:174
+#: ../e-util/e-print.c:173
 msgid "The printing system did not report any additional details about the error."
 msgstr "印刷システムはエラーに関して何も詳細を報告してきませんでした。"
 
-#: ../e-util/e-rule-editor.c:185
+#: ../e-util/e-proxy-editor.c:314
+msgid "_Method:"
+msgstr "メソッド(_M):"
+
+#: ../e-util/e-proxy-editor.c:336
+msgid "Defer to Desktop Settings"
+msgstr "デスクトップ設定に従う"
+
+#: ../e-util/e-proxy-editor.c:340
+msgid "_Open Desktop Settings"
+msgstr "デスクトップ設定を開く(_O)"
+
+#: ../e-util/e-proxy-editor.c:366
+msgid "Manual"
+msgstr "マニュアル"
+
+#: ../e-util/e-proxy-editor.c:385
+msgid "_HTTP Proxy:"
+msgstr "HTTP プロキシ(_H):"
+
+#: ../e-util/e-proxy-editor.c:416
+msgid "H_TTPS Proxy:"
+msgstr "HTTPS プロキシ(_T):"
+
+#: ../e-util/e-proxy-editor.c:447
+msgid "_Socks Proxy:"
+msgstr "Socks プロキシ(_S):"
+
+#: ../e-util/e-proxy-editor.c:478
+msgid "_Ignore Hosts:"
+msgstr "無視するホスト(_I):"
+
+#: ../e-util/e-proxy-editor.c:504
+msgid "Automatic"
+msgstr "自動設定"
+
+#: ../e-util/e-proxy-editor.c:523
+msgid "Configuration _URL:"
+msgstr "設定用URL(_U):"
+
+#: ../e-util/e-proxy-editor.c:552
+msgid "Use a direct connection, no proxying required."
+msgstr "プロキシ不要で直接接続します。"
+
+#: ../e-util/e-proxy-preferences.c:177
+msgid "Switch to Basic Proxy Preferences"
+msgstr "基礎的なプロキシ設定に切り替え"
+
+#: ../e-util/e-proxy-preferences.c:179
+msgid "Switch to Advanced Proxy Preferences"
+msgstr "詳細なプロキシ設定に切り替え"
+
+#: ../e-util/e-proxy-preferences.c:463
+msgid "Apply custom proxy settings to these accounts:"
+msgstr "以下のアカウントに独自のプロキシ設定を適用します:"
+
+#: ../e-util/e-proxy-preferences.c:498
+msgid "<b>Advanced Proxy Preferences</b> lets you define alternate network proxies and apply them to specific accounts"
+msgstr "<b>詳細なプロキシ設定</b>ではネットワークの代替プロキシを定義して特定のアカウントに適用することができます。"
+
+#: ../e-util/e-proxy-selector.c:85
+msgid "Custom Proxy"
+msgstr "独自のプロキシ設定"
+
+#: ../e-util/e-proxy-selector.c:487
+msgid "Create a new proxy profile"
+msgstr "新しいプロキシのプロファイルを作成します"
+
+#: ../e-util/e-proxy-selector.c:492
+msgid "Delete the selected proxy profile"
+msgstr "選択したプロキシのプロファイルを削除します"
+
+#: ../e-util/e-rule-editor.c:184
 msgid "Add Rule"
 msgstr "ルールの追加"
 
-#: ../e-util/e-rule-editor.c:287
+#: ../e-util/e-rule-editor.c:286
 msgid "Edit Rule"
 msgstr "ルールの編集"
 
-#: ../e-util/e-search-bar.c:81
+#: ../e-util/e-search-bar.c:82
 #, c-format
 msgid "Matches: %u"
 msgstr "検索結果: %u個"
 
-#: ../e-util/e-search-bar.c:565
+#: ../e-util/e-search-bar.c:566
 msgid "Close the find bar"
 msgstr "検索バーを閉じます"
 
-#: ../e-util/e-search-bar.c:573
+#: ../e-util/e-search-bar.c:574
 msgid "Fin_d:"
 msgstr "検索(_D):"
 
-#: ../e-util/e-search-bar.c:585
+#: ../e-util/e-search-bar.c:586
 msgid "Clear the search"
 msgstr "検索をクリア"
 
-#: ../e-util/e-search-bar.c:609
+#: ../e-util/e-search-bar.c:610
 msgid "_Previous"
 msgstr "前へ(_P)"
 
-#: ../e-util/e-search-bar.c:615
+#: ../e-util/e-search-bar.c:613
 msgid "Find the previous occurrence of the phrase"
 msgstr "フレーズの前の出現位置を検索"
 
-#: ../e-util/e-search-bar.c:624
+#: ../e-util/e-search-bar.c:622
 msgid "_Next"
 msgstr "次へ(_N)"
 
-#: ../e-util/e-search-bar.c:630
+#: ../e-util/e-search-bar.c:625
 msgid "Find the next occurrence of the phrase"
 msgstr "フレーズの次の出現位置を検索"
 
-#: ../e-util/e-search-bar.c:639
+#: ../e-util/e-search-bar.c:634
 msgid "Mat_ch case"
 msgstr "大文字小文字を区別して一致(_C)"
 
-#: ../e-util/e-search-bar.c:667
+#: ../e-util/e-search-bar.c:662
 msgid "Reached bottom of page, continued from top"
 msgstr "ページの末尾に到達しました。先頭から続行します"
 
-#: ../e-util/e-search-bar.c:689
+#: ../e-util/e-search-bar.c:684
 msgid "Reached top of page, continued from bottom"
 msgstr "ページの先頭に到達しました。末尾から続行します"
 
-#: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:331
-#: ../mail/importers/pine-importer.c:419
-#: ../modules/mail/e-mail-shell-view.c:1075
+#: ../e-util/e-send-options.c:537 ../mail/importers/elm-importer.c:327
+#: ../mail/importers/pine-importer.c:420
+#: ../modules/mail/e-mail-shell-view.c:1097
 msgid "Mail"
 msgstr "メール"
 
-#: ../e-util/e-send-options.c:570
+#: ../e-util/e-send-options.c:569
 msgid "When de_leted:"
 msgstr "削除した時(_L):"
 
-#: ../e-util/e-source-config.c:681 ../e-util/e-source-config.c:685
+#: ../e-util/e-source-config.c:680 ../e-util/e-source-config.c:684
 msgid "Type:"
 msgstr "種類:"
 
-#: ../e-util/e-source-config.c:693 ../e-util/e-source-config.c:697
+#: ../e-util/e-source-config.c:692 ../e-util/e-source-config.c:696
 msgid "Name:"
 msgstr "名前:"
 
 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../e-util/e-source-config.c:1302
+#: ../e-util/e-source-config.c:1301
 msgid "Refresh every"
 msgstr "更新間隔"
 
-#: ../e-util/e-source-config.c:1332 ../e-util/e-source-config.c:1402
+#: ../e-util/e-source-config.c:1331 ../e-util/e-source-config.c:1401
 msgid "Use a secure connection"
 msgstr "セキュアな接続の利用"
 
-#: ../e-util/e-source-config.c:1428
+#: ../e-util/e-source-config.c:1427
 msgid "Unset _trust for SSL certificate"
 msgstr "証明書に対する信頼を解除(_T)"
 
-#: ../e-util/e-source-config.c:1464
+#: ../e-util/e-source-config.c:1463
 msgid "User"
 msgstr "ユーザー"
 
-#: ../e-util/e-source-selector-dialog.c:229
+#: ../e-util/e-source-selector-dialog.c:226
 msgid "_Destination"
 msgstr "インポート元(_D):"
 
-#: ../e-util/e-source-selector-dialog.c:342
+#: ../e-util/e-source-selector-dialog.c:339
 msgid "Select destination"
 msgstr "インポート元の選択"
 
 #. no suggestions. Put something in the menu anyway...
-#: ../e-util/e-spell-entry.c:384
+#: ../e-util/e-spell-entry.c:383
 msgid "(no suggestions)"
 msgstr "(提案無し)"
 
-#: ../e-util/e-spell-entry.c:408
+#: ../e-util/e-spell-entry.c:407
 msgid "More..."
 msgstr "さらに..."
 
 #. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:479
+#: ../e-util/e-spell-entry.c:478
 #, c-format
 msgid "Add \"%s\" to Dictionary"
 msgstr "\"%s\" を辞書に追加"
 
 #. - Ignore All
-#: ../e-util/e-spell-entry.c:530
+#: ../e-util/e-spell-entry.c:529
 msgid "Ignore All"
 msgstr "全て無視する"
 
-#: ../e-util/e-spell-entry.c:558
+#: ../e-util/e-spell-entry.c:557
 msgid "Spelling Suggestions"
 msgstr "つづりの提案"
 
@@ -10477,60 +10918,60 @@ msgid "The task list backend servicing &quot;{0}&quot; encountered an error."
 msgstr "タスク一覧バックエンドサービスの &quot;{0}&quot; にエラーが起きました。"
 
 #: ../e-util/e-table-click-to-add.c:680
-#: ../e-util/gal-a11y-e-table-click-to-add.c:62
-#: ../e-util/gal-a11y-e-table-click-to-add.c:143
+#: ../e-util/gal-a11y-e-table-click-to-add.c:61
+#: ../e-util/gal-a11y-e-table-click-to-add.c:142
 msgid "click to add"
 msgstr "クリックして追加する"
 
-#: ../e-util/e-table-column-selector.c:266
+#: ../e-util/e-table-column-selector.c:265
 msgid "Move selected column names to top"
 msgstr "選択した行を最上部に移動"
 
-#: ../e-util/e-table-column-selector.c:271
+#: ../e-util/e-table-column-selector.c:270
 msgid "Move selected column names up one row"
 msgstr "選択した行を1つ上に移動"
 
-#: ../e-util/e-table-column-selector.c:276
+#: ../e-util/e-table-column-selector.c:275
 msgid "Move selected column names down one row"
 msgstr "選択した行を1つ下に移動"
 
-#: ../e-util/e-table-column-selector.c:281
+#: ../e-util/e-table-column-selector.c:280
 msgid "Move selected column names to bottom"
 msgstr "選択した行を最下部に移動"
 
-#: ../e-util/e-table-column-selector.c:286
+#: ../e-util/e-table-column-selector.c:285
 msgid "Select all column names"
 msgstr "行をすべて選択"
 
-#: ../e-util/e-table-config.c:389 ../e-util/e-table-config.c:435
+#: ../e-util/e-table-config.c:388 ../e-util/e-table-config.c:434
 msgid "(Ascending)"
 msgstr "(昇順)"
 
-#: ../e-util/e-table-config.c:389 ../e-util/e-table-config.c:435
+#: ../e-util/e-table-config.c:388 ../e-util/e-table-config.c:434
 msgid "(Descending)"
 msgstr "(降順)"
 
-#: ../e-util/e-table-config.c:396
+#: ../e-util/e-table-config.c:395
 msgid "Not sorted"
-msgstr "並び替えなし"
+msgstr "並べ替えなし"
 
-#: ../e-util/e-table-config.c:441
+#: ../e-util/e-table-config.c:440
 msgid "No grouping"
 msgstr "グループなし"
 
-#: ../e-util/e-table-config.c:546
+#: ../e-util/e-table-config.c:545
 msgid "Show Fields"
 msgstr "表示する項目"
 
-#: ../e-util/e-table-config.c:562
+#: ../e-util/e-table-config.c:559
 msgid "Choose the order of information to appear in the message list."
 msgstr "メッセージ一覧に表示する情報の順序を選択してください。"
 
-#: ../e-util/e-table-field-chooser-dialog.c:227
+#: ../e-util/e-table-field-chooser-dialog.c:226
 msgid "Add a Column"
 msgstr "項目の追加"
 
-#: ../e-util/e-table-field-chooser.c:167
+#: ../e-util/e-table-field-chooser.c:166
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -10538,13 +10979,13 @@ msgstr ""
 "表へ追加したい項目を選択して、\n"
 "表示させたい場所にドラッグしてください。"
 
-#: ../e-util/e-table-group-container.c:369
+#: ../e-util/e-table-group-container.c:368
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
 msgstr[0] "%s : %s (%d個のアイテム)"
 
-#: ../e-util/e-table-group-container.c:383
+#: ../e-util/e-table-group-container.c:382
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
@@ -10556,15 +10997,15 @@ msgstr "ビューのカスタマイズ"
 
 #: ../e-util/e-table-header-item.c:1599
 msgid "Sort _Ascending"
-msgstr "昇順で並び替え(_A)"
+msgstr "昇順で並べ替え(_A)"
 
 #: ../e-util/e-table-header-item.c:1602
 msgid "Sort _Descending"
-msgstr "降順で並び替え(_D)"
+msgstr "降順で並べ替え(_D)"
 
 #: ../e-util/e-table-header-item.c:1605
 msgid "_Unsort"
-msgstr "並び替えない(_U)"
+msgstr "並べ替えない(_U)"
 
 #: ../e-util/e-table-header-item.c:1608
 msgid "Group By This _Field"
@@ -10600,133 +11041,149 @@ msgstr "ビューのカスタマイズ(_M)..."
 
 #: ../e-util/e-table-header-item.c:1703
 msgid "_Sort By"
-msgstr "並び替え(_S)"
+msgstr "並べ替え(_S)"
 
 #. Custom
 #: ../e-util/e-table-header-item.c:1726
 msgid "_Custom"
 msgstr "カスタム(_C)"
 
-#: ../e-util/e-text.c:2098
+#: ../e-util/e-text.c:2110
 msgid "Select All"
 msgstr "すべて選択"
 
-#: ../e-util/e-text.c:2111
+#: ../e-util/e-text.c:2123
 msgid "Input Methods"
 msgstr "入力メソッド"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../e-util/e-timezone-dialog.c:207 ../e-util/e-timezone-dialog.c:429
-#: ../e-util/e-timezone-dialog.c:433 ../e-util/e-timezone-dialog.c:437
-#: ../e-util/e-timezone-dialog.c:803
+#: ../e-util/e-timezone-dialog.c:206 ../e-util/e-timezone-dialog.c:428
+#: ../e-util/e-timezone-dialog.c:432 ../e-util/e-timezone-dialog.c:436
+#: ../e-util/e-timezone-dialog.c:804
 msgid "UTC"
 msgstr "UTC"
 
-#: ../e-util/e-url-entry.c:109
+#: ../e-util/e-url-entry.c:108
 msgid "Click here to open the URL"
 msgstr "ここをクリックすると URL を開きます"
 
-#: ../e-util/e-url-entry.c:111
+#: ../e-util/e-url-entry.c:110
 msgid "Enter a URL here"
 msgstr "ここで URL を入力してください"
 
-#: ../e-util/e-web-view-gtkhtml.c:406 ../e-util/e-web-view.c:285
+#: ../e-util/e-web-view-gtkhtml.c:405 ../e-util/e-web-view.c:282
 msgid "_Copy Link Location"
 msgstr "リンク先のコピー(_C)"
 
-#: ../e-util/e-web-view-gtkhtml.c:408 ../e-util/e-web-view.c:287
+#: ../e-util/e-web-view-gtkhtml.c:407 ../e-util/e-web-view.c:284
 msgid "Copy the link to the clipboard"
 msgstr "リンク先をクリップボードにコピーします。"
 
-#: ../e-util/e-web-view-gtkhtml.c:416 ../e-util/e-web-view.c:295
+#: ../e-util/e-web-view-gtkhtml.c:415 ../e-util/e-web-view.c:292
 msgid "_Open Link in Browser"
 msgstr "リンクをブラウザーで開く(_O)"
 
-#: ../e-util/e-web-view-gtkhtml.c:418 ../e-util/e-web-view.c:297
+#: ../e-util/e-web-view-gtkhtml.c:417 ../e-util/e-web-view.c:294
 msgid "Open the link in a web browser"
 msgstr "リンクをブラウザーで開きます"
 
-#: ../e-util/e-web-view-gtkhtml.c:426 ../e-util/e-web-view.c:305
+#: ../e-util/e-web-view-gtkhtml.c:425 ../e-util/e-web-view.c:302
 msgid "_Copy Email Address"
 msgstr "メールアドレスのコピー(_C)"
 
-#: ../e-util/e-web-view-gtkhtml.c:443 ../e-util/e-web-view.c:322
+#: ../e-util/e-web-view-gtkhtml.c:442 ../e-util/e-web-view.c:319
 msgid "_Copy Image"
 msgstr "画像をコピー(_C)"
 
-#: ../e-util/e-web-view-gtkhtml.c:445 ../e-util/e-web-view.c:324
+#: ../e-util/e-web-view-gtkhtml.c:444 ../e-util/e-web-view.c:321
 msgid "Copy the image to the clipboard"
 msgstr "画像をクリップボードにコピーします。"
 
-#: ../e-util/e-web-view-gtkhtml.c:465 ../e-util/e-web-view-gtkhtml.c:1308
-#: ../e-util/e-web-view.c:351 ../e-util/e-web-view.c:1317
+#: ../e-util/e-web-view-gtkhtml.c:464 ../e-util/e-web-view-gtkhtml.c:1307
+#: ../e-util/e-web-view.c:348 ../e-util/e-web-view.c:1319
 msgid "Select all text and images"
 msgstr "すべてのテキストと画像を選択します"
 
-#: ../e-util/e-web-view-gtkhtml.c:972 ../e-util/e-web-view-gtkhtml.c:974
-#: ../e-util/e-web-view-gtkhtml.c:976 ../e-util/e-web-view.c:992
-#: ../e-util/e-web-view.c:994 ../e-util/e-web-view.c:996
+#: ../e-util/e-web-view-gtkhtml.c:971 ../e-util/e-web-view-gtkhtml.c:973
+#: ../e-util/e-web-view-gtkhtml.c:975 ../e-util/e-web-view.c:994
+#: ../e-util/e-web-view.c:996 ../e-util/e-web-view.c:998
 #, c-format
 msgid "Click to call %s"
 msgstr "クリックすると %s さんを呼び出します"
 
-#: ../e-util/e-web-view-gtkhtml.c:978 ../e-util/e-web-view.c:998
+#: ../e-util/e-web-view-gtkhtml.c:977 ../e-util/e-web-view.c:1000
 msgid "Click to hide/unhide addresses"
 msgstr "クリックするとメールアドレスの表示/非表示を切り替えます"
 
-#: ../e-util/e-web-view-gtkhtml.c:980 ../e-util/e-web-view.c:1000
+#: ../e-util/e-web-view-gtkhtml.c:979 ../e-util/e-web-view.c:1002
 #, c-format
 msgid "Click to open %s"
 msgstr "クリックすると %s を開きます"
 
-#: ../e-util/e-web-view.c:329
+#: ../e-util/e-web-view.c:326
 msgid "Save _Image..."
 msgstr "画像を保存(_I)..."
 
-#: ../e-util/e-web-view.c:331
+#: ../e-util/e-web-view.c:328
 msgid "Save the image to a file"
 msgstr "画像をファイルに保存します"
 
-#: ../e-util/e-web-view.c:2894
+#: ../e-util/e-web-view.c:2902
 msgid "Copying image to clipboard"
 msgstr "画像をクリップボードにコピー中"
 
-#: ../e-util/e-web-view.c:3082
+#: ../e-util/e-web-view.c:3090
 msgid "Save Image"
 msgstr "画像の保存"
 
-#: ../e-util/e-web-view.c:3118
+#: ../e-util/e-web-view.c:3126
 #, c-format
 msgid "Saving image to '%s'"
 msgstr "'%s' へ画像を保存中"
 
-#: ../e-util/ea-calendar-item.c:315 ../e-util/ea-calendar-item.c:324
+#: ../e-util/e-widget-undo.c:429
+msgid "Undo 'Insert text'"
+msgstr ""
+
+#: ../e-util/e-widget-undo.c:431
+msgid "Redo 'Insert text'"
+msgstr ""
+
+#: ../e-util/e-widget-undo.c:445
+msgid "Undo 'Delete text'"
+msgstr ""
+
+#: ../e-util/e-widget-undo.c:447
+msgid "Redo 'Delete text'"
+msgstr ""
+
+#: ../e-util/ea-calendar-item.c:314 ../e-util/ea-calendar-item.c:323
 msgid "%d %B %Y"
 msgstr "%Y年%B%e日"
 
-#: ../e-util/ea-calendar-item.c:327
+#: ../e-util/ea-calendar-item.c:326
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "カレンダー: %s 〜 %s"
 
-#: ../e-util/ea-calendar-item.c:364
+#: ../e-util/ea-calendar-item.c:363
 msgid "evolution calendar item"
 msgstr "Evolution カレンダーのアイテム"
 
-#: ../e-util/evolution-source-viewer.c:635
+#: ../e-util/evolution-source-viewer.c:636
 msgid "Evolution Source Viewer"
 msgstr "Evolution ソースビューアー"
 
 #. Translators: The name that is displayed in the user interface
-#: ../e-util/evolution-source-viewer.c:665
+#: ../e-util/evolution-source-viewer.c:666
 msgid "Display Name"
 msgstr "表示名"
 
-#: ../e-util/evolution-source-viewer.c:674
+#: ../e-util/evolution-source-viewer.c:675
 msgid "Flags"
 msgstr "フラグ"
 
-#: ../e-util/evolution-source-viewer.c:726
+#: ../e-util/evolution-source-viewer.c:727
 #: ../mail/e-mail-config-identity-page.c:677
 msgid "Identity"
 msgstr "身元情報"
@@ -10775,39 +11232,59 @@ msgstr "&quot;{0}&quot; という名前は既に使われています。"
 msgid "Please choose another name."
 msgstr "別の名前を指定してください。"
 
+#: ../e-util/filter.error.xml.h:12
+#, fuzzy
+#| msgid "Missing date."
+msgid "Missing condition."
+msgstr "日付がありません。"
+
+#: ../e-util/filter.error.xml.h:13
+msgid "Filter should have at least one condition."
+msgstr ""
+
+#: ../e-util/filter.error.xml.h:14
+#, fuzzy
+#| msgid "Missing date."
+msgid "Missing value."
+msgstr "日付がありません。"
+
+#: ../e-util/filter.error.xml.h:15
+msgid "One or more values cannot be empty."
+msgstr ""
+
 #. Translators: description of a "popup" action
-#: ../e-util/gal-a11y-e-cell-popup.c:128
+#: ../e-util/gal-a11y-e-cell-popup.c:127
 msgid "popup a child"
 msgstr "子ウィジットをポップアップします"
 
 #. Translators: description of a "toggle" action
-#: ../e-util/gal-a11y-e-cell-toggle.c:180
+#: ../e-util/gal-a11y-e-cell-toggle.c:179
 msgid "toggle the cell"
 msgstr "セルを切り替えます"
 
 #. Translators: description of an "expand" action
-#: ../e-util/gal-a11y-e-cell-tree.c:215
+#: ../e-util/gal-a11y-e-cell-tree.c:213
 msgid "expands the row in the ETree containing this cell"
 msgstr "このセルを格納する ETree オブジェクトの行を展開します"
 
 #. Translators: description of a "collapse" action
-#: ../e-util/gal-a11y-e-cell-tree.c:223
+#: ../e-util/gal-a11y-e-cell-tree.c:221
 msgid "collapses the row in the ETree containing this cell"
 msgstr "このセルを格納する ETree オブジェクトの行を畳みます"
 
-#: ../e-util/gal-a11y-e-cell.c:123
+#: ../e-util/gal-a11y-e-cell.c:122
 msgid "Table Cell"
 msgstr "テーブルのセル"
 
-#: ../e-util/gal-a11y-e-table-click-to-add.c:72
+#: ../e-util/gal-a11y-e-table-click-to-add.c:71
 msgid "click"
 msgstr "クリック"
 
-#: ../e-util/gal-a11y-e-table-column-header.c:163
+#: ../e-util/gal-a11y-e-table-column-header.c:162
 msgid "sort"
-msgstr "並び替え"
+msgstr "並べ替え"
 
-#: ../e-util/gal-view-instance-save-as-dialog.c:296
+#: ../e-util/gal-view-instance-save-as-dialog.c:295
 msgid "Save Current View"
 msgstr "このビューの保存"
 
@@ -10847,80 +11324,80 @@ msgstr "署名を読み込めませんでした。"
 msgid "Could not save signature."
 msgstr "署名を保存できませんでした。"
 
-#: ../libemail-engine/camel-sasl-xoauth2.c:27
+#: ../libemail-engine/camel-sasl-xoauth2.c:26
 msgid "OAuth2"
 msgstr "OAuth2"
 
-#: ../libemail-engine/camel-sasl-xoauth2.c:28
+#: ../libemail-engine/camel-sasl-xoauth2.c:27
 msgid "This option will use an OAuth 2.0 access token to connect to the server"
 msgstr "このオプションではサーバーへの接続に OAuth 2.0 アクセストークンを使います"
 
-#: ../libemail-engine/e-mail-authenticator.c:182
+#: ../libemail-engine/e-mail-authenticator.c:181
 #, c-format
 msgid "Invalid authentication result code (%d)"
 msgstr "無効な認証結果コード (%d)"
 
-#: ../libemail-engine/e-mail-folder-utils.c:114
+#: ../libemail-engine/e-mail-folder-utils.c:113
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "フォルダー '%s' へメッセージを保存中"
 
-#: ../libemail-engine/e-mail-folder-utils.c:572
+#: ../libemail-engine/e-mail-folder-utils.c:571
 msgid "Forwarded messages"
 msgstr "転送メッセージ"
 
-#: ../libemail-engine/e-mail-folder-utils.c:682
-#: ../libemail-engine/e-mail-folder-utils.c:933
+#: ../libemail-engine/e-mail-folder-utils.c:681
+#: ../libemail-engine/e-mail-folder-utils.c:932
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d通のメッセージの受信中"
 
-#: ../libemail-engine/e-mail-folder-utils.c:776
+#: ../libemail-engine/e-mail-folder-utils.c:775
 msgid "Scanning messages for duplicates"
 msgstr "重複メッセージを検索"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1184
+#: ../libemail-engine/e-mail-folder-utils.c:1145
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "フォルダー '%s' の削除中"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1321
+#: ../libemail-engine/e-mail-folder-utils.c:1325
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "ファイル \"%s\" が削除されています。"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1325
+#: ../libemail-engine/e-mail-folder-utils.c:1329
 msgid "File has been removed."
 msgstr "ファイルが削除されています。"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1384
+#: ../libemail-engine/e-mail-folder-utils.c:1388
 msgid "Removing attachments"
 msgstr "添付ファイルを削除中"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1548
+#: ../libemail-engine/e-mail-folder-utils.c:1552
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "%d通のメッセージの保存中"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1926
+#: ../libemail-engine/e-mail-folder-utils.c:1930
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "無効なフォルダー URI : '%s'"
 
-#: ../libemail-engine/e-mail-session-utils.c:540
+#: ../libemail-engine/e-mail-session-utils.c:539
 msgid "No mail transport service available"
 msgstr "利用できるメール転送サービスがありません"
 
-#: ../libemail-engine/e-mail-session-utils.c:640
-#: ../libemail-engine/mail-ops.c:730
+#: ../libemail-engine/e-mail-session-utils.c:639
+#: ../libemail-engine/mail-ops.c:707
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "出力フィルターの適用に失敗しました: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:689
-#: ../libemail-engine/mail-ops.c:774
+#: ../libemail-engine/e-mail-session-utils.c:688
+#: ../libemail-engine/mail-ops.c:750
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -10929,101 +11406,96 @@ msgstr ""
 "%s への追加に失敗しました: %s\n"
 "かわりにローカルの '送信箱' へ追加します。"
 
-#: ../libemail-engine/e-mail-session-utils.c:715
-#: ../libemail-engine/mail-ops.c:798
+#: ../libemail-engine/e-mail-session-utils.c:714
+#: ../libemail-engine/mail-ops.c:774
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "ローカルの '送信箱' フォルダーへの追加に失敗しました: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:916
-#: ../libemail-engine/mail-ops.c:929 ../libemail-engine/mail-ops.c:1031
+#: ../libemail-engine/e-mail-session-utils.c:915
+#: ../libemail-engine/mail-ops.c:906 ../libemail-engine/mail-ops.c:1008
 msgid "Sending message"
 msgstr "メッセージの送信中"
 
-#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-properties.c:342
-#: ../mail/em-folder-tree-model.c:786
-#: ../modules/mail/e-mail-shell-view-private.c:1076
-#: ../modules/mail/e-mail-shell-view-private.c:1087
+#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-properties.c:410
+#: ../mail/em-folder-tree-model.c:1160
+#: ../modules/mail/e-mail-shell-view-private.c:1060
+#: ../modules/mail/e-mail-shell-view-private.c:1071
 msgid "Inbox"
 msgstr "受信箱"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:779
-#: ../modules/mail/e-mail-shell-view-private.c:1074
+#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:1153
+#: ../modules/mail/e-mail-shell-view-private.c:1058
 msgid "Drafts"
 msgstr "下書き"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:790
-#: ../modules/mail/e-mail-shell-view-private.c:1078
+#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:1164
+#: ../modules/mail/e-mail-shell-view-private.c:1062
 msgid "Outbox"
 msgstr "送信トレイ"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:794
-#: ../modules/mail/e-mail-shell-view-private.c:1080
+#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:1168
+#: ../modules/mail/e-mail-shell-view-private.c:1064
 msgid "Sent"
 msgstr "送信済み"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:782
-#: ../modules/mail/e-mail-shell-view-private.c:1082
+#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:1156
+#: ../modules/mail/e-mail-shell-view-private.c:1066
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1082 ../plugins/templates/templates.c:1381
-#: ../plugins/templates/templates.c:1391
+#: ../plugins/templates/templates.c:1080 ../plugins/templates/templates.c:1379
+#: ../plugins/templates/templates.c:1389
 msgid "Templates"
 msgstr "テンプレート"
 
-#: ../libemail-engine/e-mail-session.c:1347
+#: ../libemail-engine/e-mail-session.c:1245
 #, c-format
 msgid "User cancelled operation"
 msgstr "ユーザーによって操作がキャンセルされました"
 
-#: ../libemail-engine/e-mail-session.c:1542
+#: ../libemail-engine/e-mail-session.c:1373
 #, c-format
 msgid "%s authentication failed"
 msgstr "%s の認証が失敗しました"
 
-#: ../libemail-engine/e-mail-session.c:1592
+#: ../libemail-engine/e-mail-session.c:1423
 #, c-format
 msgid "No data source found for UID '%s'"
 msgstr "UID '%s' のデータソースが見つかりませんでした"
 
-#: ../libemail-engine/e-mail-session.c:1655
+#: ../libemail-engine/e-mail-session.c:1486
 #, c-format
 msgid "No destination address provided, forwarding of the message has been cancelled."
 msgstr "宛先が指定されていないのでメッセージの転送をキャンセルしました。"
 
-#: ../libemail-engine/e-mail-session.c:1668
+#: ../libemail-engine/e-mail-session.c:1499
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr "利用できる識別子がないのでメッセージの転送をキャンセルしました。"
 
-#: ../libemail-engine/e-mail-store-utils.c:190
+#: ../libemail-engine/e-mail-store-utils.c:189
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "'%s' から切断中"
 
-#: ../libemail-engine/e-mail-store-utils.c:279
+#: ../libemail-engine/e-mail-store-utils.c:265
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "'%s' へ再接続中"
 
-#: ../libemail-engine/e-mail-store-utils.c:370
+#: ../libemail-engine/e-mail-store-utils.c:350
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "オフラインの準備中 (アカウント: '%s')"
 
-#: ../libemail-engine/mail-folder-cache.c:1241
-#, c-format
-msgid "Pinging %s"
-msgstr "%s へ ping 中に"
-
-#: ../libemail-engine/mail-ops.c:94
+#: ../libemail-engine/mail-ops.c:90
 msgid "Filtering Selected Messages"
 msgstr "選択したメッセージのフィルタリング"
 
-#: ../libemail-engine/mail-ops.c:152
+#: ../libemail-engine/mail-ops.c:148
 #, c-format
 msgid ""
 "Failed to filter selected messages. One reason can be that folder location set in one or more filters is invalid. Please check your filters in Edit->Message Filters.\n"
@@ -11032,12 +11504,12 @@ msgstr ""
 "選択したメッセージの振り分けに失敗しました。理由としてはフィルターでセットされているフォルダーの位置に不正なものがあることが考えられます。編集->フィルターの定義でフィルターをチェックしてください。\n"
 "元のエラー: %s"
 
-#: ../libemail-engine/mail-ops.c:233
+#: ../libemail-engine/mail-ops.c:229
 #, c-format
 msgid "Fetching mail from '%s'"
 msgstr "'%s' からメールを取得中"
 
-#: ../libemail-engine/mail-ops.c:724
+#: ../libemail-engine/mail-ops.c:701
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set in one or more filters is invalid. Please check your filters in Edit->Message Filters.\n"
@@ -11046,80 +11518,80 @@ msgstr ""
 "出力フィルターの適用に失敗しました。理由としてはフィルターでセットされているフォルダーの位置に不正なものがあることが考えられます。編集->フィルターの定義でフィルターをチェックしてください。\n"
 "元のエラー: %s"
 
-#: ../libemail-engine/mail-ops.c:940
+#: ../libemail-engine/mail-ops.c:917
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d 通のメッセージの送信中"
 
-#: ../libemail-engine/mail-ops.c:992
+#: ../libemail-engine/mail-ops.c:969
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
 msgstr[0] "%d / %d 通のメッセージ送信に失敗しました"
 
-#: ../libemail-engine/mail-ops.c:998
+#: ../libemail-engine/mail-ops.c:975
 msgid "Canceled."
 msgstr "キャンセルしました"
 
-#: ../libemail-engine/mail-ops.c:1000
+#: ../libemail-engine/mail-ops.c:977
 msgid "Complete."
 msgstr "完了しました"
 
-#: ../libemail-engine/mail-ops.c:1112
+#: ../libemail-engine/mail-ops.c:1089
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "'%s' へメッセージを移動中"
 
-#: ../libemail-engine/mail-ops.c:1113
+#: ../libemail-engine/mail-ops.c:1090
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "'%s' へメッセージをコピー中"
 
-#: ../libemail-engine/mail-ops.c:1232
+#: ../libemail-engine/mail-ops.c:1209
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "フォルダー '%s' の格納中"
 
-#: ../libemail-engine/mail-ops.c:1360
+#: ../libemail-engine/mail-ops.c:1337
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "アカウント '%s' を削除し保存している最中"
 
-#: ../libemail-engine/mail-ops.c:1361
+#: ../libemail-engine/mail-ops.c:1338
 #, c-format
 msgid "Storing account '%s'"
 msgstr "アカウント '%s' の格納中"
 
-#: ../libemail-engine/mail-ops.c:1435
+#: ../libemail-engine/mail-ops.c:1413
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' にあるゴミ箱のクリア中"
 
-#: ../libemail-engine/mail-tools.c:71
+#: ../libemail-engine/mail-tools.c:70
 #, c-format
 msgid "Could not create spool directory '%s': %s"
 msgstr "スプール用ディレクトリ '%s' を作成できませんでした: %s"
 
-#: ../libemail-engine/mail-tools.c:111
+#: ../libemail-engine/mail-tools.c:110
 #, c-format
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "mbox 形式ではないソース '%s' の移動を試みます"
 
-#: ../libemail-engine/mail-tools.c:237
+#: ../libemail-engine/mail-tools.c:236
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "転送するメッセージ - %s"
 
-#: ../libemail-engine/mail-tools.c:239
+#: ../libemail-engine/mail-tools.c:238
 msgid "Forwarded message"
 msgstr "転送するメッセージ"
 
-#: ../libemail-engine/mail-vfolder.c:153
+#: ../libemail-engine/mail-vfolder.c:151
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "仮想フォルダーの設定: %s"
 
-#: ../libemail-engine/mail-vfolder.c:306
+#: ../libemail-engine/mail-vfolder.c:304
 #, c-format
 msgid "Updating Search Folders for '%s' - %s"
 msgstr "仮想フォルダー '%s' の更新中: %s"
@@ -11129,7 +11601,7 @@ msgstr "仮想フォルダー '%s' の更新中: %s"
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../libemail-engine/mail-vfolder.c:670
+#: ../libemail-engine/mail-vfolder.c:668
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted folder\n"
@@ -11142,17 +11614,17 @@ msgstr[0] ""
 "削除されたフォルダー \"%2$s\" のアカウントに関連する\n"
 "仮想フォルダー \"%1$s\" が更新されました。"
 
-#: ../mail/e-mail-account-manager.c:116 ../mail/e-mail-account-manager.c:203
+#: ../mail/e-mail-account-manager.c:117 ../mail/e-mail-account-manager.c:204
 msgid "Open _Online Accounts"
 msgstr "オンラインアカウントを開く(_O)"
 
-#: ../mail/e-mail-account-manager.c:142 ../mail/e-mail-account-manager.c:229
+#: ../mail/e-mail-account-manager.c:143 ../mail/e-mail-account-manager.c:230
 msgid "This account was created through the Online Accounts service."
 msgstr "この設定は GNOME オンラインアカウントサービス経由で作成されました。"
 
 #: ../mail/e-mail-account-manager.c:690
-msgid "_Restore Default"
-msgstr "デフォルトに戻す(_R)"
+msgid "_Reset Order"
+msgstr ""
 
 #: ../mail/e-mail-account-manager.c:703
 msgid "You can drag and drop account names to reorder them."
@@ -11162,59 +11634,72 @@ msgstr "アカウント名をドラッグ&ドロップして並べかえるこ�
 msgid "De_fault"
 msgstr "デフォルト(_F)"
 
-#: ../mail/e-mail-account-tree-view.c:85
-#: ../modules/mail/em-composer-prefs.c:443
-#: ../modules/plugin-manager/evolution-plugin-manager.c:359
-#: ../plugins/publish-calendar/publish-calendar.c:890
+#: ../mail/e-mail-account-tree-view.c:84
+#: ../modules/mail/em-composer-prefs.c:1191
+#: ../modules/plugin-manager/evolution-plugin-manager.c:358
+#: ../plugins/publish-calendar/publish-calendar.c:896
 msgid "Enabled"
 msgstr "有効"
 
-#: ../mail/e-mail-account-tree-view.c:109
+#: ../mail/e-mail-account-tree-view.c:108
 msgid "Account Name"
 msgstr "アカウント名"
 
-#: ../mail/e-mail-account-tree-view.c:136
-#: ../mail/e-mail-config-security-page.c:333
-#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3532
-#: ../mail/mail-config.ui.h:49
+#: ../mail/e-mail-account-tree-view.c:135
+#: ../mail/e-mail-config-security-page.c:335
+#: ../mail/e-mail-config-security-page.c:475 ../mail/e-mail-reader.c:3602
+#: ../mail/mail-config.ui.h:66
 msgid "Default"
 msgstr "デフォルト"
 
-#: ../mail/e-mail-autoconfig.c:578
+#: ../mail/e-mail-autoconfig.c:611
 msgid "No email address provided"
 msgstr "メールアドレスが入力されていません"
 
-#: ../mail/e-mail-autoconfig.c:587
+#: ../mail/e-mail-autoconfig.c:620
 msgid "Missing domain in email address"
 msgstr "メールアドレスにドメインがありません"
 
-#: ../mail/e-mail-backend.c:737
+#: ../mail/e-mail-backend.c:841
 msgid "Unknown background operation"
 msgstr "バックグラウンドの操作が不明です"
 
-#: ../mail/e-mail-browser.c:129 ../shell/e-shell-window-actions.c:860
-#: ../shell/e-shell-window-actions.c:867 ../shell/e-shell-window-actions.c:874
+#: ../mail/e-mail-browser.c:128 ../shell/e-shell-window-actions.c:904
+#: ../shell/e-shell-window-actions.c:911 ../shell/e-shell-window-actions.c:918
 msgid "Close this window"
 msgstr "このウィンドウを閉じます"
 
-#: ../mail/e-mail-browser.c:286
+#: ../mail/e-mail-browser.c:285
 msgid "(No Subject)"
 msgstr "(件名無し)"
 
+#. GtkAssistant's back button label.
+#: ../mail/e-mail-config-assistant.c:46
+#, fuzzy
+#| msgid "Go Back"
+msgid "Go _Back"
+msgstr "前へ戻る"
+
 #. GtkAssistant sinks the floating button reference.
-#: ../mail/e-mail-config-assistant.c:102
+#: ../mail/e-mail-config-assistant.c:114
 msgid "_Skip Lookup"
 msgstr "検索をスキップ(_S)"
 
-#: ../mail/e-mail-config-assistant.c:562
+#: ../mail/e-mail-config-assistant.c:654
 msgid "Evolution Account Assistant"
 msgstr "Evolution アカウントアシスタント"
 
-#: ../mail/e-mail-config-auth-check.c:352
+#: ../mail/e-mail-config-assistant.c:936
+#, fuzzy
+#| msgid "_Restore Defaults"
+msgid "_Revise Details"
+msgstr "デフォルトに戻す(_R)"
+
+#: ../mail/e-mail-config-auth-check.c:350
 msgid "Check for Supported Types"
 msgstr "サポートしているかチェック"
 
-#: ../mail/e-mail-config-confirm-page.c:157
+#: ../mail/e-mail-config-confirm-page.c:156
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11228,101 +11713,101 @@ msgstr ""
 "\n"
 "[適用] をクリックして設定を保存してください。"
 
-#: ../mail/e-mail-config-confirm-page.c:169
+#: ../mail/e-mail-config-confirm-page.c:168
 msgid "Done"
 msgstr "完了"
 
-#: ../mail/e-mail-config-defaults-page.c:552
+#: ../mail/e-mail-config-defaults-page.c:549
 msgid "Special Folders"
 msgstr "特別なフォルダー"
 
-#: ../mail/e-mail-config-defaults-page.c:561
+#: ../mail/e-mail-config-defaults-page.c:558
 msgid "Draft Messages _Folder:"
 msgstr "下書きフォルダー(_F):"
 
-#: ../mail/e-mail-config-defaults-page.c:571
+#: ../mail/e-mail-config-defaults-page.c:568
 msgid "Choose a folder for saving draft messages."
 msgstr "下書きを保存するフォルダーを選択してください。"
 
-#: ../mail/e-mail-config-defaults-page.c:585
+#: ../mail/e-mail-config-defaults-page.c:582
 msgid "Sent _Messages Folder:"
 msgstr "送信済フォルダー(_M):"
 
-#: ../mail/e-mail-config-defaults-page.c:595
+#: ../mail/e-mail-config-defaults-page.c:592
 msgid "Choose a folder for saving sent messages."
 msgstr "送信済みメッセージを保存するフォルダーを選択してください。"
 
-#: ../mail/e-mail-config-defaults-page.c:614
+#: ../mail/e-mail-config-defaults-page.c:611
 msgid "S_ave replies in the folder of the message being replied to"
 msgstr "返信を返信元メッセージのフォルダーに保存する(_A)"
 
-#: ../mail/e-mail-config-defaults-page.c:631
+#: ../mail/e-mail-config-defaults-page.c:628
 msgid "_Restore Defaults"
 msgstr "デフォルトに戻す(_R)"
 
-#: ../mail/e-mail-config-defaults-page.c:645
+#: ../mail/e-mail-config-defaults-page.c:642
 msgid "Use a Real Folder for _Trash:"
 msgstr "ゴミ箱として実フォルダーを使う(_T):"
 
-#: ../mail/e-mail-config-defaults-page.c:646
+#: ../mail/e-mail-config-defaults-page.c:643
 msgid "Choose a folder for deleted messages."
 msgstr "削除したメッセージのフォルダーを選択してください。"
 
-#: ../mail/e-mail-config-defaults-page.c:655
+#: ../mail/e-mail-config-defaults-page.c:652
 msgid "Use a Real Folder for _Junk:"
 msgstr "ジャンクとして実フォルダーを使う(_J):"
 
-#: ../mail/e-mail-config-defaults-page.c:656
+#: ../mail/e-mail-config-defaults-page.c:653
 msgid "Choose a folder for junk messages."
 msgstr "ジャンクメッセージのフォルダーを選択してください。"
 
-#: ../mail/e-mail-config-defaults-page.c:673
+#: ../mail/e-mail-config-defaults-page.c:670
 msgid "Composing Messages"
 msgstr "メッセージの作成"
 
-#: ../mail/e-mail-config-defaults-page.c:682
+#: ../mail/e-mail-config-defaults-page.c:679
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "常に使用する CC 先(_S):"
 
-#: ../mail/e-mail-config-defaults-page.c:707
+#: ../mail/e-mail-config-defaults-page.c:704
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "常に使用する Bcc 先(_B):"
 
-#: ../mail/e-mail-config-defaults-page.c:742
+#: ../mail/e-mail-config-defaults-page.c:739
 msgid "Message Receipts"
 msgstr "メッセージの開封通知"
 
-#: ../mail/e-mail-config-defaults-page.c:751
+#: ../mail/e-mail-config-defaults-page.c:748
 msgid "S_end message receipts:"
 msgstr "開封通知の送信(_E):"
 
-#: ../mail/e-mail-config-defaults-page.c:776
+#: ../mail/e-mail-config-defaults-page.c:773
 msgid "Never"
 msgstr "しない"
 
-#: ../mail/e-mail-config-defaults-page.c:782
+#: ../mail/e-mail-config-defaults-page.c:779
 msgid "Always"
 msgstr "常に"
 
-#: ../mail/e-mail-config-defaults-page.c:788
+#: ../mail/e-mail-config-defaults-page.c:785
 msgid "Ask for each message"
 msgstr "送信する度に確認する"
 
-#: ../mail/e-mail-config-defaults-page.c:859
+#: ../mail/e-mail-config-defaults-page.c:856
 msgid "Defaults"
 msgstr "デフォルト"
 
-#: ../mail/e-mail-config-identity-page.c:266
+#: ../mail/e-mail-config-identity-page.c:265
 msgid "Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this information in email you send."
 msgstr "あなたのお名前とメールアドレスを入力してください。\"追加情報\" の欄は必須ではありませんが、自動的にメッセージの中に挿入させる場合は入力してください。"
 
-#: ../mail/e-mail-config-identity-page.c:294
-#: ../mail/e-mail-config-summary-page.c:324
+#: ../mail/e-mail-config-identity-page.c:293
+#: ../mail/e-mail-config-summary-page.c:323
 msgid "Account Information"
 msgstr "アカウント情報"
 
-#: ../mail/e-mail-config-identity-page.c:303
-#: ../mail/e-mail-config-summary-page.c:333
+#: ../mail/e-mail-config-identity-page.c:302
+#: ../mail/e-mail-config-summary-page.c:332
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example, \"Work\" or \"Personal\"."
@@ -11330,19 +11815,19 @@ msgstr ""
 "このアカウントにお好みの名前を付けてください。\n"
 "例えば、\"仕事\" や \"プライベート\"。"
 
-#: ../mail/e-mail-config-identity-page.c:348
+#: ../mail/e-mail-config-identity-page.c:347
 msgid "Required Information"
 msgstr "必須情報"
 
-#: ../mail/e-mail-config-identity-page.c:357
+#: ../mail/e-mail-config-identity-page.c:356
 msgid "Full Nam_e:"
 msgstr "氏名(_E):"
 
-#: ../mail/e-mail-config-identity-page.c:384
+#: ../mail/e-mail-config-identity-page.c:383
 msgid "Email _Address:"
 msgstr "メールアドレス(_A):"
 
-#: ../mail/e-mail-config-identity-page.c:431
+#: ../mail/e-mail-config-identity-page.c:430
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "追加情報"
@@ -11359,180 +11844,187 @@ msgstr "組織(_G):"
 msgid "Add Ne_w Signature..."
 msgstr "新しい署名の追加(_W)..."
 
-#: ../mail/e-mail-config-lookup-page.c:68
+#: ../mail/e-mail-config-lookup-page.c:67
 msgid "Looking up account details..."
 msgstr "アカウント詳細の検索中..."
 
-#: ../mail/e-mail-config-provider-page.c:485
+#: ../mail/e-mail-config-provider-page.c:484
 msgid "Checking for New Mail"
 msgstr "新着メールの確認"
 
-#: ../mail/e-mail-config-provider-page.c:501
+#: ../mail/e-mail-config-provider-page.c:500
 msgid "Check for _new messages every"
 msgstr "新着メールをチェックする周期(_N): "
 
-#: ../mail/e-mail-config-provider-page.c:700
+#: ../mail/e-mail-config-provider-page.c:699
 msgid "Receiving Options"
 msgstr "受信のオプション"
 
-#: ../mail/e-mail-config-receiving-page.c:50
+#: ../mail/e-mail-config-receiving-page.c:49
 msgid "Receiving Email"
 msgstr "メールの受信"
 
 #: ../mail/e-mail-config-security-page.c:260
-#: ../mail/em-folder-properties.c:266 ../mail/mail-config.ui.h:24
-#: ../modules/addressbook/autocompletion-config.c:114
+#: ../mail/em-folder-properties.c:334 ../mail/mail-config.ui.h:26
+#: ../modules/addressbook/autocompletion-config.c:113
 #: ../modules/calendar/e-calendar-preferences.ui.h:47
-#: ../modules/itip-formatter/plugin/config-ui.c:91
+#: ../modules/itip-formatter/plugin/config-ui.c:90
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
-#: ../smime/gui/certificate-viewer.c:653
 msgid "General"
 msgstr "全般"
 
-#: ../mail/e-mail-config-security-page.c:268
+#: ../mail/e-mail-config-security-page.c:269
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "会議開催要求には署名しない (Outlook 互換用)(_D)"
 
-#: ../mail/e-mail-config-security-page.c:290
+#: ../mail/e-mail-config-security-page.c:291
 msgid "Pretty Good Privacy (OpenPGP)"
 msgstr "Pretty Good Privacy (OpenPGP)"
 
-#: ../mail/e-mail-config-security-page.c:298
+#: ../mail/e-mail-config-security-page.c:300
 msgid "OpenPGP _Key ID:"
 msgstr "OpenPGP 鍵の ID(_K):"
 
-#: ../mail/e-mail-config-security-page.c:320
+#: ../mail/e-mail-config-security-page.c:322
 msgid "Si_gning algorithm:"
 msgstr "署名アルゴリズム(_G):"
 
-#: ../mail/e-mail-config-security-page.c:336
-#: ../mail/e-mail-config-security-page.c:475 ../mail/mail-config.ui.h:50
+#: ../mail/e-mail-config-security-page.c:338
+#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:67
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/e-mail-config-security-page.c:339
-#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:51
+#: ../mail/e-mail-config-security-page.c:341
+#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:68
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/e-mail-config-security-page.c:342
-#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:52
+#: ../mail/e-mail-config-security-page.c:344
+#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:69
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/e-mail-config-security-page.c:345
-#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:53
+#: ../mail/e-mail-config-security-page.c:347
+#: ../mail/e-mail-config-security-page.c:487 ../mail/mail-config.ui.h:70
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/e-mail-config-security-page.c:361
+#: ../mail/e-mail-config-security-page.c:363
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "このアカウントを使用する場合は常に送信メッセージに署名を付与する(_W)"
 
-#: ../mail/e-mail-config-security-page.c:373
+#: ../mail/e-mail-config-security-page.c:375
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "暗号化したメッセージを送信する場合は常にメール全体を暗号化する(_M)"
 
-#: ../mail/e-mail-config-security-page.c:385
+#: ../mail/e-mail-config-security-page.c:387
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "暗号解読時には常に信用キーを使用する(_T)"
 
-#: ../mail/e-mail-config-security-page.c:409
+#: ../mail/e-mail-config-security-page.c:411
 msgid "Secure MIME (S/MIME)"
 msgstr "Secure MIME (S/MIME)"
 
-#: ../mail/e-mail-config-security-page.c:417
+#: ../mail/e-mail-config-security-page.c:420
 msgid "Sig_ning certificate:"
 msgstr "署名する証明書(_N):"
 
-#: ../mail/e-mail-config-security-page.c:441
-#: ../mail/e-mail-config-security-page.c:547
+#: ../mail/e-mail-config-security-page.c:444
+#: ../mail/e-mail-config-security-page.c:550
 msgid "Select"
 msgstr "選択"
 
-#: ../mail/e-mail-config-security-page.c:459
+#: ../mail/e-mail-config-security-page.c:453
+#: ../mail/e-mail-config-security-page.c:559 ../mail/mail-dialogs.ui.h:5
+#: ../shell/e-shell-window-actions.c:1007
+#, fuzzy
+#| msgid "_Clear Flag"
+msgid "_Clear"
+msgstr "フラグの解除(_C)"
+
+#: ../mail/e-mail-config-security-page.c:462
 msgid "Signing _algorithm:"
 msgstr "署名アルゴリズム(_A)"
 
-#: ../mail/e-mail-config-security-page.c:500
+#: ../mail/e-mail-config-security-page.c:503
 msgid "Always sign outgoing messages when using this account"
 msgstr "このアカウントを使用する場合は常に送信メッセージに電子署名する"
 
-#: ../mail/e-mail-config-security-page.c:523
+#: ../mail/e-mail-config-security-page.c:526
 msgid "Encryption certificate:"
 msgstr "暗号化する証明書:"
 
-#: ../mail/e-mail-config-security-page.c:565
+#: ../mail/e-mail-config-security-page.c:568
 msgid "Always encrypt outgoing messages when using this account"
 msgstr "このアカウントを使用する場合は常に送信メッセージを暗号化する"
 
-#: ../mail/e-mail-config-security-page.c:585
+#: ../mail/e-mail-config-security-page.c:588
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr "暗号化したメッセージを送信する場合は常に自分宛にも暗号化する"
 
-#: ../mail/e-mail-config-sending-page.c:50
+#: ../mail/e-mail-config-sending-page.c:49
 msgid "Sending Email"
 msgstr "メールの送信"
 
-#: ../mail/e-mail-config-service-page.c:640
+#: ../mail/e-mail-config-service-page.c:639
 msgid "Server _Type:"
 msgstr "サーバー種別(_T):"
 
-#: ../mail/e-mail-config-summary-page.c:142
+#: ../mail/e-mail-config-summary-page.c:141
 msgid "SSL"
 msgstr "SSL"
 
-#: ../mail/e-mail-config-summary-page.c:145
+#: ../mail/e-mail-config-summary-page.c:144
 msgid "TLS"
 msgstr "TLS"
 
-#: ../mail/e-mail-config-summary-page.c:307
+#: ../mail/e-mail-config-summary-page.c:306
 msgid "This is a summary of the settings which will be used to access your mail."
 msgstr "メールにアクセスするのに使われる設定の概要です。"
 
-#: ../mail/e-mail-config-summary-page.c:372
+#: ../mail/e-mail-config-summary-page.c:371
 msgid "Personal Details"
 msgstr "個人の詳細"
 
-#: ../mail/e-mail-config-summary-page.c:381
+#: ../mail/e-mail-config-summary-page.c:380
 msgid "Full Name:"
 msgstr "氏名:"
 
-#: ../mail/e-mail-config-summary-page.c:395
+#: ../mail/e-mail-config-summary-page.c:394
 msgid "Email Address:"
 msgstr "メールアドレス:"
 
-#: ../mail/e-mail-config-summary-page.c:409
+#: ../mail/e-mail-config-summary-page.c:408
 msgid "Receiving"
 msgstr "受信"
 
-#: ../mail/e-mail-config-summary-page.c:421
+#: ../mail/e-mail-config-summary-page.c:420
 msgid "Sending"
 msgstr "送信"
 
-#: ../mail/e-mail-config-summary-page.c:433
+#: ../mail/e-mail-config-summary-page.c:432
 msgid "Server Type:"
 msgstr "サーバー種別:"
 
-#: ../mail/e-mail-config-summary-page.c:454
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:608
+#: ../mail/e-mail-config-summary-page.c:453
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:607
 msgid "Server:"
 msgstr "サーバー:"
 
-#: ../mail/e-mail-config-summary-page.c:475
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:697
+#: ../mail/e-mail-config-summary-page.c:474
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:696
 msgid "Username:"
 msgstr "ユーザー名:"
 
-#: ../mail/e-mail-config-summary-page.c:496
+#: ../mail/e-mail-config-summary-page.c:495
 msgid "Security:"
 msgstr "セキュリティ:"
 
-#: ../mail/e-mail-config-summary-page.c:787
+#: ../mail/e-mail-config-summary-page.c:786
 msgid "Account Summary"
 msgstr "アカウントの概要"
 
-#: ../mail/e-mail-config-welcome-page.c:157
+#: ../mail/e-mail-config-welcome-page.c:156
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11542,83 +12034,83 @@ msgstr ""
 "\n"
 "[続ける] ボタンをクリックしてください。"
 
-#: ../mail/e-mail-config-welcome-page.c:167
-#: ../modules/startup-wizard/e-startup-assistant.c:152
+#: ../mail/e-mail-config-welcome-page.c:166
+#: ../modules/startup-wizard/e-startup-assistant.c:151
 msgid "Welcome"
 msgstr "ようこそ"
 
-#: ../mail/e-mail-config-window.c:327
+#: ../mail/e-mail-config-window.c:326
 msgid "Account Editor"
 msgstr "アカウントエディター"
 
-#: ../mail/e-mail-display.c:96
+#: ../mail/e-mail-display.c:95
 msgid "_Add to Address Book..."
 msgstr "アドレス帳に追加(_A)..."
 
-#: ../mail/e-mail-display.c:103
+#: ../mail/e-mail-display.c:102
 msgid "_To This Address"
 msgstr "このアドレスへ(_T)"
 
-#: ../mail/e-mail-display.c:110
+#: ../mail/e-mail-display.c:109
 msgid "_From This Address"
 msgstr "このアドレスら(_F)"
 
-#: ../mail/e-mail-display.c:117
+#: ../mail/e-mail-display.c:116
 msgid "Send _Reply To..."
 msgstr "返信する(_R)..."
 
-#: ../mail/e-mail-display.c:119
+#: ../mail/e-mail-display.c:118
 msgid "Send a reply message to this address"
 msgstr "このアドレスに返信"
 
-#: ../mail/e-mail-display.c:126
+#: ../mail/e-mail-display.c:125
 msgid "Create Search _Folder"
 msgstr "仮想フォルダーの作成(_F)"
 
 #. Label + combo box has a 12px left margin so it's
 #. * aligned with the junk mail options above it.
-#: ../mail/e-mail-junk-options.c:252
+#: ../mail/e-mail-junk-options.c:297
 msgid "Junk filtering software:"
 msgstr "ジャンクフィルターのソフトウェア:"
 
-#: ../mail/e-mail-label-dialog.c:225
+#: ../mail/e-mail-label-dialog.c:224
 msgid "_Label name:"
 msgstr "ラベルの名前(_L):"
 
-#: ../mail/e-mail-label-list-store.c:57
+#: ../mail/e-mail-label-list-store.c:56
 msgid "I_mportant"
 msgstr "重要(_M)"
 
 #. red
-#: ../mail/e-mail-label-list-store.c:58
+#: ../mail/e-mail-label-list-store.c:57
 msgid "_Work"
 msgstr "仕事(_W)"
 
 #. orange
-#: ../mail/e-mail-label-list-store.c:59
+#: ../mail/e-mail-label-list-store.c:58
 msgid "_Personal"
 msgstr "個人(_P)"
 
 #. green
-#: ../mail/e-mail-label-list-store.c:60
+#: ../mail/e-mail-label-list-store.c:59
 msgid "_To Do"
 msgstr "ToDo(_T)"
 
 #. blue
-#: ../mail/e-mail-label-list-store.c:61
+#: ../mail/e-mail-label-list-store.c:60
 msgid "_Later"
 msgstr "保留(_L)"
 
-#: ../mail/e-mail-label-manager.c:170
-#: ../modules/mail/e-mail-shell-view-actions.c:1025
+#: ../mail/e-mail-label-manager.c:171
+#: ../modules/mail/e-mail-shell-view-actions.c:1028
 msgid "Add Label"
 msgstr "ラベルの追加"
 
-#: ../mail/e-mail-label-manager.c:221
+#: ../mail/e-mail-label-manager.c:222
 msgid "Edit Label"
 msgstr "ラベルの編集"
 
-#: ../mail/e-mail-label-manager.c:353
+#: ../mail/e-mail-label-manager.c:354
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
@@ -11626,631 +12118,632 @@ msgstr ""
 "注記: ラベルの中にあるアンダースコア (下線) は\n"
 "メニューの中でニーモニックとして使用されます。"
 
-#: ../mail/e-mail-label-tree-view.c:89
+#: ../mail/e-mail-label-tree-view.c:88
 msgid "Color"
 msgstr "色"
 
-#: ../mail/e-mail-print-config-headers.c:167
+#: ../mail/e-mail-print-config-headers.c:166
 msgid "Move selected headers to top"
 msgstr "選択したヘッダーを最上部へ移動します"
 
-#: ../mail/e-mail-print-config-headers.c:172
+#: ../mail/e-mail-print-config-headers.c:171
 msgid "Move selected headers up one row"
 msgstr "選択したヘッダーを1つ上へ移動します"
 
-#: ../mail/e-mail-print-config-headers.c:177
+#: ../mail/e-mail-print-config-headers.c:176
 msgid "Move selected headers down one row"
 msgstr "選択したヘッダーを1つ下へ移動します"
 
-#: ../mail/e-mail-print-config-headers.c:182
+#: ../mail/e-mail-print-config-headers.c:181
 msgid "Move selected headers to bottom"
 msgstr "選択したヘッダーを最下部へ移動します"
 
-#: ../mail/e-mail-print-config-headers.c:187
+#: ../mail/e-mail-print-config-headers.c:186
 msgid "Select all headers"
 msgstr "ヘッダーをすべて選択"
 
-#: ../mail/e-mail-print-config-headers.c:206
+#: ../mail/e-mail-print-config-headers.c:205
 msgid "Header Name"
 msgstr "ヘッダーの名前"
 
-#: ../mail/e-mail-print-config-headers.c:215
+#: ../mail/e-mail-print-config-headers.c:214
 msgid "Header Value"
 msgstr "ヘッダーの値"
 
-#: ../mail/e-mail-printer.c:125 ../mail/mail-config.ui.h:101
+#: ../mail/e-mail-printer.c:124 ../mail/mail-config.ui.h:106
 msgid "Headers"
 msgstr "ヘッダー"
 
-#: ../mail/e-mail-printer.c:167
+#: ../mail/e-mail-printer.c:166
 #, c-format
 msgid "Page %d of %d"
 msgstr "%d / %d ページ"
 
-#: ../mail/e-mail-reader.c:346 ../mail/em-filter-i18n.h:12
+#: ../mail/e-mail-reader.c:348 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "フォルダーへコピーする"
 
-#: ../mail/e-mail-reader.c:346 ../mail/em-folder-utils.c:517
+#: ../mail/e-mail-reader.c:348 ../mail/em-folder-utils.c:505
 msgid "C_opy"
 msgstr "コピー(_O)"
 
-#: ../mail/e-mail-reader.c:846 ../mail/em-filter-i18n.h:54
+#: ../mail/e-mail-reader.c:848 ../mail/em-filter-i18n.h:33
 msgid "Move to Folder"
 msgstr "フォルダーへ移動する"
 
-#: ../mail/e-mail-reader.c:846 ../mail/em-folder-utils.c:517
+#: ../mail/e-mail-reader.c:848 ../mail/em-folder-utils.c:505
 msgid "_Move"
 msgstr "移動(_M)"
 
-#: ../mail/e-mail-reader.c:1172 ../mail/e-mail-reader.c:1384
-#: ../mail/e-mail-reader.c:1424
+#: ../mail/e-mail-reader.c:1174 ../mail/e-mail-reader.c:1386
+#: ../mail/e-mail-reader.c:1426
 msgid "_Do not ask me again."
 msgstr "次回からこのメッセージを表示しない(_D)"
 
-#: ../mail/e-mail-reader.c:1430
+#: ../mail/e-mail-reader.c:1432
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "メーリングリストで常に Reply-To: を無視する(_A)"
 
-#: ../mail/e-mail-reader.c:1632
+#: ../mail/e-mail-reader.c:1634
 msgid "Failed to retrieve message:"
 msgstr "メッセージの取得に失敗しました:"
 
-#: ../mail/e-mail-reader.c:1672 ../mail/e-mail-reader.c:2774
+#: ../mail/e-mail-reader.c:1674 ../mail/e-mail-reader.c:2843
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "メッセージ '%s' を取得中"
 
-#: ../mail/e-mail-reader.c:1860
+#: ../mail/e-mail-reader.c:1862
 msgid "A_dd Sender to Address Book"
 msgstr "差出人をアドレス帳へ追加(_D)"
 
-#: ../mail/e-mail-reader.c:1862
+#: ../mail/e-mail-reader.c:1864
 msgid "Add sender to address book"
 msgstr "差出人をアドレス帳に追加します"
 
-#: ../mail/e-mail-reader.c:1867
+#: ../mail/e-mail-reader.c:1869
 msgid "Check for _Junk"
 msgstr "ジャンクかチェックする(_J)"
 
-#: ../mail/e-mail-reader.c:1869
+#: ../mail/e-mail-reader.c:1871
 msgid "Filter the selected messages for junk status"
 msgstr "選択したメッセージがジャンクであるかどうかを確認します"
 
-#: ../mail/e-mail-reader.c:1874
+#: ../mail/e-mail-reader.c:1876
 msgid "_Copy to Folder..."
 msgstr "フォルダーへコピー(_C)..."
 
-#: ../mail/e-mail-reader.c:1876
+#: ../mail/e-mail-reader.c:1878
 msgid "Copy selected messages to another folder"
 msgstr "選択したメッセージを別のフォルダーへコピーします"
 
-#: ../mail/e-mail-reader.c:1881
+#: ../mail/e-mail-reader.c:1883
 msgid "_Delete Message"
 msgstr "削除マークの付与(_D)"
 
-#: ../mail/e-mail-reader.c:1883
+#: ../mail/e-mail-reader.c:1885
 msgid "Mark the selected messages for deletion"
 msgstr "選択したメッセージに削除マークを付けます"
 
-#: ../mail/e-mail-reader.c:1888
+#: ../mail/e-mail-reader.c:1890
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "メーリングリストのフィルタールールを作成(_L)..."
 
-#: ../mail/e-mail-reader.c:1890
+#: ../mail/e-mail-reader.c:1892
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "このメーリングリストへのメッセージをフィルターするルールを作成します"
 
-#: ../mail/e-mail-reader.c:1895
+#: ../mail/e-mail-reader.c:1897
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "宛先のフィルターを作成(_R)..."
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:1899
 msgid "Create a rule to filter messages to these recipients"
 msgstr "これらの宛先へのメッセージをフィルターするルールを作成します"
 
-#: ../mail/e-mail-reader.c:1902
+#: ../mail/e-mail-reader.c:1904
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "差出人のフィルタールールを作成(_N)..."
 
-#: ../mail/e-mail-reader.c:1904
+#: ../mail/e-mail-reader.c:1906
 msgid "Create a rule to filter messages from this sender"
 msgstr "この差出人からのメッセージをフィルターするルールを作成します"
 
-#: ../mail/e-mail-reader.c:1909
+#: ../mail/e-mail-reader.c:1911
 msgid "Create a Filter Rule for _Subject..."
 msgstr "件名のフィルタールールを作成(_S)..."
 
-#: ../mail/e-mail-reader.c:1911
+#: ../mail/e-mail-reader.c:1913
 msgid "Create a rule to filter messages with this subject"
 msgstr "この件名のメッセージをフィルターするルールを作成します"
 
-#: ../mail/e-mail-reader.c:1916
+#: ../mail/e-mail-reader.c:1918
 msgid "A_pply Filters"
 msgstr "フィルターの適用(_P)"
 
-#: ../mail/e-mail-reader.c:1918
+#: ../mail/e-mail-reader.c:1920
 msgid "Apply filter rules to the selected messages"
 msgstr "選択したメッセージに対してフィルタールールを適用します"
 
-#: ../mail/e-mail-reader.c:1923
+#: ../mail/e-mail-reader.c:1925
 msgid "_Find in Message..."
 msgstr "メッセージから検索(_F)..."
 
-#: ../mail/e-mail-reader.c:1925
+#: ../mail/e-mail-reader.c:1927
 msgid "Search for text in the body of the displayed message"
 msgstr "表示したメッセージ本文に含まれる文字列を検索します"
 
-#: ../mail/e-mail-reader.c:1930
+#: ../mail/e-mail-reader.c:1932
 msgid "_Clear Flag"
 msgstr "フラグの解除(_C)"
 
-#: ../mail/e-mail-reader.c:1932
+#: ../mail/e-mail-reader.c:1934
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "選択したメッセージからフォローアップマークを削除します"
 
-#: ../mail/e-mail-reader.c:1937
+#: ../mail/e-mail-reader.c:1939
 msgid "_Flag Completed"
 msgstr "完了フラグ(_F)"
 
-#: ../mail/e-mail-reader.c:1939
+#: ../mail/e-mail-reader.c:1941
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "選択したメッセージのフォローアップマークを「完了した」にします"
 
-#: ../mail/e-mail-reader.c:1944
+#: ../mail/e-mail-reader.c:1946
 msgid "Follow _Up..."
 msgstr "フォローアップ(_U)..."
 
-#: ../mail/e-mail-reader.c:1946
+#: ../mail/e-mail-reader.c:1948
 msgid "Flag the selected messages for follow-up"
 msgstr "選択したメッセージにフォローアップマークを付けます"
 
-#: ../mail/e-mail-reader.c:1951
+#: ../mail/e-mail-reader.c:1953
 msgid "_Attached"
 msgstr "添付する(_A)"
 
-#: ../mail/e-mail-reader.c:1953 ../mail/e-mail-reader.c:1960
+#: ../mail/e-mail-reader.c:1955 ../mail/e-mail-reader.c:1962
 msgid "Forward the selected message to someone as an attachment"
 msgstr "選択したメッセージを添付して誰かに転送します"
 
-#: ../mail/e-mail-reader.c:1958
+#: ../mail/e-mail-reader.c:1960
 msgid "Forward As _Attached"
 msgstr "添付として転送(_A)"
 
-#: ../mail/e-mail-reader.c:1965
+#: ../mail/e-mail-reader.c:1967
 msgid "_Inline"
 msgstr "インライン(_I)"
 
-#: ../mail/e-mail-reader.c:1967 ../mail/e-mail-reader.c:1974
+#: ../mail/e-mail-reader.c:1969 ../mail/e-mail-reader.c:1976
 msgid "Forward the selected message in the body of a new message"
 msgstr "選択したメッセージを新しいメッセージの本文に挿入して転送します"
 
-#: ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:1974
 msgid "Forward As _Inline"
 msgstr "インラインで転送(_I)"
 
-#: ../mail/e-mail-reader.c:1979
+#: ../mail/e-mail-reader.c:1981
 msgid "_Quoted"
 msgstr "引用する(_Q)"
 
-#: ../mail/e-mail-reader.c:1981 ../mail/e-mail-reader.c:1988
+#: ../mail/e-mail-reader.c:1983 ../mail/e-mail-reader.c:1990
 msgid "Forward the selected message quoted like a reply"
 msgstr "選択したメッセージを返信のように引用して転送します"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:1988
 msgid "Forward As _Quoted"
 msgstr "引用として転送(_Q)"
 
-#: ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:1995
 msgid "_Load Images"
 msgstr "画像の読み込み(_L)"
 
-#: ../mail/e-mail-reader.c:1995
+#: ../mail/e-mail-reader.c:1997
 msgid "Force images in HTML mail to be loaded"
 msgstr "HTML メールの画像を強制的に読み込みます"
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:2002
 msgid "_Important"
 msgstr "重要(_I)"
 
-#: ../mail/e-mail-reader.c:2002
+#: ../mail/e-mail-reader.c:2004
 msgid "Mark the selected messages as important"
 msgstr "選択したメッセージに重要マークを付けます"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2009
 msgid "_Junk"
 msgstr "ジャンク(_J)"
 
-#: ../mail/e-mail-reader.c:2009
+#: ../mail/e-mail-reader.c:2011
 msgid "Mark the selected messages as junk"
 msgstr "選択したメッセージにジャンクマークを付けます"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2016
 msgid "_Not Junk"
 msgstr "ジャンクではない(_N)"
 
-#: ../mail/e-mail-reader.c:2016
+#: ../mail/e-mail-reader.c:2018
 msgid "Mark the selected messages as not being junk"
 msgstr "選択したメッセージのジャンクマークを外します"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2023
 msgid "_Read"
 msgstr "既読(_R)"
 
-#: ../mail/e-mail-reader.c:2023
+#: ../mail/e-mail-reader.c:2025
 msgid "Mark the selected messages as having been read"
 msgstr "選択したメッセージに既読マークを付けます"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2030
 msgid "Uni_mportant"
 msgstr "重要ではない(_M)"
 
-#: ../mail/e-mail-reader.c:2030
+#: ../mail/e-mail-reader.c:2032
 msgid "Mark the selected messages as unimportant"
 msgstr "選択したメッセージの重要マークを外します"
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:2037
 msgid "_Unread"
 msgstr "未読(_U)"
 
-#: ../mail/e-mail-reader.c:2037
+#: ../mail/e-mail-reader.c:2039
 msgid "Mark the selected messages as not having been read"
 msgstr "選択したメッセージに未読マークを付けます"
 
-#: ../mail/e-mail-reader.c:2042
+#: ../mail/e-mail-reader.c:2044
 msgid "_Edit as New Message..."
 msgstr "新規のメッセージとして編集(_E)..."
 
-#: ../mail/e-mail-reader.c:2044
+#: ../mail/e-mail-reader.c:2046
 msgid "Open the selected messages in the composer for editing"
 msgstr "選択したメッセージを開いて編集します"
 
-#: ../mail/e-mail-reader.c:2049
+#: ../mail/e-mail-reader.c:2051
 msgid "Compose _New Message"
 msgstr "新しいメッセージの作成(_N)"
 
-#: ../mail/e-mail-reader.c:2051
+#: ../mail/e-mail-reader.c:2053
 msgid "Open a window for composing a mail message"
 msgstr "メッセージを作成するためのウィンドウを開きます"
 
-#: ../mail/e-mail-reader.c:2056
+#: ../mail/e-mail-reader.c:2058
 msgid "_Open in New Window"
 msgstr "新しいウィンドウで開く(_O)"
 
-#: ../mail/e-mail-reader.c:2058
+#: ../mail/e-mail-reader.c:2060
 msgid "Open the selected messages in a new window"
 msgstr "選択したメッセージを新しいウィンドウの中で開きます"
 
-#: ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2065
 msgid "_Move to Folder..."
 msgstr "フォルダーへ移動(_M)..."
 
-#: ../mail/e-mail-reader.c:2065
+#: ../mail/e-mail-reader.c:2067
 msgid "Move selected messages to another folder"
 msgstr "選択したメッセージを別のフォルダーへ移動します"
 
-#: ../mail/e-mail-reader.c:2070
+#: ../mail/e-mail-reader.c:2072
 msgid "_Next Message"
 msgstr "次のメッセージへ(_N)"
 
-#: ../mail/e-mail-reader.c:2072
+#: ../mail/e-mail-reader.c:2074
 msgid "Display the next message"
 msgstr "次のメッセージを表示します"
 
-#: ../mail/e-mail-reader.c:2077
+#: ../mail/e-mail-reader.c:2079
 msgid "Next _Important Message"
 msgstr "次の重要なメッセージへ(_I)"
 
-#: ../mail/e-mail-reader.c:2079
+#: ../mail/e-mail-reader.c:2081
 msgid "Display the next important message"
 msgstr "次の重要なメッセージを表示します"
 
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2086
 msgid "Next _Thread"
 msgstr "次のスレッドへ(_T)"
 
-#: ../mail/e-mail-reader.c:2086
+#: ../mail/e-mail-reader.c:2088
 msgid "Display the next thread"
 msgstr "次のスレッドを表示します"
 
-#: ../mail/e-mail-reader.c:2091
+#: ../mail/e-mail-reader.c:2093
 msgid "Next _Unread Message"
 msgstr "次の未読メッセージへ(_U)"
 
-#: ../mail/e-mail-reader.c:2093
+#: ../mail/e-mail-reader.c:2095
 msgid "Display the next unread message"
 msgstr "次の未読メッセージを表示します"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2100
 msgid "_Previous Message"
 msgstr "前のメッセージへ(_P)"
 
-#: ../mail/e-mail-reader.c:2100
+#: ../mail/e-mail-reader.c:2102
 msgid "Display the previous message"
 msgstr "前のメッセージを表示します"
 
-#: ../mail/e-mail-reader.c:2105
+#: ../mail/e-mail-reader.c:2107
 msgid "Pr_evious Important Message"
 msgstr "前の重要なメッセージへ(_E)"
 
-#: ../mail/e-mail-reader.c:2107
+#: ../mail/e-mail-reader.c:2109
 msgid "Display the previous important message"
 msgstr "前の重要なメッセージを表示します"
 
-#: ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2114
 msgid "Previous T_hread"
 msgstr "前のスレッドへ(_H)"
 
-#: ../mail/e-mail-reader.c:2114
+#: ../mail/e-mail-reader.c:2116
 msgid "Display the previous thread"
 msgstr "前のスレッドを表示します"
 
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2121
 msgid "P_revious Unread Message"
 msgstr "前の未読メッセージへ(_R)"
 
-#: ../mail/e-mail-reader.c:2121
+#: ../mail/e-mail-reader.c:2123
 msgid "Display the previous unread message"
 msgstr "前の未読メッセージを表示します"
 
-#: ../mail/e-mail-reader.c:2128
+#: ../mail/e-mail-reader.c:2130
 msgid "Print this message"
 msgstr "メッセージを印刷します"
 
-#: ../mail/e-mail-reader.c:2135
+#: ../mail/e-mail-reader.c:2137
 msgid "Preview the message to be printed"
 msgstr "印刷されるメッセージのプレビューを表示します"
 
-#: ../mail/e-mail-reader.c:2140
+#: ../mail/e-mail-reader.c:2142
 msgid "Re_direct"
 msgstr "リダイレクト(_D)"
 
-#: ../mail/e-mail-reader.c:2142
+#: ../mail/e-mail-reader.c:2144
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "選択したメッセージを誰かに転送します"
 
-#: ../mail/e-mail-reader.c:2147
+#: ../mail/e-mail-reader.c:2149
 msgid "Remo_ve Attachments"
 msgstr "添付ファイルの削除(_V)"
 
-#: ../mail/e-mail-reader.c:2149
+#: ../mail/e-mail-reader.c:2151
 msgid "Remove attachments"
 msgstr "添付ファイルを削除します"
 
-#: ../mail/e-mail-reader.c:2154
+#: ../mail/e-mail-reader.c:2156
 msgid "Remove Du_plicate Messages"
 msgstr "重複したメッセージの削除(_P)"
 
-#: ../mail/e-mail-reader.c:2156
+#: ../mail/e-mail-reader.c:2158
 msgid "Checks selected messages for duplicates"
 msgstr "選択したメッセージに削除マークを付けます"
 
-#: ../mail/e-mail-reader.c:2161 ../mail/mail.error.xml.h:27
-#: ../modules/calendar/e-cal-shell-view-actions.c:1547
-#: ../modules/mail/e-mail-attachment-handler.c:214
+#: ../mail/e-mail-reader.c:2163 ../mail/mail.error.xml.h:27
+#: ../modules/calendar/e-cal-shell-view-actions.c:1546
+#: ../modules/mail/e-mail-attachment-handler.c:213
 msgid "Reply to _All"
 msgstr "全員へ返信(_A)"
 
-#: ../mail/e-mail-reader.c:2163
+#: ../mail/e-mail-reader.c:2165
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "選択したメッセージのすべての宛先へ返信します"
 
-#: ../mail/e-mail-reader.c:2168 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2170 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "メーリングリストへ返信(_L)"
 
-#: ../mail/e-mail-reader.c:2170
+#: ../mail/e-mail-reader.c:2172
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "選択したメッセージのメーリングリストへ返信します"
 
-#: ../mail/e-mail-reader.c:2175
-#: ../modules/mail/e-mail-attachment-handler.c:221
+#: ../mail/e-mail-reader.c:2177
+#: ../modules/mail/e-mail-attachment-handler.c:220
 msgid "_Reply to Sender"
 msgstr "差出人へ返信(_R)"
 
-#: ../mail/e-mail-reader.c:2177
+#: ../mail/e-mail-reader.c:2179
 msgid "Compose a reply to the sender of the selected message"
 msgstr "選択したメッセージの差出人へ返信します"
 
-#: ../mail/e-mail-reader.c:2182
+#: ../mail/e-mail-reader.c:2184
 msgid "_Save as mbox..."
 msgstr "mbox 形式で保存(_S)..."
 
-#: ../mail/e-mail-reader.c:2184
+#: ../mail/e-mail-reader.c:2186
 msgid "Save selected messages as an mbox file"
 msgstr "選択したメッセージ mbox 形式のファイルで保存します"
 
-#: ../mail/e-mail-reader.c:2189
+#: ../mail/e-mail-reader.c:2191
 msgid "_Message Source"
 msgstr "メッセージのソース(_M)"
 
-#: ../mail/e-mail-reader.c:2191
+#: ../mail/e-mail-reader.c:2193
 msgid "Show the raw email source of the message"
 msgstr "メッセージのソースを表示します"
 
-#: ../mail/e-mail-reader.c:2203
+#: ../mail/e-mail-reader.c:2205
 msgid "_Undelete Message"
 msgstr "削除マークの解除(_U)"
 
-#: ../mail/e-mail-reader.c:2205
+#: ../mail/e-mail-reader.c:2207
 msgid "Undelete the selected messages"
 msgstr "選択したメッセージの削除を取り消します"
 
-#: ../mail/e-mail-reader.c:2210
+#: ../mail/e-mail-reader.c:2212
 msgid "_Normal Size"
 msgstr "通常のサイズ(_N)"
 
-#: ../mail/e-mail-reader.c:2212
+#: ../mail/e-mail-reader.c:2214
 msgid "Reset the text to its original size"
 msgstr "文字のサイズを初期サイズに戻します"
 
-#: ../mail/e-mail-reader.c:2217
+#: ../mail/e-mail-reader.c:2219
 msgid "_Zoom In"
 msgstr "拡大(_Z)"
 
-#: ../mail/e-mail-reader.c:2219
+#: ../mail/e-mail-reader.c:2221
 msgid "Increase the text size"
 msgstr "文字のサイズを大きくします"
 
-#: ../mail/e-mail-reader.c:2224
-msgid "Zoom _Out"
-msgstr "縮小(_O)"
-
-#: ../mail/e-mail-reader.c:2226
+#: ../mail/e-mail-reader.c:2228
 msgid "Decrease the text size"
 msgstr "文字のサイズを小さくします"
 
-#: ../mail/e-mail-reader.c:2233
+#: ../mail/e-mail-reader.c:2235
 msgid "Cre_ate"
 msgstr "作成(_A)"
 
-#: ../mail/e-mail-reader.c:2240
+#: ../mail/e-mail-reader.c:2242
 msgid "Ch_aracter Encoding"
 msgstr "エンコーディング(_A)"
 
-#: ../mail/e-mail-reader.c:2247
+#: ../mail/e-mail-reader.c:2249
 msgid "F_orward As"
 msgstr "別の形式で転送(_O)"
 
-#: ../mail/e-mail-reader.c:2254
+#: ../mail/e-mail-reader.c:2256
 msgid "_Group Reply"
 msgstr "グループに返信(_G)"
 
-#: ../mail/e-mail-reader.c:2261
+#: ../mail/e-mail-reader.c:2263
 msgid "_Go To"
 msgstr "ジャンプ(_G)"
 
-#: ../mail/e-mail-reader.c:2268
+#: ../mail/e-mail-reader.c:2270
 msgid "Mar_k As"
 msgstr "マークの付与(_K)"
 
-#: ../mail/e-mail-reader.c:2275
+#: ../mail/e-mail-reader.c:2277
 msgid "_Message"
 msgstr "メッセージ(_M)"
 
-#: ../mail/e-mail-reader.c:2282
+#: ../mail/e-mail-reader.c:2284
 msgid "_Zoom"
 msgstr "ズーム(_Z)"
 
-#: ../mail/e-mail-reader.c:2292
+#: ../mail/e-mail-reader.c:2294
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "メーリングリストから仮想フォルダーを作成(_L)..."
 
-#: ../mail/e-mail-reader.c:2294
+#: ../mail/e-mail-reader.c:2296
 msgid "Create a search folder for this mailing list"
 msgstr "このメーリングリストに対する仮想フォルダーを作成します"
 
-#: ../mail/e-mail-reader.c:2299
+#: ../mail/e-mail-reader.c:2301
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "宛先から仮想フォルダーを作成(_T)..."
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2303
 msgid "Create a search folder for these recipients"
 msgstr "これらの宛先に対する仮想フォルダーを作成します"
 
-#: ../mail/e-mail-reader.c:2306
+#: ../mail/e-mail-reader.c:2308
 msgid "Create a Search Folder from Sen_der..."
 msgstr "差出人から仮想フォルダーを作成(_D)..."
 
-#: ../mail/e-mail-reader.c:2308
+#: ../mail/e-mail-reader.c:2310
 msgid "Create a search folder for this sender"
 msgstr "この差出人に対する仮想フォルダーを作成します"
 
-#: ../mail/e-mail-reader.c:2313
+#: ../mail/e-mail-reader.c:2315
 msgid "Create a Search Folder from S_ubject..."
 msgstr "件名から仮想フォルダーを作成(_U)..."
 
-#: ../mail/e-mail-reader.c:2315
+#: ../mail/e-mail-reader.c:2317
 msgid "Create a search folder for this subject"
 msgstr "この件名に対する仮想フォルダーを作成します"
 
-#: ../mail/e-mail-reader.c:2338
+#: ../mail/e-mail-reader.c:2340
 msgid "Mark for Follo_w Up..."
 msgstr "フォローアップとしてマーク(_W)..."
 
-#: ../mail/e-mail-reader.c:2346
+#: ../mail/e-mail-reader.c:2348
 msgid "Mark as _Important"
 msgstr "重要としてマーク(_I)"
 
-#: ../mail/e-mail-reader.c:2350
+#: ../mail/e-mail-reader.c:2352
 msgid "Mark as _Junk"
 msgstr "ジャンクとしてマーク(_J)"
 
-#: ../mail/e-mail-reader.c:2354
+#: ../mail/e-mail-reader.c:2356
 msgid "Mark as _Not Junk"
 msgstr "ジャンクではないとしてマーク(_N)"
 
-#: ../mail/e-mail-reader.c:2358
+#: ../mail/e-mail-reader.c:2360
 msgid "Mar_k as Read"
 msgstr "既読としてマーク(_K)"
 
-#: ../mail/e-mail-reader.c:2362
+#: ../mail/e-mail-reader.c:2364
 msgid "Mark as Uni_mportant"
 msgstr "重要でないとしてマーク(_M)"
 
-#: ../mail/e-mail-reader.c:2366
+#: ../mail/e-mail-reader.c:2368
 msgid "Mark as _Unread"
 msgstr "未読としてマーク(_U)"
 
-#: ../mail/e-mail-reader.c:2410
+#: ../mail/e-mail-reader.c:2412
 msgid "_Caret Mode"
 msgstr "カーソルモード(_C)"
 
-#: ../mail/e-mail-reader.c:2412
+#: ../mail/e-mail-reader.c:2414
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "表示したメッセージの本文に点滅するカーソルを表示します"
 
-#: ../mail/e-mail-reader.c:2418
+#: ../mail/e-mail-reader.c:2420
 msgid "All Message _Headers"
 msgstr "メッセージのヘッダー情報(_H)"
 
-#: ../mail/e-mail-reader.c:2420
+#: ../mail/e-mail-reader.c:2422
 msgid "Show messages with all email headers"
 msgstr "メールヘッダーも含めてメッセージをすべて表示します"
 
-#: ../mail/e-mail-reader.c:2780
+#: ../mail/e-mail-reader.c:2849
 msgid "Retrieving message"
 msgstr "メッセージの受信中"
 
-#: ../mail/e-mail-reader.c:3702
-#: ../modules/mail/e-mail-attachment-handler.c:207
+#: ../mail/e-mail-reader.c:3772
+#: ../modules/mail/e-mail-attachment-handler.c:206
 msgid "_Forward"
 msgstr "転送(_F)"
 
-#: ../mail/e-mail-reader.c:3703
+#: ../mail/e-mail-reader.c:3773
 msgid "Forward the selected message to someone"
 msgstr "選択したメッセージを誰かに転送します"
 
-#: ../mail/e-mail-reader.c:3722
+#: ../mail/e-mail-reader.c:3792
 msgid "Group Reply"
 msgstr "グループに返信"
 
-#: ../mail/e-mail-reader.c:3723
+#: ../mail/e-mail-reader.c:3793
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "メーリングリスト、あるいはすべての宛先に返信します"
 
-#: ../mail/e-mail-reader.c:3789 ../mail/em-filter-i18n.h:15
+#: ../mail/e-mail-reader.c:3859 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "削除する"
 
-#: ../mail/e-mail-reader.c:3801
-#: ../modules/calendar/e-cal-shell-view-actions.c:1372
+#: ../mail/e-mail-reader.c:3871
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
 msgid "Next"
 msgstr "次へ"
 
-#: ../mail/e-mail-reader.c:3805
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../mail/e-mail-reader.c:3875
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Previous"
 msgstr "前へ"
 
-#: ../mail/e-mail-reader.c:3814 ../mail/mail-dialogs.ui.h:15
+#: ../mail/e-mail-reader.c:3884 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "返信"
 
-#: ../mail/e-mail-reader-utils.c:151
+#: ../mail/e-mail-reader-utils.c:147
 msgid "Do not warn me again"
 msgstr "次回から警告を表示しない"
 
+#: ../mail/e-mail-reader-utils.c:557 ../plugins/face/face.c:170
+#: ../smime/gui/certificate-manager.c:329
+msgid "Unknown error"
+msgstr "原因不明のエラー"
+
 #: ../mail/e-mail-reader-utils.c:976
 msgid "Printing"
 msgstr "印刷"
@@ -12282,11 +12775,11 @@ msgstr[0] "メッセージ"
 msgid "Parsing message"
 msgstr "メッセージの解析中"
 
-#: ../mail/e-mail-request.c:182
+#: ../mail/e-mail-request.c:199
 msgid "The message has no text content."
 msgstr "このメッセージにはテキストの内容がありません。"
 
-#: ../mail/e-mail-tag-editor.c:238
+#: ../mail/e-mail-tag-editor.c:237
 msgid "Flag to Follow Up"
 msgstr "フォローアップするフラグ"
 
@@ -12294,31 +12787,31 @@ msgstr "フォローアップするフラグ"
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1372
+#: ../mail/em-composer-utils.c:1454
 msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
 msgstr "${Year}-${Month}-${Day} (${AbbrevWeekdayName}) の ${24Hour}:${Minute} ${TimeZone} に ${Sender} さんは書きました:"
 
-#: ../mail/em-composer-utils.c:1378
+#: ../mail/em-composer-utils.c:1460
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 転送するメッセージ --------"
 
-#: ../mail/em-composer-utils.c:1383
+#: ../mail/em-composer-utils.c:1465
 msgid "-----Original Message-----"
 msgstr "-------- オリジナルのメッセージ --------"
 
-#: ../mail/em-composer-utils.c:2528
+#: ../mail/em-composer-utils.c:2615
 msgid "an unknown sender"
 msgstr "差出人が不明"
 
-#: ../mail/em-composer-utils.c:2949
+#: ../mail/em-composer-utils.c:3040
 msgid "Posting destination"
 msgstr "送信先を指定します"
 
-#: ../mail/em-composer-utils.c:2950
+#: ../mail/em-composer-utils.c:3041
 msgid "Choose folders to post the message to."
 msgstr "メッセージを投稿するフォルダーを選択してください。"
 
-#: ../mail/em-filter-editor-folder-element.c:157
+#: ../mail/em-filter-editor-folder-element.c:153
 msgid "Select Folder"
 msgstr "フォルダーの選択"
 
@@ -12355,541 +12848,558 @@ msgstr "Cc"
 msgid "Completed On"
 msgstr "完了日"
 
-#: ../mail/em-filter-i18n.h:13
+#: ../mail/em-filter-i18n.h:12
 msgid "Date received"
 msgstr "受信日"
 
-#: ../mail/em-filter-i18n.h:14
+#: ../mail/em-filter-i18n.h:13
 msgid "Date sent"
 msgstr "送信日"
 
-#: ../mail/em-filter-i18n.h:16
+#: ../mail/em-filter-i18n.h:15
 msgid "Deleted"
 msgstr "削除済み"
 
-#: ../mail/em-filter-i18n.h:18
-msgid "does not end with"
-msgstr "が次で終わらない"
-
-#: ../mail/em-filter-i18n.h:19
-msgid "does not exist"
-msgstr "が存在しない"
-
-#: ../mail/em-filter-i18n.h:20
-msgid "does not have words"
-msgstr "という語を含まない"
-
-#: ../mail/em-filter-i18n.h:21
-msgid "does not return"
-msgstr "が次の値を返さない"
-
-#: ../mail/em-filter-i18n.h:22
-msgid "does not sound like"
-msgstr "が次のようではない"
-
-#: ../mail/em-filter-i18n.h:23
-msgid "does not start with"
-msgstr "が次で始まらない"
-
-#: ../mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:17
 msgid "Draft"
 msgstr "下書き"
 
-#: ../mail/em-filter-i18n.h:26
-msgid "ends with"
-msgstr "が次で終わる"
-
-#: ../mail/em-filter-i18n.h:28
-msgid "exists"
-msgstr "が存在する"
-
-#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:19
 msgid "Expression"
 msgstr "表現"
 
-#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:20
 msgid "Follow Up"
 msgstr "フローアップ"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:21
 msgid "Forward to"
 msgstr "転送"
 
-#: ../mail/em-filter-i18n.h:32
-msgid "has words"
-msgstr "が次の語を含む"
-
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:22
 msgid "Important"
 msgstr "重要"
 
-#: ../mail/em-filter-i18n.h:35
-msgid "is after"
-msgstr "が次の日より後にある"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is before"
-msgstr "が次の日より前にある"
-
-#: ../mail/em-filter-i18n.h:37
-msgid "is Flagged"
-msgstr "にフラグが付いている"
-
-#: ../mail/em-filter-i18n.h:41
-msgid "is not Flagged"
-msgstr "にフラグが付いていない"
-
-#: ../mail/em-filter-i18n.h:42
-msgid "is not set"
-msgstr "が付与されていない"
-
-#: ../mail/em-filter-i18n.h:43
-msgid "is set"
-msgstr "が付与されている"
+#: ../mail/em-filter-i18n.h:23
+msgid "Junk Test"
+msgstr "ジャンクテストの結果"
 
-#: ../mail/em-filter-i18n.h:44 ../mail/mail-config.ui.h:108
+#: ../mail/em-filter-i18n.h:24 ../mail/mail-config.ui.h:113
 msgid "Junk"
 msgstr "ジャンク"
 
-#: ../mail/em-filter-i18n.h:45
-msgid "Junk Test"
-msgstr "ジャンクテストの結果"
-
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:25
 msgid "Label"
 msgstr "ラベル"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:26
 msgid "Mailing list"
 msgstr "メーリングリスト"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:27
 msgid "Match All"
 msgstr "すべてに一致する"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:28
 msgid "Message Body"
 msgstr "メッセージの本文"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:29
 msgid "Message Header"
 msgstr "メッセージのヘッダー"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:30
+msgid "Message Location"
+msgstr "メールの場所"
+
+#: ../mail/em-filter-i18n.h:31
 msgid "Message is Junk"
 msgstr "がジャンクである"
 
-#: ../mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:32
 msgid "Message is not Junk"
 msgstr "がジャンクではない"
 
-#: ../mail/em-filter-i18n.h:53
-msgid "Message Location"
-msgstr "メールの場所"
-
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:34
 msgid "Pipe to Program"
 msgstr "次のプログラムに渡す"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:35
 msgid "Play Sound"
 msgstr "サウンドを演奏する"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:57 ../mail/mail-dialogs.ui.h:14
+#: ../mail/em-filter-i18n.h:36 ../mail/mail-dialogs.ui.h:15
 msgid "Read"
 msgstr "既読"
 
-#: ../mail/em-filter-i18n.h:58 ../mail/message-list.etspec.h:16
+#: ../mail/em-filter-i18n.h:37 ../mail/message-list.etspec.h:16
 msgid "Recipients"
 msgstr "宛先"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:38
 msgid "Regex Match"
 msgstr "次に対する正規表現"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:39
 msgid "Replied to"
 msgstr "返信済"
 
-#: ../mail/em-filter-i18n.h:61
-msgid "returns"
-msgstr "が次の値を返す"
-
-#: ../mail/em-filter-i18n.h:62
-msgid "returns greater than"
-msgstr "が次より大きい値を返す"
-
-#: ../mail/em-filter-i18n.h:63
-msgid "returns less than"
-msgstr "が次より小さい値を返す"
-
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:40
 msgid "Run Program"
 msgstr "プログラムを実行する"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/message-list.etspec.h:3
+#: ../mail/em-filter-i18n.h:41 ../mail/message-list.etspec.h:3
 msgid "Score"
 msgstr "スコア"
 
-#: ../mail/em-filter-i18n.h:66 ../mail/message-list.etspec.h:15
-msgid "Sender"
-msgstr "差出人"
-
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:42
 msgid "Sender or Recipients"
 msgstr "差出人または宛先"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:43 ../mail/message-list.etspec.h:15
+msgid "Sender"
+msgstr "差出人"
+
+#: ../mail/em-filter-i18n.h:44
 msgid "Set Label"
 msgstr "ラベルを付与する"
 
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:45
 msgid "Set Status"
 msgstr "ステータスをセットする"
 
-#: ../mail/em-filter-i18n.h:70
+#: ../mail/em-filter-i18n.h:46
 msgid "Size (kB)"
 msgstr "サイズ (KB)"
 
-#: ../mail/em-filter-i18n.h:71
-msgid "sounds like"
-msgstr "が次のようである"
-
-#: ../mail/em-filter-i18n.h:72
+#: ../mail/em-filter-i18n.h:47
 msgid "Source Account"
 msgstr "ソースのアカウント"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:48
 msgid "Specific header"
 msgstr "指定したフォルダー"
 
-#: ../mail/em-filter-i18n.h:74
-msgid "starts with"
-msgstr "が次で始まる"
-
-#: ../mail/em-filter-i18n.h:76
+#: ../mail/em-filter-i18n.h:50
 msgid "Stop Processing"
 msgstr "読み込みを停止する"
 
-#: ../mail/em-filter-i18n.h:79
+#: ../mail/em-filter-i18n.h:53
 msgid "Unset Color"
 msgstr "色の指定を解除"
 
-#: ../mail/em-filter-i18n.h:80
+#: ../mail/em-filter-i18n.h:54
 msgid "Unset Status"
 msgstr "ステータスを外す"
 
+#: ../mail/em-filter-i18n.h:57
+msgid "does not end with"
+msgstr "が次で終わらない"
+
+#: ../mail/em-filter-i18n.h:58
+msgid "does not exist"
+msgstr "が存在しない"
+
+#: ../mail/em-filter-i18n.h:59
+msgid "does not have words"
+msgstr "という語を含まない"
+
+#: ../mail/em-filter-i18n.h:60
+msgid "does not return"
+msgstr "が次の値を返さない"
+
+#: ../mail/em-filter-i18n.h:61
+msgid "does not sound like"
+msgstr "が次のようではない"
+
+#: ../mail/em-filter-i18n.h:62
+msgid "does not start with"
+msgstr "が次で始まらない"
+
+#: ../mail/em-filter-i18n.h:63
+msgid "ends with"
+msgstr "が次で終わる"
+
+#: ../mail/em-filter-i18n.h:64
+msgid "exists"
+msgstr "が存在する"
+
+#: ../mail/em-filter-i18n.h:65
+msgid "has words"
+msgstr "が次の語を含む"
+
+#: ../mail/em-filter-i18n.h:66
+msgid "is Flagged"
+msgstr "にフラグが付いている"
+
+#: ../mail/em-filter-i18n.h:67
+msgid "is after"
+msgstr "が次の日より後にある"
+
+#: ../mail/em-filter-i18n.h:68
+msgid "is before"
+msgstr "が次の日より前にある"
+
+#: ../mail/em-filter-i18n.h:71
+msgid "is not Flagged"
+msgstr "にフラグが付いていない"
+
+#: ../mail/em-filter-i18n.h:72
+msgid "is not set"
+msgstr "が付与されていない"
+
+#: ../mail/em-filter-i18n.h:74
+msgid "is set"
+msgstr "が付与されている"
+
+#: ../mail/em-filter-i18n.h:76
+msgid "returns greater than"
+msgstr "が次より大きい値を返す"
+
+#: ../mail/em-filter-i18n.h:77
+msgid "returns less than"
+msgstr "が次より小さい値を返す"
+
+#: ../mail/em-filter-i18n.h:78
+msgid "returns"
+msgstr "が次の値を返す"
+
+#: ../mail/em-filter-i18n.h:79
+msgid "sounds like"
+msgstr "が次のようである"
+
+#: ../mail/em-filter-i18n.h:80
+msgid "starts with"
+msgstr "が次で始まる"
+
 #. and now for the action area
-#: ../mail/em-filter-rule.c:583
+#: ../mail/em-filter-rule.c:587
 msgid "Then"
 msgstr "条件を満足した時のアクション"
 
-#: ../mail/em-filter-rule.c:648
+#: ../mail/em-filter-rule.c:652
 msgid "Add Ac_tion"
 msgstr "アクションの追加(_T)"
 
-#: ../mail/em-folder-properties.c:145
+#: ../mail/em-folder-properties.c:177
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "未読のメッセージ数:"
 
-#: ../mail/em-folder-properties.c:156
+#: ../mail/em-folder-properties.c:188
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "メッセージの総数:"
 
-#: ../mail/em-folder-properties.c:177
+#: ../mail/em-folder-properties.c:209
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "クォータの使用量 (%s):"
 
-#: ../mail/em-folder-properties.c:179
+#: ../mail/em-folder-properties.c:211
 #, c-format
 msgid "Quota usage"
 msgstr "クォータの使用量"
 
-#: ../mail/em-folder-properties.c:347
+#. Translators: Label of a combo with a list of configured accounts where a user can
+#. choose which account to use as the sender when composing a message in this folder
+#: ../mail/em-folder-properties.c:286
+msgid "_Send Account Override:"
+msgstr "送信アカウントの優先(_S):"
+
+#: ../mail/em-folder-properties.c:415
 msgid "Folder Properties"
 msgstr "フォルダーのプロパティ"
 
-#: ../mail/em-folder-selection-button.c:80
+#: ../mail/em-folder-selection-button.c:76
 msgid "<click here to select a folder>"
 msgstr "<ここをクリックしてフォルダーを選択してください>"
 
-#: ../mail/em-folder-selector.c:390
+#: ../mail/em-folder-selector.c:387
 msgid "C_reate"
 msgstr "作成(_R)"
 
-#: ../mail/em-folder-selector.c:396
+#: ../mail/em-folder-selector.c:393
 msgid "Folder _name:"
 msgstr "フォルダー名(_N):"
 
-#: ../mail/em-folder-tree.c:637
+#: ../mail/em-folder-tree.c:682
 msgid "Folder names cannot contain '/'"
 msgstr "フォルダー名には '/' を含めることはできません。"
 
-#: ../mail/em-folder-tree.c:774
+#: ../mail/em-folder-tree.c:819
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1599
+#: ../mail/em-folder-tree.c:1667
 msgid "Mail Folder Tree"
 msgstr "メールフォルダーのツリー"
 
-#: ../mail/em-folder-tree.c:2168 ../mail/em-folder-utils.c:112
+#: ../mail/em-folder-tree.c:2215 ../mail/em-folder-utils.c:100
 #, c-format
 msgid "Moving folder %s"
 msgstr "フォルダー %s の移動中"
 
-#: ../mail/em-folder-tree.c:2171 ../mail/em-folder-utils.c:114
+#: ../mail/em-folder-tree.c:2218 ../mail/em-folder-utils.c:102
 #, c-format
 msgid "Copying folder %s"
 msgstr "フォルダー %s のコピー中"
 
-#: ../mail/em-folder-tree.c:2178 ../mail/message-list.c:2280
+#: ../mail/em-folder-tree.c:2225 ../mail/message-list.c:2284
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "フォルダー %s へメッセージの移動中"
 
-#: ../mail/em-folder-tree.c:2182 ../mail/message-list.c:2282
+#: ../mail/em-folder-tree.c:2229 ../mail/message-list.c:2286
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "フォルダー %s へメッセージのコピー中"
 
-#: ../mail/em-folder-tree.c:2201
+#: ../mail/em-folder-tree.c:2248
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "メッセージをトップレベルの中に移せません"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:176 ../mail/em-folder-tree-model.c:178
+#: ../mail/em-folder-tree-model.c:430 ../mail/em-folder-tree-model.c:432
 msgid "UNMATCHED"
 msgstr "該当しないもの"
 
-#: ../mail/em-folder-tree-model.c:870 ../mail/em-folder-tree-model.c:1165
+#: ../mail/em-folder-tree-model.c:1244 ../mail/em-folder-tree-model.c:1621
 msgid "Loading..."
 msgstr "読み込み中..."
 
-#: ../mail/em-folder-utils.c:518
+#: ../mail/em-folder-utils.c:506
 msgid "Move Folder To"
 msgstr "フォルダーの移動"
 
-#: ../mail/em-folder-utils.c:518
+#: ../mail/em-folder-utils.c:506
 msgid "Copy Folder To"
 msgstr "フォルダーのコピー"
 
-#: ../mail/em-folder-utils.c:616
+#: ../mail/em-folder-utils.c:604
 msgid "Create Folder"
 msgstr "フォルダーの作成"
 
-#: ../mail/em-folder-utils.c:617
+#: ../mail/em-folder-utils.c:605
 msgid "Specify where to create the folder:"
 msgstr "フォルダーを作成する場所を指定してください:"
 
-#: ../mail/em-subscription-editor.c:867
+#: ../mail/em-subscription-editor.c:855
 msgid "_Subscribe"
 msgstr "購読(_S)"
 
-#: ../mail/em-subscription-editor.c:876
+#: ../mail/em-subscription-editor.c:864
 msgid "Su_bscribe To Shown"
 msgstr "表示したものを購読(_B)"
 
-#: ../mail/em-subscription-editor.c:884
+#: ../mail/em-subscription-editor.c:872
 msgid "Subscribe To _All"
 msgstr "すべてを購読(_A)"
 
-#: ../mail/em-subscription-editor.c:981 ../mail/em-subscription-editor.c:1836
-#: ../modules/mail/e-mail-shell-view-actions.c:1630
+#: ../mail/em-subscription-editor.c:969 ../mail/em-subscription-editor.c:1867
+#: ../modules/mail/e-mail-shell-view-actions.c:1631
 msgid "_Unsubscribe"
 msgstr "購読の停止(_U)"
 
-#: ../mail/em-subscription-editor.c:990
+#: ../mail/em-subscription-editor.c:978
 #, fuzzy
 msgid "Unsu_bscribe From Hidden"
 msgstr "メーリングリストの購読停止(_B)"
 
-#: ../mail/em-subscription-editor.c:998
+#: ../mail/em-subscription-editor.c:986
 msgid "Unsubscribe From _All"
 msgstr "すべての購読停止(_A)"
 
-#: ../mail/em-subscription-editor.c:1677
+#: ../mail/em-subscription-editor.c:1704
 msgid "Folder Subscriptions"
 msgstr "フォルダーの購読"
 
-#: ../mail/em-subscription-editor.c:1716
+#: ../mail/em-subscription-editor.c:1743
 msgid "_Account:"
 msgstr "アカウント(_A):"
 
-#: ../mail/em-subscription-editor.c:1729
+#: ../mail/em-subscription-editor.c:1756
 msgid "Clear Search"
 msgstr "検索をクリア"
 
-#: ../mail/em-subscription-editor.c:1746
+#: ../mail/em-subscription-editor.c:1773
 msgid "Sho_w items that contain:"
 msgstr "以下を含むアイテムを表示(_W):"
 
-#: ../mail/em-subscription-editor.c:1789
+#: ../mail/em-subscription-editor.c:1820
 msgid "Subscribe to the selected folder"
 msgstr "選択したフォルダーを購読します"
 
-#: ../mail/em-subscription-editor.c:1790
+#: ../mail/em-subscription-editor.c:1821
 msgid "Su_bscribe"
 msgstr "購読(_B)"
 
-#: ../mail/em-subscription-editor.c:1835
-#: ../modules/mail/e-mail-shell-view-actions.c:1632
+#: ../mail/em-subscription-editor.c:1866
+#: ../modules/mail/e-mail-shell-view-actions.c:1633
 msgid "Unsubscribe from the selected folder"
 msgstr "選択したフォルダーの購読を停止します"
 
-#: ../mail/em-subscription-editor.c:1875
+#: ../mail/em-subscription-editor.c:1906
 msgid "Collapse all folders"
 msgstr "すべてのフォルダーを畳む"
 
-#: ../mail/em-subscription-editor.c:1876
+#: ../mail/em-subscription-editor.c:1907
 msgid "C_ollapse All"
 msgstr "すべて畳む(_O)"
 
-#: ../mail/em-subscription-editor.c:1886
+#: ../mail/em-subscription-editor.c:1917
 msgid "Expand all folders"
 msgstr "すべてのフォルダーを展開する"
 
-#: ../mail/em-subscription-editor.c:1887
+#: ../mail/em-subscription-editor.c:1918
 msgid "E_xpand All"
 msgstr "すべてを展開(_X)"
 
-#: ../mail/em-subscription-editor.c:1897
+#: ../mail/em-subscription-editor.c:1928
 msgid "Refresh the folder list"
 msgstr "フォルダーの一覧を更新します"
 
-#: ../mail/em-subscription-editor.c:1909
+#: ../mail/em-subscription-editor.c:1929
+#: ../modules/mail/e-mail-shell-view-actions.c:1533
+#: ../modules/mail/e-mail-shell-view-actions.c:1603
+msgid "_Refresh"
+msgstr "更新(_R)"
+
+#: ../mail/em-subscription-editor.c:1940
 msgid "Stop the current operation"
 msgstr "現在の操作を取り消します"
 
+#: ../mail/em-subscription-editor.c:1941
+#: ../modules/addressbook/e-book-shell-view-actions.c:934
+msgid "_Stop"
+msgstr ""
+
 #. Translators: This message is shown only for ten or more
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:86
+#: ../mail/em-utils.c:75
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "本当に %d 通のメッセージを一度に開いてもよろしいですか?"
 
-#: ../mail/em-utils.c:142
-#: ../modules/mailto-handler/evolution-mailto-handler.c:150
+#: ../mail/em-utils.c:131
+#: ../modules/mailto-handler/evolution-mailto-handler.c:148
 msgid "_Do not show this message again"
 msgstr "次回からこのメッセージを表示しない(_D)"
 
-#: ../mail/em-utils.c:252
+#: ../mail/em-utils.c:241
 msgid "Message Filters"
 msgstr "フィルターの定義"
 
-#: ../mail/em-utils.c:982
+#: ../mail/em-utils.c:970
 #, c-format
 msgid "Messages from %s"
 msgstr "%s さんからのメッセージ"
 
-#: ../mail/em-vfolder-editor.c:105
+#: ../mail/em-vfolder-editor.c:104
 msgid "Search _Folders"
 msgstr "仮想フォルダー(_F)"
 
-#: ../mail/em-vfolder-editor-rule.c:397
+#: ../mail/em-vfolder-editor-rule.c:392
 msgid "Add Folder"
 msgstr "フォルダーを追加"
 
-#: ../mail/em-vfolder-editor-rule.c:523
+#: ../mail/em-vfolder-editor-rule.c:518
 msgid "Search Folder Sources"
 msgstr "仮想フォルダーのソース"
 
-#: ../mail/em-vfolder-editor-rule.c:555
+#: ../mail/em-vfolder-editor-rule.c:550
 msgid "Automatically update on any _source folder change"
 msgstr "ソースフォルダーに何か変更があれば自動的に更新(_S)"
 
-#: ../mail/em-vfolder-editor-rule.c:567
+#: ../mail/em-vfolder-editor-rule.c:562
 msgid "All local folders"
 msgstr "ローカルフォルダーすべて"
 
-#: ../mail/em-vfolder-editor-rule.c:568
+#: ../mail/em-vfolder-editor-rule.c:563
 msgid "All active remote folders"
 msgstr "利用可能なリモートフォルダーのすべて"
 
-#: ../mail/em-vfolder-editor-rule.c:569
+#: ../mail/em-vfolder-editor-rule.c:564
 msgid "All local and active remote folders"
 msgstr "ローカルと利用可能なリモートフォルダーのすべて"
 
-#: ../mail/em-vfolder-editor-rule.c:570
+#: ../mail/em-vfolder-editor-rule.c:565
 msgid "Specific folders"
 msgstr "指定したフォルダーだけ"
 
 # "検索フォルダ"は適訳ではない
-#: ../mail/em-vfolder-editor-rule.c:608
+#: ../mail/em-vfolder-editor-rule.c:603
 msgid "include subfolders"
 msgstr "サブフォルダーを含める"
 
-#: ../mail/importers/elm-importer.c:178
+#: ../mail/importers/elm-importer.c:173
 msgid "Importing Elm data"
 msgstr "Elm データのインポート"
 
-#: ../mail/importers/elm-importer.c:378
+#: ../mail/importers/elm-importer.c:374
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm インポーター"
 
-#: ../mail/importers/elm-importer.c:379
+#: ../mail/importers/elm-importer.c:375
 msgid "Import mail from Elm."
 msgstr "Elm からのメールのインポート"
 
-#: ../mail/importers/evolution-mbox-importer.c:140
-#: ../plugins/dbx-import/dbx-importer.c:250
+#: ../mail/importers/evolution-mbox-importer.c:134
+#: ../plugins/dbx-import/dbx-importer.c:246
 msgid "_Destination folder:"
 msgstr "インポート先フォルダー(_D):"
 
-#: ../mail/importers/evolution-mbox-importer.c:146
-#: ../plugins/dbx-import/dbx-importer.c:256
-#: ../plugins/pst-import/pst-importer.c:545
+#: ../mail/importers/evolution-mbox-importer.c:140
+#: ../plugins/dbx-import/dbx-importer.c:252
+#: ../plugins/pst-import/pst-importer.c:541
 msgid "Select folder"
 msgstr "フォルダーの選択"
 
-#: ../mail/importers/evolution-mbox-importer.c:147
-#: ../plugins/dbx-import/dbx-importer.c:257
-#: ../plugins/pst-import/pst-importer.c:546
+#: ../mail/importers/evolution-mbox-importer.c:141
+#: ../plugins/dbx-import/dbx-importer.c:253
+#: ../plugins/pst-import/pst-importer.c:542
 msgid "Select folder to import into"
 msgstr "インポート先フォルダーの選択"
 
-#: ../mail/importers/evolution-mbox-importer.c:437
+#: ../mail/importers/evolution-mbox-importer.c:435
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "件名"
 
-#: ../mail/importers/evolution-mbox-importer.c:442
+#: ../mail/importers/evolution-mbox-importer.c:440
 msgctxt "mboxImp"
 msgid "From"
 msgstr "差出人"
 
-#: ../mail/importers/evolution-mbox-importer.c:486
-#: ../shell/e-shell-utils.c:172
+#: ../mail/importers/evolution-mbox-importer.c:493
+#: ../shell/e-shell-utils.c:171
 msgid "Berkeley Mailbox (mbox)"
 msgstr "バークレー Mailbox (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:487
+#: ../mail/importers/evolution-mbox-importer.c:494
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "バークレー Mailbox 形式のフォルダーをインポートします"
 
-#: ../mail/importers/mail-importer.c:63
+#: ../mail/importers/mail-importer.c:54
 msgid "Importing mailbox"
 msgstr "mailbox のインポート"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:153
-#: ../plugins/dbx-import/dbx-importer.c:612
-#: ../plugins/pst-import/pst-importer.c:764
+#: ../mail/importers/mail-importer.c:144
+#: ../plugins/dbx-import/dbx-importer.c:609
+#: ../plugins/pst-import/pst-importer.c:760
 #, c-format
 msgid "Importing '%s'"
 msgstr "'%s' をインポート中"
 
-#: ../mail/importers/mail-importer.c:316
+#: ../mail/importers/mail-importer.c:309
 #, c-format
 msgid "Scanning %s"
 msgstr "%s の解析"
@@ -12898,35 +13408,35 @@ msgstr "%s の解析"
 msgid "Importing Pine data"
 msgstr "Pine データのインポート"
 
-#: ../mail/importers/pine-importer.c:474
+#: ../mail/importers/pine-importer.c:475
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine インポーター"
 
-#: ../mail/importers/pine-importer.c:475
+#: ../mail/importers/pine-importer.c:476
 msgid "Import mail from Pine."
 msgstr "Pine からのメールのインポート"
 
-#: ../mail/mail-autofilter.c:70
+#: ../mail/mail-autofilter.c:63
 #, c-format
 msgid "Mail to %s"
 msgstr "宛先が %s のメール"
 
-#: ../mail/mail-autofilter.c:226 ../mail/mail-autofilter.c:269
+#: ../mail/mail-autofilter.c:219 ../mail/mail-autofilter.c:262
 #, c-format
 msgid "Mail from %s"
 msgstr "差出人が %s のメール"
 
-#: ../mail/mail-autofilter.c:252
+#: ../mail/mail-autofilter.c:245
 #, c-format
 msgid "Subject is %s"
 msgstr "件名が %s のメール"
 
-#: ../mail/mail-autofilter.c:293
+#: ../mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "メーリングリストが %s のメール"
 
-#: ../mail/mail-autofilter.c:403
+#: ../mail/mail-autofilter.c:396
 msgid "Add Filter Rule"
 msgstr "フィルタールールの追加"
 
@@ -12935,7 +13445,7 @@ msgstr "フィルタールールの追加"
 #. * folder. For more than one filter rule is each of
 #. * them on a separate line, with four spaces in front
 #. * of its name, without quotes.
-#: ../mail/mail-autofilter.c:512
+#: ../mail/mail-autofilter.c:505
 #, c-format
 msgid ""
 "The filter rule \"%s\" has been modified to account for the deleted folder\n"
@@ -12952,393 +13462,392 @@ msgstr[0] ""
 msgid "Set custom junk header"
 msgstr "独自のジャンクヘッダーを設定"
 
-#: ../mail/mail-config.ui.h:2
+#: ../mail/mail-config.ui.h:4
 msgid "All new emails with header that matches given content will be automatically filtered as junk"
 msgstr "ヘッダーが指定した内容と一致したすべての新しいメールは、ジャンクとして自動的にフィルターされます"
 
-#: ../mail/mail-config.ui.h:3
+#: ../mail/mail-config.ui.h:5
 msgid "Header name"
 msgstr "ヘッダー名"
 
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:6
 msgid "Header content"
 msgstr "ヘッダーの内容"
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:7
 msgid "Default Behavior"
 msgstr "デフォルトの動作"
 
-#: ../mail/mail-config.ui.h:6
+#: ../mail/mail-config.ui.h:8
 msgid "For_mat messages in HTML"
 msgstr "HTML メッセージを整形する(_M)"
 
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:9
 msgid "Automatically insert _emoticon images"
 msgstr "自動的にスマイリーアイコンを挿入する(_E)"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:10
 msgid "Always request rea_d receipt"
 msgstr "常に開封通知を要求する(_D)"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:11
 msgid "Encode filenames in an _Outlook/GMail way"
 msgstr "ファイル名を Outlook や GMail と同じ方法でエンコード(_O)"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:12
 msgid "Ch_aracter encoding:"
 msgstr "文字コード(_A):"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:13
 msgid "Replies and Forwards"
 msgstr "返信と転送"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:14
 msgid "_Reply style:"
 msgstr "返信方法(_R):"
 
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:15
 msgid "_Forward style:"
 msgstr "転送方式(_F):"
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:16
 msgid "Start _typing at the bottom on replying"
 msgstr "返信時は最下部で入力を開始する(_T)"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:17
 msgid "_Keep signature above the original message on replying"
 msgstr "返信時に署名をオリジナルのメッセージの上に保つ(_K)"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:18
 msgid "Ig_nore Reply-To: for mailing lists"
 msgstr "メーリングリストでは Reply-To: を無視する(_N)"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:19
 msgid "Gro_up Reply goes only to mailing list, if possible"
 msgstr "「グループに返信」は可能ならメーリングリストのみに送信(_U)"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:20
 msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
 msgstr "元のメッセージが署名されていたら、メッセージをデジタル署名する(PGP または S/MIME)(_S)"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:21
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "添付ファイル"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:22
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "インラインにする (Outlook 形式)"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:23
 msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr "引用する"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:24
 msgctxt "ReplyForward"
 msgid "Do Not Quote"
 msgstr "何も引用しない"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:25
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "インラインにする"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:27
 msgid "Sig_natures"
 msgstr "署名(_N)"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:28
 msgid "Signatures"
 msgstr "署名"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:29
 msgid "_Languages"
 msgstr "言語(_L)"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:30
 msgid "Languages Table"
 msgstr "言語の一覧"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:31
 msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
 msgstr "お使いのシステムにインストールした辞書 (言語) だけ一覧に表示されます。"
 
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:33
 msgid "Check spelling while I _type"
 msgstr "入力時にスペルチェックする(_T)"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:34
 msgid "Color for _misspelled words:"
 msgstr "スペルミスした文字の色(_M):"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:35
 #: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "Pick a color"
 msgstr "色の選択"
 
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:36
 msgid "Spell Checking"
 msgstr "スペルチェック"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:37
 msgid "To help avoid email accidents and embarrassments, ask for confirmation before taking the following checkmarked actions:"
 msgstr "メールの事故や問題を回避するのに役立てるために、以下でチェックマークをつけたアクションの前には確認をします:"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:39
 msgid "Sending a message with an _empty subject line"
 msgstr "件名が空のメッセージを送信(_E)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:41
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "Bcc 受信者のみ指定されているメッセージを送信(_B)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:43
 msgid "Sending a _private reply to a mailing list message"
 msgstr "メーリングリストのメッセージにプライベートな返信を送信(_P)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:45
 msgid "Sending a reply to a large _number of recipients"
 msgstr "たくさんの宛先に返信を送る(_N)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:47
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr "メーリングリストが私信での返信をメーリングリスト宛に誘導するのを許可(_M)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:49
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr "メールアドレスが受信者に指定されてないメッセージを送信します(_R)"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:50
 msgid "Confirmations"
 msgstr "確認"
 
-#: ../mail/mail-config.ui.h:54 ../smime/gui/smime-ui.ui.h:1
-msgid "a"
-msgstr "a"
-
-#: ../mail/mail-config.ui.h:55 ../smime/gui/smime-ui.ui.h:2
-msgid "b"
-msgstr "b"
+# "検索フォルダ"は適訳ではない
+#. Translators: Label of a frame with a list of folders for which to use selected account in Send account overrides
+#: ../mail/mail-config.ui.h:54
+#, fuzzy
+#| msgid "Search Folders"
+msgid "Use for Folders"
+msgstr "仮想フォルダー"
 
-#: ../mail/mail-config.ui.h:56
-msgid "Proxy Settings"
-msgstr "プロキシの設定"
+#: ../mail/mail-config.ui.h:55
+msgid "A_dd"
+msgstr "追加(_D)"
 
 #: ../mail/mail-config.ui.h:57
-msgid "_Use system defaults"
-msgstr "システムのデフォルトを使用する(_U)"
-
-#: ../mail/mail-config.ui.h:58
-msgid "_Direct connection to the Internet"
-msgstr "インターネットに直接接続する(_D)"
+#, fuzzy
+#| msgid "Remove"
+msgid "Re_move"
+msgstr "削除"
 
+#. Translators: Label of a frame with a list of recipients for whom to use selected account in Send account overrides
 #: ../mail/mail-config.ui.h:59
-msgid "_Manual proxy configuration:"
-msgstr "マニュアルでプロキシの設定を行う(_M):"
-
-#: ../mail/mail-config.ui.h:60
-msgid "H_TTP Proxy:"
-msgstr "HTTP プロキシ(_T):"
+#, fuzzy
+#| msgid " Use for Recipients "
+msgid "Use for Recipients"
+msgstr " 受け取り人にする "
 
-#: ../mail/mail-config.ui.h:61
-msgid "_Secure HTTP Proxy:"
-msgstr "セキュア HTTP プロキシ(_S):"
+#. Translators: Label of a frame with a list of configured accounts in Send account overrides
+#: ../mail/mail-config.ui.h:61 ../modules/mail/em-composer-prefs.c:870
+msgid "Account"
+msgstr "アカウント"
 
 #: ../mail/mail-config.ui.h:62
-msgid "SOC_KS Proxy:"
-msgstr "Socks プロキシ(_K):"
+msgid "Send account overrides"
+msgstr "送信アカウントの優先"
 
 #: ../mail/mail-config.ui.h:63
-msgid "No _Proxy for:"
-msgstr "無視するホスト(_P):"
+msgid "Assign which account should be used as a send account for respective folders or recipients, an override for usual send account detection. List of recipients can contain partial addresses or names. The name and the address parts are compared separately."
+msgstr "フォルダーや宛先それぞれの送信アカウントとして利用するアカウントを割り当て、通常の送信アカウント選択よりも優先します。宛先一覧にはアドレスや名前の一部を指定できます。名前とアドレス部は別々に比較されます。"
 
 #: ../mail/mail-config.ui.h:64
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:614
-msgid "Port:"
-msgstr "ポート番号:"
+#, fuzzy
+#| msgid "Folder override has precedence over Recipient override"
+msgid "_Folder override has precedence over Recipient override"
+msgstr "フォルダーの優先は宛先の優先よりも優位となります"
 
 #: ../mail/mail-config.ui.h:65
-msgid "Use Authe_ntication"
-msgstr "認証する(_N)"
+msgid "Send Account"
+msgstr "送信アカウント"
 
-#: ../mail/mail-config.ui.h:66
-msgid "Us_ername:"
-msgstr "ユーザー名(_E):"
+#: ../mail/mail-config.ui.h:71 ../smime/gui/smime-ui.ui.h:1
+msgid "a"
+msgstr "a"
 
-#: ../mail/mail-config.ui.h:67
-msgid "Pass_word:"
-msgstr "パスワード(_W):"
+#: ../mail/mail-config.ui.h:72 ../smime/gui/smime-ui.ui.h:2
+msgid "b"
+msgstr "b"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:73
 msgid "Start up"
 msgstr "起動"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:74
 msgid "Check for new _messages on start"
 msgstr "起動時に新着メッセージをチェック(_M)"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:75
 msgid "Check for new messa_ges in all active accounts"
 msgstr "すべてのアカウントの新着メッセージをチェック(_G)"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:76
 msgid "Message Display"
 msgstr "メッセージの表示"
 
-#: ../mail/mail-config.ui.h:72
+#: ../mail/mail-config.ui.h:77
 msgid "_Use the same fonts as other applications"
 msgstr "他のアプリと同じフォントを使う(_U)"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:78
 msgid "S_tandard Font:"
 msgstr "標準フォント(_T):"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:79
 msgid "Select HTML fixed width font"
 msgstr "固定幅フォントの選択 (HTML 表示)"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:80
 msgid "Select HTML variable width font"
 msgstr "可変幅フォントの選択 (HTML 表示)"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:81
 msgid "Fix_ed Width Font:"
 msgstr "固定幅のフォント(_E):"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:82
 msgid "_Mark messages as read after"
 msgstr "指定時間経過後にメッセージを既読にする(_M)"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:84
 msgid "Highlight _quotations with"
 msgstr "次の色で引用を強調表示する(_Q): "
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:85
 msgid "color"
 msgstr "色"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:86
 msgid "Default character e_ncoding:"
 msgstr "デフォルトの文字エンコード(_N):"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:87
 msgid "Apply the same _view settings to all folders"
 msgstr "同じ表示設定をすべてのフォルダーに適用する(_V)"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:88
 msgid "F_all back to threading messages by subject"
 msgstr "件名によるスレッド表示に戻す(_A)"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:89
 msgid "Delete Mail"
 msgstr "メールを削除"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:90
 msgid "Empty _trash folders"
 msgstr "ゴミ箱フォルダーを空にする(_T)"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:91
 msgid "Confirm _when expunging a folder"
 msgstr "フォルダーを抹消する前に確認する(_W)"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:93
 msgid "_Show animated images"
 msgstr "アニメーション画像を動かす(_S)"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:94
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "HTML 形式を希望していない連絡先に送信する場合は確認する(_P)"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:95
 msgid "Loading Images"
 msgstr "画像の読み込み"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:96
 msgid "_Never load images from the Internet"
 msgstr "画像を読み込まない(_N)"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:97
 msgid "_Load images only in messages from contacts"
 msgstr "連絡先に登録されている差出人のメッセージでのみ画像を読み込む(_L)"
 
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:98
 msgid "_Always load images from the Internet"
 msgstr "常に画像を読み込む(_A)"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:99
 msgid "HTML Messages"
 msgstr "HTML メッセージ"
 
-#: ../mail/mail-config.ui.h:95 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:100 ../mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "ラベル"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:101
 msgid "Sender Photograph"
 msgstr "送信者の写真"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:102
 msgid "_Show the photograph of sender in the message preview"
 msgstr "プレビュー時に送信者の写真を表示する(_S)"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:103
 msgid "Displayed Message Headers"
 msgstr "表示されるメッセージのヘッダー"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:104
 msgid "Mail Headers Table"
 msgstr "メールヘッダーの一覧"
 
-#: ../mail/mail-config.ui.h:100
-#: ../modules/addressbook/autocompletion-config.c:117
+#: ../mail/mail-config.ui.h:105
+#: ../modules/addressbook/autocompletion-config.c:116
 #: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "Date/Time Format"
 msgstr "日付/時刻の形式"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:107
 msgid "Check incoming _messages for junk"
 msgstr "受信したメールがジャンクかどうかチェックする(_M)"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:108
 msgid "_Delete junk messages"
 msgstr "ジャンクメールを削除する(_D)"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:109
 msgid "Check cu_stom headers for junk"
 msgstr "独自のヘッダーもチェックする(_S)"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:110
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "差出人がアドレス帳にある場合はジャンクメールにしない(_K)"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:111
 msgid "_Lookup in local address book only"
 msgstr "ローカルにあるアドレス帳のみ検索する(_L)"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:112
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "ここで指定したヘッダーに一致するメールを検出した場合は次のオプションが無視されます:"
 
-#: ../mail/mail-config.ui.h:109
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:225
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:159
+#: ../mail/mail-config.ui.h:114
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:224
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:158
 msgid "No encryption"
 msgstr "暗号化しない"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:115
 msgid "TLS encryption"
 msgstr "TLS で暗号化する"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:116
 msgid "SSL encryption"
 msgstr "SSL 暗号化"
 
@@ -13359,63 +13868,63 @@ msgid "_Due By:"
 msgstr "期日(_D):"
 
 #. Translators: Flag Completed
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Co_mpleted"
 msgstr "完了した(_M)"
 
-#: ../mail/mail-dialogs.ui.h:7
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Call"
 msgstr "呼び出す"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Do Not Forward"
 msgstr "転送しない"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Follow-Up"
 msgstr "フォローアップ"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
 msgid "For Your Information"
 msgstr "F.Y.I"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Forward"
 msgstr "転送"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
 msgid "No Response Necessary"
 msgstr "返信の必要なし"
 
-#: ../mail/mail-dialogs.ui.h:16
+#: ../mail/mail-dialogs.ui.h:17
 msgid "Reply to All"
 msgstr "全員へ返信"
 
-#: ../mail/mail-dialogs.ui.h:17
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Review"
 msgstr "レビュー"
 
-#: ../mail/mail-dialogs.ui.h:18
+#: ../mail/mail-dialogs.ui.h:19
 msgid "License Agreement"
 msgstr "ライセンス同意書"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:20
 msgid "_Tick this to accept the license agreement"
 msgstr "ライセンス同意書を受諾する場合はここをチェックする(_T)"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:22
 msgid "_Accept License"
 msgstr "ライセンスを受諾する(_A)"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:23
 msgid "Security Information"
 msgstr "セキュリティ情報"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:24
 msgid "Digital Signature"
 msgstr "電子署名"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:25
 msgid "Encryption"
 msgstr "暗号化"
 
@@ -13558,7 +14067,7 @@ msgid "Are you sure you want to permanently remove all the deleted messages in a
 msgstr "すべてのフォルダーにある削除マーク付きメッセージのすべてを完全に抹消してもよろしいですか?"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1518
+#: ../modules/mail/e-mail-shell-view-actions.c:1519
 msgid "_Empty Trash"
 msgstr "ゴミ箱を空にする(_E)"
 
@@ -13746,7 +14255,7 @@ msgid "Do _Not Disable"
 msgstr "無効にしない(_N)"
 
 #: ../mail/mail.error.xml.h:90
-#: ../plugins/publish-calendar/publish-calendar.c:649
+#: ../plugins/publish-calendar/publish-calendar.c:655
 msgid "_Disable"
 msgstr "無効にする(_D)"
 
@@ -13931,14 +14440,6 @@ msgstr "フォルダーツリー中のフォルダーをコピー"
 msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
 msgstr "本当にフォルダー '{0}' をフォルダー '{1}' にコピーしてもよろしいですか?"
 
-#: ../mail/mail.error.xml.h:138
-msgid "_Yes"
-msgstr "はい(_Y)"
-
-#: ../mail/mail.error.xml.h:139
-msgid "_No"
-msgstr "いいえ(_N)"
-
 #: ../mail/mail.error.xml.h:140
 msgid "_Always"
 msgstr "常に(_A)"
@@ -14066,128 +14567,132 @@ msgstr "この操作を {0} で実行できませんでした。"
 msgid "You must be working online to complete this operation."
 msgstr "この操作を完了させるにはオンラインでの作業が必要です。"
 
-#: ../mail/mail-send-recv.c:202
+#: ../mail/mail.error.xml.h:173
+msgid "Message from &quot;{0}&quot; account:"
+msgstr ""
+
+#: ../mail/mail-send-recv.c:188
 msgid "Canceling..."
 msgstr "キャンセル中..."
 
-#: ../mail/mail-send-recv.c:546
+#: ../mail/mail-send-recv.c:526
 msgid "Send & Receive Mail"
 msgstr "メールの送信と受信"
 
-#: ../mail/mail-send-recv.c:562
+#: ../mail/mail-send-recv.c:542
 msgid "Cancel _All"
 msgstr "すべてキャンセル(_A)"
 
-#: ../mail/mail-send-recv.c:655 ../mail/mail-send-recv.c:1047
+#: ../mail/mail-send-recv.c:632 ../mail/mail-send-recv.c:1024
 msgid "Updating..."
 msgstr "更新中..."
 
-#: ../mail/mail-send-recv.c:655 ../mail/mail-send-recv.c:736
+#: ../mail/mail-send-recv.c:632 ../mail/mail-send-recv.c:714
 msgid "Waiting..."
 msgstr "待機中..."
 
-#: ../mail/mail-send-recv.c:1020
+#: ../mail/mail-send-recv.c:997
 #, c-format
 msgid "Checking for new mail at '%s'"
 msgstr "'%s' で新着メールの確認中"
 
 # "検索フォルダ"は適訳ではない
-#: ../mail/mail-vfolder-ui.c:78
+#: ../mail/mail-vfolder-ui.c:66
 msgid "Search Folders"
 msgstr "仮想フォルダー"
 
-#: ../mail/mail-vfolder-ui.c:158
+#: ../mail/mail-vfolder-ui.c:146
 msgid "Edit Search Folder"
 msgstr "フォルダーの編集"
 
-#: ../mail/mail-vfolder-ui.c:279
+#: ../mail/mail-vfolder-ui.c:267
 msgid "New Search Folder"
 msgstr "新しい仮想フォルダー"
 
-#: ../mail/message-list.c:298
+#: ../mail/message-list.c:287
 msgid "Unseen"
 msgstr "未読"
 
-#: ../mail/message-list.c:299
+#: ../mail/message-list.c:288
 msgid "Seen"
 msgstr "既読"
 
-#: ../mail/message-list.c:300
+#: ../mail/message-list.c:289
 msgid "Answered"
 msgstr "返答済み"
 
-#: ../mail/message-list.c:301
+#: ../mail/message-list.c:290
 msgid "Forwarded"
 msgstr "転送済み"
 
-#: ../mail/message-list.c:302
+#: ../mail/message-list.c:291
 msgid "Multiple Unseen Messages"
 msgstr "複数の未読メッセージ"
 
-#: ../mail/message-list.c:303
+#: ../mail/message-list.c:292
 msgid "Multiple Messages"
 msgstr "複数のメッセージ"
 
-#: ../mail/message-list.c:316
+#: ../mail/message-list.c:305
 msgid "Lowest"
 msgstr "最も低い"
 
-#: ../mail/message-list.c:317
+#: ../mail/message-list.c:306
 msgid "Lower"
 msgstr "低い"
 
-#: ../mail/message-list.c:321
+#: ../mail/message-list.c:310
 msgid "Higher"
 msgstr "高い"
 
-#: ../mail/message-list.c:322
+#: ../mail/message-list.c:311
 msgid "Highest"
 msgstr "最も高い"
 
-#: ../mail/message-list.c:466 ../mail/message-list.c:5719
+#: ../mail/message-list.c:455 ../mail/message-list.c:5749
 msgid "Generating message list"
 msgstr "メッセージの一覧の作成中"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1858 ../modules/itip-formatter/itip-view.c:244
+#: ../mail/message-list.c:1860 ../modules/itip-formatter/itip-view.c:237
 msgid "Today %l:%M %p"
 msgstr "今日の%p%l:%M"
 
-#: ../mail/message-list.c:1867
+#: ../mail/message-list.c:1869
 msgid "Yesterday %l:%M %p"
 msgstr "昨日の%p%l:%M"
 
-#: ../mail/message-list.c:1879
+#: ../mail/message-list.c:1881
 msgid "%a %l:%M %p"
 msgstr "%p%l:%M (%a)"
 
-#: ../mail/message-list.c:1887
+#: ../mail/message-list.c:1889
 msgid "%b %d %l:%M %p"
 msgstr "%B%e日 %p%l:%M"
 
-#: ../mail/message-list.c:1889
+#: ../mail/message-list.c:1891
 msgid "%b %d %Y"
 msgstr "%Y年%B%e日"
 
-#: ../mail/message-list.c:2767
+#: ../mail/message-list.c:2771
 msgid "Select all visible messages"
 msgstr "すべてのメッセージを選択します"
 
-#: ../mail/message-list.c:3395 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3399 ../mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "メッセージ"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4764
+#: ../mail/message-list.c:4706
 msgid "Follow-up"
 msgstr "フォローアップ"
 
-#: ../mail/message-list.c:5657
+#: ../mail/message-list.c:5687
 msgid "No message satisfies your search criteria. Change search criteria by selecting a new Show message filter from the drop down list above or by running a new search either by clearing it with Search->Clear menu item or by changing the query above."
 msgstr "検索基準を満たすメッセージがありませんでした。上記のドロップダウンリストから新しいメッセージ表示フィルターを選択して検索基準を変更するか、メニュー項目の検索->クリアでクリアするか上記の条件を変更して、新たに検索を実行してください。"
 
-#: ../mail/message-list.c:5665
+#: ../mail/message-list.c:5695
 msgid "There are no messages in this folder."
 msgstr "このフォルダーにメッセージはありません。"
 
@@ -14212,10 +14717,8 @@ msgid "Due By"
 msgstr "期日"
 
 #: ../mail/message-list.etspec.h:18
-#, fuzzy
-#| msgid "Messages"
 msgid "Messages To"
-msgstr "メッセージ"
+msgstr ""
 
 #: ../mail/message-list.etspec.h:20
 msgid "Subject - Trimmed"
@@ -14226,394 +14729,374 @@ msgid "Subject or Addresses contains"
 msgstr "以下を含む件名あるいはアドレス"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:2001
+#: ../modules/mail/e-mail-shell-view-actions.c:2002
 msgid "Recipients contain"
 msgstr "宛先"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1994
+#: ../modules/mail/e-mail-shell-view-actions.c:1995
 msgid "Message contains"
 msgstr "メール全体"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:2015
+#: ../modules/mail/e-mail-shell-view-actions.c:2016
 msgid "Subject contains"
 msgstr "件名"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:2008
+#: ../modules/mail/e-mail-shell-view-actions.c:2009
 msgid "Sender contains"
 msgstr "差出人"
 
 #: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1987
+#: ../modules/mail/e-mail-shell-view-actions.c:1988
 msgid "Body contains"
 msgstr "メッセージの本文"
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/addressbook/autocompletion-config.c:123
-#: ../modules/mail/em-mailer-prefs.c:1213
+#: ../modules/addressbook/autocompletion-config.c:122
+#: ../modules/mail/em-mailer-prefs.c:1212
 msgid "_Table column:"
 msgstr "表の項目(_T):"
 
-#: ../modules/addressbook/autocompletion-config.c:126
+#: ../modules/addressbook/autocompletion-config.c:125
 msgid "Address formatting"
 msgstr "アドレスの整形"
 
-#: ../modules/addressbook/autocompletion-config.c:129
+#: ../modules/addressbook/autocompletion-config.c:128
 msgid "_Format address according to standard of its destination country"
 msgstr "アドレスを送信先の国の標準に合わせた形式に整形(_F)"
 
-#: ../modules/addressbook/autocompletion-config.c:137
+#: ../modules/addressbook/autocompletion-config.c:136
 msgid "Autocompletion"
 msgstr "自動補完"
 
-#: ../modules/addressbook/autocompletion-config.c:140
+#: ../modules/addressbook/autocompletion-config.c:139
 msgid "Always _show address of the autocompleted contact"
 msgstr "自動補完した連絡先にメールアドレスを表示する(_S)"
 
-#: ../modules/addressbook/eab-composer-util.c:148
+#: ../modules/addressbook/eab-composer-util.c:147
 msgid "Multiple vCards"
 msgstr "複数の vCard"
 
-#: ../modules/addressbook/eab-composer-util.c:156
+#: ../modules/addressbook/eab-composer-util.c:155
 #, c-format
 msgid "vCard for %s"
 msgstr "%s の vCard"
 
-#: ../modules/addressbook/eab-composer-util.c:168
-#: ../modules/addressbook/eab-composer-util.c:195
+#: ../modules/addressbook/eab-composer-util.c:167
+#: ../modules/addressbook/eab-composer-util.c:194
 #, c-format
 msgid "Contact information"
 msgstr "連絡先の情報"
 
-#: ../modules/addressbook/eab-composer-util.c:197
+#: ../modules/addressbook/eab-composer-util.c:196
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s の連絡先の情報"
 
-#: ../modules/addressbook/e-book-shell-backend.c:259
-#: ../modules/addressbook/e-book-shell-view-actions.c:125
+#: ../modules/addressbook/e-book-shell-backend.c:258
+#: ../modules/addressbook/e-book-shell-view-actions.c:124
 msgid "New Address Book"
 msgstr "新しいアドレス帳"
 
-#: ../modules/addressbook/e-book-shell-backend.c:268
+#: ../modules/addressbook/e-book-shell-backend.c:267
 msgctxt "New"
 msgid "_Contact"
 msgstr "連絡先(_C)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:270
-#: ../modules/addressbook/e-book-shell-view-actions.c:982
+#: ../modules/addressbook/e-book-shell-backend.c:269
+#: ../modules/addressbook/e-book-shell-view-actions.c:978
 msgid "Create a new contact"
 msgstr "新しい連絡先を作成します"
 
-#: ../modules/addressbook/e-book-shell-backend.c:275
+#: ../modules/addressbook/e-book-shell-backend.c:274
 msgctxt "New"
 msgid "Contact _List"
 msgstr "連絡先の一覧(_L)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:277
-#: ../modules/addressbook/e-book-shell-view-actions.c:989
+#: ../modules/addressbook/e-book-shell-backend.c:276
+#: ../modules/addressbook/e-book-shell-view-actions.c:985
 msgid "Create a new contact list"
 msgstr "新しい連絡先の一覧を作成します"
 
-#: ../modules/addressbook/e-book-shell-backend.c:285
+#: ../modules/addressbook/e-book-shell-backend.c:284
 msgctxt "New"
 msgid "Address _Book"
 msgstr "アドレス帳(_B)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:287
-#: ../modules/addressbook/e-book-shell-view-actions.c:905
+#: ../modules/addressbook/e-book-shell-backend.c:286
+#: ../modules/addressbook/e-book-shell-view-actions.c:901
 msgid "Create a new address book"
 msgstr "新しいアドレス帳を作成します"
 
-#: ../modules/addressbook/e-book-shell-backend.c:315
+#: ../modules/addressbook/e-book-shell-backend.c:314
 msgid "Certificates"
 msgstr "証明書"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:198
+#: ../modules/addressbook/e-book-shell-view-actions.c:197
 msgid "Address Book Properties"
 msgstr "アドレス帳のプロパティ"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:479
-#: ../modules/addressbook/e-book-shell-view-actions.c:775
+#: ../modules/addressbook/e-book-shell-view-actions.c:475
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
 msgid "Save as vCard"
 msgstr "vCard 形式で保存"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:882
+#: ../modules/addressbook/e-book-shell-view-actions.c:878
 msgid "Co_py All Contacts To..."
 msgstr "すべての連絡先のコピー(_P)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:884
+#: ../modules/addressbook/e-book-shell-view-actions.c:880
 msgid "Copy the contacts of the selected address book to another"
 msgstr "選択したアドレス帳の連絡先を別へコピーします"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:889
+#: ../modules/addressbook/e-book-shell-view-actions.c:885
 msgid "D_elete Address Book"
 msgstr "アドレス帳の削除(_E)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:891
+#: ../modules/addressbook/e-book-shell-view-actions.c:887
 msgid "Delete the selected address book"
 msgstr "選択したアドレス帳を削除します"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:896
+#: ../modules/addressbook/e-book-shell-view-actions.c:892
 msgid "Mo_ve All Contacts To..."
 msgstr "すべての連絡先の移動(_V)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:898
+#: ../modules/addressbook/e-book-shell-view-actions.c:894
 msgid "Move the contacts of the selected address book to another"
 msgstr "選択したアドレス帳の連絡先を別へ移動します"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:903
+#: ../modules/addressbook/e-book-shell-view-actions.c:899
 msgid "_New Address Book"
 msgstr "新しいアドレス帳(_N)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:910
+#: ../modules/addressbook/e-book-shell-view-actions.c:906
 msgid "Address _Book Properties"
 msgstr "アドレス帳のプロパティ(_B)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:912
+#: ../modules/addressbook/e-book-shell-view-actions.c:908
 msgid "Show properties of the selected address book"
 msgstr "選択したアドレス帳のプロパティを表示します"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:917
-#: ../modules/calendar/e-cal-shell-view-actions.c:1414
-#: ../modules/calendar/e-memo-shell-view-actions.c:636
-#: ../modules/calendar/e-task-shell-view-actions.c:760
+#: ../modules/addressbook/e-book-shell-view-actions.c:913
+#: ../modules/calendar/e-cal-shell-view-actions.c:1413
+#: ../modules/calendar/e-memo-shell-view-actions.c:635
+#: ../modules/calendar/e-task-shell-view-actions.c:759
 msgid "Re_fresh"
 msgstr "更新(_F)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:919
+#: ../modules/addressbook/e-book-shell-view-actions.c:915
 msgid "Refresh the selected address book"
 msgstr "選択したアドレス帳を更新します"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:924
+#: ../modules/addressbook/e-book-shell-view-actions.c:920
 msgid "Address Book _Map"
 msgstr "アドレス帳地図(_M)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:926
+#: ../modules/addressbook/e-book-shell-view-actions.c:922
 msgid "Show map with all contacts from selected address book"
 msgstr "選択したアドレス帳の全連絡先の地図を表示します"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:931
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
-#: ../modules/calendar/e-memo-shell-view-actions.c:643
-#: ../modules/calendar/e-task-shell-view-actions.c:767
-#: ../modules/mail/e-mail-shell-view-actions.c:1609
+#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/calendar/e-cal-shell-view-actions.c:1420
+#: ../modules/calendar/e-memo-shell-view-actions.c:642
+#: ../modules/calendar/e-task-shell-view-actions.c:766
+#: ../modules/mail/e-mail-shell-view-actions.c:1610
 msgid "_Rename..."
 msgstr "名前の変更(_R)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:933
+#: ../modules/addressbook/e-book-shell-view-actions.c:929
 msgid "Rename the selected address book"
 msgstr "選択したアドレス帳の名前を変更します"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:940
+#: ../modules/addressbook/e-book-shell-view-actions.c:936
 msgid "Stop loading"
 msgstr "読み込みを停止します"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:945
+#: ../modules/addressbook/e-book-shell-view-actions.c:941
 msgid "_Copy Contact To..."
 msgstr "連絡先のコピー(_C)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:947
+#: ../modules/addressbook/e-book-shell-view-actions.c:943
 msgid "Copy selected contacts to another address book"
 msgstr "選択したアドレス帳の連絡先を別のアドレス帳コピーします"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:952
+#: ../modules/addressbook/e-book-shell-view-actions.c:948
 msgid "_Delete Contact"
 msgstr "連絡先の削除(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:959
+#: ../modules/addressbook/e-book-shell-view-actions.c:955
 msgid "_Find in Contact..."
 msgstr "連絡先の検索(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:961
+#: ../modules/addressbook/e-book-shell-view-actions.c:957
 msgid "Search for text in the displayed contact"
 msgstr "表示されている連絡先中の文字列を検索します"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:966
+#: ../modules/addressbook/e-book-shell-view-actions.c:962
 msgid "_Forward Contact..."
 msgstr "連絡先の転送(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:968
+#: ../modules/addressbook/e-book-shell-view-actions.c:964
 msgid "Send selected contacts to another person"
 msgstr "選択した連絡先を別の人に送信します"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:973
+#: ../modules/addressbook/e-book-shell-view-actions.c:969
 msgid "_Move Contact To..."
 msgstr "連絡先の移動(_M)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:975
+#: ../modules/addressbook/e-book-shell-view-actions.c:971
 msgid "Move selected contacts to another address book"
 msgstr "選択した連絡先を別のアドレス帳へ移動します"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:980
+#: ../modules/addressbook/e-book-shell-view-actions.c:976
 msgid "_New Contact..."
 msgstr "新しい連絡先(_N)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:987
+#: ../modules/addressbook/e-book-shell-view-actions.c:983
 msgid "New Contact _List..."
 msgstr "新しい連絡先の一覧(_L)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:994
+#: ../modules/addressbook/e-book-shell-view-actions.c:990
 msgid "_Open Contact"
 msgstr "連絡先を開く(_O)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:996
+#: ../modules/addressbook/e-book-shell-view-actions.c:992
 msgid "View the current contact"
 msgstr "この連絡先を表示します"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1001
+#: ../modules/addressbook/e-book-shell-view-actions.c:997
 msgid "_Send Message to Contact..."
 msgstr "連絡先へメールの送信(_S)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1003
+#: ../modules/addressbook/e-book-shell-view-actions.c:999
 msgid "Send a message to the selected contacts"
 msgstr "選択した連絡先へメールを送信します"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1010
-#: ../modules/calendar/e-cal-shell-view-actions.c:1577
-#: ../modules/calendar/e-task-shell-view-actions.c:825
+#: ../modules/addressbook/e-book-shell-view-actions.c:1006
+#: ../modules/calendar/e-cal-shell-view-actions.c:1576
+#: ../modules/calendar/e-task-shell-view-actions.c:824
 msgid "_Actions"
 msgstr "アクション(_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1017
-#: ../modules/calendar/e-memo-shell-view-actions.c:680
-#: ../modules/calendar/e-task-shell-view-actions.c:832
-#: ../modules/mail/e-mail-shell-view-actions.c:1774
+#: ../modules/addressbook/e-book-shell-view-actions.c:1013
+#: ../modules/calendar/e-memo-shell-view-actions.c:679
+#: ../modules/calendar/e-task-shell-view-actions.c:831
+#: ../modules/mail/e-mail-shell-view-actions.c:1775
 msgid "_Preview"
 msgstr "プレビュー(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1026
-#: ../modules/calendar/e-cal-shell-view-actions.c:1594
-#: ../modules/calendar/e-memo-shell-view-actions.c:693
-#: ../modules/calendar/e-task-shell-view-actions.c:845
-msgid "_Delete"
-msgstr "削除(_D)"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:1030
-#: ../modules/mail/e-mail-shell-view-actions.c:1525
-msgid "_Properties"
-msgstr "プロパティ(_P)"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:1038
+#: ../modules/addressbook/e-book-shell-view-actions.c:1034
 msgid "Address Book Map"
 msgstr "アドレス帳の地図"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1070
+#: ../modules/addressbook/e-book-shell-view-actions.c:1066
 msgid "Contact _Preview"
 msgstr "連絡先のプレビュー(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1072
+#: ../modules/addressbook/e-book-shell-view-actions.c:1068
 msgid "Show contact preview window"
 msgstr "連絡先プレビューウィンドウの表示/非表示を切り替えます"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1078
+#: ../modules/addressbook/e-book-shell-view-actions.c:1074
 msgid "Show _Maps"
 msgstr "地図を表示(_M)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1080
+#: ../modules/addressbook/e-book-shell-view-actions.c:1076
 msgid "Show maps in contact preview window"
 msgstr "連絡先プレビューウィンドウに地図を表示する"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1099
-#: ../modules/calendar/e-memo-shell-view-actions.c:750
-#: ../modules/calendar/e-task-shell-view-actions.c:914
-#: ../modules/mail/e-mail-shell-view-actions.c:1904
+#: ../modules/addressbook/e-book-shell-view-actions.c:1095
+#: ../modules/calendar/e-memo-shell-view-actions.c:749
+#: ../modules/calendar/e-task-shell-view-actions.c:913
+#: ../modules/mail/e-mail-shell-view-actions.c:1905
 msgid "_Classic View"
 msgstr "クラッシックな表示(_C)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1101
+#: ../modules/addressbook/e-book-shell-view-actions.c:1097
 msgid "Show contact preview below the contact list"
 msgstr "連絡先の一覧の下に連絡先のプレビューを表示します"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1106
-#: ../modules/calendar/e-memo-shell-view-actions.c:757
-#: ../modules/calendar/e-task-shell-view-actions.c:921
-#: ../modules/mail/e-mail-shell-view-actions.c:1911
+#: ../modules/addressbook/e-book-shell-view-actions.c:1102
+#: ../modules/calendar/e-memo-shell-view-actions.c:756
+#: ../modules/calendar/e-task-shell-view-actions.c:920
+#: ../modules/mail/e-mail-shell-view-actions.c:1912
 msgid "_Vertical View"
 msgstr "縦型の表示(_V)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1108
+#: ../modules/addressbook/e-book-shell-view-actions.c:1104
 msgid "Show contact preview alongside the contact list"
 msgstr "連絡先の一覧の横に連絡先のプレビューを表示します"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1123
-#: ../modules/calendar/e-cal-shell-view-actions.c:1754
-#: ../modules/calendar/e-memo-shell-view-actions.c:774
-#: ../modules/calendar/e-task-shell-view-actions.c:973
+#: ../modules/addressbook/e-book-shell-view-actions.c:1119
+#: ../modules/calendar/e-cal-shell-view-actions.c:1753
+#: ../modules/calendar/e-memo-shell-view-actions.c:773
+#: ../modules/calendar/e-task-shell-view-actions.c:972
 msgid "Unmatched"
 msgstr "該当しないもの"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1133
-#: ../modules/calendar/e-cal-shell-view-actions.c:1764
-#: ../modules/calendar/e-memo-shell-view-actions.c:784
-#: ../modules/calendar/e-task-shell-view-actions.c:983
-#: ../modules/mail/e-mail-shell-view-actions.c:1980
-#: ../shell/e-shell-content.c:658
+#: ../modules/addressbook/e-book-shell-view-actions.c:1129
+#: ../modules/calendar/e-cal-shell-view-actions.c:1763
+#: ../modules/calendar/e-memo-shell-view-actions.c:783
+#: ../modules/calendar/e-task-shell-view-actions.c:982
+#: ../modules/mail/e-mail-shell-view-actions.c:1981
+#: ../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr "拡張検索"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1166
+#: ../modules/addressbook/e-book-shell-view-actions.c:1162
 msgid "Print all shown contacts"
 msgstr "表示されている連絡先すべてを印刷します"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1173
+#: ../modules/addressbook/e-book-shell-view-actions.c:1169
 msgid "Preview the contacts to be printed"
 msgstr "印刷する連絡先のプレビューを表示します"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1180
+#: ../modules/addressbook/e-book-shell-view-actions.c:1176
 msgid "Print selected contacts"
 msgstr "選択した連絡先を印刷します"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1195
+#: ../modules/addressbook/e-book-shell-view-actions.c:1191
 msgid "S_ave Address Book as vCard"
 msgstr "アドレス帳を vCard 形式で保存(_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1197
+#: ../modules/addressbook/e-book-shell-view-actions.c:1193
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "選択したアドレス帳の連絡先を vCard 形式で保存します"
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:1203
-#: ../modules/addressbook/e-book-shell-view-actions.c:1213
+#: ../modules/addressbook/e-book-shell-view-actions.c:1199
+#: ../modules/addressbook/e-book-shell-view-actions.c:1209
 msgid "_Save as vCard..."
 msgstr "vCard 形式で保存(_S)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1205
+#: ../modules/addressbook/e-book-shell-view-actions.c:1201
 msgid "Save selected contacts as a vCard"
 msgstr "選択した連絡先を vCard 形式で保存します"
 
-#: ../modules/addressbook/e-book-shell-view.c:312
+#: ../modules/addressbook/e-book-shell-view.c:311
 msgid "_Forward Contacts"
 msgstr "複数の連絡先の転送(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:314
+#: ../modules/addressbook/e-book-shell-view.c:313
 msgid "_Forward Contact"
 msgstr "連絡先の転送(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:345
+#: ../modules/addressbook/e-book-shell-view.c:344
 msgid "_Send Message to Contacts"
 msgstr "複数の連絡先へメッセージを送信(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:347
+#: ../modules/addressbook/e-book-shell-view.c:346
 msgid "_Send Message to List"
 msgstr "一覧へメッセージの送信(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:349
+#: ../modules/addressbook/e-book-shell-view.c:348
 msgid "_Send Message to Contact"
 msgstr "連絡先へメッセージの送信(_S)"
 
-#: ../modules/audio-inline/e-mail-formatter-audio.c:316
-msgid "Audio Player"
-msgstr "音楽プレーヤー"
-
-#: ../modules/audio-inline/e-mail-formatter-audio.c:317
-msgid "Play the attachment in embedded audio player"
-msgstr "組み込み音楽プレーヤーで添付ファイルを再生"
-
-#: ../modules/backup-restore/e-mail-config-restore-page.c:165
+#: ../modules/backup-restore/e-mail-config-restore-page.c:164
 msgid ""
 "You can restore Evolution from a backup file.\n"
 "\n"
@@ -14623,130 +15106,130 @@ msgstr ""
 "\n"
 "個人の設定やメールフィルターなども一緒にリストアします。"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:180
+#: ../modules/backup-restore/e-mail-config-restore-page.c:179
 msgid "_Restore from a backup file:"
 msgstr "バックアップファイルからリストアする(_R):"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:191
+#: ../modules/backup-restore/e-mail-config-restore-page.c:190
 msgid "Choose a backup file to restore"
 msgstr "リストアするバックアップファイルを選択してください"
 
 #. Keep the title identical to EMailConfigRestorePage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/backup-restore/e-mail-config-restore-page.c:311
-#: ../modules/backup-restore/e-mail-config-restore-ready-page.c:57
+#: ../modules/backup-restore/e-mail-config-restore-page.c:310
+#: ../modules/backup-restore/e-mail-config-restore-ready-page.c:56
 msgid "Restore from Backup"
 msgstr "バックアップからのリストア"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:217
+#: ../modules/backup-restore/evolution-backup-restore.c:216
 msgid "Select name of the Evolution backup file"
 msgstr "Evolution のバックアップファイルの名前の選択"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:250
+#: ../modules/backup-restore/evolution-backup-restore.c:249
 msgid "_Restart Evolution after backup"
 msgstr "バックアップの後で Evolution を再起動(_R)"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:277
+#: ../modules/backup-restore/evolution-backup-restore.c:276
 msgid "Select name of the Evolution backup file to restore"
 msgstr "リストアする Evolution バックアップファイルの名前の選択"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:290
+#: ../modules/backup-restore/evolution-backup-restore.c:289
 msgid "_Restart Evolution after restore"
 msgstr "リストアした後に Evolution を再起動(_R)"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:308
+#: ../modules/backup-restore/evolution-backup-restore.c:307
 msgid "_Back up Evolution Data..."
 msgstr "Evolution データのバックアップ(_B)..."
 
-#: ../modules/backup-restore/evolution-backup-restore.c:310
+#: ../modules/backup-restore/evolution-backup-restore.c:309
 msgid "Back up Evolution data and settings to an archive file"
 msgstr "Evolution のデータと設定をアーカイブファイルにバックアップします"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:315
+#: ../modules/backup-restore/evolution-backup-restore.c:314
 msgid "R_estore Evolution Data..."
 msgstr "Evolution データのリストア(_E)..."
 
-#: ../modules/backup-restore/evolution-backup-restore.c:317
+#: ../modules/backup-restore/evolution-backup-restore.c:316
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Evolution のデータと設定をアーカイブファイルからリストアします"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:84
+#: ../modules/backup-restore/evolution-backup-tool.c:83
 msgid "Back up Evolution directory"
 msgstr "Evolution フォルダーのバックアップ"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:86
+#: ../modules/backup-restore/evolution-backup-tool.c:85
 msgid "Restore Evolution directory"
 msgstr "Evolution フォルダーのリストア"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:88
+#: ../modules/backup-restore/evolution-backup-tool.c:87
 msgid "Check Evolution Back up"
 msgstr "Evolution のバックアップの確認"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:90
+#: ../modules/backup-restore/evolution-backup-tool.c:89
 msgid "Restart Evolution"
 msgstr "Evolution の再起動"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:92
+#: ../modules/backup-restore/evolution-backup-tool.c:91
 msgid "With Graphical User Interface"
 msgstr "GUI を表示する"
 
 #. FIXME Will the versioned setting always work?
-#: ../modules/backup-restore/evolution-backup-tool.c:322
-#: ../modules/backup-restore/evolution-backup-tool.c:516
+#: ../modules/backup-restore/evolution-backup-tool.c:321
+#: ../modules/backup-restore/evolution-backup-tool.c:515
 msgid "Shutting down Evolution"
 msgstr "Evolution のシャットダウン中"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:331
+#: ../modules/backup-restore/evolution-backup-tool.c:330
 msgid "Backing Evolution accounts and settings"
 msgstr "Evolution アカウントと設定のバックアップ中"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:348
+#: ../modules/backup-restore/evolution-backup-tool.c:347
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "Evolution のデータ (メール、連絡先、カレンダー、タスク、メモ) をバックアップしています"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:364
+#: ../modules/backup-restore/evolution-backup-tool.c:363
 msgid "Back up complete"
 msgstr "バックアップが完了しました"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:371
-#: ../modules/backup-restore/evolution-backup-tool.c:703
+#: ../modules/backup-restore/evolution-backup-tool.c:370
+#: ../modules/backup-restore/evolution-backup-tool.c:702
 msgid "Restarting Evolution"
 msgstr "Evolution のリストア中"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:522
+#: ../modules/backup-restore/evolution-backup-tool.c:521
 msgid "Back up current Evolution data"
 msgstr "現在の Evolution データをバックアップする"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:529
+#: ../modules/backup-restore/evolution-backup-tool.c:528
 msgid "Extracting files from back up"
 msgstr "バックアップからファイルを展開しています"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:611
+#: ../modules/backup-restore/evolution-backup-tool.c:610
 msgid "Loading Evolution settings"
 msgstr "Evolution の設定を読み込んでいます"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:677
+#: ../modules/backup-restore/evolution-backup-tool.c:676
 msgid "Removing temporary back up files"
 msgstr "作業用のバックアップファイルを削除しています"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:688
+#: ../modules/backup-restore/evolution-backup-tool.c:687
 msgid "Reloading registry service"
 msgstr "レジストリサービスのリロード中"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:915
+#: ../modules/backup-restore/evolution-backup-tool.c:916
 msgid "Evolution Back Up"
 msgstr "Evolution のバックアップ"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:916
+#: ../modules/backup-restore/evolution-backup-tool.c:917
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "%s にバックアップしています"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:920
+#: ../modules/backup-restore/evolution-backup-tool.c:921
 msgid "Evolution Restore"
 msgstr "Evolution のリストア"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:921
+#: ../modules/backup-restore/evolution-backup-tool.c:922
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "%s からリストアしています"
@@ -14811,284 +15294,324 @@ msgstr "権限が適当ではありません"
 msgid "The selected folder is not writable."
 msgstr "選択したフォルダーは書き込み可能ではありません。"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:145
+#: ../modules/bogofilter/evolution-bogofilter.c:144
 #, c-format
 msgid "Failed to spawn Bogofilter (%s): "
 msgstr "Bogofilter の起動に失敗しました (%s): "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:163
+#: ../modules/bogofilter/evolution-bogofilter.c:162
 msgid "Failed to stream mail message content to Bogofilter: "
 msgstr "Bogofilter へのメッセージ内容の受け渡しに失敗しました: "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:212
+#: ../modules/bogofilter/evolution-bogofilter.c:211
 msgid "Bogofilter either crashed or failed to process a mail message"
 msgstr "Bogofilter がクラッシュしたか、メールメッセージの処理に失敗しました"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:308
+#: ../modules/bogofilter/evolution-bogofilter.c:307
 msgid "Bogofilter Options"
 msgstr "Bogofilter のオプション"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:317
+#: ../modules/bogofilter/evolution-bogofilter.c:316
 msgid "Convert message text to _Unicode"
 msgstr "メッセージを Unicode に変換する(_U)"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:474
+#: ../modules/bogofilter/evolution-bogofilter.c:473
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:447
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:446
 msgid "Standard LDAP Port"
 msgstr "標準のLDAPポート番号"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:453
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:625
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:452
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
 msgid "LDAP over SSL (deprecated)"
 msgstr "LDAP over SSL (非推奨)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:459
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:458
 msgid "Microsoft Global Catalog"
 msgstr "Microsoft Global Catalog"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:465
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:464
 msgid "Microsoft Global Catalog over SSL"
 msgstr "SSL 越しの Microsoft Global Catalog"
 
 #. Page 1
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:570
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:569
 msgid "Connecting to LDAP"
 msgstr "LDAP へ接続中"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:587
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:586
 msgid "Server Information"
 msgstr "サーバーの情報"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:628
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:613
+msgid "Port:"
+msgstr "ポート番号:"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:627
 msgid "StartTLS (recommended)"
 msgstr "StartTLS (推奨)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:630
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:629
 msgid "Encryption:"
 msgstr "暗号化:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:654
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:246
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:180
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:653
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:245
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:179
 msgid "Authentication"
 msgstr "認証"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:677
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:676
 msgid "Anonymous"
 msgstr "匿名"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:680
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
 msgid "Using email address"
 msgstr "メールアドレスを使う"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:683
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:682
 msgid "Using distinguished name (DN)"
 msgstr "識別名 (DN) を使用"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:685
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
 msgid "Method:"
 msgstr "メソッド:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:690
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:689
 msgid "This is the method Evolution will use to authenticate you.  Note that setting this to \"Using email address\" requires anonymous access to your LDAP server."
 msgstr "これは Evolution があなたを認証する際に使用する方法で、\"メールアドレスを使う\" を選択すると、LDAP サーバーへは匿名アクセスになります"
 
 #. Page 2
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:705
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:704
 msgid "Using LDAP"
 msgstr "LDAP を使用"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:722
-#: ../modules/mail/e-mail-shell-view.c:117
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:721
+#: ../modules/mail/e-mail-shell-view.c:115
 msgid "Searching"
 msgstr "検索"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:744
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:743
 msgid "Search Base:"
 msgstr "検索ベース:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:749
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:747
 msgid "Find Possible Search Bases"
 msgstr "利用可能な検索ベースを探す"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:774
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:769
 msgid "One Level"
 msgstr "指定ベースのみ"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:776
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:771
 msgid "Subtree"
 msgstr "サブツリー"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:773
 msgid "Search Scope:"
 msgstr "検索範囲:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:783
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
 msgid "The search scope defines how deep you would like the search to extend down the directory tree.  A search scope of \"Subtree\" will include all entries below your search base.  A search scope of \"One Level\" will only include the entries one level beneath your search base."
 msgstr "ディレクトリツリーで、どれくらいの深さまで検索対象にするかを定義します。検索範囲を \"サブツリー\" にすると検索ベースの下にあるすべてのエントリが含まれるようになり、\"指定ベースのみ\" にすると検索ベースの1番目のエントリだけが含まれるようになります。"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:792
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:787
 msgid "Search Filter:"
 msgstr "検索フィルター:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:804
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:799
 msgid "Downloading"
 msgstr "ダウンロード"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:825
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:820
 msgid "Limit:"
 msgstr "上限:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:836
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:831
 msgid "contacts"
 msgstr "連絡先"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:841
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:836
 msgid "Browse until limit is reached"
 msgstr "ダウンロードの上限に到達するまでアドレス帳を閲覧する"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:136
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:205
-#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:128
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:135
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:204
+#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:127
 msgid "URL:"
 msgstr "URL:"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:146
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:145
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "If-Match リクエストを使用しない (Apache HTTP Server 2.2.8 未満で必要)"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:447
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:441
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "HTTP のエラー: %s"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:475
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:469
 msgid "Could not parse response"
 msgstr "応答を解析できませんでした: "
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:484
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:478
 msgid "Empty response"
 msgstr "応答を空にする"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:492
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:486
 msgid "Unexpected reply from server"
 msgstr "サーバーから予期しない応答が返りました"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1124
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1118
 msgid "Could not locate user's calendars"
 msgstr "ユーザーのカレンダーを見つけられませんでした。"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1348
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1342
 msgid "Path"
 msgstr "パス"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:264
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:200
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:263
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:199
 msgid "Choose a Calendar"
 msgstr "カレンダーを選択してください"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:267
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:266
 msgid "Choose a Memo List"
 msgstr "メモ一覧を選択してください"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:270
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:269
 msgid "Choose a Task List"
 msgstr "タスク一覧を選択してください"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:219
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:218
 msgid "Find Calendars"
 msgstr "カレンダーを検索"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:222
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:221
 msgid "Find Memo Lists"
 msgstr "メモ一覧を検索"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:225
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:224
 msgid "Find Task Lists"
 msgstr "タスク一覧を検索"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:243
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:242
 msgid "Email:"
 msgstr "メール:"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:248
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:247
 msgid "Server handles meeting invitations"
 msgstr "サーバーが会議の招待を処理"
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:71
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:70
 msgid "Choose which address books to use."
 msgstr "どのアドレス帳を使うのか選択する。"
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:201
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:200
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr "誕生日と記念日のカレンダーで使用"
 
-#: ../modules/cal-config-google/e-google-chooser-button.c:127
+#: ../modules/cal-config-google/e-google-chooser-button.c:126
 msgid "Default User Calendar"
 msgstr "デフォルトのユーザーカレンダー"
 
-#: ../modules/cal-config-google/e-google-chooser.c:515
+#: ../modules/cal-config-google/e-google-chooser.c:514
 #, c-format
 msgid "Enter Google password for user '%s'."
 msgstr "ユーザー '%s' の Google のパスワードを入力してください。"
 
-#: ../modules/cal-config-google/e-google-chooser.c:532
+#: ../modules/cal-config-google/e-google-chooser.c:531
 msgid "User declined to provide a password"
 msgstr "ユーザーがパスワードの提供を拒否しました"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:160
+#: ../modules/cal-config-local/evolution-cal-config-local.c:159
 msgid "Use an existing iCalendar (ics) file"
 msgstr "既存の iCalendar (ics) ファイルを利用"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:185
+#: ../modules/cal-config-local/evolution-cal-config-local.c:184
 msgid "iCalendar File"
 msgstr "iCalendar ファイル"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:197
+#: ../modules/cal-config-local/evolution-cal-config-local.c:196
 msgid "Choose an iCalendar file"
 msgstr "iCalendar ファイルを選択してください"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:200
+#: ../modules/cal-config-local/evolution-cal-config-local.c:199
 msgid "File:"
 msgstr "ファイル:"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:215
+#: ../modules/cal-config-local/evolution-cal-config-local.c:214
 msgid "Allow Evolution to update the file"
 msgstr "Evolution がファイルを更新するのを許可"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:320
+#. Translators: Please indicate whether your locale uses the
+#. * metric or imperial measurement system by changing this to
+#. * either "default:mm" or "default:inch", respectively.
+#. *
+#. * This string is just a fallback mechanism for systems on
+#. * which _NL_MEASUREMENT_MEASUREMENT is not available.
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:187
+#, fuzzy
+#| msgid "Default"
+msgctxt "locale-metric"
+msgid "default:mm"
+msgstr "デフォルト"
+
+#. Translators: This is the temperature in degrees
+#. * Fahrenheit. (\302\260 is U+00B0 DEGREE SIGN)
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:259
+msgid "Fahrenheit (°F)"
+msgstr ""
+
+#. Translators: This is the temperature in degrees
+#. * Celsius. (\302\260 is U+00B0 DEGREE SIGN)
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:264
+msgid "Centigrade (°C)"
+msgstr ""
+
+#. Translators: This is the temperature in kelvin.
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:268
+msgid "Kelvin (K)"
+msgstr ""
+
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:270
+#, fuzzy
+#| msgid "Unit"
+msgid "Units:"
+msgstr "単位"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:319
 #: ../smime/gui/smime-ui.ui.h:9
 msgid "I_mport"
 msgstr "インポート(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:406
+#: ../modules/calendar/e-cal-attachment-handler.c:405
 msgid "Select a Calendar"
 msgstr "カレンダーの選択"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:433
+#: ../modules/calendar/e-cal-attachment-handler.c:432
 msgid "Select a Task List"
 msgstr "タスクの一覧の選択"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:443
+#: ../modules/calendar/e-cal-attachment-handler.c:442
 msgid "I_mport to Calendar"
 msgstr "カレンダーへのインポート(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:450
+#: ../modules/calendar/e-cal-attachment-handler.c:449
 msgid "I_mport to Tasks"
 msgstr "タスクへのインポート(_M)"
 
-#: ../modules/calendar/e-calendar-preferences.c:517
+#: ../modules/calendar/e-calendar-preferences.c:516
 msgid "Selected Calendars for Alarms"
 msgstr "アラーム用に選択したカレンダー"
 
-#: ../modules/calendar/e-calendar-preferences.c:925
+#: ../modules/calendar/e-calendar-preferences.c:924
 msgid "Ti_me and date:"
 msgstr "時刻と日付(_M):"
 
-#: ../modules/calendar/e-calendar-preferences.c:926
+#: ../modules/calendar/e-calendar-preferences.c:925
 msgid "_Date only:"
 msgstr "日付のみ(_D):"
 
@@ -15149,7 +15672,7 @@ msgid "_24 hour"
 msgstr "24 時間制(_2)"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
-#: ../modules/calendar/e-cal-shell-view-actions.c:1716
+#: ../modules/calendar/e-cal-shell-view-actions.c:1715
 msgid "Work Week"
 msgstr "平日"
 
@@ -15302,433 +15825,440 @@ msgstr "%u と %d を指定すると、メールアドレスのユーザー名�
 msgid "Publishing Information"
 msgstr "公開する情報"
 
-#: ../modules/calendar/e-cal-shell-backend.c:313
-#: ../modules/calendar/e-cal-shell-view-actions.c:191
+#: ../modules/calendar/e-cal-shell-backend.c:312
+#: ../modules/calendar/e-cal-shell-view-actions.c:190
 msgid "New Calendar"
 msgstr "新しいカレンダー"
 
-#: ../modules/calendar/e-cal-shell-backend.c:322
+#: ../modules/calendar/e-cal-shell-backend.c:321
 msgctxt "New"
 msgid "_Appointment"
 msgstr "予定(_A)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:324
-#: ../modules/calendar/e-cal-shell-view-actions.c:1521
+#: ../modules/calendar/e-cal-shell-backend.c:323
+#: ../modules/calendar/e-cal-shell-view-actions.c:1520
 msgid "Create a new appointment"
 msgstr "新しい予定を作成します"
 
-#: ../modules/calendar/e-cal-shell-backend.c:329
+#: ../modules/calendar/e-cal-shell-backend.c:328
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "終日の予定(_P)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:331
+#: ../modules/calendar/e-cal-shell-backend.c:330
 msgid "Create a new all-day appointment"
 msgstr "新しい終日の予定を作成します"
 
-#: ../modules/calendar/e-cal-shell-backend.c:336
+#: ../modules/calendar/e-cal-shell-backend.c:335
 msgctxt "New"
 msgid "M_eeting"
 msgstr "会議(_E)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:338
+#: ../modules/calendar/e-cal-shell-backend.c:337
 msgid "Create a new meeting request"
 msgstr "新しい会議を召集します"
 
-#: ../modules/calendar/e-cal-shell-backend.c:346
+#: ../modules/calendar/e-cal-shell-backend.c:345
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "カレンダー(_N)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:348
-#: ../modules/calendar/e-cal-shell-view-actions.c:1395
+#: ../modules/calendar/e-cal-shell-backend.c:347
+#: ../modules/calendar/e-cal-shell-view-actions.c:1394
 msgid "Create a new calendar"
 msgstr "新しいカレンダーを作成します"
 
-#: ../modules/calendar/e-cal-shell-backend.c:703
+#: ../modules/calendar/e-cal-shell-backend.c:702
 msgid "Calendar and Tasks"
 msgstr "カレンダーとタスク"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:119
+#: ../modules/calendar/e-cal-shell-sidebar.c:118
 #, c-format
 msgid "Opening calendar '%s'"
 msgstr "カレンダー %s を開いています"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:591
+#: ../modules/calendar/e-cal-shell-sidebar.c:589
 msgid "Calendar Selector"
 msgstr "カレンダーの選択"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:216
-#: ../modules/calendar/e-cal-shell-view-actions.c:245
+#: ../modules/calendar/e-cal-shell-view-actions.c:215
+#: ../modules/calendar/e-cal-shell-view-actions.c:244
 msgid "Print"
 msgstr "印刷"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:291
+#: ../modules/calendar/e-cal-shell-view-actions.c:290
 msgid "Calendar Properties"
 msgstr "カレンダーのプロパティ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:322
+#: ../modules/calendar/e-cal-shell-view-actions.c:321
 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 events."
 msgstr "この操作は選択したイベントより古いイベントをすべて完全に削除します。続行すると、これらのイベントを復旧できなくなります。"
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:339
+#: ../modules/calendar/e-cal-shell-view-actions.c:338
 msgid "Purge events older than"
 msgstr "次より古いイベントを抹消する: "
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:585
+#: ../modules/calendar/e-cal-shell-view-actions.c:584
 msgid "Copying Items"
 msgstr "アイテムのコピー中"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:878
+#: ../modules/calendar/e-cal-shell-view-actions.c:877
 msgid "Moving Items"
 msgstr "アイテムの移動中"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1211
+#: ../modules/calendar/e-cal-shell-view-actions.c:1210
 msgid "event"
 msgstr "イベント"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1213
-#: ../modules/calendar/e-cal-shell-view-memopad.c:231
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:298
-#: ../modules/calendar/e-memo-shell-view-actions.c:527
-#: ../modules/calendar/e-task-shell-view-actions.c:644
+#: ../modules/calendar/e-cal-shell-view-actions.c:1212
+#: ../modules/calendar/e-cal-shell-view-memopad.c:230
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:297
+#: ../modules/calendar/e-memo-shell-view-actions.c:526
+#: ../modules/calendar/e-task-shell-view-actions.c:643
 msgid "Save as iCalendar"
 msgstr "iCalendar 形式で保存"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
-#: ../modules/calendar/e-memo-shell-view-actions.c:608
+#: ../modules/calendar/e-cal-shell-view-actions.c:1350
+#: ../modules/calendar/e-memo-shell-view-actions.c:607
+#: ../modules/calendar/e-task-shell-view-actions.c:731
 msgid "_Copy..."
 msgstr "コピー(_C)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1358
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
 msgid "D_elete Calendar"
 msgstr "カレンダーの削除(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1360
+#: ../modules/calendar/e-cal-shell-view-actions.c:1359
 msgid "Delete the selected calendar"
 msgstr "選択したカレンダーを削除"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1367
+#: ../modules/calendar/e-cal-shell-view-actions.c:1366
 msgid "Go Back"
 msgstr "前へ戻る"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1374
+#: ../modules/calendar/e-cal-shell-view-actions.c:1373
 msgid "Go Forward"
 msgstr "次へ進む"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1381
+#: ../modules/calendar/e-cal-shell-view-actions.c:1380
 msgid "Select today"
 msgstr "今日に移動します"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1386
+#: ../modules/calendar/e-cal-shell-view-actions.c:1385
 msgid "Select _Date"
 msgstr "日付の選択(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1388
+#: ../modules/calendar/e-cal-shell-view-actions.c:1387
 msgid "Select a specific date"
 msgstr "指定した日に移動します"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1392
 msgid "_New Calendar"
 msgstr "新しいカレンダー(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1407
-#: ../modules/calendar/e-task-shell-view-actions.c:816
+#: ../modules/calendar/e-cal-shell-view-actions.c:1406
+#: ../modules/calendar/e-task-shell-view-actions.c:815
 msgid "Purg_e"
 msgstr "抹消(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1409
+#: ../modules/calendar/e-cal-shell-view-actions.c:1408
 msgid "Purge old appointments and meetings"
 msgstr "古い予定と会議を完全に削除します"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1416
+#: ../modules/calendar/e-cal-shell-view-actions.c:1415
 msgid "Refresh the selected calendar"
 msgstr "選択したカレンダーを更新"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1423
+#: ../modules/calendar/e-cal-shell-view-actions.c:1422
 msgid "Rename the selected calendar"
 msgstr "選択したカレンダーの名前を変更します"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
-#, fuzzy
-#| msgid "Find _next"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1427
 msgid "Find _Next"
 msgstr "次を検索(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1430
+#: ../modules/calendar/e-cal-shell-view-actions.c:1429
 msgid "Find next occurrence of the current search string"
 msgstr "現在検索中の文字列の次の出現位置を検索"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
-#, fuzzy
-#| msgid "Find _previous"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1434
 msgid "Find _Previous"
 msgstr "前を検索(_P)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1437
+#: ../modules/calendar/e-cal-shell-view-actions.c:1436
 msgid "Find previous occurrence of the current search string"
 msgstr "現在検索中の文字列の前の出現位置を検索"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1442
-#, fuzzy
-#| msgid "Stop _running search"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
 msgid "Stop _Running Search"
 msgstr "実行中の検索を中止(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1444
+#: ../modules/calendar/e-cal-shell-view-actions.c:1443
 msgid "Stop currently running search"
 msgstr "現在実行中の検索を中止する"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1449
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
 msgid "Show _Only This Calendar"
 msgstr "このカレンダーだけ表示する(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1456
+#: ../modules/calendar/e-cal-shell-view-actions.c:1455
 msgid "Cop_y to Calendar..."
 msgstr "カレンダーへコピー(_Y)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1463
+#: ../modules/calendar/e-cal-shell-view-actions.c:1462
 msgid "_Delegate Meeting..."
 msgstr "会議の委任(_D)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1470
+#: ../modules/calendar/e-cal-shell-view-actions.c:1469
 msgid "_Delete Appointment"
 msgstr "予定を削除(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1472
+#: ../modules/calendar/e-cal-shell-view-actions.c:1471
 msgid "Delete selected appointments"
 msgstr "選択した予定を削除します"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1477
+#: ../modules/calendar/e-cal-shell-view-actions.c:1476
 msgid "Delete This _Occurrence"
 msgstr "このイベントの削除(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1479
+#: ../modules/calendar/e-cal-shell-view-actions.c:1478
 msgid "Delete this occurrence"
 msgstr "このイベントを削除します"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1484
+#: ../modules/calendar/e-cal-shell-view-actions.c:1483
 msgid "Delete All Occ_urrences"
 msgstr "すべてのイベントの削除(_U)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1486
+#: ../modules/calendar/e-cal-shell-view-actions.c:1485
 msgid "Delete all occurrences"
 msgstr "すべてのイベントを削除します"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1491
+#: ../modules/calendar/e-cal-shell-view-actions.c:1490
 msgid "New All Day _Event..."
 msgstr "新しい終日のイベント(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1493
+#: ../modules/calendar/e-cal-shell-view-actions.c:1492
 msgid "Create a new all day event"
 msgstr "新しい終日の予定を作成します"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1498
-#: ../modules/calendar/e-cal-shell-view-memopad.c:265
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-memo-shell-view-actions.c:601
-#: ../modules/calendar/e-task-shell-view-actions.c:725
+#: ../modules/calendar/e-cal-shell-view-actions.c:1497
+#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
+#: ../modules/calendar/e-memo-shell-view-actions.c:600
+#: ../modules/calendar/e-task-shell-view-actions.c:724
 msgid "_Forward as iCalendar..."
 msgstr "iCalendar 形式で転送(_F)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1505
+#: ../modules/calendar/e-cal-shell-view-actions.c:1504
 msgid "New _Meeting..."
 msgstr "新しい会議(_M)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1507
+#: ../modules/calendar/e-cal-shell-view-actions.c:1506
 msgid "Create a new meeting"
 msgstr "新しい会議を作成します"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1512
+#: ../modules/calendar/e-cal-shell-view-actions.c:1511
 msgid "Mo_ve to Calendar..."
 msgstr "カレンダーへ移動(_V)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1519
+#: ../modules/calendar/e-cal-shell-view-actions.c:1518
 msgid "New _Appointment..."
 msgstr "新しい予定(_A)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1526
+#: ../modules/calendar/e-cal-shell-view-actions.c:1525
 msgid "Make this Occurrence _Movable"
 msgstr "このイベントを移動可能にする(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1533
+#: ../modules/calendar/e-cal-shell-view-actions.c:1532
 msgid "_Open Appointment"
 msgstr "予定を開く(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1535
+#: ../modules/calendar/e-cal-shell-view-actions.c:1534
 msgid "View the current appointment"
 msgstr "現在の予定の表示"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1540
+#: ../modules/calendar/e-cal-shell-view-actions.c:1539
 msgid "_Reply"
 msgstr "返信(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1554
+#: ../modules/calendar/e-cal-shell-view-actions.c:1553
 msgid "_Schedule Meeting..."
 msgstr "会議のスケジュール(_S)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1556
+#: ../modules/calendar/e-cal-shell-view-actions.c:1555
 msgid "Converts an appointment to a meeting"
 msgstr "約束を会議に変更します"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1561
+#: ../modules/calendar/e-cal-shell-view-actions.c:1560
 msgid "Conv_ert to Appointment..."
 msgstr "約束へ変更(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1563
+#: ../modules/calendar/e-cal-shell-view-actions.c:1562
 msgid "Converts a meeting to an appointment"
 msgstr "会議を約束へ変更します"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1568
+#: ../modules/calendar/e-cal-shell-view-actions.c:1567
 msgid "Quit"
 msgstr "終了"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1688
+#: ../modules/calendar/e-cal-shell-view-actions.c:1687
 msgid "Day"
 msgstr "日"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1690
+#: ../modules/calendar/e-cal-shell-view-actions.c:1689
 msgid "Show one day"
 msgstr "1日を表示します"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1695
+#: ../modules/calendar/e-cal-shell-view-actions.c:1694
 msgid "List"
 msgstr "一覧"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1697
+#: ../modules/calendar/e-cal-shell-view-actions.c:1696
 msgid "Show as list"
 msgstr "一覧形式で表示します"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1702
+#: ../modules/calendar/e-cal-shell-view-actions.c:1701
 msgid "Month"
 msgstr "月"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1704
+#: ../modules/calendar/e-cal-shell-view-actions.c:1703
 msgid "Show one month"
 msgstr "1ヶ月を表示します"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1709
+#: ../modules/calendar/e-cal-shell-view-actions.c:1708
 msgid "Week"
 msgstr "週"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1711
+#: ../modules/calendar/e-cal-shell-view-actions.c:1710
 msgid "Show one week"
 msgstr "1週間を表示します"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1718
+#: ../modules/calendar/e-cal-shell-view-actions.c:1717
 msgid "Show one work week"
 msgstr "平日1週間を表示します"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1726
+#: ../modules/calendar/e-cal-shell-view-actions.c:1725
 msgid "Active Appointments"
 msgstr "実行中の予定"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1740
+#: ../modules/calendar/e-cal-shell-view-actions.c:1739
 msgid "Next 7 Days' Appointments"
 msgstr "次の7日間の予定"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1747
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1746
 msgid "Occurs Less Than 5 Times"
-msgstr "5回以下"
+msgstr "5回未満"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1778
-#: ../modules/calendar/e-memo-shell-view-actions.c:798
-#: ../modules/calendar/e-task-shell-view-actions.c:997
+#: ../modules/calendar/e-cal-shell-view-actions.c:1777
+#: ../modules/calendar/e-memo-shell-view-actions.c:797
+#: ../modules/calendar/e-task-shell-view-actions.c:996
 msgid "Description contains"
 msgstr "説明が次のものを含む"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1785
-#: ../modules/calendar/e-memo-shell-view-actions.c:805
-#: ../modules/calendar/e-task-shell-view-actions.c:1004
+#: ../modules/calendar/e-cal-shell-view-actions.c:1784
+#: ../modules/calendar/e-memo-shell-view-actions.c:804
+#: ../modules/calendar/e-task-shell-view-actions.c:1003
 msgid "Summary contains"
 msgstr "サマリが次のものを含む"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1797
+#: ../modules/calendar/e-cal-shell-view-actions.c:1794
+#: ../modules/calendar/e-cal-shell-view-actions.c:1808
+#: ../modules/calendar/e-cal-shell-view-memopad.c:295
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:382
+#: ../modules/calendar/e-memo-shell-view-actions.c:814
+#: ../modules/calendar/e-memo-shell-view-actions.c:828
+#: ../modules/calendar/e-task-shell-view-actions.c:1013
+#: ../modules/calendar/e-task-shell-view-actions.c:1027
+#, fuzzy
+#| msgid "_Print..."
+msgid "Print..."
+msgstr "印刷(_P)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1796
 msgid "Print this calendar"
 msgstr "このカレンダーを印刷します"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1804
+#: ../modules/calendar/e-cal-shell-view-actions.c:1803
 msgid "Preview the calendar to be printed"
 msgstr "印刷されるカレンダーのプレビューを表示します"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1826
-#: ../modules/calendar/e-cal-shell-view-memopad.c:306
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:393
-#: ../modules/calendar/e-memo-shell-view-actions.c:846
-#: ../modules/calendar/e-task-shell-view-actions.c:1045
+#: ../modules/calendar/e-cal-shell-view-actions.c:1825
+#: ../modules/calendar/e-cal-shell-view-memopad.c:305
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:392
+#: ../modules/calendar/e-memo-shell-view-actions.c:845
+#: ../modules/calendar/e-task-shell-view-actions.c:1044
 msgid "_Save as iCalendar..."
 msgstr "iCalendar 形式で保存(_S)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1903
+#: ../modules/calendar/e-cal-shell-view-actions.c:1902
 msgid "Go To"
 msgstr "移動"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:229
-#: ../modules/calendar/e-memo-shell-view-actions.c:525
+#: ../modules/calendar/e-cal-shell-view-memopad.c:228
+#: ../modules/calendar/e-memo-shell-view-actions.c:524
 msgid "memo"
 msgstr "メモ"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:272
-#: ../modules/calendar/e-memo-shell-view-actions.c:657
+#: ../modules/calendar/e-cal-shell-view-memopad.c:271
+#: ../modules/calendar/e-memo-shell-view-actions.c:656
 msgid "New _Memo"
 msgstr "新しいメモ(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:274
-#: ../modules/calendar/e-memo-shell-backend.c:219
-#: ../modules/calendar/e-memo-shell-view-actions.c:659
+#: ../modules/calendar/e-cal-shell-view-memopad.c:273
+#: ../modules/calendar/e-memo-shell-backend.c:218
+#: ../modules/calendar/e-memo-shell-view-actions.c:658
 msgid "Create a new memo"
 msgstr "新しいメモを作成します"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:279
-#: ../modules/calendar/e-memo-shell-view-actions.c:664
+#: ../modules/calendar/e-cal-shell-view-memopad.c:278
+#: ../modules/calendar/e-memo-shell-view-actions.c:663
 msgid "_Open Memo"
 msgstr "メモを開く(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:281
-#: ../modules/calendar/e-memo-shell-view-actions.c:666
+#: ../modules/calendar/e-cal-shell-view-memopad.c:280
+#: ../modules/calendar/e-memo-shell-view-actions.c:665
 msgid "View the selected memo"
 msgstr "選択したメモを表示します"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:286
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:373
-#: ../modules/calendar/e-memo-shell-view-actions.c:671
-#: ../modules/calendar/e-task-shell-view-actions.c:809
+#: ../modules/calendar/e-cal-shell-view-memopad.c:285
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:372
+#: ../modules/calendar/e-memo-shell-view-actions.c:670
+#: ../modules/calendar/e-task-shell-view-actions.c:808
 msgid "Open _Web Page"
 msgstr "ウェブページを開く(_W)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:298
-#: ../modules/calendar/e-memo-shell-view-actions.c:831
+#: ../modules/calendar/e-cal-shell-view-memopad.c:297
+#: ../modules/calendar/e-memo-shell-view-actions.c:830
 msgid "Print the selected memo"
 msgstr "選択したメモを印刷します"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1600
+#: ../modules/calendar/e-cal-shell-view-private.c:1561
 msgid "Searching next matching event"
 msgstr "一致する次のイベントを検索"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1601
+#: ../modules/calendar/e-cal-shell-view-private.c:1562
 msgid "Searching previous matching event"
 msgstr "一致する前のイベントを検索"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1622
+#: ../modules/calendar/e-cal-shell-view-private.c:1583
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
 msgstr[0] "一致するイベントは次の %d 年以内には見つかりませんでした"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1626
+#: ../modules/calendar/e-cal-shell-view-private.c:1587
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
 msgstr[0] "一致するイベントは前の %d 年以内には見つかりませんでした"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1651
+#: ../modules/calendar/e-cal-shell-view-private.c:1612
 msgid "Cannot search with no active calendar"
 msgstr "アクティブなカレンダーが1つもない場合は検索できません"
 
@@ -15736,236 +16266,236 @@ msgstr "アクティブなカレンダーが1つもない場合は検索でき�
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:296
-#: ../modules/calendar/e-task-shell-view-actions.c:642
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:295
+#: ../modules/calendar/e-task-shell-view-actions.c:641
 msgid "task"
 msgstr "タスク"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
-#: ../modules/calendar/e-task-shell-view-actions.c:704
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
+#: ../modules/calendar/e-task-shell-view-actions.c:703
 msgid "_Assign Task"
 msgstr "タスクの割当て(_A)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:781
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
+#: ../modules/calendar/e-task-shell-view-actions.c:780
 msgid "_Mark as Complete"
 msgstr "完了としてマーク(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:783
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
+#: ../modules/calendar/e-task-shell-view-actions.c:782
 msgid "Mark selected tasks as complete"
 msgstr "選択したタスクに完了マークを付与します"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
 msgid "_Mark as Incomplete"
 msgstr "未完了としてマーク(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:354
-#: ../modules/calendar/e-task-shell-view-actions.c:790
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:353
+#: ../modules/calendar/e-task-shell-view-actions.c:789
 msgid "Mark selected tasks as incomplete"
 msgstr "選択したタスクに未完とのマークを付与します"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-task-shell-view-actions.c:795
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:358
+#: ../modules/calendar/e-task-shell-view-actions.c:794
 msgid "New _Task"
 msgstr "新しいタスク(_T)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
-#: ../modules/calendar/e-task-shell-backend.c:216
-#: ../modules/calendar/e-task-shell-view-actions.c:797
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:360
+#: ../modules/calendar/e-task-shell-backend.c:215
+#: ../modules/calendar/e-task-shell-view-actions.c:796
 msgid "Create a new task"
 msgstr "新しいタスクを作成します"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:366
-#: ../modules/calendar/e-task-shell-view-actions.c:802
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:365
+#: ../modules/calendar/e-task-shell-view-actions.c:801
 msgid "_Open Task"
 msgstr "タスクを開く(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:368
-#: ../modules/calendar/e-task-shell-view-actions.c:804
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:367
+#: ../modules/calendar/e-task-shell-view-actions.c:803
 msgid "View the selected task"
 msgstr "選択したタスクを表示します"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:385
-#: ../modules/calendar/e-task-shell-view-actions.c:1030
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:384
+#: ../modules/calendar/e-task-shell-view-actions.c:1029
 msgid "Print the selected task"
 msgstr "選択したタスクを印刷します"
 
-#: ../modules/calendar/e-memo-shell-backend.c:208
-#: ../modules/calendar/e-memo-shell-view-actions.c:196
+#: ../modules/calendar/e-memo-shell-backend.c:207
+#: ../modules/calendar/e-memo-shell-view-actions.c:195
 msgid "New Memo List"
 msgstr "新しいメモの一覧"
 
-#: ../modules/calendar/e-memo-shell-backend.c:217
+#: ../modules/calendar/e-memo-shell-backend.c:216
 msgctxt "New"
 msgid "Mem_o"
 msgstr "メモ(_O)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:224
+#: ../modules/calendar/e-memo-shell-backend.c:223
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "メモの共有(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:226
+#: ../modules/calendar/e-memo-shell-backend.c:225
 msgid "Create a new shared memo"
 msgstr "新しい共有メモを作成します"
 
-#: ../modules/calendar/e-memo-shell-backend.c:234
+#: ../modules/calendar/e-memo-shell-backend.c:233
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "メモの一覧(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:236
-#: ../modules/calendar/e-memo-shell-view-actions.c:624
+#: ../modules/calendar/e-memo-shell-backend.c:235
+#: ../modules/calendar/e-memo-shell-view-actions.c:623
 msgid "Create a new memo list"
 msgstr "新しいメモの一覧を作成します"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:117
+#: ../modules/calendar/e-memo-shell-sidebar.c:116
 #, c-format
 msgid "Opening memo list '%s'"
 msgstr "メモ一覧 %s を開いています"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:547
+#: ../modules/calendar/e-memo-shell-sidebar.c:545
 msgid "Memo List Selector"
 msgstr "メモの一覧の選択"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:212
-#: ../modules/calendar/e-memo-shell-view-actions.c:227
+#: ../modules/calendar/e-memo-shell-view-actions.c:211
+#: ../modules/calendar/e-memo-shell-view-actions.c:226
 msgid "Print Memos"
 msgstr "メモの印刷"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:268
+#: ../modules/calendar/e-memo-shell-view-actions.c:267
 msgid "Memo List Properties"
 msgstr "タスクの一覧のプロパティ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:587
+#: ../modules/calendar/e-memo-shell-view-actions.c:586
 msgid "_Delete Memo"
 msgstr "メモの削除(_D)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:594
+#: ../modules/calendar/e-memo-shell-view-actions.c:593
 msgid "_Find in Memo..."
 msgstr "メモから検索(_F)..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:596
+#: ../modules/calendar/e-memo-shell-view-actions.c:595
 msgid "Search for text in the displayed memo"
 msgstr "表示したメモに含まれる文字列を検索します"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:615
+#: ../modules/calendar/e-memo-shell-view-actions.c:614
 msgid "D_elete Memo List"
 msgstr "メモの一覧の削除(_E)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:617
+#: ../modules/calendar/e-memo-shell-view-actions.c:616
 msgid "Delete the selected memo list"
 msgstr "選択したメモの一覧を削除します"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:622
+#: ../modules/calendar/e-memo-shell-view-actions.c:621
 msgid "_New Memo List"
 msgstr "新しいメモの一覧(_N)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:638
+#: ../modules/calendar/e-memo-shell-view-actions.c:637
 msgid "Refresh the selected memo list"
 msgstr "選択したメモの一覧を更新"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:645
+#: ../modules/calendar/e-memo-shell-view-actions.c:644
 msgid "Rename the selected memo list"
 msgstr "選択したメモの一覧の名前を変更"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:650
+#: ../modules/calendar/e-memo-shell-view-actions.c:649
 msgid "Show _Only This Memo List"
 msgstr "このメモの一覧だけ表示(_O)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:729
+#: ../modules/calendar/e-memo-shell-view-actions.c:728
 msgid "Memo _Preview"
 msgstr "メモのプレビュー(_P)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:731
+#: ../modules/calendar/e-memo-shell-view-actions.c:730
 msgid "Show memo preview pane"
 msgstr "メモのプレビューペインを表示するかどうか"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:752
+#: ../modules/calendar/e-memo-shell-view-actions.c:751
 msgid "Show memo preview below the memo list"
 msgstr "メモの一覧の下にメモのプレビューを表示します"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:759
+#: ../modules/calendar/e-memo-shell-view-actions.c:758
 msgid "Show memo preview alongside the memo list"
 msgstr "メモの一覧の横にメモのプレビューを表示します"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:817
+#: ../modules/calendar/e-memo-shell-view-actions.c:816
 msgid "Print the list of memos"
 msgstr "メモの一覧を印刷します"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:824
+#: ../modules/calendar/e-memo-shell-view-actions.c:823
 msgid "Preview the list of memos to be printed"
 msgstr "印刷するメモの一覧のプレビューを表示します"
 
-#: ../modules/calendar/e-memo-shell-view.c:239
+#: ../modules/calendar/e-memo-shell-view.c:238
 msgid "Delete Memos"
 msgstr "複数のメモの削除"
 
-#: ../modules/calendar/e-memo-shell-view.c:241
+#: ../modules/calendar/e-memo-shell-view.c:240
 msgid "Delete Memo"
 msgstr "メモの削除"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:538
+#: ../modules/calendar/e-memo-shell-view-private.c:537
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d個のメモ"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:542
-#: ../modules/calendar/e-task-shell-view-private.c:746
+#: ../modules/calendar/e-memo-shell-view-private.c:541
+#: ../modules/calendar/e-task-shell-view-private.c:747
 #, c-format
 msgid "%d selected"
 msgstr "%d個 選択済"
 
-#: ../modules/calendar/e-task-shell-backend.c:205
-#: ../modules/calendar/e-task-shell-view-actions.c:219
+#: ../modules/calendar/e-task-shell-backend.c:204
+#: ../modules/calendar/e-task-shell-view-actions.c:218
 msgid "New Task List"
 msgstr "新しいタスクの一覧"
 
-#: ../modules/calendar/e-task-shell-backend.c:214
+#: ../modules/calendar/e-task-shell-backend.c:213
 msgctxt "New"
 msgid "_Task"
 msgstr "タスク(_T)"
 
-#: ../modules/calendar/e-task-shell-backend.c:221
+#: ../modules/calendar/e-task-shell-backend.c:220
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "タスクの割当て(_D)"
 
-#: ../modules/calendar/e-task-shell-backend.c:223
+#: ../modules/calendar/e-task-shell-backend.c:222
 msgid "Create a new assigned task"
 msgstr "新しいタスクの割り当てを作成します"
 
-#: ../modules/calendar/e-task-shell-backend.c:231
+#: ../modules/calendar/e-task-shell-backend.c:230
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "タスクの一覧(_K)"
 
-#: ../modules/calendar/e-task-shell-backend.c:233
-#: ../modules/calendar/e-task-shell-view-actions.c:748
+#: ../modules/calendar/e-task-shell-backend.c:232
+#: ../modules/calendar/e-task-shell-view-actions.c:747
 msgid "Create a new task list"
 msgstr "新しいタスクの一覧を作成します"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:117
+#: ../modules/calendar/e-task-shell-sidebar.c:116
 #, c-format
 msgid "Opening task list '%s'"
 msgstr "タスク一覧 %s を開いています"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:547
+#: ../modules/calendar/e-task-shell-sidebar.c:545
 msgid "Task List Selector"
 msgstr "タスクの一覧の選択"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:235
-#: ../modules/calendar/e-task-shell-view-actions.c:250
+#: ../modules/calendar/e-task-shell-view-actions.c:234
+#: ../modules/calendar/e-task-shell-view-actions.c:249
 msgid "Print Tasks"
 msgstr "タスクの印刷"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:291
+#: ../modules/calendar/e-task-shell-view-actions.c:290
 msgid "Task List Properties"
 msgstr "タスクの一覧のプロパティ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:586
+#: ../modules/calendar/e-task-shell-view-actions.c:585
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n"
 "\n"
@@ -15975,115 +16505,111 @@ msgstr ""
 "\n"
 "本当にこれらのタスクを削除しますか?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:593
+#: ../modules/calendar/e-task-shell-view-actions.c:592
 msgid "Do not ask me again"
 msgstr "次回からこのメッセージを表示しない"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:711
+#: ../modules/calendar/e-task-shell-view-actions.c:710
 msgid "_Delete Task"
 msgstr "タスク削除(_D)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:718
+#: ../modules/calendar/e-task-shell-view-actions.c:717
 msgid "_Find in Task..."
 msgstr "タスクから検索(_F)..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:720
+#: ../modules/calendar/e-task-shell-view-actions.c:719
 msgid "Search for text in the displayed task"
 msgstr "表示されているタスクから文字列を検索します"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:732
-msgid "Copy..."
-msgstr "コピー..."
-
-#: ../modules/calendar/e-task-shell-view-actions.c:739
+#: ../modules/calendar/e-task-shell-view-actions.c:738
 msgid "D_elete Task List"
 msgstr "タスクの一覧の削除(_E)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:740
 msgid "Delete the selected task list"
 msgstr "選択したタスクの一覧を削除します"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:746
+#: ../modules/calendar/e-task-shell-view-actions.c:745
 msgid "_New Task List"
 msgstr "新しいタスクの一覧(_N)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:761
 msgid "Refresh the selected task list"
 msgstr "選択したタスクの一覧を更新"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-task-shell-view-actions.c:768
 msgid "Rename the selected task list"
 msgstr "選択したタスクの一覧の名前を変更"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:774
+#: ../modules/calendar/e-task-shell-view-actions.c:773
 msgid "Show _Only This Task List"
 msgstr "このタスクの一覧だけ表示(_O)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:787
 msgid "Mar_k as Incomplete"
 msgstr "未完了としてマーク(_K)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:818
+#: ../modules/calendar/e-task-shell-view-actions.c:817
 msgid "Delete completed tasks"
 msgstr "完了したタスクを削除します"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:893
+#: ../modules/calendar/e-task-shell-view-actions.c:892
 msgid "Task _Preview"
 msgstr "タスクのプレビュー(_P)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:895
+#: ../modules/calendar/e-task-shell-view-actions.c:894
 msgid "Show task preview pane"
 msgstr "タスクのプレビューペインを表示する"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:916
+#: ../modules/calendar/e-task-shell-view-actions.c:915
 msgid "Show task preview below the task list"
 msgstr "タスクの一覧の下にタスクのプレビューを表示します"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:923
+#: ../modules/calendar/e-task-shell-view-actions.c:922
 msgid "Show task preview alongside the task list"
 msgstr "タスクの一覧の横にタスクのプレビューを表示します"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:931
+#: ../modules/calendar/e-task-shell-view-actions.c:930
 msgid "Active Tasks"
 msgstr "実行中のタスク"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:945
+#: ../modules/calendar/e-task-shell-view-actions.c:944
 msgid "Completed Tasks"
 msgstr "完了したタスク"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:952
+#: ../modules/calendar/e-task-shell-view-actions.c:951
 msgid "Next 7 Days' Tasks"
 msgstr "次の7日間のタスク"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:959
+#: ../modules/calendar/e-task-shell-view-actions.c:958
 msgid "Overdue Tasks"
 msgstr "期限を過ぎたタスク"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:966
+#: ../modules/calendar/e-task-shell-view-actions.c:965
 msgid "Tasks with Attachments"
 msgstr "添付ありのタスク"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1016
+#: ../modules/calendar/e-task-shell-view-actions.c:1015
 msgid "Print the list of tasks"
 msgstr "タスクの一覧を印刷します"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1023
+#: ../modules/calendar/e-task-shell-view-actions.c:1022
 msgid "Preview the list of tasks to be printed"
 msgstr "タスクの一覧の印刷プレビューを表示します"
 
-#: ../modules/calendar/e-task-shell-view.c:374
+#: ../modules/calendar/e-task-shell-view.c:373
 msgid "Delete Tasks"
 msgstr "タスクを削除"
 
-#: ../modules/calendar/e-task-shell-view.c:376
+#: ../modules/calendar/e-task-shell-view.c:375
 msgid "Delete Task"
 msgstr "タスクを委任"
 
-#: ../modules/calendar/e-task-shell-view-private.c:631
+#: ../modules/calendar/e-task-shell-view-private.c:632
 msgid "Expunging"
 msgstr "抹消"
 
-#: ../modules/calendar/e-task-shell-view-private.c:742
+#: ../modules/calendar/e-task-shell-view-private.c:743
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -16099,652 +16625,652 @@ msgstr "招待状として表示"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:235
+#: ../modules/itip-formatter/itip-view.c:228
 msgid "Today %H:%M"
 msgstr "今日の%k:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:239
+#: ../modules/itip-formatter/itip-view.c:232
 msgid "Today %H:%M:%S"
 msgstr "今日の%k:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:248
+#: ../modules/itip-formatter/itip-view.c:241
 msgid "Today %l:%M:%S %p"
 msgstr "今日の%p%l:%M:%S"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:263
+#: ../modules/itip-formatter/itip-view.c:256
 msgid "Tomorrow %H:%M"
 msgstr "明日の%k:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:267
+#: ../modules/itip-formatter/itip-view.c:260
 msgid "Tomorrow %H:%M:%S"
 msgstr "明日の%k:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:272
+#: ../modules/itip-formatter/itip-view.c:265
 msgid "Tomorrow %l:%M %p"
 msgstr "明日の%p%l:%M"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:276
+#: ../modules/itip-formatter/itip-view.c:269
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "明日の%p%l:%M:%S"
 
 #. strftime format of a weekday.
-#: ../modules/itip-formatter/itip-view.c:295
+#: ../modules/itip-formatter/itip-view.c:288
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:300
+#: ../modules/itip-formatter/itip-view.c:293
 msgid "%A %H:%M"
 msgstr "%Aの%k:%M"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:304
+#: ../modules/itip-formatter/itip-view.c:297
 msgid "%A %H:%M:%S"
 msgstr "%Aの%k:%M:%S"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:309
+#: ../modules/itip-formatter/itip-view.c:302
 msgid "%A %l:%M %p"
 msgstr "%Aの%p%l:%M"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:313
+#: ../modules/itip-formatter/itip-view.c:306
 msgid "%A %l:%M:%S %p"
 msgstr "%Aの%p%l:%M:%S"
 
 #. strftime format of a weekday and a date
 #. * without a year.
-#: ../modules/itip-formatter/itip-view.c:322
+#: ../modules/itip-formatter/itip-view.c:315
 msgid "%A, %B %e"
 msgstr "%B%e日 %A"
 
 #. strftime format of a weekday, a date
 #. * without a year and a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:328
+#: ../modules/itip-formatter/itip-view.c:321
 msgid "%A, %B %e %H:%M"
 msgstr "%B%e日 %A %k:%M"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:332
+#: ../modules/itip-formatter/itip-view.c:325
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%B%e日 %A %k:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:337
+#: ../modules/itip-formatter/itip-view.c:330
 msgid "%A, %B %e %l:%M %p"
 msgstr "%B%e日 %A %p%l:%M"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:341
+#: ../modules/itip-formatter/itip-view.c:334
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%B%e日 %A %p%l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../modules/itip-formatter/itip-view.c:347
+#: ../modules/itip-formatter/itip-view.c:340
 msgid "%A, %B %e, %Y"
 msgstr "%Y年%B%e日 %A"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:352
+#: ../modules/itip-formatter/itip-view.c:345
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%Y年%B%e日 %A %k:%M"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:356
+#: ../modules/itip-formatter/itip-view.c:349
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%Y年%B%e日 %A %k:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:361
+#: ../modules/itip-formatter/itip-view.c:354
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%Y年%B%e日 %A %p%l:%M"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:365
+#: ../modules/itip-formatter/itip-view.c:358
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Y年%B%e日 %A %p%l:%M:%S"
 
-#: ../modules/itip-formatter/itip-view.c:403
-#: ../modules/itip-formatter/itip-view.c:404
-#: ../modules/itip-formatter/itip-view.c:493
-#: ../modules/itip-formatter/itip-view.c:494
-#: ../modules/itip-formatter/itip-view.c:583
+#: ../modules/itip-formatter/itip-view.c:396
+#: ../modules/itip-formatter/itip-view.c:397
+#: ../modules/itip-formatter/itip-view.c:486
+#: ../modules/itip-formatter/itip-view.c:487
+#: ../modules/itip-formatter/itip-view.c:576
 msgid "An unknown person"
 msgstr "身元が不明な人"
 
-#: ../modules/itip-formatter/itip-view.c:408
-#: ../modules/itip-formatter/itip-view.c:498
-#: ../modules/itip-formatter/itip-view.c:587
+#: ../modules/itip-formatter/itip-view.c:401
+#: ../modules/itip-formatter/itip-view.c:491
+#: ../modules/itip-formatter/itip-view.c:580
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "%s さんに代わって返信してください"
 
-#: ../modules/itip-formatter/itip-view.c:410
-#: ../modules/itip-formatter/itip-view.c:500
-#: ../modules/itip-formatter/itip-view.c:589
+#: ../modules/itip-formatter/itip-view.c:403
+#: ../modules/itip-formatter/itip-view.c:493
+#: ../modules/itip-formatter/itip-view.c:582
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "%s に代わって受信しました"
 
-#: ../modules/itip-formatter/itip-view.c:415
+#: ../modules/itip-formatter/itip-view.c:408
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s さんは %s さんをとおして次の会議召集通知を公開しました:"
 
-#: ../modules/itip-formatter/itip-view.c:417
+#: ../modules/itip-formatter/itip-view.c:410
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s さんが次の会議召集通知を公開しました:"
 
-#: ../modules/itip-formatter/itip-view.c:422
+#: ../modules/itip-formatter/itip-view.c:415
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s さんが次の会議をあなたに委任しました:"
 
-#: ../modules/itip-formatter/itip-view.c:425
+#: ../modules/itip-formatter/itip-view.c:418
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s さんは %s さんをとおして次の会議への出席を要求してきました:"
 
-#: ../modules/itip-formatter/itip-view.c:427
+#: ../modules/itip-formatter/itip-view.c:420
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s さんが会議への出席を要求しています:"
 
-#: ../modules/itip-formatter/itip-view.c:433
+#: ../modules/itip-formatter/itip-view.c:426
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s さんは %s さんをとおして既存の会議への参加を希望しています:"
 
-#: ../modules/itip-formatter/itip-view.c:435
+#: ../modules/itip-formatter/itip-view.c:428
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s さんは既存の会議への参加を希望しています:"
 
-#: ../modules/itip-formatter/itip-view.c:439
+#: ../modules/itip-formatter/itip-view.c:432
 #, c-format
 msgid "%s through %s wishes to receive the latest information for the following meeting:"
 msgstr "%s さんは %s さんを通して次の会議の最新情報を希望しています:"
 
-#: ../modules/itip-formatter/itip-view.c:441
+#: ../modules/itip-formatter/itip-view.c:434
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s さんは次の会議の最新情報を希望しています:"
 
-#: ../modules/itip-formatter/itip-view.c:445
+#: ../modules/itip-formatter/itip-view.c:438
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s さんがは %s さんを通して次の会議の返事を返してきました:"
 
-#: ../modules/itip-formatter/itip-view.c:447
+#: ../modules/itip-formatter/itip-view.c:440
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s さんが次の会議の返事を返してきました:"
 
-#: ../modules/itip-formatter/itip-view.c:451
+#: ../modules/itip-formatter/itip-view.c:444
 #, c-format
 msgid "%s through %s has canceled the following meeting:"
 msgstr "%s さんは %s さんをとおして次の会議をキャンセルしました:"
 
-#: ../modules/itip-formatter/itip-view.c:453
+#: ../modules/itip-formatter/itip-view.c:446
 #, c-format
 msgid "%s has canceled the following meeting:"
 msgstr "%s さんが次の会議をキャンセルしました:"
 
-#: ../modules/itip-formatter/itip-view.c:457
+#: ../modules/itip-formatter/itip-view.c:450
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s さんは %s さんを通して会議の変更を提案してきました:"
 
-#: ../modules/itip-formatter/itip-view.c:459
+#: ../modules/itip-formatter/itip-view.c:452
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s さんが会議の変更を提案してきました:"
 
-#: ../modules/itip-formatter/itip-view.c:463
+#: ../modules/itip-formatter/itip-view.c:456
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s さんは %s さんをとおして会議の変更を断ってきました:"
 
-#: ../modules/itip-formatter/itip-view.c:465
+#: ../modules/itip-formatter/itip-view.c:458
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s さんが会議の変更を断ってきました:"
 
-#: ../modules/itip-formatter/itip-view.c:505
+#: ../modules/itip-formatter/itip-view.c:498
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s さんは %s さんが次のタスクを公開したと考えています:"
 
-#: ../modules/itip-formatter/itip-view.c:507
+#: ../modules/itip-formatter/itip-view.c:500
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s さんが次のタスク情報を公開しました:"
 
-#: ../modules/itip-formatter/itip-view.c:512
+#: ../modules/itip-formatter/itip-view.c:505
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s さんが次のタスクに対する %s の割り当てを要求しています:"
 
-#: ../modules/itip-formatter/itip-view.c:515
+#: ../modules/itip-formatter/itip-view.c:508
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s さんは %s さんをとおしてあなたにタスクを割り当てました:"
 
-#: ../modules/itip-formatter/itip-view.c:517
+#: ../modules/itip-formatter/itip-view.c:510
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s さんはタスクをあなたに割り当てました:"
 
-#: ../modules/itip-formatter/itip-view.c:523
+#: ../modules/itip-formatter/itip-view.c:516
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s さんは %s さんをとおして既存のタスクへの追加を希望しています:"
 
-#: ../modules/itip-formatter/itip-view.c:525
+#: ../modules/itip-formatter/itip-view.c:518
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s さんは既存のタスクへの追加を希望しています:"
 
-#: ../modules/itip-formatter/itip-view.c:529
+#: ../modules/itip-formatter/itip-view.c:522
 #, c-format
 msgid "%s through %s wishes to receive the latest information for the following assigned task:"
 msgstr "%s さんは %s さんを通して次のタスク割り当てに関する最新情報を希望しています:"
 
-#: ../modules/itip-formatter/itip-view.c:531
+#: ../modules/itip-formatter/itip-view.c:524
 #, c-format
 msgid "%s wishes to receive the latest information for the following assigned task:"
 msgstr "%s さんは次のタスク割り当てに関する最新情報を希望しています:"
 
-#: ../modules/itip-formatter/itip-view.c:535
+#: ../modules/itip-formatter/itip-view.c:528
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr "%s さんは %s さんを通して次のタスク割り当てに対する回答を返してきました:"
 
-#: ../modules/itip-formatter/itip-view.c:537
+#: ../modules/itip-formatter/itip-view.c:530
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s さんは次のタスク割り当てに対する回答を返してきました:"
 
-#: ../modules/itip-formatter/itip-view.c:541
+#: ../modules/itip-formatter/itip-view.c:534
 #, c-format
 msgid "%s through %s has canceled the following assigned task:"
 msgstr "%s さんは %s さんを通して次のタスクをキャンセルしました:"
 
-#: ../modules/itip-formatter/itip-view.c:543
+#: ../modules/itip-formatter/itip-view.c:536
 #, c-format
 msgid "%s has canceled the following assigned task:"
 msgstr "%s さんは次のタスクをキャンセルしました:"
 
-#: ../modules/itip-formatter/itip-view.c:547
+#: ../modules/itip-formatter/itip-view.c:540
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "%s さんは %s さんを通してタスク割り当ての変更を提案してきました:"
 
-#: ../modules/itip-formatter/itip-view.c:549
+#: ../modules/itip-formatter/itip-view.c:542
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s さんがタスク割り当ての変更を提案してきました:"
 
-#: ../modules/itip-formatter/itip-view.c:553
+#: ../modules/itip-formatter/itip-view.c:546
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s さんは %s さんを通して次のタスクを辞退しました:"
 
-#: ../modules/itip-formatter/itip-view.c:555
+#: ../modules/itip-formatter/itip-view.c:548
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s さんは次のタスクを辞退しました:"
 
-#: ../modules/itip-formatter/itip-view.c:594
+#: ../modules/itip-formatter/itip-view.c:587
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s さんは %s さんを通して次のメモを公開しました:"
 
-#: ../modules/itip-formatter/itip-view.c:596
+#: ../modules/itip-formatter/itip-view.c:589
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s さんが次のメモ情報を公開しました:"
 
-#: ../modules/itip-formatter/itip-view.c:601
+#: ../modules/itip-formatter/itip-view.c:594
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s さんは %s さんを通して既存のメモへの追加を希望しています:"
 
-#: ../modules/itip-formatter/itip-view.c:603
+#: ../modules/itip-formatter/itip-view.c:596
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s さんは既存のメモへの追加を希望しています:"
 
-#: ../modules/itip-formatter/itip-view.c:607
+#: ../modules/itip-formatter/itip-view.c:600
 #, c-format
 msgid "%s through %s has canceled the following shared memo:"
 msgstr "%s さんは %s さんを通して次の共有メモをキャンセルしました:"
 
-#: ../modules/itip-formatter/itip-view.c:609
+#: ../modules/itip-formatter/itip-view.c:602
 #, c-format
 msgid "%s has canceled the following shared memo:"
 msgstr "%s さんは次の共有メモをキャンセルしました:"
 
-#: ../modules/itip-formatter/itip-view.c:682
+#: ../modules/itip-formatter/itip-view.c:675
 msgid "All day:"
 msgstr "終日:"
 
-#: ../modules/itip-formatter/itip-view.c:688
+#: ../modules/itip-formatter/itip-view.c:681
 msgid "Start day:"
 msgstr "開始日:"
 
-#: ../modules/itip-formatter/itip-view.c:688
-#: ../modules/itip-formatter/itip-view.c:1490
+#: ../modules/itip-formatter/itip-view.c:681
+#: ../modules/itip-formatter/itip-view.c:1504
 msgid "Start time:"
 msgstr "開始時刻:"
 
-#: ../modules/itip-formatter/itip-view.c:697
+#: ../modules/itip-formatter/itip-view.c:690
 msgid "End day:"
 msgstr "終了日:"
 
-#: ../modules/itip-formatter/itip-view.c:697
-#: ../modules/itip-formatter/itip-view.c:1491
+#: ../modules/itip-formatter/itip-view.c:690
+#: ../modules/itip-formatter/itip-view.c:1505
 msgid "End time:"
 msgstr "終了時刻:"
 
-#: ../modules/itip-formatter/itip-view.c:1016
+#: ../modules/itip-formatter/itip-view.c:1030
 msgid "Ope_n Calendar"
 msgstr "カレンダーを開く(_N)"
 
-#: ../modules/itip-formatter/itip-view.c:1019
+#: ../modules/itip-formatter/itip-view.c:1033
 msgid "_Decline all"
 msgstr "すべて辞退する(_D)"
 
-#: ../modules/itip-formatter/itip-view.c:1022
+#: ../modules/itip-formatter/itip-view.c:1036
 msgid "_Decline"
 msgstr "辞退する(_D)"
 
-#: ../modules/itip-formatter/itip-view.c:1025
+#: ../modules/itip-formatter/itip-view.c:1039
 msgid "_Tentative all"
 msgstr "すべて仮承認する(_T)"
 
-#: ../modules/itip-formatter/itip-view.c:1028
+#: ../modules/itip-formatter/itip-view.c:1042
 msgid "_Tentative"
 msgstr "仮承認する(_T)"
 
-#: ../modules/itip-formatter/itip-view.c:1031
+#: ../modules/itip-formatter/itip-view.c:1045
 msgid "Acce_pt all"
 msgstr "すべて受諾する(_P)"
 
-#: ../modules/itip-formatter/itip-view.c:1034
+#: ../modules/itip-formatter/itip-view.c:1048
 msgid "Acce_pt"
 msgstr "受諾する(_P)"
 
-#: ../modules/itip-formatter/itip-view.c:1037
+#: ../modules/itip-formatter/itip-view.c:1051
 msgid "Send _Information"
 msgstr "情報を送信する(_I)"
 
-#: ../modules/itip-formatter/itip-view.c:1040
+#: ../modules/itip-formatter/itip-view.c:1054
 msgid "_Update Attendee Status"
 msgstr "出席者の状態を更新する(_U)"
 
-#: ../modules/itip-formatter/itip-view.c:1043
+#: ../modules/itip-formatter/itip-view.c:1057
 msgid "_Update"
 msgstr "更新する(_U)"
 
-#: ../modules/itip-formatter/itip-view.c:1493
-#: ../modules/itip-formatter/itip-view.c:1541
-#: ../modules/itip-formatter/itip-view.c:1612
+#: ../modules/itip-formatter/itip-view.c:1507
+#: ../modules/itip-formatter/itip-view.c:1555
+#: ../modules/itip-formatter/itip-view.c:1626
 msgid "Comment:"
 msgstr "コメント:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1529
+#: ../modules/itip-formatter/itip-view.c:1543
 msgid "Send reply to sender"
 msgstr "差出人に返信する"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1544
+#: ../modules/itip-formatter/itip-view.c:1558
 msgid "Send _updates to attendees"
 msgstr "更新情報を出席者へ送信する(_U)"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1547
+#: ../modules/itip-formatter/itip-view.c:1561
 msgid "_Apply to all instances"
 msgstr "すべてのインスタンスに適用する(_A)"
 
-#: ../modules/itip-formatter/itip-view.c:1548
+#: ../modules/itip-formatter/itip-view.c:1562
 msgid "Show time as _free"
 msgstr "予定なしの時間を表示する(_F)"
 
-#: ../modules/itip-formatter/itip-view.c:1549
+#: ../modules/itip-formatter/itip-view.c:1563
 msgid "_Preserve my reminder"
 msgstr "リマインダーを保存しておく(_P)"
 
-#: ../modules/itip-formatter/itip-view.c:1550
+#: ../modules/itip-formatter/itip-view.c:1564
 msgid "_Inherit reminder"
 msgstr "リマインダーを継承する(_I)"
 
-#: ../modules/itip-formatter/itip-view.c:1880
+#: ../modules/itip-formatter/itip-view.c:1894
 msgid "_Tasks:"
 msgstr "タスク(_T):"
 
-#: ../modules/itip-formatter/itip-view.c:1883
+#: ../modules/itip-formatter/itip-view.c:1897
 msgid "_Memos:"
 msgstr "メモ(_M):"
 
-#: ../modules/itip-formatter/itip-view.c:3111
+#: ../modules/itip-formatter/itip-view.c:3125
 msgid "Sa_ve"
 msgstr "保存(_V)"
 
-#: ../modules/itip-formatter/itip-view.c:3571
-#: ../modules/itip-formatter/itip-view.c:5016
+#: ../modules/itip-formatter/itip-view.c:3585
+#: ../modules/itip-formatter/itip-view.c:5032
 msgid "Attendee status updated"
 msgstr "出席状況を更新しました"
 
-#: ../modules/itip-formatter/itip-view.c:3750
+#: ../modules/itip-formatter/itip-view.c:3764
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "カレンダー '%s' の予定がこの会議の時間と重なっています"
 
-#: ../modules/itip-formatter/itip-view.c:3779
+#: ../modules/itip-formatter/itip-view.c:3793
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "カレンダー '%s' の中に予定がありました"
 
-#: ../modules/itip-formatter/itip-view.c:3892
+#: ../modules/itip-formatter/itip-view.c:3906
 msgid "Unable to find any calendars"
 msgstr "カレンダーが見つかりませんでした"
 
-#: ../modules/itip-formatter/itip-view.c:3900
+#: ../modules/itip-formatter/itip-view.c:3914
 msgid "Unable to find this meeting in any calendar"
 msgstr "この会議の予定を記録したカレンダーが見つかりませんでした"
 
-#: ../modules/itip-formatter/itip-view.c:3905
+#: ../modules/itip-formatter/itip-view.c:3919
 msgid "Unable to find this task in any task list"
 msgstr "このタスクを記録したタスクの一覧が見つかりませんでした"
 
-#: ../modules/itip-formatter/itip-view.c:3910
+#: ../modules/itip-formatter/itip-view.c:3924
 msgid "Unable to find this memo in any memo list"
 msgstr "このタスクを記録したタスクの一覧が見つかりませんでした"
 
-#: ../modules/itip-formatter/itip-view.c:4254
+#: ../modules/itip-formatter/itip-view.c:4268
 msgid "Opening the calendar. Please wait..."
 msgstr "カレンダーを開いています。お待ちください..."
 
 # 要再考
-#: ../modules/itip-formatter/itip-view.c:4259
+#: ../modules/itip-formatter/itip-view.c:4273
 msgid "Searching for an existing version of this appointment"
 msgstr "この予定の既存バージョンの検索"
 
-#: ../modules/itip-formatter/itip-view.c:4652
+#: ../modules/itip-formatter/itip-view.c:4668
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "アイテムをカレンダー '%s' に保存できません (%s)"
 
-#: ../modules/itip-formatter/itip-view.c:4667
+#: ../modules/itip-formatter/itip-view.c:4683
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "承認したものとしてカレンダー '%s' に保存しました"
 
-#: ../modules/itip-formatter/itip-view.c:4672
+#: ../modules/itip-formatter/itip-view.c:4688
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "仮承認したものとしてカレンダー '%s' に保存しました"
 
-#: ../modules/itip-formatter/itip-view.c:4678
+#: ../modules/itip-formatter/itip-view.c:4694
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "辞退したものとしてカレンダー '%s' に保存しました"
 
-#: ../modules/itip-formatter/itip-view.c:4684
+#: ../modules/itip-formatter/itip-view.c:4700
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "キャンセルしたものとしてカレンダー '%s' に保存しました"
 
-#: ../modules/itip-formatter/itip-view.c:4705
-#: ../modules/itip-formatter/itip-view.c:5162
-#: ../modules/itip-formatter/itip-view.c:5268
+#: ../modules/itip-formatter/itip-view.c:4721
+#: ../modules/itip-formatter/itip-view.c:5178
+#: ../modules/itip-formatter/itip-view.c:5284
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "カレンダーの変更を保存しています。お待ちください..."
 
-#: ../modules/itip-formatter/itip-view.c:4746
+#: ../modules/itip-formatter/itip-view.c:4762
 msgid "Unable to parse item"
 msgstr "アイテムを解析できません"
 
-#: ../modules/itip-formatter/itip-view.c:4939
+#: ../modules/itip-formatter/itip-view.c:4955
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organizer が %s への委譲を削除しました "
 
-#: ../modules/itip-formatter/itip-view.c:4956
+#: ../modules/itip-formatter/itip-view.c:4972
 msgid "Sent a cancelation notice to the delegate"
 msgstr "DeleGate へキャンセル通知を送信しました"
 
-#: ../modules/itip-formatter/itip-view.c:4960
+#: ../modules/itip-formatter/itip-view.c:4976
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "DeleGate へキャンセル通知を送信できませんでした"
 
-#: ../modules/itip-formatter/itip-view.c:5008
+#: ../modules/itip-formatter/itip-view.c:5024
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "出席者 %s を更新できません"
 
-#: ../modules/itip-formatter/itip-view.c:5051
+#: ../modules/itip-formatter/itip-view.c:5067
 msgid "The meeting is invalid and cannot be updated"
 msgstr "この会議は不正で更新できません"
 
-#: ../modules/itip-formatter/itip-view.c:5127
+#: ../modules/itip-formatter/itip-view.c:5143
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "不正なステータスのため出席状況が更新できませんでした"
 
-#: ../modules/itip-formatter/itip-view.c:5199
-#: ../modules/itip-formatter/itip-view.c:5238
+#: ../modules/itip-formatter/itip-view.c:5215
+#: ../modules/itip-formatter/itip-view.c:5254
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "アイテムがまだ存在していないので出席状況を更新できませんでした"
 
-#: ../modules/itip-formatter/itip-view.c:5301
+#: ../modules/itip-formatter/itip-view.c:5317
 msgid "Meeting information sent"
 msgstr "会議の情報の送信"
 
-#: ../modules/itip-formatter/itip-view.c:5306
+#: ../modules/itip-formatter/itip-view.c:5322
 msgid "Task information sent"
 msgstr "タスク情報の送信"
 
-#: ../modules/itip-formatter/itip-view.c:5311
+#: ../modules/itip-formatter/itip-view.c:5327
 msgid "Memo information sent"
 msgstr "メモ情報の送信"
 
-#: ../modules/itip-formatter/itip-view.c:5322
+#: ../modules/itip-formatter/itip-view.c:5338
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "会議が存在しないので、その会議の情報を送信できません"
 
-#: ../modules/itip-formatter/itip-view.c:5327
+#: ../modules/itip-formatter/itip-view.c:5343
 msgid "Unable to send task information, the task does not exist"
 msgstr "タスクが存在しないので、そのタスクの情報を送信できません"
 
-#: ../modules/itip-formatter/itip-view.c:5332
+#: ../modules/itip-formatter/itip-view.c:5348
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "メモが存在しないので、そのメモの情報を送信できません"
 
 #. Translators: This is a default filename for a calendar.
-#: ../modules/itip-formatter/itip-view.c:5397
+#: ../modules/itip-formatter/itip-view.c:5413
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5402
+#: ../modules/itip-formatter/itip-view.c:5418
 msgid "Save Calendar"
 msgstr "カレンダーを保存"
 
-#: ../modules/itip-formatter/itip-view.c:5451
-#: ../modules/itip-formatter/itip-view.c:5464
+#: ../modules/itip-formatter/itip-view.c:5467
+#: ../modules/itip-formatter/itip-view.c:5480
 msgid "The calendar attached is not valid"
 msgstr "添付されたカレンダーが不正です"
 
-#: ../modules/itip-formatter/itip-view.c:5452
-#: ../modules/itip-formatter/itip-view.c:5465
+#: ../modules/itip-formatter/itip-view.c:5468
+#: ../modules/itip-formatter/itip-view.c:5481
 msgid "The message claims to contain a calendar, but the calendar is not a valid iCalendar."
 msgstr "メッセージにカレンダーが添付されていますが、そのカレンダーは妥当な iCalendar 形式ではありません。"
 
-#: ../modules/itip-formatter/itip-view.c:5507
-#: ../modules/itip-formatter/itip-view.c:5537
-#: ../modules/itip-formatter/itip-view.c:5638
+#: ../modules/itip-formatter/itip-view.c:5523
+#: ../modules/itip-formatter/itip-view.c:5553
+#: ../modules/itip-formatter/itip-view.c:5654
 msgid "The item in the calendar is not valid"
 msgstr "カレンダーのアイテムが不正です"
 
-#: ../modules/itip-formatter/itip-view.c:5508
-#: ../modules/itip-formatter/itip-view.c:5538
-#: ../modules/itip-formatter/itip-view.c:5639
+#: ../modules/itip-formatter/itip-view.c:5524
+#: ../modules/itip-formatter/itip-view.c:5554
+#: ../modules/itip-formatter/itip-view.c:5655
 msgid "The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"
 msgstr "メッセージにカレンダーが添付されていますが、そのカレンダーにはイベントまたタスク、スケジュールが含まれていません。"
 
-#: ../modules/itip-formatter/itip-view.c:5553
+#: ../modules/itip-formatter/itip-view.c:5569
 msgid "The calendar attached contains multiple items"
 msgstr "添付されたカレンダーには複数のアイテムが含まれています"
 
-#: ../modules/itip-formatter/itip-view.c:5554
+#: ../modules/itip-formatter/itip-view.c:5570
 msgid "To process all of these items, the file should be saved and the calendar imported"
 msgstr "これらのアイテムのすべてを処理するには、ファイルを保存してカレンダーをインポートしてください"
 
-#: ../modules/itip-formatter/itip-view.c:6055
+#: ../modules/itip-formatter/itip-view.c:6072
 msgctxt "cal-itip"
 msgid "None"
 msgstr "なし"
 
-#: ../modules/itip-formatter/itip-view.c:6071
+#: ../modules/itip-formatter/itip-view.c:6088
 msgid "Tentatively Accepted"
 msgstr "仮承認済"
 
-#: ../modules/itip-formatter/itip-view.c:6231
+#: ../modules/itip-formatter/itip-view.c:6248
 msgid "This meeting recurs"
 msgstr "この会議を繰り返す"
 
-#: ../modules/itip-formatter/itip-view.c:6234
+#: ../modules/itip-formatter/itip-view.c:6251
 msgid "This task recurs"
 msgstr "このタスクを繰り返す"
 
-#: ../modules/itip-formatter/itip-view.c:6237
+#: ../modules/itip-formatter/itip-view.c:6254
 msgid "This memo recurs"
 msgstr "このメモを繰り返す"
 
@@ -16760,21 +17286,21 @@ msgstr "この会議は委任されました"
 msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
 msgstr "'{0}' さんが会議を委任しました。委任された '{1}' さんを追加しますか?"
 
-#: ../modules/itip-formatter/plugin/config-ui.c:82
+#: ../modules/itip-formatter/plugin/config-ui.c:81
 msgid "Meeting Invitations"
 msgstr "会議への招待"
 
-#: ../modules/itip-formatter/plugin/config-ui.c:108
+#: ../modules/itip-formatter/plugin/config-ui.c:107
 msgid "_Delete message after acting"
 msgstr "会議開催後にメッセージを削除する(_D)"
 
-#: ../modules/itip-formatter/plugin/config-ui.c:122
-#: ../modules/itip-formatter/plugin/config-ui.c:153
+#: ../modules/itip-formatter/plugin/config-ui.c:121
+#: ../modules/itip-formatter/plugin/config-ui.c:152
 msgid "Conflict Search"
 msgstr "重複するイベントの検索"
 
 #. Source selector
-#: ../modules/itip-formatter/plugin/config-ui.c:137
+#: ../modules/itip-formatter/plugin/config-ui.c:136
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "重複する会議を検索するカレンダーを選択してください:"
 
@@ -16786,117 +17312,116 @@ msgstr "Itip フォーマッタ"
 msgid "Display \"text/calendar\" MIME parts in mail messages."
 msgstr "メールメッセージの中の MIMEの \"text/calendar\" 形式のパーツを表示します"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:252
-#, fuzzy
+#: ../modules/mail-config/e-mail-config-google-summary.c:251
 msgid "Google Features"
-msgstr "Google カレンダー"
+msgstr "Google Features"
 
 # 訳注: 「Google Calendar」は固有名詞なので、その表記に従い、
 # 「カレンダ」ではなく、「カレンダー」とします
-#: ../modules/mail-config/e-mail-config-google-summary.c:261
+#: ../modules/mail-config/e-mail-config-google-summary.c:260
 msgid "Add Google Ca_lendar to this account"
 msgstr "Google カレンダーをこのアカウントに追加(_L)"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:269
+#: ../modules/mail-config/e-mail-config-google-summary.c:268
 msgid "Add Google Con_tacts to this account"
 msgstr "Google コンタクトをこのアカウントに追加(_T)"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:277
+#: ../modules/mail-config/e-mail-config-google-summary.c:276
 msgid "You may need to enable IMAP access"
 msgstr "IMAP アクセスを有効にする必要があるかもしれません"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:246
-#: ../modules/mail-config/e-mail-config-local-accounts.c:292
+#: ../modules/mail-config/e-mail-config-local-accounts.c:245
+#: ../modules/mail-config/e-mail-config-local-accounts.c:291
 msgid "Mail _Directory:"
 msgstr "保存先のフォルダー(_D):"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:247
+#: ../modules/mail-config/e-mail-config-local-accounts.c:246
 msgid "Choose a MH mail directory"
 msgstr "MH メールディレクトリを選択してください"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:269
+#: ../modules/mail-config/e-mail-config-local-accounts.c:268
 msgid "Local Delivery _File:"
 msgstr "ローカル配送ファイル(_F):"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:270
+#: ../modules/mail-config/e-mail-config-local-accounts.c:269
 msgid "Choose a local delivery file"
 msgstr "ローカル配送ファイルを選択してください"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:293
+#: ../modules/mail-config/e-mail-config-local-accounts.c:292
 msgid "Choose a Maildir mail directory"
 msgstr "Maildir メールディレクトリを選択してください"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:315
+#: ../modules/mail-config/e-mail-config-local-accounts.c:314
 msgid "Spool _File:"
 msgstr "スプールファイル(_F):"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:316
+#: ../modules/mail-config/e-mail-config-local-accounts.c:315
 msgid "Choose a mbox spool file"
 msgstr "mbox スプールファイルを選択してください"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:338
+#: ../modules/mail-config/e-mail-config-local-accounts.c:337
 msgid "Spool _Directory:"
 msgstr "スプール用ディレクトリ(_D):"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:339
+#: ../modules/mail-config/e-mail-config-local-accounts.c:338
 msgid "Choose a mbox spool directory"
 msgstr "mbox スプール用ディレクトリを選択してください"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:137
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:54
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:80
-#: ../modules/plugin-manager/evolution-plugin-manager.c:159
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:136
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:53
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:79
+#: ../modules/plugin-manager/evolution-plugin-manager.c:158
 msgid "Configuration"
 msgstr "設定"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:155
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:98
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:154
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:97
 #: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_Server:"
 msgstr "サーバー(_S):"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:169
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:111
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:168
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:110
 msgid "_Port:"
 msgstr "ポート番号(_P):"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:181
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:227
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:180
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:226
 msgid "User_name:"
 msgstr "ユーザー名(_N):"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:214
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:148
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:213
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:147
 msgid "Encryption _method:"
 msgstr "暗号化方法(_M):"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:229
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:163
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:228
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:162
 msgid "STARTTLS after connecting"
 msgstr "接続後に STARTTLS"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:233
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:167
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:232
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:166
 msgid "SSL on a dedicated port"
 msgstr "専用のポートで SSL"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:70
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:69
 msgid "_Use custom binary, instead of 'sendmail'"
 msgstr "sendmail の代わりに独自バイナリーを利用する(_U)"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:74
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:73
 msgid "_Custom binary:"
 msgstr "独自バイナリー(_C):"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:91
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:90
 msgid "U_se custom arguments"
 msgstr "独自の引数を使用する(_S)"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:95
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:94
 msgid "Cus_tom arguments:"
 msgstr "独自の引数(_T):"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:113
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:112
 msgid ""
 "Default arguments are '-i -f %F -- %R', where\n"
 "   %F - stands for the From address\n"
@@ -16906,523 +17431,529 @@ msgstr ""
 "   %F には From アドレス、\n"
 "   %R には受信者アドレスが入ります"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:128
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:127
 msgid "Send mail also when in offline _mode"
 msgstr "オフラインモードでもメールを送る(_M)"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:123
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:122
 msgid "Ser_ver requires authentication"
 msgstr "サーバー認証を行う(_V)"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:209
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:208
 msgid "T_ype:"
 msgstr "種別(_Y):"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:247
-#, fuzzy
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:246
 msgid "Yahoo! Features"
-msgstr "IMAP の拡張"
+msgstr "Yahoo! Features"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:256
-#, fuzzy
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:255
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
-msgstr "Yahoo!カレンダーをこのアカウントに追加"
+msgstr "Yahoo!カレンダーとタスクをアカウントに追加する(_L)"
 
-#: ../modules/mail/e-mail-attachment-handler.c:425
+#: ../modules/mail/e-mail-attachment-handler.c:424
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "%d 個の添付メッセージ"
 
-#: ../modules/mail/e-mail-shell-backend.c:237
+#: ../modules/mail/e-mail-shell-backend.c:314
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "メッセージ(_M)"
 
-#: ../modules/mail/e-mail-shell-backend.c:239
+#: ../modules/mail/e-mail-shell-backend.c:316
 msgid "Compose a new mail message"
 msgstr "新しいメッセージを作成します"
 
-#: ../modules/mail/e-mail-shell-backend.c:247
+#: ../modules/mail/e-mail-shell-backend.c:324
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "メールのアカウント(_U)"
 
-#: ../modules/mail/e-mail-shell-backend.c:249
+#: ../modules/mail/e-mail-shell-backend.c:326
 msgid "Create a new mail account"
 msgstr "新しいメールアカウントを作成します"
 
-#: ../modules/mail/e-mail-shell-backend.c:254
+#: ../modules/mail/e-mail-shell-backend.c:331
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "メールのフォルダー(_F)"
 
-#: ../modules/mail/e-mail-shell-backend.c:256
+#: ../modules/mail/e-mail-shell-backend.c:333
 msgid "Create a new mail folder"
 msgstr "新しいメールフォルダーを作成します"
 
-#: ../modules/mail/e-mail-shell-backend.c:551
+#: ../modules/mail/e-mail-shell-backend.c:644
 msgid "Mail Accounts"
 msgstr "メールのアカウント"
 
-#: ../modules/mail/e-mail-shell-backend.c:560
+#: ../modules/mail/e-mail-shell-backend.c:653
 msgid "Mail Preferences"
 msgstr "メールの設定"
 
-#: ../modules/mail/e-mail-shell-backend.c:569
+#: ../modules/mail/e-mail-shell-backend.c:662
 msgid "Composer Preferences"
 msgstr "コンポーザーの設定"
 
-#: ../modules/mail/e-mail-shell-backend.c:578
+#: ../modules/mail/e-mail-shell-backend.c:672
 msgid "Network Preferences"
 msgstr "ネットワークの設定"
 
-#. Translators: The first item in the list, to be able to set rule: [Label] [is/is-not] [None]
-#: ../modules/mail/e-mail-shell-backend.c:867
-#, fuzzy
+#. Translators: The first item in the list, to be
+#. * able to set rule: [Label] [is/is-not] [None]
+#: ../modules/mail/e-mail-shell-backend.c:964
 msgctxt "label"
 msgid "None"
 msgstr "なし"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:659
+#: ../modules/mail/e-mail-shell-view-actions.c:670
 msgid "Marking messages as read..."
 msgstr "メッセージを既読にする..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1511
+#: ../modules/mail/e-mail-shell-view-actions.c:1512
 msgid "_Disable Account"
 msgstr "アカウントの無効化(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1513
+#: ../modules/mail/e-mail-shell-view-actions.c:1514
 msgid "Disable this account"
 msgstr "このアカウントの無効にする"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1520
+#: ../modules/mail/e-mail-shell-view-actions.c:1521
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "すべてのフォルダーで削除マークが付いたメッセージを完全に削除します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1527
+#: ../modules/mail/e-mail-shell-view-actions.c:1528
 msgid "Edit properties of this account"
 msgstr "このアカウントのプロパティを編集"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1532
-msgid "_Refresh"
-msgstr "更新(_R)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1534
+#: ../modules/mail/e-mail-shell-view-actions.c:1535
 msgid "Refresh list of folders of this account"
 msgstr "このアカウントのフォルダー一覧を更新します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1539
+#: ../modules/mail/e-mail-shell-view-actions.c:1540
 msgid "_Download Messages for Offline Usage"
 msgstr "メッセージのダウンロード(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1541
+#: ../modules/mail/e-mail-shell-view-actions.c:1542
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "オフラインで参照するために指定したアカウントやフォルダーにあるメッセージをダウンロードします"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1546
+#: ../modules/mail/e-mail-shell-view-actions.c:1547
 msgid "Fl_ush Outbox"
 msgstr "送信トレイのフラッシュ(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1553
+#: ../modules/mail/e-mail-shell-view-actions.c:1554
 msgid "_Copy Folder To..."
 msgstr "フォルダーのコピー(_C)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1555
+#: ../modules/mail/e-mail-shell-view-actions.c:1556
 msgid "Copy the selected folder into another folder"
 msgstr "選択したフォルダーを別のフォルダーへコピーします"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1562
+#: ../modules/mail/e-mail-shell-view-actions.c:1563
 msgid "Permanently remove this folder"
 msgstr "このフォルダーを完全に削除します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1567
+#: ../modules/mail/e-mail-shell-view-actions.c:1568
 msgid "E_xpunge"
 msgstr "抹消(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1569
+#: ../modules/mail/e-mail-shell-view-actions.c:1570
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "このフォルダーで削除マークが付いたメッセージを完全に削除します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1574
-#: ../modules/mail/e-mail-shell-view-actions.c:1674
+#: ../modules/mail/e-mail-shell-view-actions.c:1575
+#: ../modules/mail/e-mail-shell-view-actions.c:1675
 msgid "Mar_k All Messages as Read"
 msgstr "すべて既読にする(_K)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1576
-#: ../modules/mail/e-mail-shell-view-actions.c:1676
+#: ../modules/mail/e-mail-shell-view-actions.c:1577
+#: ../modules/mail/e-mail-shell-view-actions.c:1677
 msgid "Mark all messages in the folder as read"
 msgstr "フォルダーにあるすべてのメッセージに既読マークを付与します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1581
+#: ../modules/mail/e-mail-shell-view-actions.c:1582
 msgid "_Move Folder To..."
 msgstr "フォルダーの移動(_M)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1583
+#: ../modules/mail/e-mail-shell-view-actions.c:1584
 msgid "Move the selected folder into another folder"
 msgstr "選択したフォルダーを別のフォルダーへ移動します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1588
+#: ../modules/mail/e-mail-shell-view-actions.c:1589
 msgid "_New..."
 msgstr "新規(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1590
+#: ../modules/mail/e-mail-shell-view-actions.c:1591
 msgid "Create a new folder for storing mail"
 msgstr "メールを格納するための新しいフォルダーを生成します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1597
+#: ../modules/mail/e-mail-shell-view-actions.c:1598
 msgid "Change the properties of this folder"
 msgstr "このフォルダーの設定を変更します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1604
+#: ../modules/mail/e-mail-shell-view-actions.c:1605
 msgid "Refresh the folder"
 msgstr "フォルダーの中身を更新します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1611
+#: ../modules/mail/e-mail-shell-view-actions.c:1612
 msgid "Change the name of this folder"
 msgstr "このフォルダーの名前を変更します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1616
+#: ../modules/mail/e-mail-shell-view-actions.c:1617
 msgid "Select Message _Thread"
 msgstr "スレッドグループの選択(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1618
+#: ../modules/mail/e-mail-shell-view-actions.c:1619
 msgid "Select all messages in the same thread as the selected message"
 msgstr "選択したメッセージと同じスレッドのメッセージをすべて選択します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1623
+#: ../modules/mail/e-mail-shell-view-actions.c:1624
 msgid "Select Message S_ubthread"
 msgstr "サブスレッドの選択(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1625
+#: ../modules/mail/e-mail-shell-view-actions.c:1626
 msgid "Select all replies to the currently selected message"
 msgstr "選択したメッセージに対する返信をすべて選択します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1637
+#: ../modules/mail/e-mail-shell-view-actions.c:1638
 msgid "Empty _Trash"
 msgstr "ゴミ箱を空にする(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1639
+#: ../modules/mail/e-mail-shell-view-actions.c:1640
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "すべてのアカウントで削除マークが付いたメッセージを完全に削除します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1644
+#: ../modules/mail/e-mail-shell-view-actions.c:1645
 msgid "_New Label"
 msgstr "新しいラベル(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1653
+#: ../modules/mail/e-mail-shell-view-actions.c:1654
 msgid "N_one"
 msgstr "なし(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1667
+#: ../modules/mail/e-mail-shell-view-actions.c:1668
 msgid "_Manage Subscriptions"
 msgstr "購読を管理(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1669
-#: ../modules/mail/e-mail-shell-view-actions.c:1753
+#: ../modules/mail/e-mail-shell-view-actions.c:1670
+#: ../modules/mail/e-mail-shell-view-actions.c:1754
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "リモートサーバーにあるフォルダーの購読の開始/停止を切り替えます"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1681
-#: ../modules/mail/e-mail-shell-view-actions.c:1702
+#: ../modules/mail/e-mail-shell-view-actions.c:1682
+#: ../modules/mail/e-mail-shell-view-actions.c:1703
 msgid "Send / _Receive"
 msgstr "送受信(_R)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1683
+#: ../modules/mail/e-mail-shell-view-actions.c:1684
 msgid "Send queued items and retrieve new items"
 msgstr "キューにあるメッセージを送信して新着メッセージを受信します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1688
+#: ../modules/mail/e-mail-shell-view-actions.c:1689
 msgid "R_eceive All"
 msgstr "すべて受信(_E)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1690
+#: ../modules/mail/e-mail-shell-view-actions.c:1691
 msgid "Receive new items from all accounts"
 msgstr "すべてのアカウントの新しいアイテムを受信します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1695
+#: ../modules/mail/e-mail-shell-view-actions.c:1696
 msgid "_Send All"
 msgstr "すべて送信(_S)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1697
+#: ../modules/mail/e-mail-shell-view-actions.c:1698
 msgid "Send queued items in all accounts"
 msgstr "すべてのアカウントのキューにあるメッセージを送信します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1725
+#: ../modules/mail/e-mail-shell-view-actions.c:1726
 msgid "Cancel the current mail operation"
 msgstr "現在のメール操作を取り消します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1730
+#: ../modules/mail/e-mail-shell-view-actions.c:1731
 msgid "Collapse All _Threads"
 msgstr "すべてのスレッドを折り畳む(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1732
+#: ../modules/mail/e-mail-shell-view-actions.c:1733
 msgid "Collapse all message threads"
 msgstr "メッセージの全スレッドを折り畳んで表示します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1737
+#: ../modules/mail/e-mail-shell-view-actions.c:1738
 msgid "E_xpand All Threads"
 msgstr "すべてのスレッドを展開する(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1739
+#: ../modules/mail/e-mail-shell-view-actions.c:1740
 msgid "Expand all message threads"
 msgstr "メッセージの全スレッドを展開して表示します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1744
+#: ../modules/mail/e-mail-shell-view-actions.c:1745
 msgid "_Message Filters"
 msgstr "フィルターの定義(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1746
+#: ../modules/mail/e-mail-shell-view-actions.c:1747
 msgid "Create or edit rules for filtering new mail"
 msgstr "新着メールをフィルターするルールを作成したり編集します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1751
+#: ../modules/mail/e-mail-shell-view-actions.c:1752
 msgid "_Subscriptions..."
 msgstr "購読(_S)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1760
+#: ../modules/mail/e-mail-shell-view-actions.c:1761
 msgid "F_older"
 msgstr "フォルダー(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1767
+#: ../modules/mail/e-mail-shell-view-actions.c:1768
 msgid "_Label"
 msgstr "ラベル(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1784
+#: ../modules/mail/e-mail-shell-view-actions.c:1785
 msgid "C_reate Search Folder From Search..."
 msgstr "検索結果から仮想フォルダーの作成(_R)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1791
+#: ../modules/mail/e-mail-shell-view-actions.c:1792
 msgid "Search F_olders"
 msgstr "仮想フォルダーの編集(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1793
+#: ../modules/mail/e-mail-shell-view-actions.c:1794
 msgid "Create or edit search folder definitions"
 msgstr "仮想フォルダーの定義を作成したり編集します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1832
+#: ../modules/mail/e-mail-shell-view-actions.c:1833
 msgid "_New Folder..."
 msgstr "新しいフォルダー(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1860
+#: ../modules/mail/e-mail-shell-view-actions.c:1861
 msgid "Show Message _Preview"
 msgstr "メッセージのプレビュー表示(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1862
+#: ../modules/mail/e-mail-shell-view-actions.c:1863
 msgid "Show message preview pane"
 msgstr "メッセージのプレビューウィンドウを表示します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1868
+#: ../modules/mail/e-mail-shell-view-actions.c:1869
 msgid "Show _Deleted Messages"
 msgstr "削除したメッセージを表示(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1870
+#: ../modules/mail/e-mail-shell-view-actions.c:1871
 msgid "Show deleted messages with a line through them"
 msgstr "削除したメッセージを打ち消し線を付けて表示する"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1876
+#: ../modules/mail/e-mail-shell-view-actions.c:1877
 msgid "_Group By Threads"
 msgstr "スレッドでグループ化(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1878
+#: ../modules/mail/e-mail-shell-view-actions.c:1879
 msgid "Threaded message list"
 msgstr "メッセージの一覧をスレッド表示"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1884
+#: ../modules/mail/e-mail-shell-view-actions.c:1885
 msgid "_Unmatched Folder Enabled"
 msgstr "一致していないフォルダーの有効化(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1886
+#: ../modules/mail/e-mail-shell-view-actions.c:1887
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "一致していない仮想フォルダーの有効/無効を切り替えます"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1906
+#: ../modules/mail/e-mail-shell-view-actions.c:1907
 msgid "Show message preview below the message list"
 msgstr "メッセージの一覧の下にメッセージのプレビューを表示します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1913
+#: ../modules/mail/e-mail-shell-view-actions.c:1914
 msgid "Show message preview alongside the message list"
 msgstr "メッセージの一覧の横にメッセージのプレビューを表示します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1921
+#: ../modules/mail/e-mail-shell-view-actions.c:1922
 msgid "All Messages"
 msgstr "すべてのメッセージ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1928
+#: ../modules/mail/e-mail-shell-view-actions.c:1929
 msgid "Important Messages"
 msgstr "重要なメッセージ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1935
+#: ../modules/mail/e-mail-shell-view-actions.c:1936
 msgid "Last 5 Days' Messages"
 msgstr "この5日間のメッセージ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1942
+#: ../modules/mail/e-mail-shell-view-actions.c:1943
 msgid "Messages Not Junk"
 msgstr "ジャンクではないメッセージ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1949
+#: ../modules/mail/e-mail-shell-view-actions.c:1950
 msgid "Messages with Attachments"
 msgstr "添付ありのメッセージ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1956
+#: ../modules/mail/e-mail-shell-view-actions.c:1957
 msgid "No Label"
 msgstr "ラベルなしのメッセージ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1963
+#: ../modules/mail/e-mail-shell-view-actions.c:1964
 msgid "Read Messages"
 msgstr "既読のメッセージ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1970
+#: ../modules/mail/e-mail-shell-view-actions.c:1971
 msgid "Unread Messages"
 msgstr "未読のメッセージ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2022
+#: ../modules/mail/e-mail-shell-view-actions.c:2023
 msgid "Subject or Addresses contain"
 msgstr "件名またはアドレス"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2032
+#: ../modules/mail/e-mail-shell-view-actions.c:2033
 msgid "All Accounts"
 msgstr "すべてのアカウント"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2039
+#: ../modules/mail/e-mail-shell-view-actions.c:2040
 msgid "Current Account"
 msgstr "現在のアカウント"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2046
+#: ../modules/mail/e-mail-shell-view-actions.c:2047
 msgid "Current Folder"
 msgstr "現在のフォルダー"
 
-#: ../modules/mail/e-mail-shell-view.c:630
+#: ../modules/mail/e-mail-shell-view.c:636
 msgid "All Account Search"
 msgstr "すべてのアカウントの検索"
 
-#: ../modules/mail/e-mail-shell-view.c:734
+#: ../modules/mail/e-mail-shell-view.c:744
 msgid "Account Search"
 msgstr "アカウントの検索"
 
-#: ../modules/mail/e-mail-shell-view-private.c:988
+#: ../modules/mail/e-mail-shell-view-private.c:972
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] " 選択済 %d通、"
 
-#: ../modules/mail/e-mail-shell-view-private.c:997
-#: ../modules/mail/e-mail-shell-view-private.c:1014
+#: ../modules/mail/e-mail-shell-view-private.c:981
+#: ../modules/mail/e-mail-shell-view-private.c:998
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "削除済 %d通"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1023
-#: ../modules/mail/e-mail-shell-view-private.c:1029
+#: ../modules/mail/e-mail-shell-view-private.c:1007
+#: ../modules/mail/e-mail-shell-view-private.c:1013
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "ジャンク %d通"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1036
+#: ../modules/mail/e-mail-shell-view-private.c:1020
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "下書き %d通"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1042
+#: ../modules/mail/e-mail-shell-view-private.c:1026
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "未送信 %d通"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1048
+#: ../modules/mail/e-mail-shell-view-private.c:1032
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "送信済 %d通"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1060
+#: ../modules/mail/e-mail-shell-view-private.c:1044
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "未読 %d通, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1063
+#: ../modules/mail/e-mail-shell-view-private.c:1047
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "合計 %d通"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1084
+#: ../modules/mail/e-mail-shell-view-private.c:1068
 msgid "Trash"
 msgstr "ゴミ箱"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1522
+#: ../modules/mail/e-mail-shell-view-private.c:1505
 msgid "Send / Receive"
 msgstr "送信 / 受信"
 
-#: ../modules/mail/em-composer-prefs.c:447
+#: ../modules/mail/em-composer-prefs.c:443
+msgid "Select Folder to Add"
+msgstr "追加するフォルダーの選択"
+
+#: ../modules/mail/em-composer-prefs.c:888
+msgid "Folder"
+msgstr "フォルダー"
+
+#: ../modules/mail/em-composer-prefs.c:924
+msgid "Recipient"
+msgstr "宛先"
+
+#: ../modules/mail/em-composer-prefs.c:1195
 msgid "Language(s)"
 msgstr "言語"
 
-#: ../modules/mail/em-mailer-prefs.c:81
+#: ../modules/mail/em-mailer-prefs.c:80
 msgid "On exit, every time"
 msgstr "終了時、毎回"
 
-#: ../modules/mail/em-mailer-prefs.c:82
+#: ../modules/mail/em-mailer-prefs.c:81
 msgid "On exit, once per day"
 msgstr "終了時、日に一度"
 
-#: ../modules/mail/em-mailer-prefs.c:83
+#: ../modules/mail/em-mailer-prefs.c:82
 msgid "On exit, once per week"
 msgstr "終了時、週に一度"
 
-#: ../modules/mail/em-mailer-prefs.c:84
+#: ../modules/mail/em-mailer-prefs.c:83
 msgid "On exit, once per month"
 msgstr "終了時、月に一度"
 
-#: ../modules/mail/em-mailer-prefs.c:85
+#: ../modules/mail/em-mailer-prefs.c:84
 msgid "Immediately, on folder leave"
 msgstr "フォルダーから離れるとき、直ちに"
 
-#: ../modules/mail/em-mailer-prefs.c:356
+#: ../modules/mail/em-mailer-prefs.c:355
 msgid "Header"
 msgstr "ヘッダー"
 
-#: ../modules/mail/em-mailer-prefs.c:360
+#: ../modules/mail/em-mailer-prefs.c:359
 msgid "Contains Value"
 msgstr "ジャンクと判定する値"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1215
+#: ../modules/mail/em-mailer-prefs.c:1214
 msgid "_Date header:"
 msgstr "日付のヘッダー(_D):"
 
-#: ../modules/mail/em-mailer-prefs.c:1216
+#: ../modules/mail/em-mailer-prefs.c:1215
 msgid "Show _original header value"
 msgstr "元のヘッダーの値を表示(_O):"
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:142
+#: ../modules/mailto-handler/evolution-mailto-handler.c:140
 msgid "Do you want to make Evolution your default email client?"
 msgstr "Evolution をデフォルトのメーラーにしますか?"
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../modules/mdn/evolution-mdn.c:311
+#: ../modules/mdn/evolution-mdn.c:307
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "%s 宛の \"%s\" についてのメールは %s に読まれました。"
 
 #. Translators: %s is the subject of the email message.
-#: ../modules/mdn/evolution-mdn.c:378
+#: ../modules/mdn/evolution-mdn.c:374
 #, c-format
 msgid "Delivery Notification for \"%s\""
 msgstr "メール配送通知: \"%s\""
 
-#: ../modules/mdn/evolution-mdn.c:543
+#: ../modules/mdn/evolution-mdn.c:539
 #, c-format
 msgid "Send a read receipt to '%s'"
 msgstr "'%s' に開封通知を送信する"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:548
+#: ../modules/mdn/evolution-mdn.c:544
 msgid "_Notify Sender"
 msgstr "送信者に通知(_N)"
 
@@ -17450,86 +17981,86 @@ msgstr "ネットワークの問題のため、Evolution は現在オフライ�
 msgid "Evolution will return to online mode once a network connection is established."
 msgstr "ネットワークの接続が確立すると、Evolution はオンラインモードに復帰します。"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:68
+#: ../modules/plugin-manager/evolution-plugin-manager.c:67
 msgid "Author(s)"
 msgstr "作者"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:254
+#: ../modules/plugin-manager/evolution-plugin-manager.c:253
 msgid "Plugin Manager"
 msgstr "プラグインマネージャー"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:269
+#: ../modules/plugin-manager/evolution-plugin-manager.c:268
 msgid "Note: Some changes will not take effect until restart"
 msgstr "注記: プラグインに対するいくつかの変更は再起動するまで有効になりません。"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:298
+#: ../modules/plugin-manager/evolution-plugin-manager.c:297
 msgid "Overview"
 msgstr "概要"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:367
-#: ../modules/plugin-manager/evolution-plugin-manager.c:450
+#: ../modules/plugin-manager/evolution-plugin-manager.c:366
+#: ../modules/plugin-manager/evolution-plugin-manager.c:449
 msgid "Plugin"
 msgstr "プラグイン"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:488
+#: ../modules/plugin-manager/evolution-plugin-manager.c:487
 msgid "_Plugins"
 msgstr "プラグイン(_P)"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:489
+#: ../modules/plugin-manager/evolution-plugin-manager.c:488
 msgid "Enable and disable plugins"
 msgstr "プラグインの有効/無効を管理します"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:140
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:139
 msgid "Display plain text version"
 msgstr "プレーンテキスト版を表示"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:142
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:141
 msgid "Display plain text version of multipart/alternative message"
 msgstr "multipart/alternative メッセージのプレーンテキスト版を表示します"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:148
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:147
 msgid "Display HTML version"
 msgstr "HTML 版を表示"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:150
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:149
 msgid "Display HTML version of multipart/alternative message"
 msgstr "multipart/alternative メッセージの HTML 版を表示します"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
-#: ../modules/prefer-plain/plugin/config-ui.c:44
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:77
+#: ../modules/prefer-plain/plugin/config-ui.c:43
 msgid "Show HTML if present"
 msgstr "可能ならば HTML を表示する"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
-#: ../modules/prefer-plain/plugin/config-ui.c:45
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
+#: ../modules/prefer-plain/plugin/config-ui.c:44
 msgid "Let Evolution choose the best part to show."
 msgstr "Evolution に表示するのに最適なパートを選択させます。"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
-#: ../modules/prefer-plain/plugin/config-ui.c:48
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:81
+#: ../modules/prefer-plain/plugin/config-ui.c:47
 msgid "Show plain text if present"
 msgstr "存在するならプレーンテキストを表示する"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
-#: ../modules/prefer-plain/plugin/config-ui.c:49
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
+#: ../modules/prefer-plain/plugin/config-ui.c:48
 msgid "Show plain text part, if present, otherwise let Evolution choose the best part to show."
 msgstr "存在しているなら、プレーンテキストのパートを表示する。そうでない場合、表示するのに適したパートを Evolution に選択させます。"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
-#: ../modules/prefer-plain/plugin/config-ui.c:53
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:86
+#: ../modules/prefer-plain/plugin/config-ui.c:52
 msgid "Only ever show plain text"
 msgstr "プレーンテキストのみを常に表示"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
-#: ../modules/prefer-plain/plugin/config-ui.c:54
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
+#: ../modules/prefer-plain/plugin/config-ui.c:53
 msgid "Always show plain text part and make attachments from other parts, if requested."
 msgstr "常にプレーンテキストのみ表示し、要求があれば他のパートは添付ファイルにします。"
 
-#: ../modules/prefer-plain/plugin/config-ui.c:105
+#: ../modules/prefer-plain/plugin/config-ui.c:104
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "表示されなかった HTML パートを添付として表示(_U)"
 
-#: ../modules/prefer-plain/plugin/config-ui.c:127
+#: ../modules/prefer-plain/plugin/config-ui.c:126
 msgid "HTML _Mode"
 msgstr "HTML モード(_M)"
 
@@ -17546,60 +18077,60 @@ msgstr "プレーンテキストモード"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "HTML の内容を含んでいても、メールメッセージをプレーンテキストとして表示します。"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:151
+#: ../modules/spamassassin/evolution-spamassassin.c:150
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
 msgstr "SpamAssassin の起動に失敗しました (%s): "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:174
+#: ../modules/spamassassin/evolution-spamassassin.c:173
 msgid "Failed to stream mail message content to SpamAssassin: "
 msgstr "SpamAssassin にメッセージの内容を受け渡すのに失敗しました:"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:193
+#: ../modules/spamassassin/evolution-spamassassin.c:192
 #, c-format
 msgid "Failed to write '%s' to SpamAssassin: "
 msgstr "'%s' の SpamAssassin への書き出しに失敗しました"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:221
+#: ../modules/spamassassin/evolution-spamassassin.c:220
 msgid "Failed to read output from SpamAssassin: "
 msgstr "SpamAssassin から出力を読み取るのに失敗しました: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:276
+#: ../modules/spamassassin/evolution-spamassassin.c:275
 msgid "SpamAssassin either crashed or failed to process a mail message"
 msgstr "SpamAssassin がクラッシュしたか、メールメッセージの処理に失敗しました"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:356
+#: ../modules/spamassassin/evolution-spamassassin.c:355
 msgid "SpamAssassin Options"
 msgstr "SpamAssassin のオプション"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:371
+#: ../modules/spamassassin/evolution-spamassassin.c:370
 msgid "I_nclude remote tests"
 msgstr "リモートサーバーもテストする(_N)"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:385
+#: ../modules/spamassassin/evolution-spamassassin.c:384
 msgid "This will make SpamAssassin more reliable, but slower."
 msgstr "これは SpamAssassin の信頼性を上げますが低速になります"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:559
+#: ../modules/spamassassin/evolution-spamassassin.c:558
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
 #. Keep the title identical to EMailConfigImportPage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/startup-wizard/e-mail-config-import-page.c:262
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:342
+#: ../modules/startup-wizard/e-mail-config-import-page.c:261
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:340
 msgid "Importing Files"
 msgstr "ファイルのインポート"
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:261
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:259
 msgid "Import cancelled."
 msgstr "インポートをキャンセルしました。"
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:278
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:276
 msgid "Import complete."
 msgstr "インポート完了。"
 
-#: ../modules/startup-wizard/e-startup-assistant.c:156
+#: ../modules/startup-wizard/e-startup-assistant.c:155
 msgid ""
 "Welcome to Evolution.\n"
 "\n"
@@ -17609,286 +18140,284 @@ msgstr ""
 "\n"
 "これ以降のステップでは Evolution をお使いのメールアカウントへ接続して、他のアプリケーションからファイルをインポートできるようにします。"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:229
+#: ../modules/startup-wizard/evolution-startup-wizard.c:228
 msgid "Loading accounts..."
 msgstr "アカウントの読み込み中..."
 
-#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:95
+#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:94
 msgid "_Format as..."
 msgstr "言語を指定して整形(_F)..."
 
-#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:103
+#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:102
 msgid "_Other languages"
 msgstr "他の言語(_O)"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:362
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:481
 msgid "Text Highlight"
 msgstr "テキストの強調表示"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:363
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:482
 msgid "Syntax highlighting of mail parts"
 msgstr "メール中の構文を強調表示します"
 
-#: ../modules/text-highlight/languages.c:32
+#: ../modules/text-highlight/languages.c:31
 msgid "_Plain text"
 msgstr "プレーンテキスト(_P)"
 
-#: ../modules/text-highlight/languages.c:38
+#: ../modules/text-highlight/languages.c:37
 msgid "_Assembler"
 msgstr "アセンブラ(_A)"
 
-#: ../modules/text-highlight/languages.c:43
+#: ../modules/text-highlight/languages.c:42
 msgid "_Bash"
 msgstr "_Bash"
 
-#: ../modules/text-highlight/languages.c:54
+#: ../modules/text-highlight/languages.c:53
 msgid "_C/C++"
 msgstr "_C/C++"
 
-#: ../modules/text-highlight/languages.c:63
+#: ../modules/text-highlight/languages.c:62
 msgid "_C#"
 msgstr "_C#"
 
-#: ../modules/text-highlight/languages.c:68
+#: ../modules/text-highlight/languages.c:67
 msgid "_Cascade Style Sheet"
 msgstr "カスケードスタイルシート(_CSS)"
 
-#: ../modules/text-highlight/languages.c:73
+#: ../modules/text-highlight/languages.c:72
 msgid "_HTML"
 msgstr "_HTML"
 
-#: ../modules/text-highlight/languages.c:81
+#: ../modules/text-highlight/languages.c:80
 msgid "_Java"
 msgstr "_Java"
 
-#: ../modules/text-highlight/languages.c:87
+#: ../modules/text-highlight/languages.c:86
 msgid "_JavaScript"
 msgstr "_JavaScript"
 
-#: ../modules/text-highlight/languages.c:93
+#: ../modules/text-highlight/languages.c:92
 msgid "_Patch/diff"
 msgstr "パッチ/diff(_P)"
 
-#: ../modules/text-highlight/languages.c:99
+#: ../modules/text-highlight/languages.c:98
 msgid "_Perl"
 msgstr "_Perl"
 
-#: ../modules/text-highlight/languages.c:110
+#: ../modules/text-highlight/languages.c:109
 msgid "_PHP"
 msgstr "_PHP"
 
-#: ../modules/text-highlight/languages.c:123
+#: ../modules/text-highlight/languages.c:122
 msgid "_Python"
 msgstr "_Python"
 
-#: ../modules/text-highlight/languages.c:128
+#: ../modules/text-highlight/languages.c:127
 msgid "_Ruby"
 msgstr "_Ruby"
 
-#: ../modules/text-highlight/languages.c:135
+#: ../modules/text-highlight/languages.c:134
 msgid "_Tcl/Tk"
 msgstr "_Tcl/Tk"
 
-#: ../modules/text-highlight/languages.c:141
+#: ../modules/text-highlight/languages.c:140
 msgid "_TeX/LaTeX"
 msgstr "_TeX/LaTeX"
 
-#: ../modules/text-highlight/languages.c:147
+#: ../modules/text-highlight/languages.c:146
 msgid "_Vala"
 msgstr "_Vala"
 
-#: ../modules/text-highlight/languages.c:152
+#: ../modules/text-highlight/languages.c:151
 msgid "_Visual Basic"
 msgstr "_Visual Basic"
 
-#: ../modules/text-highlight/languages.c:159
+#: ../modules/text-highlight/languages.c:158
 msgid "_XML"
 msgstr "_XML"
 
-#: ../modules/text-highlight/languages.c:177
+#: ../modules/text-highlight/languages.c:176
 msgid "_ActionScript"
 msgstr "_ActionScript"
 
-#: ../modules/text-highlight/languages.c:182
+#: ../modules/text-highlight/languages.c:181
 msgid "_ADA95"
 msgstr "_ADA95"
 
-#: ../modules/text-highlight/languages.c:189
+#: ../modules/text-highlight/languages.c:188
 msgid "_ALGOL 68"
 msgstr "_ALGOL 68"
 
-#: ../modules/text-highlight/languages.c:194
+#: ../modules/text-highlight/languages.c:193
 msgid "(_G)AWK"
 msgstr "(_G)AWK"
 
-#: ../modules/text-highlight/languages.c:199
+#: ../modules/text-highlight/languages.c:198
 msgid "_COBOL"
 msgstr "_COBOL"
 
-#: ../modules/text-highlight/languages.c:204
+#: ../modules/text-highlight/languages.c:203
 msgid "_DOS Batch"
 msgstr "_DOS バッチ"
 
-#: ../modules/text-highlight/languages.c:209
+#: ../modules/text-highlight/languages.c:208
 msgid "_D"
 msgstr "_D"
 
-#: ../modules/text-highlight/languages.c:214
+#: ../modules/text-highlight/languages.c:213
 msgid "_Erlang"
 msgstr "_Erlang"
 
-#: ../modules/text-highlight/languages.c:219
+#: ../modules/text-highlight/languages.c:218
 msgid "_FORTRAN 77"
 msgstr "_FORTRAN 77"
 
-#: ../modules/text-highlight/languages.c:225
+#: ../modules/text-highlight/languages.c:224
 msgid "_FORTRAN 90"
 msgstr "_FORTRAN 90"
 
-#: ../modules/text-highlight/languages.c:230
+#: ../modules/text-highlight/languages.c:229
 msgid "_F#"
 msgstr "_F#"
 
-#: ../modules/text-highlight/languages.c:235
+#: ../modules/text-highlight/languages.c:234
 msgid "_Go"
 msgstr "_Go"
 
-#: ../modules/text-highlight/languages.c:240
+#: ../modules/text-highlight/languages.c:239
 msgid "_Haskell"
 msgstr "_Haskell"
 
-#: ../modules/text-highlight/languages.c:245
+#: ../modules/text-highlight/languages.c:244
 msgid "_JSP"
 msgstr "_JSP"
 
-#: ../modules/text-highlight/languages.c:250
+#: ../modules/text-highlight/languages.c:249
 msgid "_Lisp"
 msgstr "_Lisp"
 
-#: ../modules/text-highlight/languages.c:258
+#: ../modules/text-highlight/languages.c:257
 msgid "_Lotus"
 msgstr "_Lotus"
 
-#: ../modules/text-highlight/languages.c:263
+#: ../modules/text-highlight/languages.c:262
 msgid "_Lua"
 msgstr "_Lua"
 
-#: ../modules/text-highlight/languages.c:268
+#: ../modules/text-highlight/languages.c:267
 msgid "_Maple"
 msgstr "_Maple"
 
-#: ../modules/text-highlight/languages.c:273
+#: ../modules/text-highlight/languages.c:272
 msgid "_Matlab"
 msgstr "_Matlab"
 
-#: ../modules/text-highlight/languages.c:278
+#: ../modules/text-highlight/languages.c:277
 msgid "_Maya"
 msgstr "_Maya"
 
-#: ../modules/text-highlight/languages.c:283
+#: ../modules/text-highlight/languages.c:282
 msgid "_Oberon"
 msgstr "_Oberon"
 
-#: ../modules/text-highlight/languages.c:288
+#: ../modules/text-highlight/languages.c:287
 msgid "_Objective C"
 msgstr "_Objective C"
 
-#: ../modules/text-highlight/languages.c:294
+#: ../modules/text-highlight/languages.c:293
 msgid "_OCaml"
 msgstr "_OCaml"
 
-#: ../modules/text-highlight/languages.c:299
+#: ../modules/text-highlight/languages.c:298
 msgid "_Octave"
 msgstr "_Octave"
 
-#: ../modules/text-highlight/languages.c:304
+#: ../modules/text-highlight/languages.c:303
 msgid "_Object Script"
 msgstr "_Object Script"
 
-#: ../modules/text-highlight/languages.c:309
+#: ../modules/text-highlight/languages.c:308
 msgid "_Pascal"
 msgstr "_Pascal"
 
-#: ../modules/text-highlight/languages.c:314
+#: ../modules/text-highlight/languages.c:313
 msgid "_POV-Ray"
 msgstr "_POV-Ray"
 
-#: ../modules/text-highlight/languages.c:319
+#: ../modules/text-highlight/languages.c:318
 msgid "_Prolog"
 msgstr "_Prolog"
 
-#: ../modules/text-highlight/languages.c:324
+#: ../modules/text-highlight/languages.c:323
 msgid "_PostScript"
 msgstr "_PostScript"
 
-#: ../modules/text-highlight/languages.c:329
+#: ../modules/text-highlight/languages.c:328
 msgid "_R"
 msgstr "_R"
 
-#: ../modules/text-highlight/languages.c:334
+#: ../modules/text-highlight/languages.c:333
 msgid "_RPM Spec"
 msgstr "_RPM Spec"
 
-#: ../modules/text-highlight/languages.c:339
+#: ../modules/text-highlight/languages.c:338
 msgid "_Scala"
 msgstr "_Scala"
 
-#: ../modules/text-highlight/languages.c:344
+#: ../modules/text-highlight/languages.c:343
 msgid "_Smalltalk"
 msgstr "_Smalltalk"
 
-#: ../modules/text-highlight/languages.c:350
+#: ../modules/text-highlight/languages.c:349
 msgid "_TCSH"
 msgstr "_TCSH"
 
-#: ../modules/text-highlight/languages.c:355
+#: ../modules/text-highlight/languages.c:354
 msgid "_VHDL"
 msgstr "_VHDL"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:129
-#: ../modules/vcard-inline/e-mail-part-vcard.c:152
-#, fuzzy
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:131
+#: ../modules/vcard-inline/e-mail-part-vcard.c:151
 msgid "Show F_ull vCard"
-msgstr "すべての vCard の表示"
+msgstr "すべての vCard の表示(_U)"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:132
-#: ../modules/vcard-inline/e-mail-part-vcard.c:170
-#, fuzzy
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:134
+#: ../modules/vcard-inline/e-mail-part-vcard.c:169
 msgid "Show Com_pact vCard"
-msgstr "vCard の表示 (簡易)"
+msgstr "vCard の表示 (簡易)(_P)"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:157
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:162
 msgid "Save _To Addressbook"
 msgstr "アドレス帳に保存(_T)"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:178
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:184
 msgid "There is one other contact."
 msgstr "他に 1個の連絡先があります。"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:184
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:189
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "他に %d個の連絡先があります。"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:209
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:215
 msgid "Addressbook Contact"
 msgstr "アドレス帳の連絡先"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:210
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:216
 msgid "Display the part as an addressbook contact"
 msgstr "アドレス帳の連絡先として表示"
 
-#: ../modules/web-inspector/evolution-web-inspector.c:96
+#: ../modules/web-inspector/evolution-web-inspector.c:95
 msgid "Evolution Web Inspector"
 msgstr "Evolution ウェブインスペクター"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:122
 msgid "_Do not show this message again."
 msgstr "次回からこのメッセージを表示しない(_D)"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:583
-#: ../plugins/templates/templates.c:480
+#: ../plugins/attachment-reminder/attachment-reminder.c:584
+#: ../plugins/templates/templates.c:478
 msgid "Keywords"
 msgstr "キーワード"
 
@@ -17916,35 +18445,35 @@ msgstr "添付し忘れの防止"
 msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr "メールのメッセージに添付し忘れた時に通知します。"
 
-#: ../plugins/bbdb/bbdb.c:635 ../plugins/bbdb/bbdb.c:644
+#: ../plugins/bbdb/bbdb.c:636 ../plugins/bbdb/bbdb.c:645
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "連絡先の自動生成"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:659
+#: ../plugins/bbdb/bbdb.c:660
 msgid "Create _address book entries when sending mails"
 msgstr "メッセージを送ったらアドレス帳に登録する(_A)"
 
-#: ../plugins/bbdb/bbdb.c:666
+#: ../plugins/bbdb/bbdb.c:667
 msgid "Select Address book for Automatic Contacts"
 msgstr "連絡先の自動登録に使用するアドレス帳を選択してください:"
 
-#: ../plugins/bbdb/bbdb.c:683
+#: ../plugins/bbdb/bbdb.c:684
 msgid "Instant Messaging Contacts"
 msgstr "インスタントメッセンジャーの連絡先"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:698
+#: ../plugins/bbdb/bbdb.c:699
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "Pidgin の仲間リストから連絡先とその画像を同期(_S)"
 
-#: ../plugins/bbdb/bbdb.c:705
+#: ../plugins/bbdb/bbdb.c:706
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Pidgin の仲間リストとして使用するアドレス帳を選択してください:"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:718
+#: ../plugins/bbdb/bbdb.c:719
 msgid "Synchronize with _buddy list now"
 msgstr "今すぐ仲間リストを同期する(_B)"
 
@@ -17962,7 +18491,7 @@ msgstr ""
 "\n"
 "メッセージに返信した際に氏名とメールアドレスを自動的にアドレス帳に追加します。また、仲間リストから自動的にインスタントメッセンジャーの連絡先情報を追加します。"
 
-#: ../plugins/dbx-import/dbx-importer.c:282
+#: ../plugins/dbx-import/dbx-importer.c:278
 msgid "Importing Outlook Express data"
 msgstr "Outlook Express のデータのインポート中"
 
@@ -17978,52 +18507,52 @@ msgstr "Outlook Express 5/6 の個人のフォルダー (.dbx)"
 msgid "Import Outlook Express messages from DBX file"
 msgstr "DBX ファイルから Outlook Express のメッセージをインポートする"
 
-#: ../plugins/email-custom-header/email-custom-header.c:291
+#: ../plugins/email-custom-header/email-custom-header.c:293
 msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "セキュリティ:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:295
+#: ../plugins/email-custom-header/email-custom-header.c:297
 msgctxt "email-custom-header-Security"
 msgid "Personal"
 msgstr "個人的"
 
-#: ../plugins/email-custom-header/email-custom-header.c:296
+#: ../plugins/email-custom-header/email-custom-header.c:298
 msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "未分類"
 
-#: ../plugins/email-custom-header/email-custom-header.c:297
+#: ../plugins/email-custom-header/email-custom-header.c:299
 msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "保護済"
 
-#: ../plugins/email-custom-header/email-custom-header.c:298
+#: ../plugins/email-custom-header/email-custom-header.c:300
 msgctxt "email-custom-header-Security"
 msgid "Confidential"
 msgstr "部外秘"
 
-#: ../plugins/email-custom-header/email-custom-header.c:299
+#: ../plugins/email-custom-header/email-custom-header.c:301
 msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "機密"
 
-#: ../plugins/email-custom-header/email-custom-header.c:300
+#: ../plugins/email-custom-header/email-custom-header.c:302
 msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "極秘"
 
-#: ../plugins/email-custom-header/email-custom-header.c:360
+#: ../plugins/email-custom-header/email-custom-header.c:362
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "なし"
 
-#: ../plugins/email-custom-header/email-custom-header.c:536
+#: ../plugins/email-custom-header/email-custom-header.c:538
 msgid "_Custom Header"
 msgstr "独自のヘッダー(_C)"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:806
+#: ../plugins/email-custom-header/email-custom-header.c:808
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -18031,12 +18560,12 @@ msgstr ""
 "独自ヘッダーを構成する情報をキーとその値で指定してください:\n"
 "キーの値は \";\" 文字で区切ってください。"
 
-#: ../plugins/email-custom-header/email-custom-header.c:859
+#: ../plugins/email-custom-header/email-custom-header.c:861
 msgid "Key"
 msgstr "キー"
 
-#: ../plugins/email-custom-header/email-custom-header.c:876
-#: ../plugins/templates/templates.c:489
+#: ../plugins/email-custom-header/email-custom-header.c:878
+#: ../plugins/templates/templates.c:487
 msgid "Values"
 msgstr "値"
 
@@ -18053,11 +18582,11 @@ msgstr "送信するメールのメッセージに独自のヘッダーを付加
 msgid "Email Custom Header"
 msgstr "メールの独自ヘッダー"
 
-#: ../plugins/external-editor/external-editor.c:112
+#: ../plugins/external-editor/external-editor.c:113
 msgid "Command to be executed to launch the editor: "
 msgstr "起動するエディターのコマンド: "
 
-#: ../plugins/external-editor/external-editor.c:113
+#: ../plugins/external-editor/external-editor.c:114
 msgid ""
 "For XEmacs use \"xemacs\"\n"
 "For Vim use \"gvim -f\""
@@ -18065,12 +18594,12 @@ msgstr ""
 "XEmacs ならば \"xemacs\"\n"
 "Vim ならば \"gvim -f\""
 
-#: ../plugins/external-editor/external-editor.c:123
+#: ../plugins/external-editor/external-editor.c:124
 msgid "_Automatically launch when a new mail is edited"
 msgstr "新規メールの作成時に自動的に起動(_A)"
 
-#: ../plugins/external-editor/external-editor.c:413
-#: ../plugins/external-editor/external-editor.c:415
+#: ../plugins/external-editor/external-editor.c:417
+#: ../plugins/external-editor/external-editor.c:419
 msgid "Compose in External Editor"
 msgstr "外部エディターで文章を作成"
 
@@ -18106,27 +18635,23 @@ msgstr "外部エディターがまだ動作中です"
 msgid "The external editor is still running. The mail composer window cannot be closed as long as the editor is active."
 msgstr "外部エディターがまだ動作中です。外部エディターが動作中の間はメール作成ウィンドウを閉じることができません。"
 
-#: ../plugins/face/face.c:171 ../smime/gui/certificate-manager.c:322
-msgid "Unknown error"
-msgstr "原因不明のエラー"
-
-#: ../plugins/face/face.c:289
+#: ../plugins/face/face.c:288
 msgid "Select a Face Picture"
 msgstr "顔写真の選択"
 
-#: ../plugins/face/face.c:299
+#: ../plugins/face/face.c:298
 msgid "Image files"
 msgstr "画像ファイル"
 
-#: ../plugins/face/face.c:358
+#: ../plugins/face/face.c:357
 msgid "_Insert Face picture by default"
 msgstr "顔写真をデフォルトで添付(_I)"
 
-#: ../plugins/face/face.c:371
+#: ../plugins/face/face.c:370
 msgid "Load new _Face picture"
 msgstr "新しい顔写真を読み込み(_F)"
 
-#: ../plugins/face/face.c:432
+#: ../plugins/face/face.c:431
 msgid "Include _Face"
 msgstr "顔を挿入(_F)"
 
@@ -18166,55 +18691,55 @@ msgstr "インライン画像"
 msgid "View image attachments directly in mail messages."
 msgstr "添付画像を直接メール中に表示します。"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:368
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:364
 msgid "Get List _Archive"
 msgstr "アーカイブの取得(_A)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:370
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:366
 msgid "Get an archive of the list this message belongs to"
 msgstr "このメーリングリストの過去メールをまとめたアーカイブを取得します"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:375
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:371
 msgid "Get List _Usage Information"
 msgstr "使用方法の取得(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:377
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:373
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "このメーリングリストの使い方について情報を取得します"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:382
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:378
 msgid "Contact List _Owner"
 msgstr "管理者に連絡する(_O)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:384
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "このメーリングリストの管理者へメールを送信します"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:389
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:385
 msgid "_Post Message to List"
 msgstr "メーリングリストへ投稿(_P)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:391
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:387
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "このメーリングリストへメッセージを投稿します"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:396
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:392
 msgid "_Subscribe to List"
 msgstr "メーリングリストの購読(_S)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:398
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:394
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "このメーリングリストを購読します"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:403
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:399
 msgid "_Unsubscribe from List"
 msgstr "メーリングリストの購読停止(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:405
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:401
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "このメッセージが送られてきたメーリングリストの購読を停止します"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:412
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:408
 msgid "Mailing _List"
 msgstr "メーリングリスト(_L)"
 
@@ -18292,8 +18817,8 @@ msgstr ""
 "\n"
 "ヘッダー: {0}"
 
-#: ../plugins/mail-notification/mail-notification.c:384
-#: ../plugins/mail-notification/mail-notification.c:420
+#: ../plugins/mail-notification/mail-notification.c:382
+#: ../plugins/mail-notification/mail-notification.c:418
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -18301,54 +18826,54 @@ msgstr[0] "%d通の新しいメッセージが届いています"
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user@example.com"
-#: ../plugins/mail-notification/mail-notification.c:395
+#: ../plugins/mail-notification/mail-notification.c:393
 #, c-format
 msgid "From: %s"
 msgstr "差出人: %s"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:409
+#: ../plugins/mail-notification/mail-notification.c:407
 #, c-format
 msgid "Subject: %s"
 msgstr "件名: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:426
+#: ../plugins/mail-notification/mail-notification.c:424
 msgid "New email in Evolution"
 msgstr "Evolution に新しいメールがあります"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../plugins/mail-notification/mail-notification.c:461
+#: ../plugins/mail-notification/mail-notification.c:459
 #, c-format
 msgid "Show %s"
 msgstr "%s を表示"
 
-#: ../plugins/mail-notification/mail-notification.c:663
+#: ../plugins/mail-notification/mail-notification.c:661
 msgid "_Play sound when a new message arrives"
 msgstr "新しいメッセージが届いたら演奏する(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:695
+#: ../plugins/mail-notification/mail-notification.c:693
 msgid "_Beep"
 msgstr "ビープ音を鳴らす(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:708
+#: ../plugins/mail-notification/mail-notification.c:706
 msgid "Use sound _theme"
 msgstr "サウンドテーマを使用(_T)"
 
-#: ../plugins/mail-notification/mail-notification.c:727
+#: ../plugins/mail-notification/mail-notification.c:725
 msgid "Play _file:"
 msgstr "ファイルを再生(_F):"
 
-#: ../plugins/mail-notification/mail-notification.c:736
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "Select sound file"
 msgstr "音声ファイルの選択"
 
-#: ../plugins/mail-notification/mail-notification.c:792
+#: ../plugins/mail-notification/mail-notification.c:790
 msgid "Notify new messages for _Inbox only"
 msgstr "受信箱の新着メッセージだけ通知する(_I)"
 
-#: ../plugins/mail-notification/mail-notification.c:802
+#: ../plugins/mail-notification/mail-notification.c:800
 msgid "Show _notification when a new message arrives"
 msgstr "新しいメッセージが届いたらパネルの通知領域にアイコンを表示して通知する(_N)"
 
@@ -18361,111 +18886,107 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "新しいメールが届いたら通知するかどうか。"
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../plugins/mail-to-task/mail-to-task.c:232
+#: ../plugins/mail-to-task/mail-to-task.c:229
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "%s からのメールにより作成"
 
-#: ../plugins/mail-to-task/mail-to-task.c:616
+#: ../plugins/mail-to-task/mail-to-task.c:613
 #, c-format
 msgid "Selected calendar contains event '%s' already. Would you like to edit the old event?"
 msgstr "選択したカレンダーにはイベント '%s' が既に登録されています。古いイベントを編集しますか?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:619
+#: ../plugins/mail-to-task/mail-to-task.c:616
 #, c-format
 msgid "Selected task list contains task '%s' already. Would you like to edit the old task?"
 msgstr "選択したタスクの一覧にはタスク '%s' が既に登録されています。古いタスクを編集しますか?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:622
+#: ../plugins/mail-to-task/mail-to-task.c:619
 #, c-format
 msgid "Selected memo list contains memo '%s' already. Would you like to edit the old memo?"
 msgstr "選択したメモの一覧にはメモ '%s' が既に登録されています。古いメモを編集しますか?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:642
+#: ../plugins/mail-to-task/mail-to-task.c:639
 #, c-format
 msgid "You have selected %d mails to be converted to events. Do you really want to add them all?"
 msgid_plural "You have selected %d mails to be converted to events. Do you really want to add them all?"
 msgstr[0] "%d通のメールをイベントに変換するよう選択しました。これらすべてを本当に追加しますか?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:649
+#: ../plugins/mail-to-task/mail-to-task.c:646
 #, c-format
 msgid "You have selected %d mails to be converted to tasks. Do you really want to add them all?"
 msgid_plural "You have selected %d mails to be converted to tasks. Do you really want to add them all?"
 msgstr[0] "%d通のメールをタスクに変換するよう選択しました。これらすべてを本当に追加しますか?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:656
+#: ../plugins/mail-to-task/mail-to-task.c:653
 #, c-format
 msgid "You have selected %d mails to be converted to memos. Do you really want to add them all?"
 msgid_plural "You have selected %d mails to be converted to memos. Do you really want to add them all?"
 msgstr[0] "%d通のメールをメモに変換するよう選択しました。これらすべてを本当に追加しますか?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:677
+#: ../plugins/mail-to-task/mail-to-task.c:674
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "残りのメールの変換を続けてよろしいですか?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:753
+#: ../plugins/mail-to-task/mail-to-task.c:750
 msgid "[No Summary]"
 msgstr "[サマリ無し]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:766
+#: ../plugins/mail-to-task/mail-to-task.c:763
 msgid "Invalid object returned from a server"
 msgstr "サーバーから正しくないオブジェクトが返ってきました"
 
-#: ../plugins/mail-to-task/mail-to-task.c:821
+#: ../plugins/mail-to-task/mail-to-task.c:818
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "処理中にエラーが発生しました: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:855
+#: ../plugins/mail-to-task/mail-to-task.c:852
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "カレンダーを開けません: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:862
+#: ../plugins/mail-to-task/mail-to-task.c:856
 msgid "Selected calendar is read only, thus cannot create event there. Select other calendar, please."
 msgstr "選択したカレンダーは読み込み専用のためイベントを生成できません。他のカレンダーを選択してください。"
 
-#: ../plugins/mail-to-task/mail-to-task.c:865
+#: ../plugins/mail-to-task/mail-to-task.c:859
 msgid "Selected task list is read only, thus cannot create task there. Select other task list, please."
 msgstr "選択したタスク一覧は読み込み専用のためタスクを生成できません。他のタスク一覧を選択してください。"
 
-#: ../plugins/mail-to-task/mail-to-task.c:868
+#: ../plugins/mail-to-task/mail-to-task.c:862
 msgid "Selected memo list is read only, thus cannot create memo there. Select other memo list, please."
 msgstr "選択したメモ一覧は読み込み専用のためメモを生成できません。他のメモ一覧を選択してください。"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1203
-msgid "No writable calendar is available."
-msgstr "書き込み可能なカレンダーがありません。"
-
-#: ../plugins/mail-to-task/mail-to-task.c:1280
+#: ../plugins/mail-to-task/mail-to-task.c:1261
 msgid "Create an _Appointment"
 msgstr "新しい予定の作成(_A)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1282
+#: ../plugins/mail-to-task/mail-to-task.c:1263
 msgid "Create a new event from the selected message"
 msgstr "選択したメッセージから新しいイベントを作成します"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1287
+#: ../plugins/mail-to-task/mail-to-task.c:1268
 msgid "Create a Mem_o"
 msgstr "メモの作成(_O)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1289
+#: ../plugins/mail-to-task/mail-to-task.c:1270
 msgid "Create a new memo from the selected message"
 msgstr "選択したメッセージから新しいメモを作成します"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1294
+#: ../plugins/mail-to-task/mail-to-task.c:1275
 msgid "Create a _Task"
 msgstr "タスクの作成(_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1296
+#: ../plugins/mail-to-task/mail-to-task.c:1277
 msgid "Create a new task from the selected message"
 msgstr "選択したメッセージから新しいタスクを作成します"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1304
+#: ../plugins/mail-to-task/mail-to-task.c:1285
 msgid "Create a _Meeting"
 msgstr "会議の作成(_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1306
+#: ../plugins/mail-to-task/mail-to-task.c:1287
 msgid "Create a new meeting from the selected message"
 msgstr "選択したメッセージから新しい会議を作成します"
 
@@ -18485,37 +19006,37 @@ msgstr "Outlook の個人のフォルダー (.pst)"
 msgid "Import Outlook messages from PST file"
 msgstr "PST ファイルから Outlook のメッセージをインポートするプラグインです。"
 
-#: ../plugins/pst-import/pst-importer.c:530
+#: ../plugins/pst-import/pst-importer.c:526
 msgid "_Mail"
 msgstr "メール(_M)"
 
-#: ../plugins/pst-import/pst-importer.c:559
+#: ../plugins/pst-import/pst-importer.c:555
 msgid "Destination folder:"
 msgstr "転送先フォルダー:"
 
-#: ../plugins/pst-import/pst-importer.c:569
+#: ../plugins/pst-import/pst-importer.c:565
 msgid "_Address Book"
 msgstr "アドレス帳(_A)"
 
-#: ../plugins/pst-import/pst-importer.c:574
+#: ../plugins/pst-import/pst-importer.c:570
 msgid "A_ppointments"
 msgstr "予定(_P)"
 
-#: ../plugins/pst-import/pst-importer.c:579 ../views/tasks/galview.xml.h:1
+#: ../plugins/pst-import/pst-importer.c:575 ../views/tasks/galview.xml.h:1
 msgid "_Tasks"
 msgstr "タスク(_T)"
 
-#: ../plugins/pst-import/pst-importer.c:584
+#: ../plugins/pst-import/pst-importer.c:580
 msgid "_Journal entries"
 msgstr "ジャーナルのエントリ(_J)"
 
-#: ../plugins/pst-import/pst-importer.c:701
+#: ../plugins/pst-import/pst-importer.c:697
 msgid "Importing Outlook data"
 msgstr "Outlook データのインポート中"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-#: ../plugins/publish-calendar/publish-calendar.c:141
-#: ../plugins/publish-calendar/publish-calendar.c:148
+#: ../plugins/publish-calendar/publish-calendar.c:140
+#: ../plugins/publish-calendar/publish-calendar.c:147
 msgid "Calendar Publishing"
 msgstr "カレンダーの公開"
 
@@ -18548,23 +19069,23 @@ msgstr "%s への公開が正常に終了しました"
 msgid "Mount of %s failed:"
 msgstr "%s のマウントに失敗しました。"
 
-#: ../plugins/publish-calendar/publish-calendar.c:649
-#: ../plugins/publish-calendar/publish-calendar.ui.h:33
+#: ../plugins/publish-calendar/publish-calendar.c:655
+#: ../plugins/publish-calendar/publish-calendar.ui.h:35
 msgid "E_nable"
 msgstr "有効(_N)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:799
+#: ../plugins/publish-calendar/publish-calendar.c:805
 msgid "Are you sure you want to remove this location?"
 msgstr "本当にこの場所を削除してもよろしいですか?"
 
 #. To Translators: This is shown to a user when creation of a new thread,
 #. * where the publishing should be done, fails. Basically, this shouldn't
 #. * ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1138
+#: ../plugins/publish-calendar/publish-calendar.c:1142
 msgid "Could not create publish thread."
 msgstr "公開のためのプログラムのスレッドを作成できませんでした。"
 
-#: ../plugins/publish-calendar/publish-calendar.c:1148
+#: ../plugins/publish-calendar/publish-calendar.c:1152
 msgid "_Publish Calendar Information"
 msgstr "カレンダー情報を公開する(_P)"
 
@@ -18656,100 +19177,100 @@ msgstr "このパスワードを記憶する(_R)"
 msgid "Publishing Location"
 msgstr "公開する場所"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:100
-#: ../plugins/publish-calendar/publish-format-ical.c:103
+#: ../plugins/publish-calendar/publish-format-fb.c:99
+#: ../plugins/publish-calendar/publish-format-ical.c:102
 #, c-format
 msgid "Invalid source UID '%s'"
 msgstr "無効なソース UID: '%s'"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:540
+#: ../plugins/publish-calendar/url-editor-dialog.c:544
 msgid "New Location"
 msgstr "新しい場所"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:542
+#: ../plugins/publish-calendar/url-editor-dialog.c:546
 msgid "Edit Location"
 msgstr "場所の編集"
 
 #. Translators: the %F %T is the third argument for a
 #. * strftime function.  It lets you define the formatting
 #. * of the date in the csv-file.
-#: ../plugins/save-calendar/csv-format.c:161
+#: ../plugins/save-calendar/csv-format.c:160
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Description List"
 msgstr "説明の一覧"
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Categories List"
 msgstr "カテゴリの一覧"
 
-#: ../plugins/save-calendar/csv-format.c:379
+#: ../plugins/save-calendar/csv-format.c:378
 msgid "Comment List"
 msgstr "コメントの一覧"
 
-#: ../plugins/save-calendar/csv-format.c:382
+#: ../plugins/save-calendar/csv-format.c:381
 msgid "Contact List"
 msgstr "連絡先の一覧"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "Start"
 msgstr "開始"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "End"
 msgstr "終了"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "Due"
 msgstr "期日"
 
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "percent Done"
 msgstr "%% 完了"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:387
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:388
 msgid "Attendees List"
 msgstr "出席者の一覧"
 
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../plugins/save-calendar/csv-format.c:390
 msgid "Modified"
 msgstr "変更済"
 
-#: ../plugins/save-calendar/csv-format.c:564
+#: ../plugins/save-calendar/csv-format.c:563
 msgid "A_dvanced options for the CSV format"
 msgstr "CSV 形式の拡張オプション(_D)"
 
-#: ../plugins/save-calendar/csv-format.c:572
+#: ../plugins/save-calendar/csv-format.c:571
 msgid "Prepend a _header"
 msgstr "ヘッダーを付与する(_H)"
 
-#: ../plugins/save-calendar/csv-format.c:581
+#: ../plugins/save-calendar/csv-format.c:580
 msgid "_Value delimiter:"
 msgstr "数値の区切り(_V):"
 
-#: ../plugins/save-calendar/csv-format.c:592
+#: ../plugins/save-calendar/csv-format.c:591
 msgid "_Record delimiter:"
 msgstr "レコードの区切り(_R):"
 
-#: ../plugins/save-calendar/csv-format.c:603
+#: ../plugins/save-calendar/csv-format.c:602
 msgid "_Encapsulate values with:"
 msgstr "数値のカプセル化(_E):"
 
-#: ../plugins/save-calendar/csv-format.c:629
+#: ../plugins/save-calendar/csv-format.c:628
 msgid "Comma separated values (.csv)"
 msgstr "CSV (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:184 ../shell/e-shell-utils.c:178
+#: ../plugins/save-calendar/ical-format.c:183 ../shell/e-shell-utils.c:177
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
@@ -18774,23 +19295,29 @@ msgstr "%FT%T"
 msgid "RDF (.rdf)"
 msgstr "RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:121
+#: ../plugins/save-calendar/save-calendar.c:120
 msgid "_Format:"
 msgstr "形式(_F):"
 
-#: ../plugins/save-calendar/save-calendar.c:187
+#: ../plugins/save-calendar/save-calendar.c:186
 msgid "Select destination file"
 msgstr "保存先の選択"
 
-#: ../plugins/save-calendar/save-calendar.c:343
+#: ../plugins/save-calendar/save-calendar.c:190
+#, fuzzy
+#| msgid "_Save"
+msgid "_Save As"
+msgstr "保存(_S)"
+
+#: ../plugins/save-calendar/save-calendar.c:347
 msgid "Save the selected calendar to disk"
 msgstr "選択したカレンダーをディスクに保存します"
 
-#: ../plugins/save-calendar/save-calendar.c:374
+#: ../plugins/save-calendar/save-calendar.c:378
 msgid "Save the selected memo list to disk"
 msgstr "選択したメモの一覧をディスクに保存します"
 
-#: ../plugins/save-calendar/save-calendar.c:405
+#: ../plugins/save-calendar/save-calendar.c:409
 msgid "Save the selected task list to disk"
 msgstr "選択したタスクの一覧をディスクに保存します"
 
@@ -18798,39 +19325,39 @@ msgstr "選択したタスクの一覧をディスクに保存します"
 msgid "Drafts based template plugin. You can use variables like $ORIG[subject], $ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from an email you are replying to."
 msgstr "テンプレートプラグインを元にした草稿です。$ORIG[subject]、$ORIG[from]、$ORIG[to]、$ORIG[body] の様な変数が使えます。これは返信するメールの値に置き換えられます。"
 
-#: ../plugins/templates/templates.c:1148
+#: ../plugins/templates/templates.c:1146
 msgid "No Title"
 msgstr "タイトルなし"
 
-#: ../plugins/templates/templates.c:1257
+#: ../plugins/templates/templates.c:1255
 msgid "Save as _Template"
 msgstr "テンプレートとして保存(_T)"
 
-#: ../plugins/templates/templates.c:1259
+#: ../plugins/templates/templates.c:1257
 msgid "Save as Template"
 msgstr "テンプレートとして保存します"
 
-#: ../shell/e-shell.c:278
+#: ../shell/e-shell.c:302
 msgid "Preparing to go offline..."
 msgstr "オフラインの準備中..."
 
-#: ../shell/e-shell.c:331
+#: ../shell/e-shell.c:355
 msgid "Preparing to go online..."
 msgstr "オンラインの準備中..."
 
-#: ../shell/e-shell.c:412
+#: ../shell/e-shell.c:436
 msgid "Preparing to quit"
 msgstr "終了の準備中"
 
-#: ../shell/e-shell.c:418
+#: ../shell/e-shell.c:442
 msgid "Preparing to quit..."
 msgstr "終了の準備中..."
 
-#: ../shell/e-shell-content.c:721 ../shell/e-shell-content.c:722
+#: ../shell/e-shell-content.c:720 ../shell/e-shell-content.c:721
 msgid "Searches"
 msgstr "検索"
 
-#: ../shell/e-shell-content.c:765
+#: ../shell/e-shell-content.c:764
 msgid "Save Search"
 msgstr "検索結果の保存"
 
@@ -18838,38 +19365,38 @@ msgstr "検索結果の保存"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:1102
+#: ../shell/e-shell-searchbar.c:937
 msgid "Sho_w:"
 msgstr "表示(_W):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1136
+#: ../shell/e-shell-searchbar.c:962
 msgid "Sear_ch:"
 msgstr "検索(_C):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1217
+#: ../shell/e-shell-searchbar.c:1030
 msgid "i_n"
 msgstr "検索対象(_N):"
 
-#: ../shell/e-shell-utils.c:175
+#: ../shell/e-shell-utils.c:174
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:199
+#: ../shell/e-shell-utils.c:198
 msgid "All Files (*)"
 msgstr "すべてのファイル (*)"
 
-#: ../shell/e-shell-view.c:292
+#: ../shell/e-shell-view.c:291
 msgid "Saving user interface state"
 msgstr "ユーザーインターフェースの状態を保存中"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:74
+#: ../shell/e-shell-window-actions.c:73
 msgid "translator-credits"
 msgstr ""
 "相花 毅 <takeshi.aihana@gmail.com>\n"
@@ -18882,282 +19409,291 @@ msgstr ""
 "やまねひでき <henrich@debian.org>\n"
 "日本GNOMEユーザー会 <http://www.gnome.gr.jp/>"
 
-#: ../shell/e-shell-window-actions.c:85
+#: ../shell/e-shell-window-actions.c:84
 msgid "Evolution Website"
 msgstr "Evolution のウェブサイト"
 
-#: ../shell/e-shell-window-actions.c:341
+#: ../shell/e-shell-window-actions.c:340
 msgid "Categories Editor"
 msgstr "カテゴリエディター"
 
-#: ../shell/e-shell-window-actions.c:672
+#: ../shell/e-shell-window-actions.c:716
 msgid "Bug Buddy is not installed."
 msgstr "Bug Buddy がインストールされていません。"
 
-#: ../shell/e-shell-window-actions.c:673
+#: ../shell/e-shell-window-actions.c:717
 msgid "Bug Buddy could not be run."
 msgstr "Bug Buddy を実行できませんでした"
 
-#: ../shell/e-shell-window-actions.c:853
+#: ../shell/e-shell-window-actions.c:895
+msgid "_About"
+msgstr ""
+
+#: ../shell/e-shell-window-actions.c:897
 msgid "Show information about Evolution"
 msgstr "Evolution についての情報を表示します"
 
-#: ../shell/e-shell-window-actions.c:858 ../shell/e-shell-window-actions.c:872
+#: ../shell/e-shell-window-actions.c:902 ../shell/e-shell-window-actions.c:916
 msgid "_Close Window"
 msgstr "ウィンドウを閉じる(_C)"
 
-#: ../shell/e-shell-window-actions.c:879
+#: ../shell/e-shell-window-actions.c:923
 msgid "_Contents"
 msgstr "目次(_C)"
 
-#: ../shell/e-shell-window-actions.c:881
+#: ../shell/e-shell-window-actions.c:925
 msgid "Open the Evolution User Guide"
 msgstr "Evolution ユーザーガイドを開く"
 
-#: ../shell/e-shell-window-actions.c:907
+#: ../shell/e-shell-window-actions.c:951
 msgid "I_mport..."
 msgstr "インポート(_M)..."
 
-#: ../shell/e-shell-window-actions.c:909
+#: ../shell/e-shell-window-actions.c:953
 msgid "Import data from other programs"
 msgstr "他のプログラムからデータを取り込みます"
 
-#: ../shell/e-shell-window-actions.c:914
+#: ../shell/e-shell-window-actions.c:958
 msgid "New _Window"
 msgstr "新しいウィンドウ(_W)"
 
-#: ../shell/e-shell-window-actions.c:916
+#: ../shell/e-shell-window-actions.c:960
 msgid "Create a new window displaying this view"
 msgstr "このビューを表示する新しいウィンドウを作成します"
 
-#: ../shell/e-shell-window-actions.c:928
+#: ../shell/e-shell-window-actions.c:972
 msgid "Available Cate_gories"
 msgstr "利用可能な項目(_G)"
 
-#: ../shell/e-shell-window-actions.c:930
+#: ../shell/e-shell-window-actions.c:974
 msgid "Manage available categories"
 msgstr "利用可能なカテゴリを管理する"
 
-#: ../shell/e-shell-window-actions.c:942
+#: ../shell/e-shell-window-actions.c:986
 msgid "_Quick Reference"
 msgstr "クィックリファレンス(_Q)"
 
-#: ../shell/e-shell-window-actions.c:944
+#: ../shell/e-shell-window-actions.c:988
 msgid "Show Evolution's shortcut keys"
 msgstr "Evolution のショートカットキーを表示"
 
-#: ../shell/e-shell-window-actions.c:951
+#: ../shell/e-shell-window-actions.c:993
+#, fuzzy
+#| msgid "Quit"
+msgid "_Quit"
+msgstr "終了"
+
+#: ../shell/e-shell-window-actions.c:995
 msgid "Exit the program"
 msgstr "プログラムを終了します"
 
-#: ../shell/e-shell-window-actions.c:956
+#: ../shell/e-shell-window-actions.c:1000
 msgid "_Advanced Search..."
 msgstr "高度な検索(_A)..."
 
-#: ../shell/e-shell-window-actions.c:958
+#: ../shell/e-shell-window-actions.c:1002
 msgid "Construct a more advanced search"
 msgstr "より高度な検索を設定"
 
-#: ../shell/e-shell-window-actions.c:965
+#: ../shell/e-shell-window-actions.c:1009
 msgid "Clear the current search parameters"
 msgstr "この検索条件を消去します"
 
-#: ../shell/e-shell-window-actions.c:970
+#: ../shell/e-shell-window-actions.c:1014
 msgid "_Edit Saved Searches..."
 msgstr "保存した検索結果の編集(_E)..."
 
-#: ../shell/e-shell-window-actions.c:972
+#: ../shell/e-shell-window-actions.c:1016
 msgid "Manage your saved searches"
 msgstr "保存した検索条件を管理"
 
-#: ../shell/e-shell-window-actions.c:979
+#: ../shell/e-shell-window-actions.c:1023
 msgid "Click here to change the search type"
 msgstr "ここをクリックして検索の種類を変更してください"
 
-#: ../shell/e-shell-window-actions.c:984
+#: ../shell/e-shell-window-actions.c:1028
 msgid "_Find Now"
 msgstr "今すぐ検索(_F)"
 
-#. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:986
+#: ../shell/e-shell-window-actions.c:1030
 msgid "Execute the current search parameters"
 msgstr "現在の検索条件を保存します"
 
-#: ../shell/e-shell-window-actions.c:991
+#: ../shell/e-shell-window-actions.c:1035
 msgid "_Save Search..."
 msgstr "検索条件の保存(_S)..."
 
-#: ../shell/e-shell-window-actions.c:993
+#: ../shell/e-shell-window-actions.c:1037
 msgid "Save the current search parameters"
 msgstr "現在の検索条件を保存します"
 
-#: ../shell/e-shell-window-actions.c:1005
+#: ../shell/e-shell-window-actions.c:1049
 msgid "Submit _Bug Report..."
 msgstr "バグ報告の提出(_B)..."
 
-#: ../shell/e-shell-window-actions.c:1007
+#: ../shell/e-shell-window-actions.c:1051
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug Buddy を使ってバグを報告します"
 
-#: ../shell/e-shell-window-actions.c:1012
+#: ../shell/e-shell-window-actions.c:1056
 msgid "_Work Offline"
 msgstr "オフラインで動作(_W)"
 
-#: ../shell/e-shell-window-actions.c:1014
+#: ../shell/e-shell-window-actions.c:1058
 msgid "Put Evolution into offline mode"
 msgstr "Evolution をオフラインモードにする"
 
-#: ../shell/e-shell-window-actions.c:1019
+#: ../shell/e-shell-window-actions.c:1063
 msgid "_Work Online"
 msgstr "オンラインで動作(_W)"
 
-#: ../shell/e-shell-window-actions.c:1021
+#: ../shell/e-shell-window-actions.c:1065
 msgid "Put Evolution into online mode"
 msgstr "Evolution をオンラインモードにする"
 
-#: ../shell/e-shell-window-actions.c:1049
+#: ../shell/e-shell-window-actions.c:1093
 msgid "Lay_out"
 msgstr "配置(_O)"
 
-#: ../shell/e-shell-window-actions.c:1056
-msgid "_New"
-msgstr "新規(_N)"
-
-#: ../shell/e-shell-window-actions.c:1063
+#: ../shell/e-shell-window-actions.c:1107
 msgid "_Search"
 msgstr "検索(_S)"
 
-#: ../shell/e-shell-window-actions.c:1070
+#: ../shell/e-shell-window-actions.c:1114
 msgid "_Switcher Appearance"
 msgstr "ボタンのスタイル(_S)"
 
-#: ../shell/e-shell-window-actions.c:1084
+#: ../shell/e-shell-window-actions.c:1128
 msgid "_Window"
 msgstr "ウィンドウ(_W)"
 
-#: ../shell/e-shell-window-actions.c:1113
+#: ../shell/e-shell-window-actions.c:1157
 msgid "Show Side _Bar"
 msgstr "サイドバーを表示する(_B)"
 
-#: ../shell/e-shell-window-actions.c:1115
+#: ../shell/e-shell-window-actions.c:1159
 msgid "Show the side bar"
 msgstr "サイドバーを表示する"
 
-#: ../shell/e-shell-window-actions.c:1121
+#: ../shell/e-shell-window-actions.c:1165
 msgid "Show _Buttons"
 msgstr "ボタンを表示(_B)"
 
-#: ../shell/e-shell-window-actions.c:1123
+#: ../shell/e-shell-window-actions.c:1167
 msgid "Show the switcher buttons"
 msgstr "切替ボタンを表示"
 
-#: ../shell/e-shell-window-actions.c:1129
+#: ../shell/e-shell-window-actions.c:1173
 msgid "Show _Status Bar"
 msgstr "ステータスバーを表示する(_S)"
 
-#: ../shell/e-shell-window-actions.c:1131
+#: ../shell/e-shell-window-actions.c:1175
 msgid "Show the status bar"
 msgstr "ステータスバーを表示する"
 
-#: ../shell/e-shell-window-actions.c:1137
+#: ../shell/e-shell-window-actions.c:1181
 msgid "Show _Tool Bar"
 msgstr "ツールバーを表示(_T)"
 
-#: ../shell/e-shell-window-actions.c:1139
+#: ../shell/e-shell-window-actions.c:1183
 msgid "Show the tool bar"
 msgstr "ツールバーを表示する"
 
-#: ../shell/e-shell-window-actions.c:1161
+#: ../shell/e-shell-window-actions.c:1205
 msgid "_Icons Only"
 msgstr "アイコンのみ(_I)"
 
-#: ../shell/e-shell-window-actions.c:1163
+#: ../shell/e-shell-window-actions.c:1207
 msgid "Display window buttons with icons only"
 msgstr "アイコンのみ付けてウィンドウボタンを表示します"
 
-#: ../shell/e-shell-window-actions.c:1168
+#: ../shell/e-shell-window-actions.c:1212
 msgid "_Text Only"
 msgstr "ラベルのみ(_T)"
 
-#: ../shell/e-shell-window-actions.c:1170
+#: ../shell/e-shell-window-actions.c:1214
 msgid "Display window buttons with text only"
 msgstr "ラベルのみ付けてウィンドウボタンを表示します"
 
-#: ../shell/e-shell-window-actions.c:1175
+#: ../shell/e-shell-window-actions.c:1219
 msgid "Icons _and Text"
 msgstr "アイコンとラベル(_A)"
 
-#: ../shell/e-shell-window-actions.c:1177
+#: ../shell/e-shell-window-actions.c:1221
 msgid "Display window buttons with icons and text"
 msgstr "アイコンとラベルを付けてウィンドウボタンを表示します"
 
-#: ../shell/e-shell-window-actions.c:1182
+#: ../shell/e-shell-window-actions.c:1226
 msgid "Tool_bar Style"
 msgstr "ツールバーのスタイル(_B)"
 
-#: ../shell/e-shell-window-actions.c:1184
+#: ../shell/e-shell-window-actions.c:1228
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "デスクトップの設定に従ってウィンドウボタンを表示します"
 
-#: ../shell/e-shell-window-actions.c:1192
+#: ../shell/e-shell-window-actions.c:1236
 msgid "Delete Current View"
 msgstr "このビューの削除"
 
-#: ../shell/e-shell-window-actions.c:1199
+#: ../shell/e-shell-window-actions.c:1243
 msgid "Save Custom View..."
 msgstr "カスタム表示の保存..."
 
-#: ../shell/e-shell-window-actions.c:1201
+#: ../shell/e-shell-window-actions.c:1245
 msgid "Save current custom view"
 msgstr "現在のビューを保存します"
 
-#: ../shell/e-shell-window-actions.c:1208
+#: ../shell/e-shell-window-actions.c:1252
 msgid "C_urrent View"
 msgstr "現在のビュー(_U)"
 
-#: ../shell/e-shell-window-actions.c:1218
+#: ../shell/e-shell-window-actions.c:1262
 msgid "Custom View"
 msgstr "ビューのカスタマイズ"
 
-#: ../shell/e-shell-window-actions.c:1220
+#: ../shell/e-shell-window-actions.c:1264
 msgid "Current view is a customized view"
 msgstr "現在のビューはカスタマイズしたビューです"
 
-#: ../shell/e-shell-window-actions.c:1230
+#: ../shell/e-shell-window-actions.c:1272
+msgid "Page Set_up..."
+msgstr ""
+
+#: ../shell/e-shell-window-actions.c:1274
 msgid "Change the page settings for your current printer"
 msgstr "現在のプリンターのページ設定を変更する"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1635
 #, c-format
 msgid "Switch to %s"
 msgstr "%sに切り替えます"
 
-#: ../shell/e-shell-window-actions.c:1714
+#: ../shell/e-shell-window-actions.c:1758
 #, c-format
 msgid "Select view: %s"
 msgstr "ビューの選択: %s"
 
-#: ../shell/e-shell-window-actions.c:1731
+#: ../shell/e-shell-window-actions.c:1775
 #, c-format
 msgid "Delete view: %s"
 msgstr "ビューの削除: %s"
 
-#: ../shell/e-shell-window-actions.c:1825
+#: ../shell/e-shell-window-actions.c:1869
 msgid "Execute these search parameters"
 msgstr "この検索条件で検索を実行"
 
-#: ../shell/e-shell-window.c:455
+#: ../shell/e-shell-window.c:503
 msgid "New"
 msgstr "新規"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:580
+#: ../shell/e-shell-window-private.c:579
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:183
+#: ../shell/main.c:182
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19194,7 +19730,7 @@ msgstr ""
 "私たちの激務の成果に満足してくれることを願い、\n"
 "そしてあなたの貢献を熱心に待つことにします!\n"
 
-#: ../shell/main.c:207
+#: ../shell/main.c:206
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19202,58 +19738,58 @@ msgstr ""
 "感謝します\n"
 "Evolution 開発チーム\n"
 
-#: ../shell/main.c:213
+#: ../shell/main.c:212
 msgid "Do not tell me again"
 msgstr "次回からこのメッセージを表示しない"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:302
+#: ../shell/main.c:301
 msgid "Start Evolution showing the specified component. Available options are 'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
 msgstr "Evolution を起動した時に指定したコンポーネントを表示する。利用可能なオプションは 'mail'、'calendar'、'contacts'、'tasks' または 'memos' です。"
 
-#: ../shell/main.c:306
+#: ../shell/main.c:305
 msgid "Apply the given geometry to the main window"
 msgstr "指定した座標をメインウィンドウに適用する"
 
-#: ../shell/main.c:310
+#: ../shell/main.c:309
 msgid "Start in online mode"
 msgstr "オンラインモードで起動する"
 
-#: ../shell/main.c:312
+#: ../shell/main.c:311
 msgid "Ignore network availability"
 msgstr "ネットワークが利用可能かどうか無視する"
 
-#: ../shell/main.c:315
+#: ../shell/main.c:314
 msgid "Forcibly shut down Evolution"
 msgstr "Evolution を強制的に終了する"
 
-#: ../shell/main.c:318
+#: ../shell/main.c:317
 msgid "Disable loading of any plugins."
 msgstr "プラグインを読み込まない"
 
-#: ../shell/main.c:320
+#: ../shell/main.c:319
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "メール/連絡先/タスクのプレビューペインを無効にして起動する"
 
-#: ../shell/main.c:324
+#: ../shell/main.c:323
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "残りの引数で指定した URI やファイルをインポートする。"
 
-#: ../shell/main.c:326
+#: ../shell/main.c:325
 msgid "Request a running Evolution process to quit"
 msgstr "実行中の Evolution のプロセスを終了するよう要求する"
 
-#: ../shell/main.c:403
+#: ../shell/main.c:402
 #, c-format
 msgid "Cannot start Evolution.  Another Evolution instance may be unresponsive. System error: %s"
 msgstr "Evolution を起動できません。他の Evolution が反応しなくなっているかもしれません。システムエラー: %s"
 
-#: ../shell/main.c:499 ../shell/main.c:504
+#: ../shell/main.c:496 ../shell/main.c:501
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM とメールクライアント"
 
-#: ../shell/main.c:571
+#: ../shell/main.c:568
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19262,7 +19798,7 @@ msgstr ""
 "%s: --online と --offline は同時には使用できません。\n"
 "  詳細は '%s --help' をご覧ください。\n"
 
-#: ../shell/main.c:577
+#: ../shell/main.c:574
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -19301,7 +19837,7 @@ msgstr "バージョン {0} から直接アップグレードできません"
 msgid "Evolution no longer supports upgrading directly from version {0}. However as a workaround you might try first upgrading to Evolution 2, and then upgrading to Evolution 3."
 msgstr "Evolution はバージョン {0} からの直接のアップグレードをもうサポートしていません。しかしながら、とりあえずの方法として、Evolution 2 にアップグレードし、それから Evolution 3 へアップグレードするのを試みてください。"
 
-#: ../smime/gui/ca-trust-dialog.c:109
+#: ../smime/gui/ca-trust-dialog.c:108
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -19312,203 +19848,133 @@ msgstr ""
 "\n"
 "信用度を設定してください:"
 
-#: ../smime/gui/certificate-manager.c:73 ../smime/gui/certificate-manager.c:92
-#: ../smime/gui/certificate-manager.c:112
+#: ../smime/gui/certificate-manager.c:80 ../smime/gui/certificate-manager.c:99
+#: ../smime/gui/certificate-manager.c:119
 msgid "Certificate Name"
 msgstr "証明書の名前"
 
-#: ../smime/gui/certificate-manager.c:74 ../smime/gui/certificate-manager.c:94
+#: ../smime/gui/certificate-manager.c:81
+#: ../smime/gui/certificate-manager.c:101
 msgid "Issued To Organization"
 msgstr "発行先の組織"
 
-#: ../smime/gui/certificate-manager.c:75 ../smime/gui/certificate-manager.c:95
+#: ../smime/gui/certificate-manager.c:82
+#: ../smime/gui/certificate-manager.c:102
 msgid "Issued To Organizational Unit"
 msgstr "発行先の部署 (OU)"
 
-#: ../smime/gui/certificate-manager.c:76 ../smime/gui/certificate-manager.c:96
-#: ../smime/gui/certificate-manager.c:114
-#: ../smime/gui/certificate-viewer.c:638 ../smime/lib/e-asn1-object.c:134
+#: ../smime/gui/certificate-manager.c:83
+#: ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:121
 msgid "Serial Number"
 msgstr "シリアル番号"
 
-#: ../smime/gui/certificate-manager.c:77 ../smime/gui/certificate-manager.c:97
-#: ../smime/gui/certificate-manager.c:115
+#: ../smime/gui/certificate-manager.c:84
+#: ../smime/gui/certificate-manager.c:104
+#: ../smime/gui/certificate-manager.c:122
 msgid "Purposes"
 msgstr "利用の目的"
 
-#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
-#: ../smime/gui/certificate-manager.c:116
-#: ../smime/gui/certificate-viewer.c:640
+#: ../smime/gui/certificate-manager.c:85
+#: ../smime/gui/certificate-manager.c:105
+#: ../smime/gui/certificate-manager.c:123
 msgid "Issued By"
 msgstr "発行元"
 
-#: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
-#: ../smime/gui/certificate-manager.c:117
+#: ../smime/gui/certificate-manager.c:86
+#: ../smime/gui/certificate-manager.c:106
+#: ../smime/gui/certificate-manager.c:124
 msgid "Issued By Organization"
 msgstr "発行した組織"
 
-#: ../smime/gui/certificate-manager.c:80
-#: ../smime/gui/certificate-manager.c:100
-#: ../smime/gui/certificate-manager.c:118
+#: ../smime/gui/certificate-manager.c:87
+#: ../smime/gui/certificate-manager.c:107
+#: ../smime/gui/certificate-manager.c:125
 msgid "Issued By Organizational Unit"
 msgstr "発行した部署 (OU)"
 
-#: ../smime/gui/certificate-manager.c:81
-#: ../smime/gui/certificate-manager.c:101
-#: ../smime/gui/certificate-manager.c:119
+#: ../smime/gui/certificate-manager.c:88
+#: ../smime/gui/certificate-manager.c:108
+#: ../smime/gui/certificate-manager.c:126
 msgid "Issued"
 msgstr "発行対象"
 
-#: ../smime/gui/certificate-manager.c:82
-#: ../smime/gui/certificate-manager.c:102
-#: ../smime/gui/certificate-manager.c:120
+#: ../smime/gui/certificate-manager.c:89
+#: ../smime/gui/certificate-manager.c:109
+#: ../smime/gui/certificate-manager.c:127
 msgid "Expires"
 msgstr "有効期限"
 
-#: ../smime/gui/certificate-manager.c:83
-#: ../smime/gui/certificate-manager.c:103
-#: ../smime/gui/certificate-manager.c:121
-#: ../smime/gui/certificate-viewer.c:650
+#: ../smime/gui/certificate-manager.c:90
+#: ../smime/gui/certificate-manager.c:110
+#: ../smime/gui/certificate-manager.c:128
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 指紋"
 
-#: ../smime/gui/certificate-manager.c:84
-#: ../smime/gui/certificate-manager.c:104
-#: ../smime/gui/certificate-manager.c:122
-#: ../smime/gui/certificate-viewer.c:651
+#: ../smime/gui/certificate-manager.c:91
+#: ../smime/gui/certificate-manager.c:111
+#: ../smime/gui/certificate-manager.c:129
 msgid "MD5 Fingerprint"
 msgstr "MD5 指紋"
 
-#: ../smime/gui/certificate-manager.c:93
-#: ../smime/gui/certificate-manager.c:113
+#: ../smime/gui/certificate-manager.c:100
+#: ../smime/gui/certificate-manager.c:120
 msgid "Email Address"
 msgstr "メールアドレス"
 
-#: ../smime/gui/certificate-manager.c:614
+#: ../smime/gui/certificate-manager.c:621
 msgid "Select a certificate to import..."
 msgstr "インポートする証明書の選択..."
 
-#: ../smime/gui/certificate-manager.c:628
+#: ../smime/gui/certificate-manager.c:635
 msgid "All files"
 msgstr "すべてのファイル"
 
-#: ../smime/gui/certificate-manager.c:664
+#: ../smime/gui/certificate-manager.c:671
 msgid "Failed to import certificate"
 msgstr "証明書のインポートに失敗しました"
 
-#: ../smime/gui/certificate-manager.c:1046
+#: ../smime/gui/certificate-manager.c:1053
 msgid "All PKCS12 files"
 msgstr "すべての PKCS12 ファイル"
 
-#: ../smime/gui/certificate-manager.c:1063
+#: ../smime/gui/certificate-manager.c:1070
 msgid "All email certificate files"
 msgstr "すべてのメール認証ファイル"
 
-#: ../smime/gui/certificate-manager.c:1080
+#: ../smime/gui/certificate-manager.c:1087
 msgid "All CA certificate files"
 msgstr "すべての CA 認証ファイル"
 
-#: ../smime/gui/certificate-viewer.c:292
-msgid "Not part of certificate"
-msgstr "証明書の一部ではありません"
-
-#: ../smime/gui/certificate-viewer.c:600
-msgid "This certificate has been verified for the following uses:"
-msgstr "この証明書は次の用途に対して検証済です:"
-
-#: ../smime/gui/certificate-viewer.c:604 ../smime/lib/e-asn1-object.c:387
-msgid "SSL Client Certificate"
-msgstr "SSL クライアント証明書"
-
-#: ../smime/gui/certificate-viewer.c:609 ../smime/lib/e-asn1-object.c:391
-msgid "SSL Server Certificate"
-msgstr "SSL サーバー証明書"
-
-#: ../smime/gui/certificate-viewer.c:614
-msgid "Email Signer Certificate"
-msgstr "メールに署名した人の証明書"
-
-#: ../smime/gui/certificate-viewer.c:619
-msgid "Email Recipient Certificate"
-msgstr "メールを受信した人の証明書"
-
-#: ../smime/gui/certificate-viewer.c:634
-msgid "Issued To"
-msgstr "発行先"
-
-#: ../smime/gui/certificate-viewer.c:635 ../smime/gui/certificate-viewer.c:641
-msgid "Common Name (CN)"
-msgstr "Common Name (CN)"
-
-#: ../smime/gui/certificate-viewer.c:636 ../smime/gui/certificate-viewer.c:642
-msgid "Organization (O)"
-msgstr "組織 (O)"
-
-#: ../smime/gui/certificate-viewer.c:637 ../smime/gui/certificate-viewer.c:643
-msgid "Organizational Unit (OU)"
-msgstr "組織の単位 (OU)"
-
-#: ../smime/gui/certificate-viewer.c:645
-msgid "Validity"
-msgstr "妥当性"
-
-#: ../smime/gui/certificate-viewer.c:646
-msgid "Issued On"
-msgstr "発行日"
-
-#: ../smime/gui/certificate-viewer.c:647
-msgid "Expires On"
-msgstr "有効期限"
-
-#: ../smime/gui/certificate-viewer.c:649
-msgid "Fingerprints"
-msgstr "指紋"
-
-#: ../smime/gui/certificate-viewer.c:671
-msgid "Certificate Hierarchy"
-msgstr "証明書の階層"
-
-#: ../smime/gui/certificate-viewer.c:674
-msgid "Certificate Fields"
-msgstr "証明書のフィールド"
-
-#: ../smime/gui/certificate-viewer.c:677
-msgid "Field Value"
-msgstr "項目の値"
-
-#: ../smime/gui/certificate-viewer.c:679
-msgid "Details"
-msgstr "詳細"
-
-#: ../smime/gui/cert-trust-dialog.c:153
+#: ../smime/gui/cert-trust-dialog.c:152
 msgid "Because you trust the certificate authority that issued this certificate, then you trust the authenticity of this certificate unless otherwise indicated here"
 msgstr "この証明書を発行した認証局を信用したので、ここで表示された他のものを除いて、この証明書の信憑性を信用することになります。"
 
-#: ../smime/gui/cert-trust-dialog.c:158
+#: ../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 unless otherwise indicated here"
 msgstr "この証明書を発行した認証局を信用しなかったので、ここで表示された他のものを除いて、この証明書の信憑性を信用しないことになります。"
 
-#: ../smime/gui/component.c:56
+#: ../smime/gui/component.c:55
 #, c-format
 msgid "Enter the password for '%s', token '%s'"
 msgstr "'%s' のパスワードと '%s' のトークンを入力してください"
 
-#: ../smime/gui/component.c:58
+#: ../smime/gui/component.c:57
 #, c-format
 msgid "Enter the password for '%s'"
 msgstr "'%s' のパスワードを入力してください"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:86
+#: ../smime/gui/component.c:85
 msgid "Enter new password for certificate database"
 msgstr "データベースを証明する新しいパスワードを入力してください"
 
-#: ../smime/gui/component.c:89
+#: ../smime/gui/component.c:88
 msgid "Enter new password"
 msgstr "新しいパスワードの入力"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -19517,7 +19983,7 @@ msgstr ""
 "発行先:\n"
 "  件名: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:123
+#: ../smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -19526,7 +19992,7 @@ msgstr ""
 "発行元:\n"
 "  件名: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:176
+#: ../smime/gui/e-cert-selector.c:175
 msgid "Select certificate"
 msgstr "証明書の選択"
 
@@ -19547,254 +20013,84 @@ msgstr "バックアップ(_B)"
 msgid "Backup _All"
 msgstr "すべてバックアップ(_A)"
 
-#: ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "Your Certificates"
 msgstr "ユーザーの証明書"
 
-#: ../smime/gui/smime-ui.ui.h:11
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "You have certificates on file that identify these people:"
 msgstr "次の人達の身元を確認できる証明書 (ファイル) があります:"
 
-#: ../smime/gui/smime-ui.ui.h:12
+#: ../smime/gui/smime-ui.ui.h:14
 msgid "Contact Certificates"
 msgstr "連絡先の証明書"
 
-#: ../smime/gui/smime-ui.ui.h:13
+#: ../smime/gui/smime-ui.ui.h:15
 msgid "You have certificates on file that identify these certificate authorities:"
 msgstr "次の認証局を確認できる証明書 (ファイル) があります:"
 
-#: ../smime/gui/smime-ui.ui.h:14
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Authorities"
 msgstr "認証局"
 
-#: ../smime/gui/smime-ui.ui.h:15
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Certificate Authority Trust"
 msgstr "認証局の信頼性"
 
-#: ../smime/gui/smime-ui.ui.h:16
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Trust this CA to identify _websites."
 msgstr "この認証局をウェブサイトを識別するために信用します。(_W)"
 
-#: ../smime/gui/smime-ui.ui.h:17
+#: ../smime/gui/smime-ui.ui.h:19
 msgid "Trust this CA to identify _email users."
 msgstr "この認証局をメールのユーザーを識別するために信用します。(_E)"
 
-#: ../smime/gui/smime-ui.ui.h:18
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "Trust this CA to identify _software developers."
 msgstr "この認証局をソフトウェア開発者を識別するために信用します。(_S)"
 
-#: ../smime/gui/smime-ui.ui.h:19
+#: ../smime/gui/smime-ui.ui.h:21
 msgid "Before trusting this CA for any purpose, you should examine its certificate and its policy and procedures (if available)."
 msgstr "認証局 (CA) を信用する前に、(可能であれば) その証明書やポリシー、そして手続きをよく調べる必要があります。"
 
-#: ../smime/gui/smime-ui.ui.h:21 ../smime/lib/e-asn1-object.c:658
+#: ../smime/gui/smime-ui.ui.h:25
 msgid "Certificate"
 msgstr "証明書"
 
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "Certificate details"
 msgstr "証明書の詳細"
 
-#: ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Email Certificate Trust Settings"
 msgstr "メール証明書の信憑性の設定"
 
-#: ../smime/gui/smime-ui.ui.h:24
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "Trust the authenticity of this certificate"
 msgstr "この証明書を信用する"
 
-#: ../smime/gui/smime-ui.ui.h:25
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "Do not trust the authenticity of this certificate"
 msgstr "この証明書の信憑性を問わない"
 
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/smime-ui.ui.h:30
 msgid "_Edit CA Trust"
 msgstr "CA トラストの編集(_E)"
 
-#: ../smime/lib/e-asn1-object.c:95
-msgid "Version"
-msgstr "バージョン"
-
-#: ../smime/lib/e-asn1-object.c:110
-msgid "Version 1"
-msgstr "バージョン1"
-
-#: ../smime/lib/e-asn1-object.c:113
-msgid "Version 2"
-msgstr "バージョン2"
-
-#: ../smime/lib/e-asn1-object.c:116
-msgid "Version 3"
-msgstr "バージョン3"
-
-#: ../smime/lib/e-asn1-object.c:192
-msgid "PKCS #1 MD2 With RSA Encryption"
-msgstr "RSA で暗号化された PKCS #1 MD2"
-
-#: ../smime/lib/e-asn1-object.c:195
-msgid "PKCS #1 MD5 With RSA Encryption"
-msgstr "RSA で暗号化された PKCS #1 MD5"
-
-#: ../smime/lib/e-asn1-object.c:198
-msgid "PKCS #1 SHA-1 With RSA Encryption"
-msgstr "RSA で暗号化された PKCS #1 SHA-1"
-
-#: ../smime/lib/e-asn1-object.c:201
-msgid "PKCS #1 SHA-256 With RSA Encryption"
-msgstr "RSA で暗号化された PKCS #1 SHA-256"
-
-#: ../smime/lib/e-asn1-object.c:204
-msgid "PKCS #1 SHA-384 With RSA Encryption"
-msgstr "RSA で暗号化された PKCS #1 SHA-384"
-
-#: ../smime/lib/e-asn1-object.c:207
-msgid "PKCS #1 SHA-512 With RSA Encryption"
-msgstr "RSA で暗号化された PKCS #1 SHA-512"
-
-#: ../smime/lib/e-asn1-object.c:234
-msgid "PKCS #1 RSA Encryption"
-msgstr "PKCS #1 RSA 暗号化"
-
-#: ../smime/lib/e-asn1-object.c:237
-msgid "Certificate Key Usage"
-msgstr "認証の鍵の用法"
-
-#: ../smime/lib/e-asn1-object.c:240
-msgid "Netscape Certificate Type"
-msgstr "Netscape 証明書の種類"
-
-#: ../smime/lib/e-asn1-object.c:243
-msgid "Certificate Authority Key Identifier"
-msgstr "認証局の鍵の識別子"
-
-#: ../smime/lib/e-asn1-object.c:255
-#, c-format
-msgid "Object Identifier (%s)"
-msgstr "オブジェクトの識別子 (%s)"
-
-#: ../smime/lib/e-asn1-object.c:306
-msgid "Algorithm Identifier"
-msgstr "アルゴリズムの識別子"
-
-#: ../smime/lib/e-asn1-object.c:314
-msgid "Algorithm Parameters"
-msgstr "アルゴリズムの引数"
-
-#: ../smime/lib/e-asn1-object.c:336
-msgid "Subject Public Key Info"
-msgstr "主体者公開鍵情報"
-
-#: ../smime/lib/e-asn1-object.c:341
-msgid "Subject Public Key Algorithm"
-msgstr "主体者公開鍵のアルゴリズム"
-
-#: ../smime/lib/e-asn1-object.c:356
-msgid "Subject's Public Key"
-msgstr "主体者公開鍵"
-
-#: ../smime/lib/e-asn1-object.c:378 ../smime/lib/e-asn1-object.c:428
-msgid "Error: Unable to process extension"
-msgstr "エラー: 拡張処理できません"
-
-#: ../smime/lib/e-asn1-object.c:399 ../smime/lib/e-asn1-object.c:411
-msgid "Object Signer"
-msgstr "オブジェクトの署名者"
-
-#: ../smime/lib/e-asn1-object.c:403
-msgid "SSL Certificate Authority"
-msgstr "SSL 認証局"
-
-#: ../smime/lib/e-asn1-object.c:407
-msgid "Email Certificate Authority"
-msgstr "メール認証局"
-
-#: ../smime/lib/e-asn1-object.c:436
-msgid "Signing"
-msgstr "署名中"
-
-#: ../smime/lib/e-asn1-object.c:440
-msgid "Non-repudiation"
-msgstr "容認"
-
-#: ../smime/lib/e-asn1-object.c:444
-msgid "Key Encipherment"
-msgstr "鍵の暗号化"
-
-#: ../smime/lib/e-asn1-object.c:448
-msgid "Data Encipherment"
-msgstr "データの暗号化"
-
-#: ../smime/lib/e-asn1-object.c:452
-msgid "Key Agreement"
-msgstr "鍵の約款"
-
-#: ../smime/lib/e-asn1-object.c:456
-msgid "Certificate Signer"
-msgstr "証明書の署名者"
-
-#: ../smime/lib/e-asn1-object.c:460
-msgid "CRL Signer"
-msgstr "CRL の署名者"
-
-#: ../smime/lib/e-asn1-object.c:509
-msgid "Critical"
-msgstr "危険"
-
-#: ../smime/lib/e-asn1-object.c:511 ../smime/lib/e-asn1-object.c:514
-msgid "Not Critical"
-msgstr "危険ではない"
-
-#: ../smime/lib/e-asn1-object.c:535
-msgid "Extensions"
-msgstr "拡張"
-
-#. Translators: This string is used in Certificate
-#. * details for fields like Issuer or Subject, which
-#. * shows the field name on the left and its respective
-#. * value on the right, both as stored in the
-#. * certificate itself.  You probably do not need to
-#. * change this string, unless changing the order of
-#. * name and value.  As a result example:
-#. * "OU = VeriSign Trust Network"
-#: ../smime/lib/e-asn1-object.c:615
-#, c-format
-msgid "%s = %s"
-msgstr "%s = %s"
-
-#: ../smime/lib/e-asn1-object.c:672 ../smime/lib/e-asn1-object.c:807
-msgid "Certificate Signature Algorithm"
-msgstr "証明書の署名アルゴリズム"
-
-#: ../smime/lib/e-asn1-object.c:681
-msgid "Issuer"
-msgstr "発行者"
-
-#: ../smime/lib/e-asn1-object.c:735
-msgid "Issuer Unique ID"
-msgstr "重複しない発行者の ID"
-
-#: ../smime/lib/e-asn1-object.c:754
-msgid "Subject Unique ID"
-msgstr "重複しない件名の ID"
-
-#: ../smime/lib/e-asn1-object.c:813
-msgid "Certificate Signature Value"
-msgstr "証明書の署名の値"
-
-#: ../smime/lib/e-cert.c:201 ../smime/lib/e-cert.c:213
+#: ../smime/lib/e-cert.c:236 ../smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%Y/%m/%d"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:392
+#: ../smime/lib/e-cert.c:404
 msgid "Sign"
 msgstr "署名"
 
-#: ../smime/lib/e-cert.c:393
+#: ../smime/lib/e-cert.c:405
 msgid "Encrypt"
 msgstr "暗号化"
 
-#: ../smime/lib/e-cert-db.c:864
+#: ../smime/lib/e-cert-db.c:718
 msgid "Certificate already exists"
 msgstr "既に証明書があります"
 
@@ -19881,3 +20177,231 @@ msgstr "期日(_D)"
 #: ../views/tasks/galview.xml.h:3
 msgid "With _Status"
 msgstr "ステータス(_S)"
+
+#~ msgid "Original Contact:"
+#~ msgstr "元の連絡先:"
+
+#~ msgid "Ellipsize mode for folder names in side bar"
+#~ msgstr "サイドバーのフォルダー名の省略モード"
+
+#~ msgid "Pinging %s"
+#~ msgstr "%s へ ping 中に"
+
+#~ msgid "_Restore Default"
+#~ msgstr "デフォルトに戻す(_R)"
+
+#~ msgid "Add"
+#~ msgstr "追加"
+
+#~ msgid "Edit"
+#~ msgstr "編集"
+
+#~ msgid " Account "
+#~ msgstr " アカウント "
+
+#~ msgid "Copy..."
+#~ msgstr "コピー..."
+
+#~ msgid "No writable calendar is available."
+#~ msgstr "書き込み可能なカレンダーがありません。"
+
+#~ msgid "Proxy Settings"
+#~ msgstr "プロキシの設定"
+
+#~ msgid "_Use system defaults"
+#~ msgstr "システムのデフォルトを使用する(_U)"
+
+#~ msgid "_Direct connection to the Internet"
+#~ msgstr "インターネットに直接接続する(_D)"
+
+#~ msgid "_Manual proxy configuration:"
+#~ msgstr "マニュアルでプロキシの設定を行う(_M):"
+
+#~ msgid "_Secure HTTP Proxy:"
+#~ msgstr "セキュア HTTP プロキシ(_S):"
+
+#~ msgid "No _Proxy for:"
+#~ msgstr "無視するホスト(_P):"
+
+#~ msgid "Use Authe_ntication"
+#~ msgstr "認証する(_N)"
+
+#~ msgid "Us_ername:"
+#~ msgstr "ユーザー名(_E):"
+
+#~ msgid "Pass_word:"
+#~ msgstr "パスワード(_W):"
+
+#~ msgid "Not part of certificate"
+#~ msgstr "証明書の一部ではありません"
+
+#~ msgid "This certificate has been verified for the following uses:"
+#~ msgstr "この証明書は次の用途に対して検証済です:"
+
+#~ msgid "SSL Client Certificate"
+#~ msgstr "SSL クライアント証明書"
+
+#~ msgid "SSL Server Certificate"
+#~ msgstr "SSL サーバー証明書"
+
+#~ msgid "Email Signer Certificate"
+#~ msgstr "メールに署名した人の証明書"
+
+#~ msgid "Email Recipient Certificate"
+#~ msgstr "メールを受信した人の証明書"
+
+#~ msgid "Issued To"
+#~ msgstr "発行先"
+
+#~ msgid "Common Name (CN)"
+#~ msgstr "Common Name (CN)"
+
+#~ msgid "Organization (O)"
+#~ msgstr "組織 (O)"
+
+#~ msgid "Organizational Unit (OU)"
+#~ msgstr "組織の単位 (OU)"
+
+#~ msgid "Validity"
+#~ msgstr "妥当性"
+
+#~ msgid "Issued On"
+#~ msgstr "発行日"
+
+#~ msgid "Expires On"
+#~ msgstr "有効期限"
+
+#~ msgid "Fingerprints"
+#~ msgstr "指紋"
+
+#~ msgid "Certificate Hierarchy"
+#~ msgstr "証明書の階層"
+
+#~ msgid "Certificate Fields"
+#~ msgstr "証明書のフィールド"
+
+#~ msgid "Field Value"
+#~ msgstr "項目の値"
+
+#~ msgid "Details"
+#~ msgstr "詳細"
+
+#~ msgid "Version"
+#~ msgstr "バージョン"
+
+#~ msgid "Version 1"
+#~ msgstr "バージョン1"
+
+#~ msgid "Version 2"
+#~ msgstr "バージョン2"
+
+#~ msgid "Version 3"
+#~ msgstr "バージョン3"
+
+#~ msgid "PKCS #1 MD2 With RSA Encryption"
+#~ msgstr "RSA で暗号化された PKCS #1 MD2"
+
+#~ msgid "PKCS #1 MD5 With RSA Encryption"
+#~ msgstr "RSA で暗号化された PKCS #1 MD5"
+
+#~ msgid "PKCS #1 SHA-1 With RSA Encryption"
+#~ msgstr "RSA で暗号化された PKCS #1 SHA-1"
+
+#~ msgid "PKCS #1 SHA-256 With RSA Encryption"
+#~ msgstr "RSA で暗号化された PKCS #1 SHA-256"
+
+#~ msgid "PKCS #1 SHA-384 With RSA Encryption"
+#~ msgstr "RSA で暗号化された PKCS #1 SHA-384"
+
+#~ msgid "PKCS #1 SHA-512 With RSA Encryption"
+#~ msgstr "RSA で暗号化された PKCS #1 SHA-512"
+
+#~ msgid "PKCS #1 RSA Encryption"
+#~ msgstr "PKCS #1 RSA 暗号化"
+
+#~ msgid "Certificate Key Usage"
+#~ msgstr "認証の鍵の用法"
+
+#~ msgid "Netscape Certificate Type"
+#~ msgstr "Netscape 証明書の種類"
+
+#~ msgid "Certificate Authority Key Identifier"
+#~ msgstr "認証局の鍵の識別子"
+
+#~ msgid "Object Identifier (%s)"
+#~ msgstr "オブジェクトの識別子 (%s)"
+
+#~ msgid "Algorithm Identifier"
+#~ msgstr "アルゴリズムの識別子"
+
+#~ msgid "Algorithm Parameters"
+#~ msgstr "アルゴリズムの引数"
+
+#~ msgid "Subject Public Key Info"
+#~ msgstr "主体者公開鍵情報"
+
+#~ msgid "Subject Public Key Algorithm"
+#~ msgstr "主体者公開鍵のアルゴリズム"
+
+#~ msgid "Subject's Public Key"
+#~ msgstr "主体者公開鍵"
+
+#~ msgid "Error: Unable to process extension"
+#~ msgstr "エラー: 拡張処理できません"
+
+#~ msgid "Object Signer"
+#~ msgstr "オブジェクトの署名者"
+
+#~ msgid "SSL Certificate Authority"
+#~ msgstr "SSL 認証局"
+
+#~ msgid "Email Certificate Authority"
+#~ msgstr "メール認証局"
+
+#~ msgid "Signing"
+#~ msgstr "署名中"
+
+#~ msgid "Non-repudiation"
+#~ msgstr "容認"
+
+#~ msgid "Key Encipherment"
+#~ msgstr "鍵の暗号化"
+
+#~ msgid "Data Encipherment"
+#~ msgstr "データの暗号化"
+
+#~ msgid "Key Agreement"
+#~ msgstr "鍵の約款"
+
+#~ msgid "Certificate Signer"
+#~ msgstr "証明書の署名者"
+
+#~ msgid "CRL Signer"
+#~ msgstr "CRL の署名者"
+
+#~ msgid "Critical"
+#~ msgstr "危険"
+
+#~ msgid "Not Critical"
+#~ msgstr "危険ではない"
+
+#~ msgid "Extensions"
+#~ msgstr "拡張"
+
+#~ msgid "%s = %s"
+#~ msgstr "%s = %s"
+
+#~ msgid "Certificate Signature Algorithm"
+#~ msgstr "証明書の署名アルゴリズム"
+
+#~ msgid "Issuer"
+#~ msgstr "発行者"
+
+#~ msgid "Issuer Unique ID"
+#~ msgstr "重複しない発行者の ID"
+
+#~ msgid "Subject Unique ID"
+#~ msgstr "重複しない件名の ID"
+
+#~ msgid "Certificate Signature Value"
+#~ msgstr "証明書の署名の値"
author	Jiro Matsuzawa <jmatsuzawa@gnome.org>	2014-03-24 20:42:54 +0800
committer	Jiro Matsuzawa <jmatsuzawa@gnome.org>	2014-03-24 20:42:54 +0800
commit	1b9db74cf09a353a6e55c57d3b35d8d97ec3134f (patch)
tree	c1d72b51c3defe7599782a8d9483b4a9b7da6d61 /po
parent	d86e8e30b85791ee8b2dc0c2ddefcf684beb1676 (diff)
download	gsoc2013-evolution-1b9db74cf09a353a6e55c57d3b35d8d97ec3134f.tar gsoc2013-evolution-1b9db74cf09a353a6e55c57d3b35d8d97ec3134f.tar.gz gsoc2013-evolution-1b9db74cf09a353a6e55c57d3b35d8d97ec3134f.tar.bz2 gsoc2013-evolution-1b9db74cf09a353a6e55c57d3b35d8d97ec3134f.tar.lz gsoc2013-evolution-1b9db74cf09a353a6e55c57d3b35d8d97ec3134f.tar.xz gsoc2013-evolution-1b9db74cf09a353a6e55c57d3b35d8d97ec3134f.tar.zst gsoc2013-evolution-1b9db74cf09a353a6e55c57d3b35d8d97ec3134f.zip